Changeset 6459

Timestamp:

Jan 24, 2010, 5:03:27 PM (14 years ago)

Author:

rgrieder

Message:

Simplified BasicGUI construction. Just give the name of the GUI as argument. The rest will be deduced.

Location:

code/branches/gamestate/data/gui/scripts

Files:

• AudioMenu.lua (modified) (2 diffs)
• BasicGUI.lua (modified) (3 diffs)
• ControlsMenu.lua (modified) (2 diffs)
• CreditsMenu.lua (modified) (2 diffs)
• DecisionPopup.lua (modified) (2 diffs)
• GameplayMenu.lua (modified) (2 diffs)
• GraphicsMenu.lua (modified) (2 diffs)
• InGameMenu.lua (modified) (2 diffs)
• InfoPopup.lua (modified) (2 diffs)
• KeyBindMenu.lua (modified) (2 diffs)
• MainMenu.lua (modified) (2 diffs)
• MouseControlsMenu.lua (modified) (2 diffs)
• MultiplayerMenu.lua (modified) (2 diffs)
• MultiplayerOptionsMenu.lua (modified) (2 diffs)
• PickupInventory.lua (modified) (2 diffs)
• QuestGUI.lua (modified) (2 diffs)
• SettingsMenu.lua (modified) (2 diffs)
• SingleplayerMenu.lua (modified) (2 diffs)

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("AudioMenu")
 if _REQUIREDNAME == nil then
     AudioMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "AudioMenu"
-P.layoutString = "AudioMenu.layout"
 
 function P:init()

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

@@ -8 +8 @@
 end
 
+-- useless?
 P.overlay = nil
 
 -- constructor of the GUI
-function P:new (gui, fname)
-    local newElement = { window = gui, filename = fname, visible = false } or {}
+function P:new(_filename, _visible, _gui)
+    local newElement = {
+        filename = _filename,
+        gui = _gui,
+        visible = _visible or false
+    } or {}
     setmetatable(newElement, self) -- connects new element with class
     self.__index = self
@@ -23 +28 @@
 
 -- hide function for the GUI
-function P:hide ()
+function P:hide()
     self.window:hide()
     self.visible = false
@@ -29 +34 @@
 
 -- show function for the GUI
-function P:show ()
+function P:show()
     self.window:show()
     self.visible = true
 end
 
-function P:load ()
-    self.window = winMgr:loadWindowLayout(self.layoutString)
+function P:load()
+    self.window = winMgr:loadWindowLayout(self.filename .. ".layout")
     self:init()
     return self

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("ControlsMenu")
 if _REQUIREDNAME == nil then
     ControlsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "ControlsMenu"
-P.layoutString = "ControlsMenu.layout"
 
 function P.ControlsMouseControlsButton_clicked(e)

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("CreditsMenu")
 if _REQUIREDNAME == nil then
     CreditsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "CreditsMenu"
-P.layoutString = "CreditsMenu.layout"
 
 function P.CreditsBackButton_clicked(e)

code/branches/gamestate/data/gui/scripts/DecisionPopup.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("DecisionPopup")
 if _REQUIREDNAME == nil then
     DecisionPopup = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "DecisionPopup"
-P.layoutString = "DecisionPopup.layout"
 
 function P:init()

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("GameplayMenu")
 if _REQUIREDNAME == nil then
     GameplayMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "GameplayMenu"
-P.layoutString = "GameplayMenu.layout"
 
 function P:init()

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("GraphicsMenu")
 if _REQUIREDNAME == nil then
     GraphicsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "GraphicsMenu"
-P.layoutString = "GraphicsMenu.layout"
 
 function P:init()

code/branches/gamestate/data/gui/scripts/InGameMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("InGameMenu")
 if _REQUIREDNAME == nil then
     InGameMenu = P
@@ -9 +9 @@
 end
 
-P.filename = "InGameMenu"
-P.layoutString = "InGameMenu.layout"
 
 function P:init()

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("InfoPopup")
 
 if _REQUIREDNAME == nil then
@@ -9 +9 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "InfoPopup"
-P.layoutString = "InfoPopup.layout"
 
 function P:init()

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("KeyBindMenu")
 
 if _REQUIREDNAME == nil then
@@ -9 +9 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "KeyBindMenu"
-P.layoutString = "KeyBindMenu.layout"
 
 function P:init()

code/branches/gamestate/data/gui/scripts/MainMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MainMenu")
 if _REQUIREDNAME == nil then
     MainMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "MainMenu"
-P.layoutString = "MainMenu.layout"
 
 -- events for MainMenu

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MouseControlsMenu")
 if _REQUIREDNAME == nil then
     MouseControlsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "MouseControlsMenu"
-P.layoutString = "MouseControlsMenu.layout"
 
 function P:init()

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MultiplayerMenu")
 if _REQUIREDNAME == nil then
     MultiplayerMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "MultiplayerMenu"
-P.layoutString = "MultiplayerMenu.layout"
 
 function P:init()

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MultiplayerOptionsMenu")
 if _REQUIREDNAME == nil then
     MultiplayerOptionsMenu = P
@@ -9 +9 @@
 end
 
-P.filename = "MultiplayerOptionsMenu"
-P.layoutString = "MultiplayerOptionsMenu.layout"
-
 function P.MultiplayerOptionsBackButton_clicked(e)
     hideGUI(P.filename)

code/branches/gamestate/data/gui/scripts/PickupInventory.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("PickupInventory")
 if _REQUIREDNAME == nil then
     PickupInventory = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "PickupInventory"
-P.layoutString = "PickupInventory.layout"
 
 P.lastEquipmentCount_ = 0

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

@@ -1 +1 @@
 gui = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("QuestGUI")
 if _REQUIREDNAME == nil then
     QuestGUI = P
@@ -6 +6 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "QuestGUI"
-P.layoutString = "QuestGUI.layout"
 
 function P:show()

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("SettingsMenu")
 if _REQUIREDNAME == nil then
     SettingsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "SettingsMenu"
-P.layoutString = "SettingsMenu.layout"
 
 function P.SettingsGameplayButton_clicked(e)

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

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("SingleplayerMenu")
 if _REQUIREDNAME == nil then
     SingleplayerMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "SingleplayerMenu"
-P.layoutString = "SingleplayerMenu.layout"
 
 function P:init()