Ticket #2474: alert-buttons.patch

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

@@ -1846 +1846 @@
         var state = GetEntityState(e);
         return (state && state.unitAI && state.unitAI.hasWorkOrders);
     });
-    
+
     Engine.PostNetworkCommand({"type": "back-to-work", "entities": workers});
-    
 }
 
 function removeGuard()
@@ -1858 +1857 @@
         var state = GetEntityState(e);
         return (state && state.unitAI && state.unitAI.isGuarding);
     });
-    
+
     Engine.PostNetworkCommand({"type": "remove-guard", "entities": entities});
 }
 
@@ -1868 +1867 @@
         var state = GetEntityState(e);
         return (state && state.alertRaiser && state.alertRaiser.canIncreaseLevel);
     });
-    
-    Engine.PostNetworkCommand({"type": "increase-alert-level", "entities": entities});  
+
+    Engine.PostNetworkCommand({"type": "increase-alert-level", "entities": entities});
 }
 
 function endOfAlert()
@@ -1878 +1877 @@
         var state = GetEntityState(e);
         return (state && state.alertRaiser && state.alertRaiser.hasRaisedAlert);
     });
-    
+
     Engine.PostNetworkCommand({"type": "alert-end", "entities": entities});
 }
 

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

@@ -43 +43 @@
 
 var g_SelectionPanels = {};
 
+// ALERT
+g_SelectionPanels.Alert = {
+    "getMaxNumberOfItems": function()
+    {
+        return 2;
+    },
+    "getItems": function(unitEntState)
+    {
+        if (!unitEntState.alertRaiser)
+            return [];
+        return ["increase", "end"];
+    },
+    "setAction": function(data)
+    {
+        data.button.onPress = function() { 
+            if (data.item == "increase")
+                increaseAlertLevel();
+            else if (data.item == "end")
+                endOfAlert();
+        };
+    },
+    "setTooltip": function(data)
+    {
+        if (data.item == "increase")
+        {
+            if (data.unitEntState.alertRaiser.hasRaisedAlert)
+                data.button.tooltip = translate("Increase the alert level to protect more units");
+            else
+                data.button.tooltip = translate("Raise an alert!");
+        }
+        else if (data.item == "end")
+            data.button.tooltip = translate("End of alert.");
+    },
+    "setGraphics": function(data)
+    {
+        data.button.enabled = !data.stanceSelected;
+        if (data.item == "increase")
+        {
+            data.button.enabled = data.unitEntState.alertRaiser.canIncreaseLevel;
+            data.icon.sprite = "stretched:session/icons/bell_level1.png";
+        }
+        else if (data.item == "end")
+        {
+            data.button.enabled = data.unitEntState.alertRaiser.hasRaisedAlert;
+            data.icon.sprite = "stretched:session/icons/bell_level0.png";
+        }
+    },
+};
+
 // BARTER
 g_SelectionPanels.Barter = {
     "getMaxNumberOfItems": function()
@@ -1080 +1129 @@
     // LEFT PANE
     "Barter", // must always be visible on markets
     "Garrison", // more important than Formation, as you want to see the garrisoned units in ships
+    "Alert",
     "Formation",
     "Stance", // normal together with formation
 

binaries/data/mods/public/gui/session/selection_panels_left/alert_panel.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitAlertPanel"
+    style="TranslucentPanel"
+    size="4 100%-43 100%-4 100%-4"
+    type="text"
+>
+    <object size="100%-72 2 100% 100%">
+        <repeat count="2">
+            <object name="unitAlertButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
+                <object name="unitAlertIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+            </object>
+        </repeat>
+    </object>
+</object>

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

@@ -877 +877 @@
             toggleTrade();
         },
     },
-    // Raise alert
-    "increase-alert-level": {
-        "getInfo": function(entState)
-        {
-            if (!entState.alertRaiser || !entState.alertRaiser.canIncreaseLevel)
-                return false;
-
-            if (entState.alertRaiser.hasRaisedAlert)
-                var tooltip = translate("Increase the alert level to protect more units");
-            else
-                var tooltip = translate("Raise an alert!");
-            return {
-                "tooltip": tooltip,
-                "icon": "bell_level1.png"
-            };
-        },
-        "execute": function(entState)
-        {
-            increaseAlertLevel();
-        },
-    },
-    // End alert
-    "alert-end": {
-        "getInfo": function(entState)
-        {
-            if (!entState.alertRaiser || !entState.alertRaiser.hasRaisedAlert)
-                return false
-            return {
-                "tooltip": translate("End of alert."),
-                "icon": "bell_level0.png"
-            };
-        },
-        "execute": function(entState)
-        {
-            endOfAlert();
-        },
-    },
 };
 
 var g_AllyEntityCommands =

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

@@ -1 +1 @@
 // The number of currently visible buttons (used to optimise showing/hiding)
-var g_unitPanelButtons = {"Selection": 0, "Queue": 0, "Formation": 0, "Garrison": 0, "Training": 0, "Research": 0, "Barter": 0, "Construction": 0, "Command": 0, "AllyCommand": 0, "Stance": 0, "Gate": 0, "Pack": 0};
+var g_unitPanelButtons = {"Selection": 0, "Queue": 0, "Formation": 0, "Garrison": 0, "Training": 0, "Research": 0, "Alert": 0, "Barter": 0, "Construction": 0, "Command": 0, "AllyCommand": 0, "Stance": 0, "Gate": 0, "Pack": 0};
 
 /**
  * Set the position of a panel object according to the index,