Changeset 270:1d28c6212e4b

Timestamp:

07/02/12 17:18:15 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support to enable/disable the approach callouts

Files:

• TODO (modified) (1 diff)
• src/mlx/config.py (modified) (2 diffs)
• src/mlx/gui/prefs.py (modified) (4 diffs)
• src/mlx/i18n.py (modified) (2 diffs)

TODO

@@ +1 @@
+- Manual:
+  - Preferences/Sounds picture: update with the approach callout
+   enabling option and also update its description
+  - Describe the callouts editor
+   

src/mlx/config.py

@@ -639 +639 @@
         self._pilotHotkey.set(self._get(config, "sounds",
                                         "pilotHotkey", "C0"))
-        self._enableApproachCallOuts = \
-            self._getBoolean(config, "sounds", "enableApproachCallOuts", False)
+        self._enableApproachCallouts = \
+            self._getBoolean(config, "sounds", "enableApproachCallouts", False)
         self._speedbrakeAtTD = self._getBoolean(config, "sounds",
                                                 "speedbrakeAtTD", True)
@@ -713 +713 @@
                    "yes" if self._pilotControlsSounds else "no")
         config.set("sounds", "pilotHotkey", str(self._pilotHotkey))
-        #config.set("sounds", "approachCallOuts",
-        #           "yes" if self._approachCallOuts else "no")
+        config.set("sounds", "enableApproachCallouts",
+                   "yes" if self._enableApproachCallouts else "no")
         config.set("sounds", "speedbrakeAtTD",
                    "yes" if self._speedbrakeAtTD else "no")

src/mlx/gui/prefs.py

@@ -253 +253 @@
         self._pilotControlsSounds.set_active(config.pilotControlsSounds)
         self._pilotHotkey.set(config.pilotHotkey)
-        #self._approachCallOuts.set_active(config.approachCallOuts)
+        self._enableApproachCallouts.set_active(config.enableApproachCallouts)
         self._speedbrakeAtTD.set_active(config.speedbrakeAtTD)
 
@@ -298 +298 @@
         config.pilotControlsSounds = self._pilotControlsSounds.get_active()
         config.pilotHotkey = self._pilotHotkey.get()
-        #config.approachCallOuts = self._approachCallOuts.get_active()
+        config.enableApproachCallouts = self._enableApproachCallouts.get_active()
         config.speedbrakeAtTD = self._speedbrakeAtTD.get_active()
 
@@ -661 +661 @@
         backgroundBox.pack_start(self._pilotHotkey, False, False, 4)
 
-        # self._approachCallOuts = gtk.CheckButton(xstr("prefs_sounds_approachCallOuts"))
-        # self._approachCallOuts.set_use_underline(True)
-        # self._approachCallOuts.set_tooltip_text(xstr("prefs_sounds_approachCallOuts_tooltip"))
-        # backgroundBox.pack_start(self._approachCallOuts, False, False, 4)
+        self._enableApproachCallouts = gtk.CheckButton(xstr("prefs_sounds_approachCallouts"))
+        self._enableApproachCallouts.set_use_underline(True)
+        self._enableApproachCallouts.set_tooltip_text(xstr("prefs_sounds_approachCallouts_tooltip"))
+        backgroundBox.pack_start(self._enableApproachCallouts, False, False, 4)
         
         self._speedbrakeAtTD = gtk.CheckButton(xstr("prefs_sounds_speedbrakeAtTD"))
@@ -711 +711 @@
         self._pilotControlsSounds.set_sensitive(active)
         self._pilotControlsSoundsToggled(self._pilotControlsSounds)
-        #self._approachCallOuts.set_sensitive(active)
+        self._enableApproachCallouts.set_sensitive(active)
         self._speedbrakeAtTD.set_sensitive(active)
 

src/mlx/i18n.py

@@ -806 +806 @@
                  "If checked, the Shift key should be pressed together with the "
                  "main key.")
-        self.add("prefs_sounds_approachCallOuts",
-                 "Enable approach callouts")
-        self.add("prefs_sounds_approachCallOuts_tooltip",
+        self.add("prefs_sounds_approachCallouts",
+                 "Enable app_roach callouts")
+        self.add("prefs_sounds_approachCallouts_tooltip",
                  "If checked, the approach callouts will be played at "
                  "certain altitudes.")
@@ -1682 +1682 @@
                  "Ha kijelölöd, a Shift billentyűt is le kell nyomni a "
                  "főbillentyűvel együtt.")
-        self.add("prefs_sounds_approachCallOuts",
-                 "Megközelítési bemondások engedélyezése")
-        self.add("prefs_sounds_approachCallOuts_tooltip",
+        self.add("prefs_sounds_approachCallouts",
+                 "Megközelítési _bemondások engedélyezése")
+        self.add("prefs_sounds_approachCallouts_tooltip",
                  "Ha kijelölöd, megközelítés közben egyes magasságok "
                  "elérésekor a program lejátssza a megadott fájlokat.")