From: <geo...@us...> - 2007-07-02 21:30:30
|
Revision: 2112 http://svn.sourceforge.net/freeorion/revision/?rev=2112&view=rev Author: geoffthemedio Date: 2007-07-02 14:30:32 -0700 (Mon, 02 Jul 2007) Log Message: ----------- -Updated MSVC project files to point to where I have Python 2.4 installed, since the Python libs and headers aren't in the SDK directory as I had previously assumed. Anyone building FO with the project files on will need to set these directories in the project properties to where they have Python installed -Made some incomplete changes towards having clicks of BuildingTypes in SitRep entries show the clicked BuildingType in the ProductionWnd, similar to how clicking techs in the SitRep displayes the tech on the ResearchWnd Modified Paths: -------------- trunk/FreeOrion/UI/ClientUI.cpp trunk/FreeOrion/UI/MapWnd.cpp trunk/FreeOrion/UI/MapWnd.h trunk/FreeOrion/UI/SitRepPanel.cpp trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj Modified: trunk/FreeOrion/UI/ClientUI.cpp =================================================================== --- trunk/FreeOrion/UI/ClientUI.cpp 2007-07-02 08:30:02 UTC (rev 2111) +++ trunk/FreeOrion/UI/ClientUI.cpp 2007-07-02 21:30:32 UTC (rev 2112) @@ -424,7 +424,7 @@ #ifndef FREEORION_BUILD_UTIL if (!GetBuildingType(building_type_name)) return false; - // TODO + m_map_wnd->ShowBuildingType(building_type_name); return true; #else return false; Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2007-07-02 08:30:02 UTC (rev 2111) +++ trunk/FreeOrion/UI/MapWnd.cpp 2007-07-02 21:30:32 UTC (rev 2112) @@ -876,6 +876,13 @@ m_research_wnd->CenterOnTech(tech_name); } +void MapWnd::ShowBuildingType(const std::string& building_type_name) +{ + //if (!m_production_wnd->Visible()) + // ToggleProduction(); + //m_production_wnd->building_type_name); +} + void MapWnd::CenterOnSystem(System* system) { CenterOnMapCoord(system->X(), system->Y()); Modified: trunk/FreeOrion/UI/MapWnd.h =================================================================== --- trunk/FreeOrion/UI/MapWnd.h 2007-07-02 08:30:02 UTC (rev 2111) +++ trunk/FreeOrion/UI/MapWnd.h 2007-07-02 21:30:32 UTC (rev 2112) @@ -93,7 +93,8 @@ void CenterOnFleet(int fleetID); //!< centers the map on fleet \a fleetID void CenterOnSystem(System* system); //!< centers the map on system \a system void CenterOnFleet(Fleet* fleet); //!< centers the map on fleet \a fleet - void ShowTech(const std::string& tech_name);//!< brings up the research screen and centers the tech tree on \a tech_name + void ShowTech(const std::string& tech_name); //!< brings up the research screen and centers the tech tree on \a tech_name + void ShowBuildingType(const std::string& building_type_name); //!< brings up the production screen and displays info about the buildtype \a type_name void SelectSystem(int systemID); //!< catches emitted signals from the system icons, and allows programmatic selection of planets void SelectFleet(int fleetID); //!< allows programmatic selection of fleets void SelectFleet(Fleet* fleet); //!< allows programmatic selection of fleets Modified: trunk/FreeOrion/UI/SitRepPanel.cpp =================================================================== --- trunk/FreeOrion/UI/SitRepPanel.cpp 2007-07-02 08:30:02 UTC (rev 2111) +++ trunk/FreeOrion/UI/SitRepPanel.cpp 2007-07-02 21:30:32 UTC (rev 2112) @@ -83,6 +83,7 @@ GG::Connect(link_text->FleetLinkSignal, &ClientUI::ZoomToFleet, ClientUI::GetClientUI()); GG::Connect(link_text->ShipLinkSignal, &ClientUI::ZoomToShip, ClientUI::GetClientUI()); GG::Connect(link_text->TechLinkSignal, &ClientUI::ZoomToTech, ClientUI::GetClientUI()); + GG::Connect(link_text->BuildingLinkSignal, &ClientUI::ZoomToBuildingType, ClientUI::GetClientUI()); GG::Connect(link_text->EncyclopediaLinkSignal, &ClientUI::ZoomToEncyclopediaEntry, ClientUI::GetClientUI()); row->push_back(link_text); m_sitreps_lb->Insert(row); Modified: trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj =================================================================== --- trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj 2007-07-02 08:30:02 UTC (rev 2111) +++ trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj 2007-07-02 21:30:32 UTC (rev 2112) @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="2" - AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_33_1"" + AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_33_1";"C:\Program Files\Python 2.4\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_HUMAN;FREEORION_WIN32;BOOST_SIGNALS_STATIC_LINK;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE" RuntimeLibrary="2" DisableLanguageExtensions="false" @@ -69,7 +69,7 @@ AdditionalDependencies="GiGiNet.lib GiGiSDL.lib GiGi.lib opengl32.lib glu32.lib wsock32.lib zdll.lib SDL.lib SDLmain.lib log4cpp.lib freetype214MT.lib cdt.lib circogen.lib common.lib dotgen.lib fdpgen.lib gd.lib graph.lib gvc.lib libexpat.lib neatogen.lib pack.lib pathplan.lib plugin.lib twopigen.lib png.lib jpeg.lib OpenAL32.lib alut.lib libvorbisfile.lib" OutputFile="../../../freeorion.exe" LinkIncremental="1" - AdditionalLibraryDirectories="../../../../lib/;../../../../Boost/lib/" + AdditionalLibraryDirectories="../../../../lib/;../../../../Boost/lib/;"C:\Program Files\Python 2.4\libs"" GenerateManifest="true" IgnoreDefaultLibraryNames="LIBCMT" GenerateDebugInformation="true" Modified: trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj =================================================================== --- trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj 2007-07-02 08:30:02 UTC (rev 2111) +++ trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj 2007-07-02 21:30:32 UTC (rev 2112) @@ -39,7 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_33_1"" + AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_33_1";"C:\Program Files\Python 2.4\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_AI;FREEORION_WIN32;BOOST_SIGNALS_STATIC_LINK;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE" RuntimeLibrary="2" DisableLanguageExtensions="false" @@ -65,7 +65,7 @@ AdditionalDependencies="GiGiNet.lib GiGiSDL.lib GiGi.lib opengl32.lib glu32.lib wsock32.lib zdll.lib SDL.lib SDLmain.lib log4cpp.lib freetype214MT.lib cdt.lib common.lib dotgen.lib gd.lib graph.lib pathplan.lib libexpat.lib png.lib jpeg.lib python24.lib boost_python-vc80-mt-1_33_1.lib" OutputFile="../../../freeorionca.exe" LinkIncremental="1" - AdditionalLibraryDirectories="../../../../lib/;../../../../Boost/lib/" + AdditionalLibraryDirectories="../../../../lib/;../../../../Boost/lib/;"C:\Program Files\Python 2.4\libs"" GenerateManifest="true" GenerateDebugInformation="false" SubSystem="2" Modified: trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj =================================================================== --- trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj 2007-07-02 08:30:02 UTC (rev 2111) +++ trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj 2007-07-02 21:30:32 UTC (rev 2112) @@ -40,7 +40,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_33_1"" + AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_33_1";"C:\Program Files\Python 2.4\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_SERVER;FREEORION_WIN32;BOOST_SIGNALS_STATIC_LINK;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE" RuntimeLibrary="2" DisableLanguageExtensions="false" @@ -66,7 +66,7 @@ AdditionalDependencies="GiGiNet.lib GiGiSDL.lib GiGi.lib opengl32.lib glu32.lib wsock32.lib zdll.lib SDL.lib SDLmain.lib log4cpp.lib freetype214MT.lib cdt.lib common.lib dotgen.lib gd.lib graph.lib pathplan.lib libexpat.lib png.lib jpeg.lib" OutputFile="../../../freeoriond.exe" LinkIncremental="1" - AdditionalLibraryDirectories="../../../../lib/;../../../../Boost/lib/" + AdditionalLibraryDirectories="../../../../lib/;../../../../Boost/lib/;"C:\Program Files\Python 2.4\libs"" GenerateManifest="true" GenerateDebugInformation="true" SubSystem="2" |