[Orxonox-commit 1517] r6235 - in code/branches/presentation2/data/gui: layouts scripts

[cmueri at orxonox.net]

Author: cmueri
Date: 2009-12-03 20:48:25 +0100 (Thu, 03 Dec 2009)
New Revision: 6235

Modified:
   code/branches/presentation2/data/gui/layouts/ControlsMenu.layout
   code/branches/presentation2/data/gui/scripts/AudioMenu.lua
   code/branches/presentation2/data/gui/scripts/ControlsMenu.lua
Log:
Small bug in audio menu fixed.

Modified: code/branches/presentation2/data/gui/layouts/ControlsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/ControlsMenu.layout	2009-12-03 19:22:49 UTC (rev 6234)
+++ code/branches/presentation2/data/gui/layouts/ControlsMenu.layout	2009-12-03 19:48:25 UTC (rev 6235)
@@ -21,8 +21,8 @@
                 <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.318181,0},{0.7,0},{0.5,0}}" />
                 <Event Name="Clicked" Function="ControlsMenu.ControlsMouseControlsButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/KeyboardControlsButton" >
-                <Property Name="Text" Value="Keyboard controls" />
+            <Window Type="TaharezLook/Button" Name="orxonox/KeybindingsButton" >
+                <Property Name="Text" Value="Keybindings" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.590909,0},{0.7,0},{0.772727,0}}" />
                 <Event Name="Clicked" Function="ControlsMenu.ControlsKeyboardControlsButton_clicked"/>

Modified: code/branches/presentation2/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/AudioMenu.lua	2009-12-03 19:22:49 UTC (rev 6234)
+++ code/branches/presentation2/data/gui/scripts/AudioMenu.lua	2009-12-03 19:48:25 UTC (rev 6235)
@@ -130,8 +130,8 @@
             mastervolume = temp
             mastermute = true
         end
-        soundMgr:toggleMute(orxonox.SoundType.none)
     end
+    soundMgr:toggleMute(orxonox.SoundType.none)
 end
 
 function P.AudioMuteMusicCheckbox_clicked(e)
@@ -145,8 +145,8 @@
             musicvolume = temp
             musicmute = true
         end
-        soundMgr:toggleMute(orxonox.SoundType.ambient)
     end
+    soundMgr:toggleMute(orxonox.SoundType.ambient)
 end
 
 function P.AudioMuteEffectsCheckbox_clicked(e)
@@ -160,8 +160,8 @@
             effectsvolume = temp
             effectsmute = true
         end
-        soundMgr:toggleMute(orxonox.SoundType.effects)
     end
+    soundMgr:toggleMute(orxonox.SoundType.effects)
 end
 
 function P.AudioThemeCombobox_changed(e)

Modified: code/branches/presentation2/data/gui/scripts/ControlsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/ControlsMenu.lua	2009-12-03 19:22:49 UTC (rev 6234)
+++ code/branches/presentation2/data/gui/scripts/ControlsMenu.lua	2009-12-03 19:48:25 UTC (rev 6235)
@@ -16,7 +16,7 @@
 end
 
 function P.ControlsKeyboardControlsButton_clicked(e)
-    showGUI("KeyboardControlsMenu", true)
+    showGUI("KeyBindMenu", true)
 end
 
 function P.ControlsBackButton_clicked(e)