[Orxonox-commit 1987] r6704 - code/branches/gamestates2/data/gui/scripts
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Apr 12 23:23:46 CEST 2010
Author: rgrieder
Date: 2010-04-12 23:23:45 +0200 (Mon, 12 Apr 2010)
New Revision: 6704
Modified:
code/branches/gamestates2/data/gui/scripts/AudioMenu.lua
code/branches/gamestates2/data/gui/scripts/BasicGUI.lua
code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua
code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua
code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua
code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua
code/branches/gamestates2/data/gui/scripts/InfoPopup.lua
code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua
code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua
code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua
code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua
code/branches/gamestates2/data/gui/scripts/QuestGUI.lua
code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua
code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua
Log:
"filename" --> "name" table entry for GUI sheets.
Modified: code/branches/gamestates2/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/AudioMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/AudioMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -168,7 +168,7 @@
end
function P.AudioBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/BasicGUI.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/BasicGUI.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/BasicGUI.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -7,9 +7,9 @@
P.overlay = nil
-- 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
} or {}
@@ -24,9 +24,9 @@
-- 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
-- hide function for the GUI
@@ -42,7 +42,7 @@
end
function P:load()
- self.window = winMgr:loadWindowLayout(self.filename .. ".layout")
+ self.window = winMgr:loadWindowLayout(self.name .. ".layout")
self:createInputState()
self:init()
return self
Modified: code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -11,7 +11,7 @@
end
function P.ControlsBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -3,7 +3,7 @@
local P = createSheet("CreditsMenu")
function P.CreditsBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -36,7 +36,7 @@
end
function P.GameplayBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -191,7 +191,7 @@
end
function P.GraphicsBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/InfoPopup.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/InfoPopup.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/InfoPopup.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -28,7 +28,7 @@
-- events for ingamemenu
function P.close(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -125,7 +125,7 @@
plus:setSize(CEGUI.UVector2(CEGUI.UDim(0, addWidth), CEGUI.UDim(0.7, 0)))
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
@@ -140,8 +140,8 @@
local buttonWidth = size[2]
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
@@ -149,7 +149,7 @@
clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
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
end
Modified: code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -94,7 +94,7 @@
end
function P.MouseControlsBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -66,7 +66,7 @@
end
function P.MultiplayerBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -3,7 +3,7 @@
local P = createSheet("MultiplayerOptionsMenu")
function P.MultiplayerOptionsBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/QuestGUI.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/QuestGUI.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/QuestGUI.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -10,7 +10,7 @@
local questsList = winMgr:getWindow("orxonox/QuestGUI/QuestsList")
- local window = questManager:getQuestGUI(P.filename)
+ local window = questManager:getQuestGUI(P.name)
questsList:addChildWindow(window)
Modified: code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -28,7 +28,7 @@
end
function P.SettingsBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua 2010-04-12 21:01:35 UTC (rev 6703)
+++ code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua 2010-04-12 21:23:45 UTC (rev 6704)
@@ -38,7 +38,7 @@
end
function P.SingleplayerBackButton_clicked(e)
- hideGUI(P.filename)
+ hideGUI(P.name)
end
return P
More information about the Orxonox-commit
mailing list