[Orxonox-commit 2905] r7608 - in code/branches/menu/data/gui: layouts scripts

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-11-02 23:41:52 +0100 (Tue, 02 Nov 2010)
New Revision: 7608

Modified:
   code/branches/menu/data/gui/layouts/MainMenu.layout
   code/branches/menu/data/gui/scripts/MainMenu.lua
Log:
Some adjustments.


Modified: code/branches/menu/data/gui/layouts/MainMenu.layout
===================================================================
--- code/branches/menu/data/gui/layouts/MainMenu.layout	2010-11-02 22:30:44 UTC (rev 7607)
+++ code/branches/menu/data/gui/layouts/MainMenu.layout	2010-11-02 22:41:52 UTC (rev 7608)
@@ -7,7 +7,6 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Event Name="KeyDown" Function="MainMenu.Key_clicked"/>
         <Window Type="MenuWidgets/Button" Name="orxonox/QuickGameTestButton" >
             <Property Name="Text" Value="Quickstart" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />

Modified: code/branches/menu/data/gui/scripts/MainMenu.lua
===================================================================
--- code/branches/menu/data/gui/scripts/MainMenu.lua	2010-11-02 22:30:44 UTC (rev 7607)
+++ code/branches/menu/data/gui/scripts/MainMenu.lua	2010-11-02 22:41:52 UTC (rev 7608)
@@ -65,34 +65,4 @@
     end
 end
 
---[[function P.Key_clicked(e)
-    local we = tolua.cast(e, "CEGUI::KeyEventArgs")
-    cout(0, tostring(we.scancode))
-    if tostring(we.scancode) == "15" then
-        P.index = P.index + 1
-        local window = winMgr:getWindow("orxonox/MainMenuBackground")
-        if P.index == window:getChildCount() then
-            P.index = 1
-        end
-        local child = window:getChildAtIdx(P.index-1)
-        child:setProperty("NormalImageRightEdge", string.sub(child:getProperty("NormalImageRightEdge"),1,-7) .. "Highlight")
-        child:setProperty("NormalImageLeftEdge", string.sub(child:getProperty("NormalImageLeftEdge"),1,-7) .. "Highlight")
-        child:setProperty("NormalImageBackground", string.sub(child:getProperty("NormalImageBackground"),1,-7) .. "Highlight")
-    elseif tostring(we.scancode) == "28" and P.index ~= 0 then
-        if P.index == 1 then
-            P.QuickGameTestButton_clicked()
-        elseif P.index == 2 then
-            P.SingleplayerButton_clicked()
-        elseif P.index == 3 then
-            P.MultiplayerButton_clicked()
-        elseif P.index == 4 then
-            P.SettingsButton_clicked()
-        elseif P.index == 5 then
-            P.CreditsButton_clicked()
-        elseif P.index == 6 then
-            P.ExitButton_clicked()
-        end
-    end
-end]]--
-
 return P