Changeset 6704 for code/branches/gamestates2

Timestamp:

Apr 12, 2010, 11:23:45 PM (15 years ago)

Author:

rgrieder

Message:

"filename" —> "name" table entry for GUI sheets.

Location:

code/branches/gamestates2/data/gui/scripts

Files:

• AudioMenu.lua (modified) (1 diff)
• BasicGUI.lua (modified) (3 diffs)
• ControlsMenu.lua (modified) (1 diff)
• CreditsMenu.lua (modified) (1 diff)
• GameplayMenu.lua (modified) (1 diff)
• GraphicsMenu.lua (modified) (1 diff)
• InfoPopup.lua (modified) (1 diff)
• KeyBindMenu.lua (modified) (3 diffs)
• MouseControlsMenu.lua (modified) (1 diff)
• MultiplayerMenu.lua (modified) (1 diff)
• MultiplayerOptionsMenu.lua (modified) (1 diff)
• QuestGUI.lua (modified) (1 diff)
• SettingsMenu.lua (modified) (1 diff)
• SingleplayerMenu.lua (modified) (1 diff)

code/branches/gamestates2/data/gui/scripts/AudioMenu.lua

@@ -169 +169 @@
 
 function P.AudioBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/BasicGUI.lua

@@ -8 +8 @@
 
 -- constructor of the GUI
-function P:new(_filename, _gui, _visible)
+function P:new(_name, _gui, _visible)
     local newElement = {
-        filename = _filename,
+        name = _name,
         gui = _gui,
         visible = _visible or false
@@ -25 +25 @@
 -- Override this function if you want to change one of the three input parameters:
 -- showCursor = true, useKeyboard = true and blockJoyStick = false
--- But don't forget to stick to the naming convention ("GUI_" .. self.filename)
+-- But don't forget to stick to the naming convention ("GUI_" .. self.name)
 function P:createInputState()
-    self.inputState = guiMgr:createInputState("GUI_" .. self.filename)
+    self.inputState = guiMgr:createInputState("GUI_" .. self.name)
 end
 
@@ -43 +43 @@
 
 function P:load()
-    self.window = winMgr:loadWindowLayout(self.filename .. ".layout")
+    self.window = winMgr:loadWindowLayout(self.name .. ".layout")
     self:createInputState()
     self:init()

code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua

@@ -12 +12 @@
 
 function P.ControlsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua

@@ -4 +4 @@
 
 function P.CreditsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua

@@ -37 +37 @@
 
 function P.GameplayBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua

@@ -192 +192 @@
 
 function P.GraphicsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/InfoPopup.lua

@@ -29 +29 @@
 -- events for ingamemenu
 function P.close(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua

@@ -126 +126 @@
     plus:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
     plus:setText("add")
-    orxonox.GUIManager:subscribeEventHelper(plus, "Clicked", P.filename .. ".KeyBindPlus_clicked")
+    orxonox.GUIManager:subscribeEventHelper(plus, "Clicked", P.name .. ".KeyBindPlus_clicked")
     line:addChildWindow(plus)
     offset = offset + addWidth + spaceWidth
@@ -141 +141 @@
         button:setSize(CEGUI.UVector2(CEGUI.UDim(0, buttonWidth), CEGUI.UDim(0.7, 0)))
         button:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
-        orxonox.GUIManager:subscribeEventHelper(button, "Clicked", P.filename .. ".KeyBindButton_clicked")
-        --button:subscribeScriptedEvent("EventClicked", P.filename .. ".KeyBindButton_clicked")
+        orxonox.GUIManager:subscribeEventHelper(button, "Clicked", P.name .. ".KeyBindButton_clicked")
+        --button:subscribeScriptedEvent("EventClicked", P.name .. ".KeyBindButton_clicked")
         line:addChildWindow(button)
         offset = offset + buttonWidth
@@ -150 +150 @@
         clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
         clear:setText("X")
-        orxonox.GUIManager:subscribeEventHelper(clear, "Clicked", P.filename .. ".KeyBindClear_clicked")
+        orxonox.GUIManager:subscribeEventHelper(clear, "Clicked", P.name .. ".KeyBindClear_clicked")
         line:addChildWindow(clear)
         offset = offset + clearWidth + spaceWidth

code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua

@@ -95 +95 @@
 
 function P.MouseControlsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua

@@ -67 +67 @@
 
 function P.MultiplayerBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua

@@ -4 +4 @@
 
 function P.MultiplayerOptionsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/QuestGUI.lua

@@ -11 +11 @@
     local questsList = winMgr:getWindow("orxonox/QuestGUI/QuestsList")
 
-    local window = questManager:getQuestGUI(P.filename)
+    local window = questManager:getQuestGUI(P.name)
 
     questsList:addChildWindow(window)

code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua

@@ -29 +29 @@
 
 function P.SettingsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end
 

code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua

@@ -39 +39 @@
 
 function P.SingleplayerBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideGUI(P.name)
 end