[Freeorion-programmers] SF.net SVN: freeorion:[3708] trunk/FreeOrion/UI/SidePanel.cpp

[<geo...@us...>]

Revision: 3708
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3708&view=rev
Author:   geoffthemedio
Date:     2010-07-28 03:38:32 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
-Removed erroneous "uninhabitable" text from planet panels after a planet has been ordered colonized.
-Tweaked comments in SidePanel.cpp

Modified Paths:
--------------
    trunk/FreeOrion/UI/SidePanel.cpp

Modified: trunk/FreeOrion/UI/SidePanel.cpp
===================================================================
--- trunk/FreeOrion/UI/SidePanel.cpp	2010-07-27 17:45:51 UTC (rev 3707)
+++ trunk/FreeOrion/UI/SidePanel.cpp	2010-07-28 03:38:32 UTC (rev 3708)
@@ -1061,7 +1061,9 @@
 
     const Ship* ship = ValidSelectedColonyShip(SidePanel::SystemID());
 
-    // create colonize or cancel button, if appropriate (a ship is in the system that can colonize, or the planet has been ordered to be colonized already this turn)
+    // create colonize or cancel button, if appropriate (a ship is in the system
+    // that can colonize, or the planet has been ordered to be colonized already
+    // this turn)
     if (!Disabled() &&
         owner == OS_NONE &&
         ship &&
@@ -1102,10 +1104,9 @@
             m_button_colonize->SetText(UserString("CANCEL"));
         DetachChild(m_colonize_instruction);
 
-        std::string env_size_text = boost::io::str(FlexibleFormat(UserString("PL_TYPE_SIZE_ENV"))
+        std::string env_size_text = boost::io::str(FlexibleFormat(UserString("PL_TYPE_SIZE"))
                                                    % GetPlanetSizeName(*planet)
-                                                   % GetPlanetTypeName(*planet)
-                                                   % GetPlanetEnvironmentName(*planet, planet->SpeciesName()));
+                                                   % GetPlanetTypeName(*planet));
         m_env_size->SetText(env_size_text);
 
     } else {
@@ -1125,7 +1126,8 @@
     if (m_specials_panel)
         m_specials_panel->Update();
 
-    // BuildingsPanel::Refresh (and other panels) emit ExpandCollapseSignal, which should be connected to SidePanel::PlanetPanel::DoLayout
+    // BuildingsPanel::Refresh (and other panels) emit ExpandCollapseSignal,
+    // which should be connected to SidePanel::PlanetPanel::DoLayout
 }
 
 void SidePanel::PlanetPanel::SetFocus(const std::string& focus)