Changeset 5414

Timestamp:

Mar 21, 2009, 1:10:54 AM (16 years ago)

Author:

bknecht

Message:

Removed layout information to actual .layout file and leaving functions and script stuff in the lua-file. There is still some work to do to properly load layouts and call the correct functions, but it's more cleaned up now, but also more spread of corse.

Location:

data/media/gui

Files:

• layouts/MainMenu.layout (added)
• scripts/loadGUI.lua (modified) (4 diffs)

data/media/gui/scripts/loadGUI.lua

@@ -9 +9 @@
 
 
-local rootSheet = winMgr:createWindow("DefaultGUISheet", "orxonox/Sheet")
-
-local leftOffset = 0.11
-local topOffset  = 0.3
-local distance   = 0.076
-local index      = 0
-
-local standalone = winMgr:createWindow("TaharezLook/Button", "orxonox/StandaloneButton")
-standalone:setText("Standalone")
-standalone:setSize(CEGUI.UVector2(CEGUI.UDim(0.15, 0), CEGUI.UDim(0.05, 0)))
-standalone:setPosition(CEGUI.UVector2(CEGUI.UDim(leftOffset, 0), CEGUI.UDim(topOffset + index * distance, 0)))
-standalone:subscribeEvent("Clicked","button_standalone_clicked")
-index = index + 1
-
-local dedicated = winMgr:createWindow("TaharezLook/Button", "orxonox/DedicatedButton")
-dedicated:setText("Dedicated")
-dedicated:setSize(CEGUI.UVector2(CEGUI.UDim(0.15, 0), CEGUI.UDim(0.05, 0)))
-dedicated:setPosition(CEGUI.UVector2(CEGUI.UDim(leftOffset, 0), CEGUI.UDim(topOffset + index * distance, 0)))
-dedicated:subscribeEvent("Clicked","button_dedicated_clicked")
-index = index + 1
-
-local server = winMgr:createWindow("TaharezLook/Button", "orxonox/ServerButton")
-server:setText("Server")
-server:setSize(CEGUI.UVector2(CEGUI.UDim(0.15, 0), CEGUI.UDim(0.05, 0)))
-server:setPosition(CEGUI.UVector2(CEGUI.UDim(leftOffset, 0), CEGUI.UDim(topOffset + index * distance, 0)))
-server:subscribeEvent("Clicked","button_server_clicked")
-index = index + 1
-
-local client = winMgr:createWindow("TaharezLook/Button", "orxonox/ClientButton")
-client:setText("Client")
-client:setSize(CEGUI.UVector2(CEGUI.UDim(0.15, 0), CEGUI.UDim(0.05, 0)))
-client:setPosition(CEGUI.UVector2(CEGUI.UDim(leftOffset, 0), CEGUI.UDim(topOffset + index * distance, 0)))
-client:subscribeEvent("Clicked","button_client_clicked")
-index = index + 1
-
-local quit = winMgr:createWindow("TaharezLook/Button", "orxonox/QuitButton")
-quit:setText("Quit")
-quit:setSize(CEGUI.UVector2(CEGUI.UDim(0.15, 0), CEGUI.UDim(0.05, 0)))
-quit:setPosition(CEGUI.UVector2(CEGUI.UDim(leftOffset, 0), CEGUI.UDim(topOffset + index * distance, 0)))
-quit:subscribeEvent("Clicked","button_quit_clicked")
-index = index + 1
+local mainmenu =  winMgr:loadWindowLayout("MainMenu.layout")
 
 local backgroundImage = CEGUI.ImagesetManager:getSingleton():createImagesetFromImageFile("GUI/Background", "main_menu_1.jpg")
@@ -57 +17 @@
 background:setProperty("Image", "set: GUI/Background image:full_image")
 
-rootSheet:addChildWindow(quit)
-rootSheet:addChildWindow(standalone)
-rootSheet:addChildWindow(server)
-rootSheet:addChildWindow(dedicated)
-rootSheet:addChildWindow(client)
-background:addChildWindow(rootSheet)
+background:addChildWindow(mainmenu)
 
 
@@ -90 +45 @@
 end
 
-showBackground = false
+showBackground = true
 
 function showMainMenu()
@@ -96 +51 @@
     system:setGUISheet(background)
   else
-    system:setGUISheet(rootSheet)
+    orxonox.GUIManager:getInstance():testOutput("set new Menu")
+    system:setGUISheet(mainmenu)
   end
   return 0;
 end
 
+showing = true
+
+function toggleGUI()
+    if showing == true then
+        mainmenu:hide()
+        showing = false
+        orxonox.GUIManager:getInstance():testOutput("hiding Menu")
+    else
+        mainmenu:show()
+        showing = true
+        orxonox.GUIManager:getInstance():testOutput("showing Menu")
+    end
+end
+
 function hideGUI()
   --system:setGUISheet(nil)
-  orxonox.GUIManager:getInstance():hideGUI()
+  --orxonox.GUIManager:getInstance():hideGUI()
 end