From: <bi...@us...> - 2013-08-24 07:25:41
|
Revision: 6370 http://sourceforge.net/p/freeorion/code/6370 Author: bigjoe5 Date: 2013-08-24 07:25:36 +0000 (Sat, 24 Aug 2013) Log Message: ----------- - Further slight modification to German translation from previous commit, as recommended by adrian_broher. Modified Paths: -------------- trunk/FreeOrion/UI/SidePanel.cpp trunk/FreeOrion/default/stringtables/de.txt trunk/FreeOrion/default/stringtables/en.txt Modified: trunk/FreeOrion/UI/SidePanel.cpp =================================================================== --- trunk/FreeOrion/UI/SidePanel.cpp 2013-08-23 13:39:09 UTC (rev 6369) +++ trunk/FreeOrion/UI/SidePanel.cpp 2013-08-24 07:25:36 UTC (rev 6370) @@ -513,6 +513,7 @@ BuildingsPanel* m_buildings_panel; ///< contains icons representing buildings SpecialsPanel* m_specials_panel; ///< contains icons representing specials StarType m_star_type; + float m_empire_detection_strength;///< the detection strength of the viewing empire. boost::signals::connection m_planet_connection; }; @@ -799,7 +800,8 @@ m_military_panel(0), m_buildings_panel(0), m_specials_panel(0), - m_star_type(star_type) + m_star_type(star_type), + m_empire_detection_strength(0) { SetName(UserString("PLANET_PANEL")); @@ -808,6 +810,8 @@ Logger().errorStream() << "SidePanel::PlanetPanel::PlanetPanel couldn't get latest known planet with ID " << m_planet_id; return; } + + SetBrowseModeTime(GetOptionsDB().Get<int>("UI.tooltip-delay")); // create planet name text @@ -850,6 +854,7 @@ if (!building) continue; // annoying hard-coded building name here... not sure how better to deal with it + // TODO: ^^ This isn't the stone age anymore - we have tags now, and an annoying hard-coded tag is probably at least a step up. if (building->BuildingTypeName() == "BLD_SHIPYARD_BASE") { has_shipyard = true; break; @@ -868,10 +873,17 @@ else font = ClientUI::GetFont(ClientUI::Pts()*4/3); - GG::X panel_width = w - MaxPlanetDiameter() - 2*EDGE_PAD; + // get viewing empire's detection strength + int client_empire_id = HumanClientApp::GetApp()->EmpireID(); + if (client_empire_id != ALL_EMPIRES) { + Empire* client_empire = Empires().Lookup(client_empire_id); + m_empire_detection_strength = client_empire->GetMeter("METER_DETECTION_STRENGTH")->Current(); + } + + // create planet name control m_planet_name = new ShadowedTextControl(GG::X(MaxPlanetDiameter() + EDGE_PAD), GG::Y0, wrapped_planet_name, font, ClientUI::TextColor()); @@ -1600,8 +1612,25 @@ m_buildings_panel->Refresh(); if (m_specials_panel) m_specials_panel->Update(); + + // set stealth browse text + ClearBrowseInfoWnd(); + if (GetUniverse().GetObjectVisibilityByEmpire(m_planet_id, HumanClientApp::GetApp()->EmpireID()) <= VIS_BASIC_VISIBILITY) { + float stealth = planet->CurrentMeterValue(METER_STEALTH); + std::string info; + if (stealth > m_empire_detection_strength) { + info = boost::io::str(FlexibleFormat(UserString("PL_STEALTHY")) % + boost::lexical_cast<std::string>(stealth) % + boost::lexical_cast<std::string>(m_empire_detection_strength)); + } + else { + info = boost::io::str(FlexibleFormat(UserString("PL_STEALTHY_NO_INFO"))); + } + SetBrowseInfoWnd(boost::shared_ptr<GG::BrowseInfoWnd>(new TextBrowseWnd(UserString("METER_STEALTH"), info))); + } + // BuildingsPanel::Refresh (and other panels) emit ExpandCollapseSignal, // which should be connected to SidePanel::PlanetPanel::DoLayout Modified: trunk/FreeOrion/default/stringtables/de.txt =================================================================== --- trunk/FreeOrion/default/stringtables/de.txt 2013-08-23 13:39:09 UTC (rev 6369) +++ trunk/FreeOrion/default/stringtables/de.txt 2013-08-24 07:25:36 UTC (rev 6370) @@ -2132,6 +2132,10 @@ %1% %2% PL_TYPE_SIZE_ENV %1% %2% (%3%) +PL_STEALTHY +Neuste bekannte Tarnung (%1%) übersteigt die [[DETECTION_TITLE]] (%2%). +PL_STEALTHY_NO_INFO +Geringe Sichtbarkeit. ## Resources Panel ########## Modified: trunk/FreeOrion/default/stringtables/en.txt =================================================================== --- trunk/FreeOrion/default/stringtables/en.txt 2013-08-23 13:39:09 UTC (rev 6369) +++ trunk/FreeOrion/default/stringtables/en.txt 2013-08-24 07:25:36 UTC (rev 6370) @@ -2127,6 +2127,10 @@ %1% %2% PL_TYPE_SIZE_ENV %1% %2% (%3%) +PL_STEALTHY +Latest known stealth (%1%) exceeds [[DETECTION_TITLE]] (%2%). +PL_STEALTHY_NO_INFO +Low visibility. ## Resources Panel ########## |