Ticket #3211: t3211_cancel_production_queue_with_shift_click_v3.patch

binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml

@@ -2 +2 @@
 <object name="unitQueuePanel"
     size="4 -56 100% 0"
     type="image"
     sprite="queuePanelShader"
 >
-    <object size="-4 -2 52 54" type="image" sprite="stretched:session/icons/production.png" tooltip_style="sessionToolTipBottom">
+    <object size="-4 -2 46 48" type="image" sprite="stretched:session/icons/production.png" tooltip_style="sessionToolTipBottom">
         <translatableAttribute id="tooltip">Production queue</translatableAttribute>
         <object name="queueProgress" ghost="true" style="iconButtonProgress" type="text"/>
     </object>
 
-    <object size="48 6 100% 100%">
+    <object size="40 6 100% 100%">
     <repeat count="16">
         <object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
-        <object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
-        <object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37" z="20"/>
-        <object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
+            <object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
+            <object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37" z="20"/>
+            <object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
         </object>
     </repeat>
     </object>
+    
+    <object size="100%-30 12 100%-6 40" name="cancelQueue" type="button" style="iconButton" tooltip_style="sessionToolTipBottom">
+        <translatableAttribute id="tooltip">Cancel the whole production queue</translatableAttribute>
+        <object type="image" ghost="true" sprite="stretched:session/icons/cancel.png"/>
+    </object>
+    
 </object>

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

@@ -196 +196 @@
     var viewPlayerDropdown = Engine.GetGUIObjectByName("viewPlayer");
     viewPlayerDropdown.list = playerNames;
     viewPlayerDropdown.list_data = playerIDs;
     viewPlayerDropdown.selected = Engine.GetPlayerID();
 
+    // Initialize cancel production queue button
+    Engine.GetGUIObjectByName("cancelQueue").onPress = function() {
+        for(var producingEnt of g_Selection.toList())
+            for(var ent of getTrainingQueueItems([producingEnt]))
+                removeFromProductionQueue(producingEnt, ent.id);
+    };
+    
     // If in Atlas editor, disable the exit button
     if (Engine.IsAtlasRunning())
         Engine.GetGUIObjectByName("menuExitButton").enabled = false;
 
     if (hotloadData)