Changeset 10147 for ps

Timestamp:

08/31/11 04:58:57 (13 years ago)

Author:

brian

Message:

Convert delete dialog to new style. Fixes #937

Location:

ps/trunk/binaries/data/mods/public/gui

Files:

• msgbox/msgbox.xml (modified) (4 diffs)
• session/input.js (modified) (30 diffs)
• session/menu.js (modified) (1 diff)
• session/session.xml (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/gui/msgbox/msgbox.xml

@@ -8 +8 @@
         var mbTitleObj = getGUIObjectByName("mbTitleBar");
         var mbTextObj = getGUIObjectByName("mbText");
-        
+
         var mbButton1Obj = getGUIObjectByName("mbButton1");
         var mbButton2Obj = getGUIObjectByName("mbButton2");
@@ -16 +16 @@
         var mbLRDiff = data.width / 2;     // Message box left/right difference from 50% of screen
         var mbUDDiff = data.height / 2;    // Message box up/down difference from 50% of screen
-        
+
         var mbSizeString = "50%-" + mbLRDiff + " 50%-" + mbUDDiff + " 50%+" + mbLRDiff + " 50%+" + mbUDDiff;
-        
+
         mbMainObj.size = mbSizeString;
-        
+
         // Texts
         mbTitleObj.caption  = data.title;
@@ -101 +101 @@
                 type="text"
                 style="CenteredLabelText"
-                size="30 30 100%-30 100%-100"
+                size="5% 20% 95% 100%-96"
             />
-                        
+
             <object name="mbButton1"
                 style="StoneButton"
                 type="button"
                 hidden="true"
-                size="40 100%-50 33%-30 100%-20" 
+                size="40 100%-50 33%-30 100%-20"
             />
             <object name="mbButton2"
@@ -114 +114 @@
                 type="button"
                 hidden="true"
-                size="33%+30 100%-50 66%-40 100%-20" 
+                size="33%+30 100%-50 66%-40 100%-20"
             />
             <object name="mbButton3"

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

@@ -88 +88 @@
         });
     }
-    
+
     return false;
 }
@@ -114 +114 @@
 {
     var selection = g_Selection.toList();
-    
+
     // If the selection doesn't exist, no action
     var entState = GetEntityState(selection[0]);
@@ -126 +126 @@
         return entState && entState.player == playerID;
     });
-    
+
     if (!g_DevSettings.controlAll && !allOwnedByPlayer)
         return {"possible": false};
@@ -136 +136 @@
     });
 
-    
+
     if (!target)
     {
@@ -149 +149 @@
     if (haveRallyPoints && selection.indexOf(target) != -1 && action == "unset-rallypoint")
         return {"possible": true};
-        
+
     // Look at the first targeted entity
     // (TODO: maybe we eventually want to look at more, and be more context-sensitive?
@@ -164 +164 @@
     // can return to the dropsite, can build the foundation, or can attack the enemy
     var simState = Engine.GuiInterfaceCall("GetSimulationState");
-    
+
     for each (var entityID in selection)
     {
@@ -170 +170 @@
         if (!entState)
             continue;
-        
+
         var playerState = simState.players[entState.player];
         var playerOwned = (targetState.player == entState.player);
@@ -176 +176 @@
         var enemyOwned = playerState.isEnemy[targetState.player];
         var gaiaOwned = (targetState.player == 0);
-        
+
         // Find the resource type we're carrying, if any
         var carriedType = undefined;
@@ -240 +240 @@
         return undefined;
     }
-    
+
     // If the selection doesn't exist, no action
     var entState = GetEntityState(selection[0]);
@@ -252 +252 @@
         return entState && entState.player == playerID;
     });
-    
+
     if (!g_DevSettings.controlAll && !allOwnedByPlayer)
         return undefined;
@@ -289 +289 @@
                 return {"type": "repair", "cursor": "action-repair", "target": target};
             else
-                return {"type": "none", "cursor": "action-repair-disabled", "target": undefined};   
+                return {"type": "none", "cursor": "action-repair-disabled", "target": undefined};
             break;
         }
@@ -308 +308 @@
             return {"type": "returnresource", "cursor": actionInfo.cursor, "target": target};
         else if (getActionInfo("build", target).possible)
-            return {"type": "build", "cursor": "action-build", "target": target};   
+            return {"type": "build", "cursor": "action-build", "target": target};
         else if (getActionInfo("repair", target).possible)
             return {"type": "build", "cursor": "action-repair", "target": target};
@@ -374 +374 @@
 
         entStateList.push(entState);
-    }           
+    }
 
     // If there are no units, check if there are defensive entities in the selection
@@ -407 +407 @@
     // be processed here before being passed on, and propagation will stop if this function
     // returns true)
