Changeset 1094:a2a4b6462f53

Timestamp:

07/16/23 10:55:47 (16 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

The taxi sounds can be started on pushback (re #367)

Files:

• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/config.py (modified) (5 diffs)
• src/mlx/gui/prefs.py (modified) (4 diffs)
• src/mlx/soundsched.py (modified) (1 diff)

locale/en/mlx.po

@@ -1848 +1848 @@
 msgid "prefs_sounds_pilotHotkeyShift_tooltip"
 msgstr "If checked, the Shift key should be pressed together with the main key."
+
+msgid "prefs_sounds_taxiSoundOnPushback"
+msgstr "Play safety _demo on pushback"
+
+msgid "prefs_sounds_taxiSoundOnPushback_tooltip"
+msgstr ""
+"If checked, the Malév song and the safety demo are played "
+"immediately as pushback begins. Otherwise they are played when "
+"the plane is taxiing at 5 knots at least"
 
 msgid "prefs_sounds_approachCallouts"

locale/hu/mlx.po

@@ -1857 +1857 @@
 msgstr ""
 "Ha kijelölöd, a Shift billentyűt is le kell nyomni a főbillentyűvel együtt."
+
+msgid "prefs_sounds_taxiSoundOnPushback"
+msgstr "Biztonsági _ismertető indítása hátratoláskor"
+
+msgid "prefs_sounds_taxiSoundOnPushback_tooltip"
+msgstr ""
+"Ha bejelölöd, a Malév dalt és a biztonsági ismertetőt "
+"már a hátratolás megkezdésekor elkezdi játszani a program. "
+"Egyébként ezeket csak gurulás közben, 5 csomós sebesség "
+"elérésekor kezdi el."
 
 msgid "prefs_sounds_approachCallouts"

src/mlx/config.py

@@ -249 +249 @@
         self._pilotHotkey = Hotkey(ctrl = True, shift = False, key = "0")
 
+        self._taxiSoundOnPushback = False
+
         self._enableApproachCallouts = False
         self._speedbrakeAtTD = True
@@ -608 +610 @@
         if pilotHotkey!=self._pilotHotkey:
             self._pilotHotkey = pilotHotkey
+            self._modified = True
+
+    @property
+    def taxiSoundOnPushback(self):
+        """Get whether the taxi sound should be played as soon as pushback starts."""
+        return self._taxiSoundOnPushback
+
+    @taxiSoundOnPushback.setter
+    def taxiSoundOnPushback(self, taxiSoundOnPushback):
+        """Set whether the taxi sound should be played as soon as pushback starts."""
+        if taxiSoundOnPushback!=self._taxiSoundOnPushback:
+            self._taxiSoundOnPushback = taxiSoundOnPushback
             self._modified = True
 
@@ -802 +816 @@
         self._pilotHotkey.set(self._get(config, "sounds",
                                         "pilotHotkey", "C0"))
+
+        self._taxiSoundOnPushback = \
+            self._getBoolean(config, "sounds", "taxiSoundOnPushback", False)
         self._enableApproachCallouts = \
             self._getBoolean(config, "sounds", "enableApproachCallouts", False)
@@ -903 +920 @@
                    "yes" if self._pilotControlsSounds else "no")
         config.set("sounds", "pilotHotkey", str(self._pilotHotkey))
+        config.set("sounds", "taxiSoundOnPushback",
+                   "yes" if self._taxiSoundOnPushback else "no")
         config.set("sounds", "enableApproachCallouts",
                    "yes" if self._enableApproachCallouts else "no")
@@ -1047 +1066 @@
         print("  pilotHotkey:", str(self._pilotHotkey))
 
+        print("  taxiSoundOnPushback:", self._taxiSoundOnPushback)
+
         print("  enableApproachCallouts:", self._enableApproachCallouts)
         print("  speedbrakeAtTD:", self._speedbrakeAtTD)

src/mlx/gui/prefs.py

@@ -270 +270 @@
         self._enableChecklists.set_active(config.enableChecklists)
         self._checklistHotkey.set(config.checklistHotkey)
+
+        self._taxiSoundOnPushback.set_active(config.taxiSoundOnPushback)
 
         self._autoUpdate.set_active(config.autoUpdate)
@@ -321 +323 @@
         config.checklistHotkey = self._checklistHotkey.get()
 
+        config.taxiSoundOnPushback = self._taxiSoundOnPushback.get_active()
+
         config.autoUpdate = self._autoUpdate.get_active()
         config.updateURL = self._updateURL.get_text()
@@ -700 +704 @@
         backgroundBox.pack_start(self._pilotHotkey, False, False, 4)
 
+        self._taxiSoundOnPushback = Gtk.CheckButton(xstr("prefs_sounds_taxiSoundOnPushback"))
+        self._taxiSoundOnPushback.set_use_underline(True)
+        self._taxiSoundOnPushback.set_tooltip_text(xstr("prefs_sounds_taxiSoundOnPushback_tooltip"))
+        backgroundBox.pack_start(self._taxiSoundOnPushback, False, False, 4)
+
         self._enableApproachCallouts = Gtk.CheckButton(xstr("prefs_sounds_approachCallouts"))
         self._enableApproachCallouts.set_use_underline(True)
@@ -750 +759 @@
         self._pilotControlsSounds.set_sensitive(active)
         self._pilotControlsSoundsToggled(self._pilotControlsSounds)
+        self._taxiSoundOnPushback.set_sensitive(active)
         self._enableApproachCallouts.set_sensitive(active)
         self._speedbrakeAtTD.set_sensitive(active)

src/mlx/soundsched.py

@@ -149 +149 @@
     def __init__(self, flight, boardingSound = None):
         """Construct the taxi sound."""
+        config = flight.config
+
         super(TaxiSound, self).__init__(const.SOUND_MALEV,
                                         const.STAGE_PUSHANDTAXI,
                                         previousSound = boardingSound,
                                         extraCondition = lambda _flight, state:
-                                        state.groundSpeed>5)
+                                        config.taxiSoundOnPushback or state.groundSpeed>5)
 
         self._flight = flight