Changeset 7732 for code/trunk/data/gui/scripts

Timestamp:

Dec 8, 2010, 3:29:28 PM (14 years ago)

Author:

konrad

Message:

Credits Menu is now scrollable

Location:

code/trunk/data/gui/scripts

Files:

• CreditsMenu.lua (modified) (2 diffs)
• MultiplayerMenu.lua (modified) (4 diffs)
• QuestGUI.lua (modified) (7 diffs)

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

@@ -4 +4 @@
 
 P.buttonList = {}
+P.scrollbarWidth = 13
 
 function P.onLoad()
@@ -17 +18 @@
     P.oldindex = -2
     P.index = -1
+
+    local description = winMgr:getWindow("orxonox/CreditsText")
+    description:setProperty("HorzFormatting", "WordWrapLeftAligned")
+    description:setProperty("VertFormatting", "TopAligned")
+    description:setText("                                   Orxonox version 0.0.3 \n\n       Programming Language:  C++ - lua - tcl \n       Environment:  OpenAL - Ogre - OIS - CEGUI - enet - ODE \n       Licence:  GNU General Public Licence - Creative Commons \n       http://www.orxonox.net \n \n       Credits:")
+
+    description:setSize(CEGUI.UVector2(CEGUI.UDim(1.0, -P.scrollbarWidth), CEGUI.UDim(1.0, 0)))
+    height = getStaticTextWindowHeight(description)
+    description:setHeight(CEGUI.UDim(0, height))
 end
 

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

@@ -4 +4 @@
 
 P.buttonList = {}
+
+--joinMode is 1 for choice "LAN" and 2 for "Internet"
+--initial status 0
+P.joinMode = 0
 
 function P.onLoad()
@@ -26 +30 @@
     }
     P.buttonList[4] = item
-
 end
 
@@ -37 +40 @@
 end
 
+function P.LanButton_clicked(e)
+    P.joinMode = 1
+end
+
+function P.InternetButton_clicked(e)
+    P.joinMode = 2
+end
+
 function P.MultiplayerHostButton_clicked(e)
     showMenuSheet("HostMenu", true)
@@ -43 +54 @@
 
 function P.MultiplayerJoinButton_clicked(e)
-    local choice = winMgr:getWindow("orxonox/MultiplayerListbox"):getFirstSelectedItem()
-    if choice then
-        local client = orxonox.Client:getInstance()
-        local index = tolua.cast(choice, "CEGUI::ListboxItem"):getID()
-        client:setDestination( P.serverList[index][2], 55556 )
+    local choice = winMgr:getWindow("orxonox/MultiplayerListbox"):getFirstSelectedItem()   
+
+    if P.joinMode == 2 then
+        if choice then
+            local client = orxonox.Client:getInstance()
+            local index = tolua.cast(choice, "CEGUI::ListboxItem"):getID()
+            client:setDestination( P.serverList[index][2], 55556 )
+        else
+            return
+        end
+        orxonox.execute("startClient")
+        hideAllMenuSheets()
     else
-        return
+        --wait for Sandro's function
     end
-    orxonox.execute("startClient")
-    hideAllMenuSheets()
+
 end
 

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

@@ -21 +21 @@
 
     P.player = orxonox.GUIManager:getInstance():getPlayer(P.name)
-    P.rootWindow = P.createQuestGUI();
+    P.rootWindow = P.createQuestGUI()
 
     questsList:addChildWindow(P.rootWindow)
@@ -74 +74 @@
     end
 
-    return index;
+    return index
 end
 
@@ -140 +140 @@
     offset = offset + height
 
-    local descriptionTitle = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Description/Title");
+    local descriptionTitle = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Description/Title")
     window:addChildWindow(descriptionTitle)
     descriptionTitle:setProperty("HorzFormatting", "HorzCentred")
@@ -151 +151 @@
     offset = offset + height
 
-    local description = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Description");
+    local description = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Description")
     window:addChildWindow(description)
     description:setProperty("HorzFormatting", "WordWrapLeftAligned")
@@ -165 +165 @@
     local numHints = orxonox.QuestManager:getInstance():getNumHints(quest, P.player)
     if numHints > 0 then
-        local hintsTitle = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Hints/Title");
+        local hintsTitle = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Hints/Title")
         window:addChildWindow(hintsTitle)
         hintsTitle:setProperty("HorzFormatting", "HorzCentred")
@@ -247 +247 @@
     local offset = 0
     
-    local descriptionTitle = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Description/Title");
+    local descriptionTitle = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Description/Title")
     window:addChildWindow(descriptionTitle)
     descriptionTitle:setProperty("HorzFormatting", "HorzCentred")
@@ -258 +258 @@
     offset = offset + height
 
-    local description = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Description");
+    local description = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Description")
     window:addChildWindow(description)
     description:setProperty("HorzFormatting", "WordWrapLeftAligned")