Changeset 6335 for code/branches/presentation2/data/gui/scripts

Timestamp:

Dec 13, 2009, 1:46:28 PM (15 years ago)

Author:

dafrick

Message:

Removed empty lines.
Adjusted size of boxes in KeyBindMenu so that the text is displayed properly.
Regarding the bug: Found the reason why this happens. The problem is, that apparently CEGUI doesn't allow for windows bigger than the displayed screen, which means, that any window that is bigger than the scrren size isn'f fully displayed. I have no idea how to circumvent this, but I'll keep looking.

Location:

code/branches/presentation2/data/gui/scripts

Files:

• InfoPopup.lua (modified) (1 diff)
• KeyBindMenu.lua (modified) (1 diff)

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

@@ -1 +1 @@
 -- InfoPopup.lua
-
-
 
 BasicGUI = require("BasicGUI")
 local P = BasicGUI:new() --inherit everything from the gui package
 
-
 if _REQUIREDNAME == nil then
-
     InfoPopup = P
-
 else
-
     _G[_REQUIREDNAME] = P
-
 end
 
-
-
 P.filename = "InfoPopup"
-
 P.layoutString = "InfoPopup.layout"
 
-
-
 function P:init()
-
 end
 
-
-
 function P.execute(functionPtr, arguments)
-
     if functionPtr ~= nil then
-
         if arguments ~= nil then
-
             functionPtr(arguments)
-
         else
-
             functionPtr()
-
         end
-
     end
-
 end
 
-
-
 function P.setText( text )
-
     winMgr:getWindow("orxonox/InfoPopup_text"):setText( text )
-
 end
 
-
-
 function P.setCloseButton(closeButton)
-
     close = winMgr:getWindow("orxonox/InfoPopup_close")
-
     close:setVisible(closeButton)
-
     if(not closeButton) then
-
         close:deactivate();
-
     else
-
         close:activate();
-
     end
-
 end
 
-
-
 -- events for ingamemenu
-
-
 function P.close(e)
-
     hideGUI("InfoPopup")
-
 end
 
-
-
 return P
-

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

@@ -1 +1 @@
 -- KeyBindMenu.lua
 
-
-
 BasicGUI = require("BasicGUI")
-
 local P = BasicGUI:new() --inherit everything from the gui package
 
-
 if _REQUIREDNAME == nil then
-
     KeyBindMenu = P
-
 else
     _G[_REQUIREDNAME] = P
-
-end
-
-
+end
 
 P.filename = "KeyBindMenu"
-
 P.layoutString = "KeyBindMenu.layout"
 
-
-
 function P:init()
 
     commandList = {}
-
     table.insert(commandList, "fire 0")
-
     table.insert(commandList, "fire 1 | unfire")
-
     table.insert(commandList, "onpress fire 2")
-
     table.insert(commandList, "scale 1 moveFrontBack")
-
     table.insert(commandList, "scale -1 moveFrontBack")
-
     table.insert(commandList, "boost")
-
     table.insert(commandList, "scale 1 moveRightLeft")
-
     table.insert(commandList, "scale -1 moveRightLeft")
-
     table.insert(commandList, "scale 1 moveUpDown")
-
     table.insert(commandList, "scale -1 moveUpDown")
-
     table.insert(commandList, "scale 1 rotateRoll")
-
     table.insert(commandList, "scale -1 rotateRoll")
-
     table.insert(commandList, "switchCamera")
-
     table.insert(commandList, "openConsole")
-
     table.insert(commandList, "OverlayGroup toggleVisibility Debug")
-
     table.insert(commandList, "OverlayGroup toggleVisibility Stats")
-
     table.insert(commandList, "mouseLook")
-
     table.insert(commandList, "pause")
 
-    
-
     nameList = {}
-
     table.insert(nameList, "Primary Fire")
-
     table.insert(nameList, "Secondary Fire")
-
     table.insert(nameList, "Fire Rocket")
-
     table.insert(nameList, "Accelerate")
-
     table.insert(nameList, "Break")
     table.insert(nameList, "Boost")
-
     table.insert(nameList, "Move Right")
-
     table.insert(nameList, "Move Left")
