From: <de...@us...> - 2006-03-02 00:53:15
|
Revision: 1782 Author: dennis Date: 2006-03-01 16:53:02 -0800 (Wed, 01 Mar 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1782&view=rev Log Message: ----------- Ported recent changes (1781) to branch Modified Paths: -------------- branches/python-integration/FreeOrion/SConscript branches/python-integration/FreeOrion/UI/IntroScreen.cpp branches/python-integration/FreeOrion/UI/IntroScreen.h Added Paths: ----------- branches/python-integration/FreeOrion/util/Version.cpp branches/python-integration/FreeOrion/util/Version.h Modified: branches/python-integration/FreeOrion/SConscript =================================================================== --- branches/python-integration/FreeOrion/SConscript 2006-03-02 00:46:12 UTC (rev 1781) +++ branches/python-integration/FreeOrion/SConscript 2006-03-02 00:53:02 UTC (rev 1782) @@ -1,5 +1,6 @@ # -*- Python -*- Import('env') + common_sources = [ 'combat/Combat.cpp', 'Empire/ClientEmpireManager.cpp', @@ -107,7 +108,28 @@ ] target = 'human' +def get_revision(env): + "Try to determine the current revision from SVN." + try: + from os import popen + inf = popen("svn info") + for i in inf: + if i[:10] == "Revision: ": + # this \" madness is a workaround of what seems to be an SCons bug + # in combination with gcc. It might break on msvc, in that case, we + # need a check for msvc + return r'\" [Rev ' + i[10:-1] + r']\"' + except: + return None + objects = env.Object(common_sources) +if get_revision(env): + objects += env.Object('util/Version.cpp', + CPPDEFINES=[('FREEORION_REVISION',get_revision(env))] + ) +else: + objects += env.Object('util/Version.cpp') + objects += [env.Object(target = source.split(".")[0] + '-' + target, source = source, CPPDEFINES = env['CPPDEFINES'] + [env['target_define']]) Modified: branches/python-integration/FreeOrion/UI/IntroScreen.cpp =================================================================== --- branches/python-integration/FreeOrion/UI/IntroScreen.cpp 2006-03-02 00:46:12 UTC (rev 1781) +++ branches/python-integration/FreeOrion/UI/IntroScreen.cpp 2006-03-02 00:53:02 UTC (rev 1782) @@ -14,6 +14,7 @@ #include "../util/OptionsDB.h" #include "Splash.h" #include "ServerConnectWnd.h" +#include "../util/Version.h" #include <GG/DrawUtil.h> #include <GG/StaticGraphic.h> @@ -126,9 +127,9 @@ } font->RenderText(ul.x+m_cx,ul.y+m_cy+offset,ul.x+m_cx+m_cw,ul.y+m_cy+m_ch,"", format, 0); offset+=font->TextExtent("", format).y+2; + } GG::EndScissorClipping(); - if(offset<0) { m_co = 0; @@ -145,7 +146,7 @@ m_credits_wnd(0) { LoadSplashGraphics(m_bg_graphics); - + //create buttons m_single_player = new CUIButton(15, 12, 160, UserString("INTRO_BTN_SINGLE_PLAYER")); m_multi_player = new CUIButton(15, 52, 160, UserString("INTRO_BTN_MULTI_PLAYER")); @@ -375,3 +376,13 @@ if (key == GG::GGK_ESCAPE) // Same behaviour as if "done" was pressed OnExitGame(); } + +void IntroScreen::Render() +{ + boost::shared_ptr<GG::Font> font = HumanClientApp::GetApp()->GetFont(ClientUI::FONT, ClientUI::SIDE_PANEL_PTS); + CUIWnd::Render(); + GG::Pt size=font->TextExtent(FreeOrionVersionString()); + font->RenderText(GG::GUI::GetGUI()->AppWidth()-size.x, + GG::GUI::GetGUI()->AppHeight()-size.y, + FreeOrionVersionString()); +} Modified: branches/python-integration/FreeOrion/UI/IntroScreen.h =================================================================== --- branches/python-integration/FreeOrion/UI/IntroScreen.h 2006-03-02 00:46:12 UTC (rev 1781) +++ branches/python-integration/FreeOrion/UI/IntroScreen.h 2006-03-02 00:53:02 UTC (rev 1782) @@ -39,6 +39,8 @@ virtual void KeyPress (GG::Key key, Uint32 key_mods); virtual void Close() {OnExitGame();} //!< override to exit the game + + void Render(); //Override to output version info //!@} private: Copied: branches/python-integration/FreeOrion/util/Version.cpp (from rev 1781, trunk/FreeOrion/util/Version.cpp) =================================================================== --- branches/python-integration/FreeOrion/util/Version.cpp (rev 0) +++ branches/python-integration/FreeOrion/util/Version.cpp 2006-03-02 00:53:02 UTC (rev 1782) @@ -0,0 +1,14 @@ +#include "Version.h" + +namespace { + const std::string version_string = "v0.3.1-RC4" // no semicolon here +#ifdef FREEORION_REVISION + FREEORION_REVISION +#endif + ; +} + +const std::string& FreeOrionVersionString() +{ + return version_string; +} Copied: branches/python-integration/FreeOrion/util/Version.h (from rev 1781, trunk/FreeOrion/util/Version.h) =================================================================== --- branches/python-integration/FreeOrion/util/Version.h (rev 0) +++ branches/python-integration/FreeOrion/util/Version.h 2006-03-02 00:53:02 UTC (rev 1782) @@ -0,0 +1,9 @@ +// -*- C++ -*- +#ifndef _Version_h_ +#define _Version_h_ + +#include <string> + +const std::string& FreeOrionVersionString(); + +#endif |
From: Dennis B. <bra...@go...> - 2006-08-01 07:16:15
|
(Stupid SVN Mailing script thought that attaching hundreds of Kilobytes of changes was a good idea. It wasn't, so I send this just to preserve Checkin history) Revision: 1868 Author: dennis Date: 2006-07-31 11:21:50 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1868&view=rev Log Message: ----------- Merged trunk into branch, cause it was way too out-of-date Modified Paths: -------------- branches/python-integration/FreeOrion/Empire/ClientEmpireManager.cpp branches/python-integration/FreeOrion/Empire/ClientEmpireManager.h branches/python-integration/FreeOrion/Empire/Empire.cpp branches/python-integration/FreeOrion/Empire/Empire.h branches/python-integration/FreeOrion/Empire/EmpireManager.cpp branches/python-integration/FreeOrion/Empire/EmpireManager.h branches/python-integration/FreeOrion/Empire/ResourcePool.cpp branches/python-integration/FreeOrion/Empire/ResourcePool.h branches/python-integration/FreeOrion/Empire/ServerEmpireManager.cpp branches/python-integration/FreeOrion/Empire/ServerEmpireManager.h branches/python-integration/FreeOrion/SConscript branches/python-integration/FreeOrion/SConstruct branches/python-integration/FreeOrion/UI/About.cpp branches/python-integration/FreeOrion/UI/About.h branches/python-integration/FreeOrion/UI/BuildDesignatorWnd.cpp branches/python-integration/FreeOrion/UI/BuildDesignatorWnd.h branches/python-integration/FreeOrion/UI/CUIControls.cpp branches/python-integration/FreeOrion/UI/CUIControls.h branches/python-integration/FreeOrion/UI/CUIDrawUtil.cpp branches/python-integration/FreeOrion/UI/CUIDrawUtil.h branches/python-integration/FreeOrion/UI/CUISpin.h branches/python-integration/FreeOrion/UI/CUITabbedPages.cpp branches/python-integration/FreeOrion/UI/CUITabbedPages.h branches/python-integration/FreeOrion/UI/CUIWnd.cpp branches/python-integration/FreeOrion/UI/CUIWnd.h branches/python-integration/FreeOrion/UI/ClientUI.cpp branches/python-integration/FreeOrion/UI/ClientUI.h branches/python-integration/FreeOrion/UI/CombatWnd.cpp branches/python-integration/FreeOrion/UI/CombatWnd.h branches/python-integration/FreeOrion/UI/FleetButton.cpp branches/python-integration/FreeOrion/UI/FleetButton.h branches/python-integration/FreeOrion/UI/FleetWnd.cpp branches/python-integration/FreeOrion/UI/FleetWnd.h branches/python-integration/FreeOrion/UI/GalaxySetupWnd.cpp branches/python-integration/FreeOrion/UI/GalaxySetupWnd.h branches/python-integration/FreeOrion/UI/InGameMenu.cpp branches/python-integration/FreeOrion/UI/InGameMenu.h branches/python-integration/FreeOrion/UI/IntroScreen.cpp branches/python-integration/FreeOrion/UI/IntroScreen.h branches/python-integration/FreeOrion/UI/LinkText.cpp branches/python-integration/FreeOrion/UI/LinkText.h branches/python-integration/FreeOrion/UI/MapWnd.cpp branches/python-integration/FreeOrion/UI/MapWnd.h branches/python-integration/FreeOrion/UI/MultiplayerLobbyWnd.cpp branches/python-integration/FreeOrion/UI/MultiplayerLobbyWnd.h branches/python-integration/FreeOrion/UI/OptionsWnd.cpp branches/python-integration/FreeOrion/UI/OptionsWnd.h branches/python-integration/FreeOrion/UI/ProductionWnd.cpp branches/python-integration/FreeOrion/UI/ProductionWnd.h branches/python-integration/FreeOrion/UI/ResearchWnd.cpp branches/python-integration/FreeOrion/UI/ResearchWnd.h branches/python-integration/FreeOrion/UI/ServerConnectWnd.cpp branches/python-integration/FreeOrion/UI/ServerConnectWnd.h branches/python-integration/FreeOrion/UI/SidePanel.cpp branches/python-integration/FreeOrion/UI/SidePanel.h branches/python-integration/FreeOrion/UI/SitRepPanel.cpp branches/python-integration/FreeOrion/UI/SitRepPanel.h branches/python-integration/FreeOrion/UI/Splash.cpp branches/python-integration/FreeOrion/UI/Splash.h branches/python-integration/FreeOrion/UI/StringTable.cpp branches/python-integration/FreeOrion/UI/StringTable.h branches/python-integration/FreeOrion/UI/SystemIcon.cpp branches/python-integration/FreeOrion/UI/SystemIcon.h branches/python-integration/FreeOrion/UI/TechTreeWnd.cpp branches/python-integration/FreeOrion/UI/TechTreeWnd.h branches/python-integration/FreeOrion/UI/TurnProgressWnd.cpp branches/python-integration/FreeOrion/UI/TurnProgressWnd.h branches/python-integration/FreeOrion/build_config.py branches/python-integration/FreeOrion/build_support.py branches/python-integration/FreeOrion/client/AI/AIClientApp.cpp branches/python-integration/FreeOrion/client/AI/AIClientApp.h branches/python-integration/FreeOrion/client/ClientApp.cpp branches/python-integration/FreeOrion/client/ClientApp.h branches/python-integration/FreeOrion/client/human/HumanClientApp.cpp branches/python-integration/FreeOrion/client/human/HumanClientApp.h branches/python-integration/FreeOrion/client/human/HumanClientAppSoundFMOD.cpp branches/python-integration/FreeOrion/client/human/HumanClientAppSoundOpenAL.cpp branches/python-integration/FreeOrion/client/human/chmain.cpp branches/python-integration/FreeOrion/combat/Combat.cpp branches/python-integration/FreeOrion/combat/Combat.h branches/python-integration/FreeOrion/combat/CombatSystem.cpp branches/python-integration/FreeOrion/combat/CombatSystem.h branches/python-integration/FreeOrion/default/COPYING branches/python-integration/FreeOrion/default/credits.xml branches/python-integration/FreeOrion/default/eng_stringtable.txt branches/python-integration/FreeOrion/default/esp_stringtable.txt branches/python-integration/FreeOrion/default/starnames.txt branches/python-integration/FreeOrion/msvc/FreeOrion/FreeOrion.sln branches/python-integration/FreeOrion/msvc/FreeOrion/freeorion/freeorion.vcproj branches/python-integration/FreeOrion/msvc/FreeOrion/freeorionca/freeorionca.vcproj branches/python-integration/FreeOrion/msvc/FreeOrion/freeoriond/freeoriond.vcproj branches/python-integration/FreeOrion/network/ClientNetworkCore.cpp branches/python-integration/FreeOrion/network/ClientNetworkCore.h branches/python-integration/FreeOrion/network/Message.cpp branches/python-integration/FreeOrion/network/Message.h branches/python-integration/FreeOrion/network/NetworkCore.cpp branches/python-integration/FreeOrion/network/NetworkCore.h branches/python-integration/FreeOrion/network/ServerNetworkCore.cpp branches/python-integration/FreeOrion/network/ServerNetworkCore.h branches/python-integration/FreeOrion/server/ServerApp.cpp branches/python-integration/FreeOrion/server/ServerApp.h branches/python-integration/FreeOrion/universe/Building.cpp branches/python-integration/FreeOrion/universe/Building.h branches/python-integration/FreeOrion/universe/Condition.cpp branches/python-integration/FreeOrion/universe/Condition.h branches/python-integration/FreeOrion/universe/Effect.cpp branches/python-integration/FreeOrion/universe/Effect.h branches/python-integration/FreeOrion/universe/Enums.h branches/python-integration/FreeOrion/universe/Fleet.cpp branches/python-integration/FreeOrion/universe/Fleet.h branches/python-integration/FreeOrion/universe/Meter.cpp branches/python-integration/FreeOrion/universe/Meter.h branches/python-integration/FreeOrion/universe/Planet.cpp branches/python-integration/FreeOrion/universe/Planet.h branches/python-integration/FreeOrion/universe/PopCenter.cpp branches/python-integration/FreeOrion/universe/PopCenter.h branches/python-integration/FreeOrion/universe/Predicates.cpp branches/python-integration/FreeOrion/universe/Predicates.h branches/python-integration/FreeOrion/universe/ResourceCenter.cpp branches/python-integration/FreeOrion/universe/ResourceCenter.h branches/python-integration/FreeOrion/universe/Ship.cpp branches/python-integration/FreeOrion/universe/Ship.h branches/python-integration/FreeOrion/universe/ShipDesign.cpp branches/python-integration/FreeOrion/universe/ShipDesign.h branches/python-integration/FreeOrion/universe/Special.cpp branches/python-integration/FreeOrion/universe/Special.h branches/python-integration/FreeOrion/universe/System.cpp branches/python-integration/FreeOrion/universe/System.h branches/python-integration/FreeOrion/universe/Tech.cpp branches/python-integration/FreeOrion/universe/Tech.h branches/python-integration/FreeOrion/universe/Universe.cpp branches/python-integration/FreeOrion/universe/Universe.h branches/python-integration/FreeOrion/universe/UniverseObject.cpp branches/python-integration/FreeOrion/universe/UniverseObject.h branches/python-integration/FreeOrion/universe/ValueRef.cpp branches/python-integration/FreeOrion/universe/ValueRef.h branches/python-integration/FreeOrion/universe/doc/designer_effects_doc.txt branches/python-integration/FreeOrion/util/AppInterface.cpp branches/python-integration/FreeOrion/util/AppInterface.h branches/python-integration/FreeOrion/util/DataTable.cpp branches/python-integration/FreeOrion/util/DataTable.h branches/python-integration/FreeOrion/util/Directories.cpp branches/python-integration/FreeOrion/util/GZStream.cpp branches/python-integration/FreeOrion/util/GZStream.h branches/python-integration/FreeOrion/util/MultiplayerCommon.cpp branches/python-integration/FreeOrion/util/MultiplayerCommon.h branches/python-integration/FreeOrion/util/OptionValidators.h branches/python-integration/FreeOrion/util/OptionsDB.cpp branches/python-integration/FreeOrion/util/OptionsDB.h branches/python-integration/FreeOrion/util/Order.cpp branches/python-integration/FreeOrion/util/Order.h branches/python-integration/FreeOrion/util/OrderSet.cpp branches/python-integration/FreeOrion/util/OrderSet.h branches/python-integration/FreeOrion/util/Process.cpp branches/python-integration/FreeOrion/util/Process.h branches/python-integration/FreeOrion/util/Random.cpp branches/python-integration/FreeOrion/util/Random.h branches/python-integration/FreeOrion/util/Serialize.cpp branches/python-integration/FreeOrion/util/SitRepEntry.cpp branches/python-integration/FreeOrion/util/SitRepEntry.h branches/python-integration/FreeOrion/util/VarText.cpp branches/python-integration/FreeOrion/util/VarText.h branches/python-integration/FreeOrion/util/XMLDoc.cpp Added Paths: ----------- branches/python-integration/FreeOrion/default/buildings.txt branches/python-integration/FreeOrion/default/planet_specials.txt branches/python-integration/FreeOrion/default/specials.txt branches/python-integration/FreeOrion/default/techs.txt branches/python-integration/FreeOrion/msvc/FreeOrion/GG/ branches/python-integration/FreeOrion/msvc/FreeOrion/GG/Config.h branches/python-integration/FreeOrion/msvc/FreeOrion/GG/GG.vcproj branches/python-integration/FreeOrion/universe/ConditionParser.cpp branches/python-integration/FreeOrion/universe/ConditionParser1.cpp branches/python-integration/FreeOrion/universe/ConditionParser2.cpp branches/python-integration/FreeOrion/universe/EffectParser.cpp branches/python-integration/FreeOrion/universe/Parser.h branches/python-integration/FreeOrion/universe/ParserUtil.cpp branches/python-integration/FreeOrion/universe/ParserUtil.h branches/python-integration/FreeOrion/universe/TopLevelParsers.cpp branches/python-integration/FreeOrion/universe/ValueRefParser.cpp branches/python-integration/FreeOrion/universe/ValueRefParser.h Removed Paths: ------------- branches/python-integration/FreeOrion/default/buildings.xml branches/python-integration/FreeOrion/default/planet_specials.xml branches/python-integration/FreeOrion/default/specials.xml branches/python-integration/FreeOrion/default/techs.xml branches/python-integration/FreeOrion/msvc/FreeOrion/GG/Config.h branches/python-integration/FreeOrion/msvc/FreeOrion/GG/GG.vcproj branches/python-integration/FreeOrion/util/Parse.h [...] |