Changeset 7726

Timestamp:

Dec 8, 2010, 1:27:51 PM (14 years ago)

Author:

konrad

Message:

decision popup in ingame menu has been changed

Location:

code/trunk/data/gui/scripts

Files:

• DecisionPopup.lua (modified) (2 diffs)
• GUITools.lua (modified) (3 diffs)
• InGameMenu.lua (modified) (2 diffs)

code/trunk/data/gui/scripts/DecisionPopup.lua

@@ -2 +2 @@
 
 local P = createMenuSheet("DecisionPopup")
+
+P.buttonList = {}
+
+function P.onShow()
+    --indices to iterate through buttonlist
+    P.oldindex = -2
+    P.index = -1
+end
+
+function P.onLoad()
+
+    --button are arranged in a 1x2 matrix
+    local item = {
+            ["button"] = winMgr:getWindow("orxonox/DecisionPopup_button_yes"),
+            ["function"]  = P.button_yes
+    }
+    P.buttonList[1] = item
+
+    local item = {
+            ["button"] = winMgr:getWindow("orxonox/DecisionPopup_button_no"),
+            ["function"]  = P.button_no
+    }
+    P.buttonList[2] = item
+
+end
 
 function P.setCallback(functionPtr)
@@ -26 +51 @@
 end
 
+function P.onKeyPressed() 
+    buttonIteratorHelper(P.buttonList, code, P, 1, 2)
+end
+
 return P
 

code/trunk/data/gui/scripts/GUITools.lua

@@ -172 +172 @@
 
         local item = list[P.index+1]
-        local child = item["button"] 
+        local child = item["button"]
+        local s = child:getProperty("NormalImageRightEdge") 
 
         --teste ob der Button nicht schon gehighlightet ist
-        if child:getProperty("NormalImageRightEdge") == "set:TaharezGreenLook image:ButtonRightHighlight" then
+        if string.sub(s,string.len(s)-8,string.len(s)) == "Highlight" then
             --nop
         else
@@ -201 +202 @@
                 local item = list[i]
                 local child = item["button"]
-                    if child:getProperty("NormalImageRightEdge") == "set:TaharezGreenLook image:ButtonRightHighlight" then
+                local s = child:getProperty("NormalImageRightEdge")
+                    if string.sub(s,string.len(s)-8,string.len(s)) == "Highlight" then
                         child:setProperty("NormalImageRightEdge", string.sub(child:getProperty("NormalImageRightEdge"),1,-10) .. "Normal")
                         child:setProperty("NormalImageLeftEdge", string.sub(child:getProperty("NormalImageLeftEdge"),1,-10) .. "Normal")
@@ -210 +212 @@
                 i=i+1
         end
-    end
-    
+    end  
+
     --enter
-    if code == "28" and P.index >= 0 then
+    if code == "28" then
         local item = list[P.index+1]
         local child = item["button"] 

code/trunk/data/gui/scripts/InGameMenu.lua

@@ -3 +3 @@
 local P = createMenuSheet("InGameMenu")
 P.loadAlong = { "DecisionPopup" }
+
+P.buttonList = {}
+
+function P.onLoad()
+    P.multiplayerMode = "startClient" 
+
+    --button are arranged in a 4x1 matrix, the left lower item is nil
+    local item = {
+            ["button"] = winMgr:getWindow("orxonox/InGameMenu_ReturnButton"),
+            ["function"]  = P.button_settings_clicked
+    }
+    P.buttonList[1] = item
+
+    local item = {
+            ["button"] = winMgr:getWindow("orxonox/InGameMenu_MainMenuButton"),
+            ["function"]  = P.button_mainmenu_clicked
+    }
+    P.buttonList[2] = item
+
+    local item = {
+            ["button"] = winMgr:getWindow("orxonox/InGameMenu_SettingsButton"),
+            ["function"]  = P.button_settings_clicked
+    }
+    P.buttonList[3] = item
+
+    local item = {
+            ["button"] = winMgr:getWindow("orxonox/InGameMenu_QuitButton"),
+            ["function"]  = P.button_quit_clicked
+    }
+    P.buttonList[4] = item
+
+end
+
+function P.onShow()
+    --indices to iterate through buttonlist
+    P.oldindex = -2
+    P.index = -1
+end
 
 -- events for ingamemenu
@@ -27 +65 @@
         hideMenuSheet("InGameMenu")
         orxonox.execute("exit")
+    else 
+        P.onShow()
     end
+end
+
+function P.onKeyPressed() 
+    buttonIteratorHelper(P.buttonList, code, P, 4, 1)
 end