Changeset 6235 for code/branches/presentation2

Timestamp:

Dec 3, 2009, 8:48:25 PM (15 years ago)

Author:

cmueri

Message:

Small bug in audio menu fixed.

Location:

code/branches/presentation2/data/gui

Files:

• layouts/ControlsMenu.layout (modified) (1 diff)
• scripts/AudioMenu.lua (modified) (3 diffs)
• scripts/ControlsMenu.lua (modified) (1 diff)

code/branches/presentation2/data/gui/layouts/ControlsMenu.layout

@@ -22 +22 @@
                 <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}}" />

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

@@ -131 +131 @@
             mastermute = true
         end
-        soundMgr:toggleMute(orxonox.SoundType.none)
     end
+    soundMgr:toggleMute(orxonox.SoundType.none)
 end
 
@@ -146 +146 @@
             musicmute = true
         end
-        soundMgr:toggleMute(orxonox.SoundType.ambient)
     end
+    soundMgr:toggleMute(orxonox.SoundType.ambient)
 end
 
@@ -161 +161 @@
             effectsmute = true
         end
-        soundMgr:toggleMute(orxonox.SoundType.effects)
     end
+    soundMgr:toggleMute(orxonox.SoundType.effects)
 end
 

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

@@ -17 +17 @@
 
 function P.ControlsKeyboardControlsButton_clicked(e)
-    showGUI("KeyboardControlsMenu", true)
+    showGUI("KeyBindMenu", true)
 end