[Orxonox-commit 1533] r6251 - in code/branches/presentation2/data/gui: layouts scripts

[cmueri at orxonox.net]

Author: cmueri
Date: 2009-12-05 21:33:56 +0100 (Sat, 05 Dec 2009)
New Revision: 6251

Modified:
   code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout
   code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua
Log:
The menu is now able to switch between normal and derive mouse input.

Modified: code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout	2009-12-05 13:23:21 UTC (rev 6250)
+++ code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout	2009-12-05 20:33:56 UTC (rev 6251)
@@ -71,6 +71,7 @@
             </Window>
             <Window Type="TaharezLook/Checkbox" Name="orxonox/MouseInvertCheckbox" >
                 <Property Name="Text" Value="Invert mouse" />
+                <Property Name="Disabled" Value="true" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.39,0},{0.85,0},{0.61,0},{0.95,0}}" />
                 <Event Name="CheckStateChanged" Function="MouseControlsMenu.MouseInvertCheckbox_clicked" />
@@ -83,7 +84,7 @@
             <Event Name="Clicked" Function="MouseControlsMenu.MouseControlsBackButton_clicked"/>
         </Window>
         <Window Type="TaharezLook/StaticText" Name="orxonox/MouseControlsAvailable" >
-            <Property Name="Text" Value="The button functions are not yet available." />
+            <Property Name="Text" Value="The invert mouse button is not yet available." />
             <Property Name="TextColours" Value="FFFF0000" />
             <Property Name="InheritsAlpha" Value="False" />
             <Property Name="HorzFormatting" Value="HorzCentred" />

Modified: code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua	2009-12-05 13:23:21 UTC (rev 6250)
+++ code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua	2009-12-05 20:33:56 UTC (rev 6251)
@@ -85,7 +85,6 @@
         block = true
         derivewindow:setSelected(false)
         block = false
-        -- normal mouse input
         orxonox.CommandExecutor:execute("config KeyBinder bDeriveMouseInput_ false")
     end
 end
@@ -95,14 +94,12 @@
         block = true
         normalwindow:setSelected(false)
         block = false
-        -- derive mouse input
         orxonox.CommandExecutor:execute("config KeyBinder bDeriveMouseInput_ true")
     end
 end
 
 function P.MouseInvertCheckbox_clicked(e)
     -- invert mouse
-    debug("event: invert mouse")
 end
 
 function P.MouseControlsBackButton_clicked(e)