Changeset 256 for trunk/src/pyspacewar/ui.py

Timestamp:

01/07/07 21:53:18 (5 years ago)

Author:

mg

Message:

Split off video and sound options into submenus.

Files:

• trunk/src/pyspacewar/ui.py (modified) (6 diffs)

trunk/src/pyspacewar/ui.py

@@ -1436 +1436 @@
             return label + '\t' + (on and 'on' or 'off')
         self.menu_items = [
+            ('Video', self.ui.video_options_menu),
+            ('Sound', self.ui.sound_options_menu),
+            ('Controls', self.ui.controls_menu),
+            ('Return to main menu', self.close_menu),
+        ]
+
+
+class VideoOptionsMenuMode(MenuMode):
+    """Mode: video options menu."""
+
+    def init_menu(self):
+        """Initialize the mode."""
+        def title(label, on):
+            return label + '\t' + (on and 'on' or 'off')
+        self.menu_items = [
             ('Screen size\t%dx%d' % self.ui.fullscreen_mode,
              self.ui.screen_resolution_menu),
@@ -1442 +1457 @@
             (title('Missile orbits', self.ui.show_missile_trails),
              self.toggle_missile_orbits),
-            (title('Music', self.ui.music),
-             self.toggle_music),
-            (title('Sound', self.ui.sound),
-             self.toggle_sound),
-            (title('Sound in vacuum', self.ui.sound_in_vacuum),
-             self.toggle_sound_in_vacuum),
-            ('Controls', self.ui.controls_menu),
-            ('Return to main menu', self.close_menu),
+            ('Return to options menu', self.close_menu),
         ]
 
@@ -1459 +1467 @@
         self.reinit_menu()
 
-    def init(self):
-        """Initialize the mode."""
-        MenuMode.init(self)
-        # Override a couple of key bindings to do extra stuff
-        self.on_key(K_o, self.toggle_missile_orbits)
-        self.on_key(K_f, self.toggle_fullscreen)
-
     def toggle_fullscreen(self):
         """Toggle full-screen mode and reflect the setting in the menu."""
@@ -1474 +1475 @@
         """Toggle missile orbits and reflect the setting in the menu."""
         self.ui.toggle_missile_orbits()
-        self.reinit_menu()
-
-    def toggle_music(self):
-        """Toggle music and reflect the setting in the menu."""
-        self.ui.toggle_music()
-        self.reinit_menu()
-
-    def toggle_sound(self):
-        """Toggle sound effects and reflect the setting in the menu."""
-        self.ui.toggle_sound()
-        self.reinit_menu()
-
-    def toggle_sound_in_vacuum(self):
-        """Toggle sound in vacuum and reflect the setting in the menu."""
-        self.ui.toggle_sound_in_vacuum()
         self.reinit_menu()
 
@@ -1508 +1494 @@
         """Switch to a specified video mode."""
         self.ui.switch_to_mode(mode)
+        self.reinit_menu()
+
+
+class SoundOptionsMenuMode(MenuMode):
+    """Mode: sound options menu."""
+
+    def init_menu(self):
+        """Initialize the mode."""
+        def title(label, on):
+            return label + '\t' + (on and 'on' or 'off')
+        self.menu_items = [
+            (title('Music', self.ui.music),
+             self.toggle_music),
+            (title('Sound', self.ui.sound),
+             self.toggle_sound),
+            (title('Sound in vacuum', self.ui.sound_in_vacuum),
+             self.toggle_sound_in_vacuum),
+            ('Return to options menu', self.close_menu),
+        ]
+
+    def toggle_music(self):
+        """Toggle music and reflect the setting in the menu."""
+        self.ui.toggle_music()
+        self.reinit_menu()
+
+    def toggle_sound(self):
+        """Toggle sound effects and reflect the setting in the menu."""
+        self.ui.toggle_sound()
+        self.reinit_menu()
+
+    def toggle_sound_in_vacuum(self):
+        """Toggle sound in vacuum and reflect the setting in the menu."""
+        self.ui.toggle_sound_in_vacuum()
         self.reinit_menu()
 
@@ -2239 +2258 @@
         self.ui_mode = OptionsMenuMode(self)
 
+    def video_options_menu(self):
+        """Enter the video options menu."""
+        self.ui_mode = VideoOptionsMenuMode(self)
+
+    def sound_options_menu(self):
+        """Enter the sound options menu."""
+        self.ui_mode = SoundOptionsMenuMode(self)
+
     def screen_resolution_menu(self):
         """Enter the screen resolution menu."""