-
     table.insert(nameList, "Move Up")
-
     table.insert(nameList, "Move Down")
-
     table.insert(nameList, "Roll Right")
-
     table.insert(nameList, "Roll Left")
-
     table.insert(nameList, "Switch Camera")
-
     table.insert(nameList, "Open Console")
-
     table.insert(nameList, "Show Debug")
-
     table.insert(nameList, "Show Stats")
-
     table.insert(nameList, "Look Around")
-
     table.insert(nameList, "Pause")
 
-    
-
     linesList = {}
 
-
-    lineHeight = 25
+    lineHeight = 30
     commandWidth = 125
-    buttonWidth = 125
+    buttonWidth = 145
     clearWidth = 20
-    addWidth = 25
-
+    addWidth = 30
     spaceWidth = 10
 
-    
-
     P.createLines()
 
-    
-
     local funct = luaState:createLuaFunctor("KeyBindMenu.callback()")
-
     orxonox.KeyBinderManager:getInstance():registerKeybindCallback(funct)
-
-end
-
-
-
+end
 
 function P.KeyNameNiceifier(key)
-
     local name = string.sub(key, string.find(key, '%.(.*)')+1)
     local group = string.sub(key, string.find(key, '(.*)%.'))
-
     group = string.sub(group,1,string.len(group)-1)
-
     if( group == "Keys") then
-
         return "Key " .. string.sub(name, string.find(name, 'Key(.*)')+3)
-
     elseif( group == "MouseButtons") then
-
         return "Mouse " .. name
-
-    end
-
+    end
     return key
-
-end
-
-
+end
 
 function P.createLine(k)
-
     local offset = 0
-
     local line = winMgr:createWindow("DefaultWindow", "orxonox/KeyBindPane/Binding" .. k)
-
     line:setHeight(CEGUI.UDim(0, lineHeight))
-
     line:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, lineHeight*(k-1))))
 
-    
-
     local command = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/Binding" .. k .. "/Command")
-
     command:setSize(CEGUI.UVector2(CEGUI.UDim(0, commandWidth), CEGUI.UDim(1, 0)))
-
     command:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0, 0)))
-
     command:setText(nameList[k])
     line:addChildWindow(command)
-
     offset = offset + commandWidth + spaceWidth
 
+    local plus = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
+    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.KeyBinderManager:getInstance():subscribeEventHelper(plus, "Clicked", P.filename .. ".KeyBindPlus_clicked")
+    line:addChildWindow(plus)
+    offset = offset + addWidth + spaceWidth
+
+    local numButtons = orxonox.KeyBinderManager:getInstance():getCurrent():getNumberOfBindings(commandList[k]);
+    for i=0,(numButtons-1) do
+        local button = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Button" .. i)
+        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)))
+        local name = orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[k],i)
+        name = P.KeyNameNiceifier(name)
+        button:setText(name)
+        orxonox.KeyBinderManager:getInstance():subscribeEventHelper(button, "Clicked", P.filename .. ".KeyBindButton_clicked")
+        --button:subscribeScriptedEvent("EventClicked", P.filename .. ".KeyBindButton_clicked")
+        line:addChildWindow(button)
+        offset = offset + buttonWidth
+
+        local clear = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
+        clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
+        clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, (i*(buttonWidth+clearWidth+spaceWidth)+buttonWidth)+commandWidth+clearWidth+2*spaceWidth), CEGUI.UDim(0.15, 0)))
+        clear:setText("X")
+        orxonox.KeyBinderManager:getInstance():subscribeEventHelper(clear, "Clicked", P.filename .. ".KeyBindClear_clicked")
+        line:addChildWindow(clear)
+        offset = offset + clearWidth + spaceWidth
+    end
     
-
-    local plus = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
-
-    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.KeyBinderManager:getInstance():subscribeEventHelper(plus, "Clicked", P.filename .. ".KeyBindPlus_clicked")
-
-    line:addChildWindow(plus)
-
-    offset = offset + addWidth + spaceWidth
-
+    debug(0, "OFFSET: " .. offset)
+
+    line:setWidth(CEGUI.UDim(0, offset+clearWidth))
     
