Ticket #3101: civIconOverlay.patch

binaries/data/mods/public/gui/common/common_sprites.xml

@@ -741 +741 @@
         />
     </sprite>
 
+    <!--
+    ==========================================
+    CIV ICON
+    ==========================================
+    -->
+
+    <sprite name="CivIconOver">
+        <image
+            texture="session/portraits/emblems/states/hover.png"
+            size="0 0 100% 100%"
+        />
+    </sprite>
+
 </sprites>

binaries/data/mods/public/gui/common/common_styles.xml

@@ -304 +304 @@
         tooltip_style="pgToolTip"
     />
 
+        <!--
+    ==========================================
+    CIV ICON
+    ==========================================
+    -->
+    <style  name="CivIconOverlay"
+        sprite=""
+        sprite_over="CivIconOver"
+        sound_pressed="audio/interface/ui/ui_button_click.ogg"
+    />
 </styles>

binaries/data/mods/public/gui/session/session.js

@@ -188 +188 @@
     {
         // TODO: Get a civ icon for gaia/observers.
         Engine.GetGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[Engine.GetPlayerID()].civ].Emblem;
-        Engine.GetGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[Engine.GetPlayerID()].civ].Name;
+        Engine.GetGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[Engine.GetPlayerID()].civ].Name + translate(" - Structure Tree");
     }
 
     g_GameSpeeds = initGameSpeeds();
@@ -249 +249 @@
     Engine.SetPlayerID(playerID);
     if (playerID > 0) {
         Engine.GetGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[playerID].civ].Emblem;
-        Engine.GetGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[playerID].civ].Name;
+        Engine.GetGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[playerID].civ].Name + translate(" - Structure Tree");
     }
 }
 

binaries/data/mods/public/gui/session/top_panel/civ_icon.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object size="50%-48 -26 50%+48 70" name="civIcon" type="image" tooltip_style="sessionToolTipBold"/>
+
+<object type="button"
+    size="50%-48 -26 50%+48 70"
+    name="civIcon"
+    tooltip_style="sessionToolTipBold"
+>
+    <object name="civIconOverlay" style="CivIconOverlay" size="0 0 100% 100%" type="button">
+        <action on="Press">Engine.PushGuiPage("page_structree.xml", g_Players[Engine.GetPlayerID()].civ);</action>
+    </object>
+</object>

binaries/data/mods/public/gui/structree/structree.js

@@ -12 +12 @@
 /**
  * Initialize the dropdown containing all the available civs
  */
-function init()
+function init(defaultCivCode)
 {
     g_CivData = loadCivData(true);
 
@@ -32 +32 @@
     civSelection.list = civListNames;
     civSelection.list_data = civListCodes;
     civSelection.selected = 0;
+
+    if(defaultCivCode && defaultCivCode !== "")
+    {
+        civSelection.selected = civListCodes.indexOf(defaultCivCode);
+        selectCiv(defaultCivCode);
+    }
 }
 
 function selectCiv(civCode)