Changeset 584:d3f929e0eb3b

Timestamp:

12/21/14 10:12:25 (10 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

If the METAR cannot be downloaded, the Next button cannot be pressed until the METAR is provided (re #235)

Files:

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

locale/en/mlx.po

@@ -706 +706 @@
 "provides different weather."
 
+msgid "briefing_help_nometar"
+msgstr ""
+"Read carefully the NOTAMs below.\n"
+"\n"
+"<b>WARNING</b>: The METAR could not be downloaded.\n"
+"Please, provide one."
+
 msgid "briefing_chelp"
 msgstr ""

locale/hu/mlx.po

@@ -705 +705 @@
 "a METAR-t módosíthatod."
 
+msgid "briefing_help_nometar"
+msgstr ""
+"Olvasd el figyelmesen a lenti NOTAM-okat.\n"
+"\n"
+"<b>FIGYELEM</b>: A METAR-t nem sikerült letölteni.\n"
+"Kérlek, gépeld be azt."
+
 msgid "briefing_chelp"
 msgstr ""

src/mlx/gui/flight.py

@@ -2004 +2004 @@
         buffer = self._metar.get_buffer()
         if metar is None:
-            buffer.set_text(xstr("briefing_metar_failed"))
+            #buffer.set_text(xstr("briefing_metar_failed"))
+            buffer.set_text("")
+            self.setHelp(xstr("briefing_help_nometar"))
         else:
             buffer.set_text(metar)
+        self._updateButton()
 
         label = self._metarFrame.get_label_widget()
@@ -2033 +2036 @@
         if not self._uppercasingMETAR:
             self.metarEdited = True
-            self._button.set_sensitive(buffer.get_text(buffer.get_start_iter(),
-                                                       buffer.get_end_iter(),
-                                                       True)!="")
+            self._updateButton()
 
     def _metarInserted(self, textBuffer, iter, text, length):
@@ -2051 +2052 @@
 
             self._uppercasingMETAR = False
+
+    def _updateButton(self):
+        """Update the sensitivity of the Next button based on the contents of
+        the METAR field."""
+        buffer = self._metar.get_buffer()
+        self._button.set_sensitive(buffer.get_text(buffer.get_start_iter(),
+                                                   buffer.get_end_iter(),
+                                                   True)!="")
+
 
 #-----------------------------------------------------------------------------