-
-    local numButtons = orxonox.KeyBinderManager:getInstance():getCurrent():getNumberOfBindings(commandList[k]);
-
-    for i=0,(numButtons-1) do
-
-        local button = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Button" .. i)
-
-        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)))
-
-        local name = orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[k],i)
-
-        name = P.KeyNameNiceifier(name)
-
-        button:setText(name)
-
-        orxonox.KeyBinderManager:getInstance():subscribeEventHelper(button, "Clicked", P.filename .. ".KeyBindButton_clicked")
-
-        --button:subscribeScriptedEvent("EventClicked", P.filename .. ".KeyBindButton_clicked")
-
-        line:addChildWindow(button)
-
-        offset = offset + buttonWidth
-
-        
-
-        local clear = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
-
-        clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
-
-        clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, (i*(buttonWidth+clearWidth+spaceWidth)+buttonWidth)+commandWidth+clearWidth+2*spaceWidth), CEGUI.UDim(0.15, 0)))
-
-        clear:setText("X")
-
-        orxonox.KeyBinderManager:getInstance():subscribeEventHelper(clear, "Clicked", P.filename .. ".KeyBindClear_clicked")
-
-        line:addChildWindow(clear)
-
-        offset = offset + clearWidth + spaceWidth
-
-    end
-
-    
-
-    line:setWidth(CEGUI.UDim(0, offset+clearWidth))
-
-    
-
     return line
-
-end
-
-
+end
 
 function P.createLines()
-
-
     local window = winMgr:getWindow("orxonox/KeyBindPane")
 
-
     for k,v in pairs(commandList) do
-
         local line = P.createLine(k)
-
         table.insert(linesList, line)
-
         window:addChildWindow(line)
-
-    end
-
-
-end
-
-
+    end
+end
 
 function P.KeyBindButton_clicked(e)
-
     local we = CEGUI.toWindowEventArgs(e)
-
     local name = we.window:getName()
 
-
     local match = string.gmatch(name, "%d+")
-
     local commandNr = tonumber(match())
-
     local buttonNr = tonumber(match())
 
-    
-
     local arguments = {}
-
     arguments[1] = commandNr
-
     arguments[2] = buttonNr
-
     openInfoPopup("Press any button/key or move a mouse/joystick axis.", KeyBindMenu.keybind, false, arguments)
 end
 
 function P.KeyBindPlus_clicked(e)
-
     local we = CEGUI.toWindowEventArgs(e)
-
     local name = we.window:getName()
 
-    
-
     local match = string.gmatch(name, "%d+")
-
     local commandNr = tonumber(match())
-    
 
     local arguments = {}
-
     arguments[1] = commandNr
-
     openInfoPopup("Press any button/key or move a mouse/joystick axis.", KeyBindMenu.keybind, false, arguments)
 end
 
 function P.KeyBindClear_clicked(e)
-
     local we = CEGUI.toWindowEventArgs(e)
-
     local name = we.window:getName()
 
-    
-
     local match = string.gmatch(name, "%d+")
-
     local commandNr = tonumber(match())
-
     local buttonNr = tonumber(match())
-   
  
     orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
 
-    
-
     P.callback()
-
-end
-
-
+end
 
 function P.keybind(arguments)
-
     local commandNr = arguments[1]
-
     local buttonNr = arguments[2]
-
     if buttonNr ~= nil then
-
         orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
-
-    end
-
+    end
 
     orxonox.KeyBinderManager:getInstance():keybind(commandList[commandNr])
-
-end
-
-
+end
 
 function P.callback()
-
     while table.getn(linesList) ~= 0 do
-
         if linesList[1] ~= nil then
-
             winMgr:destroyWindow(linesList[1]:getName())
-
         end
-
         table.remove(linesList, 1)
-
-    end
-
-    
+    end
 
     linesList = {}
 
-
     P.createLines()
-
     if(InfoPopup ~= nil) then
-
         InfoPopup.close()
-
-    end
-
-end
-
-
+    end
+end
 
 function P.KeyBindBackButton_clicked(e)
-
     hideGUI("KeyBindMenu")
-
-end
-
-
+end
 
 return P
-