-    // 
+    //
     // TODO: it'd probably be nice to have a better state-machine system, with guaranteed
     // entry/exit functions, since this is a bit broken now
@@ -452 +452 @@
                 var preferredEntities = getPreferredEntities(ents)
 
-                if (preferredEntities.length)           
+                if (preferredEntities.length)
                     ents = preferredEntities;
 
@@ -483 +483 @@
 
                 g_Selection.setHighlightList([]);
-                
+
                 inputState = INPUT_NORMAL;
                 return true;
@@ -490 +490 @@
         }
         break;
-    
+
     case INPUT_BUILDING_CLICK:
         switch (ev.type)
@@ -569 +569 @@
                 placementPosition.z = snapData.z;
             }
-            
+
             updateBuildingPlacementPreview();
             break;
@@ -719 +719 @@
             var dragDeltaX = ev.x - dragStart[0];
             var dragDeltaY = ev.y - dragStart[1];
-            
+
             if (Math.abs(dragDeltaX) >= maxDragDelta || Math.abs(dragDeltaY) >= maxDragDelta)
             {
@@ -744 +744 @@
                 var selectedEntity = ents[0];
                 var now = new Date();
-                
+
                 // If camera following and we select different unit, stop
                 if (Engine.GetFollowedEntity() != selectedEntity)
@@ -757 +757 @@
                     var matchRank = true;
                     var templateToMatch;
-                    
+
                     // Check for double click or triple click
                     if (!doubleClicked)
@@ -782 +782 @@
                         }
                     }
-                    
+
                     // TODO: Should we handle "control all units" here as well?
                     ents = Engine.PickSimilarFriendlyEntities(templateToMatch, showOffscreen, matchRank);
@@ -811 +811 @@
                     g_Selection.addList(ents);
                 }
-                
+
                 inputState = INPUT_NORMAL;
                 return true;
@@ -835 +835 @@
                 placementPosition.z = snapData.z;
             }
-            
+
             updateBuildingPlacementPreview();
 
@@ -922 +922 @@
         // TODO: Play a sound?
         return true;
-        
+
     case "set-rallypoint":
         var target = Engine.GetTerrainAtPoint(ev.x, ev.y);
@@ -942 +942 @@
         });
         return true;
-        
+
     case "none":
         return true;
-        
+
     default:
         error("Invalid action.type "+action.type);
@@ -1078 +1078 @@
         var template = GetTemplateData(entState.template);
         var unitName = getEntityName(template);
-    
+
         var playerID = Engine.GetPlayerID();
         if (entState.player == playerID || g_DevSettings.controlAll)
@@ -1089 +1089 @@
                 if (selection.length > 0)
                 {
-                    var message = "Are you sure you want to\ndelete the selected units?";
-
-                    var deleteFunction = function ()
-                    { 
+                    closeMenu();
+                                        closeOpenDialogs();
+
+                                        var deleteFunction = function ()
+                    {
                         Engine.PostNetworkCommand({"type": "delete-entities", "entities": selection});
                     };
 
-                    g_SessionDialog.open("Delete", message, null, 340, 160, deleteFunction);
+                                        var btCaptions = ["Yes", "No"];
+                                        var btCode = [deleteFunction, null];
+
+                                        messageBox(400, 200, "Destroy everything currently selected?", "Delete", 0, btCaptions, btCode);
                 }
                 break;
@@ -1213 +1217 @@
         var data = { prevUnit: lastIdleUnit, idleClass: classes[currIdleClass] };
         var newIdleUnit = Engine.GuiInterfaceCall("FindIdleUnit", data);
-    
+
         // Check if we have new valid entity
         if (newIdleUnit && newIdleUnit != lastIdleUnit)
@@ -1221 +1225 @@
             g_Selection.addList([lastIdleUnit]);
             Engine.CameraFollow(lastIdleUnit);
-            
+
             return;
         }
-        
+
         lastIdleUnit = 0;
         currIdleClass = (currIdleClass + 1) % classes.length;
     }
-    
+
     // TODO: display a message or play a sound to indicate no more idle units, or something
     // Reset for next cycle

ps/trunk/binaries/data/mods/public/gui/session/menu.js

@@ -133 +133 @@
 }
 
-function escapeKeyAction()
+function closeOpenDialogs()
 {
         closeMenu();

ps/trunk/binaries/data/mods/public/gui/session/session.xml

@@ -43 +43 @@
 
         <object hotkey="leave">
-            <action on="Press">escapeKeyAction();</action>
+            <action on="Press">closeOpenDialogs();</action>
         </object>
 
@@ -422 +422 @@
                                                 <action on="Press">
                                                         closeMenu();
-                                                        escapeKeyAction();
+                                                        closeOpenDialogs();
                                                         <![CDATA[
                                                                 var btCaptions = ["Yes", "No"];