Changeset 708:2e411a2d77a0

Timestamp:

10/25/15 09:17:01 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

cef

Phase:

public

Message:

The takeoff and landing runways can be entered (re #279).

Files:

• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/gui/flight.py (modified) (5 diffs)

locale/en/mlx.po

@@ -747 +747 @@
 msgstr "Enter the amount of extra fuel in kilograms."
 
+msgid "simbrief_takeoff_runway"
+msgstr "_Takeoff runway:"
+
+msgid "simbrief_takeoff_runway_tooltip"
+msgstr ""
+"Enter the number of the planned takeoff runway.\n"
+"If you don't want to specify it, leave it empty"
+
+msgid "simbrief_landing_runway"
+msgstr "_Landing runway:"
+
+msgid "simbrief_landing_runway_tooltip"
+msgstr ""
+"Enter the number of the planned landing runway.\n"
+"If you don't want to specify it, leave it empty"
+
 msgid "simbrief_progress_searching_browser"
 msgstr "Searching browser..."

locale/hu/mlx.po

@@ -745 +745 @@
 msgstr "Írd be az extra üzemanyag mennyiségéet kilogrammban."
 
+msgid "simbrief_takeoff_runway"
+msgstr "_Felszálló futópálya:"
+
+msgid "simbrief_takeoff_runway_tooltip"
+msgstr
+"Írd be a tervezett felszálló futópálya számát.\n"
+"Ha nem akarod megadni, hagyd üresen a mezőt."
+
+msgid "simbrief_landing_runway"
+msgstr "_Leszálló futópálya:"
+
+msgid "simbrief_landing_runway_tooltip"
+msgstr
+"Írd be a tervezett leszálló futópálya számát.\n"
+"Ha nem akarod megadni, hagyd üresen a mezőt."
+
 msgid "simbrief_progress_searching_browser"
 msgstr "Böngésző keresése..."

src/mlx/gui/flight.py

@@ -1823 +1823 @@
         table.attach(gtk.Label("kg"), 2, 3, 3, 4)
 
+        label = gtk.Label(xstr("simbrief_takeoff_runway"))
+        label.set_use_underline(True)
+        label.set_alignment(0.0, 0.5)
+        table.attach(label, 0, 1, 4, 5)
+
+        self._takeoffRunway = gtk.Entry()
+        self._takeoffRunway.set_width_chars(10)
+        self._takeoffRunway.set_tooltip_text(xstr("simbrief_takeoff_runway_tooltip"))
+        self._takeoffRunway.connect("changed", self._upperChanged)
+        table.attach(self._takeoffRunway, 1, 2, 4, 5)
+        label.set_mnemonic_widget(self._takeoffRunway)
+
+        label = gtk.Label(xstr("simbrief_landing_runway"))
+        label.set_use_underline(True)
+        label.set_alignment(0.0, 0.5)
+        table.attach(label, 0, 1, 5, 6)
+
+        self._landingRunway = gtk.Entry()
+        self._landingRunway.set_width_chars(10)
+        self._landingRunway.set_tooltip_text(xstr("simbrief_takeoff_runway_tooltip"))
+        self._landingRunway.connect("changed", self._upperChanged)
+        table.attach(self._landingRunway, 1, 2, 5, 6)
+        label.set_mnemonic_widget(self._landingRunway)
+
         self.addCancelFlightButton()
 
@@ -1843 +1867 @@
         self._extraFuel.set_int(0)
         self._extraFuel.set_sensitive(True)
+
+        self._takeoffRunway.set_text("")
+        self._takeoffRunway.set_sensitive(True)
+
+        self._landingRunway.set_text("")
+        self._landingRunway.set_sensitive(True)
 
         self._updateForwardButton()
@@ -1877 +1907 @@
             self._rememberButton.set_sensitive(False)
             self._extraFuel.set_sensitive(False)
+            self._takeoffRunway.set_sensitive(False)
+            self._landingRunway.set_sensitive(False)
 
             self._wizard.gui.beginBusy("Calling SimBrief...")
@@ -2023 +2055 @@
 
         plan["addedfuel"] = str(self._extraFuel.get_int() / 1000.0)
-        plan["origrwy"] = "" # FIXME: query
-        plan["destrwy"] = "" # FIXME: query
+        plan["origrwy"] = self._takeoffRunway.get_text()
+        plan["destrwy"] = self._landingRunway.get_text()
         plan["climb"] = "250/300/78" # FIXME: query
         plan["cruise"] = "LRC" # FIXME: query
@@ -2030 +2062 @@
 
         return plan
+
+    def _upperChanged(self, entry, arg = None):
+        """Called when the value of some entry widget has changed and the value
+        should be converted to uppercase."""
+        entry.set_text(entry.get_text().upper())
 
 #-----------------------------------------------------------------------------