Changeset 607:d0dccf044560

Timestamp:

03/01/15 18:40:59 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The help text on the Finish page is updated dynamically based on the situation (re #248)

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

@@ -966 +966 @@
 "satisfied, you can save or send your PIREP."
 
+msgid "finish_help_faults"
+msgstr ""
+"<span foreground=\"red\">\n\nYou had one or more faults during your flight. Please, provide some\n"
+"explanation on the Flight info tab before sending the PIREP.</span>"
+
 msgid "finish_help_wrongtime"
 msgstr ""

locale/hu/mlx.po

@@ -967 +967 @@
 "megfelelnek, elmentheted vagy elküldheted a PIREP-et."
 
+msgid "finish_help_faults"
+msgstr ""
+"<span foreground=\"red\">\n\nA repülés során vétettél egy vagy több hibát. Kérlek, a Járat info oldalon\n"
+"írj ezekre magyarázatot a Járat info oldalon a PIREP elküldése előtt.</span>"
+
 msgid "finish_help_wrongtime"
 msgstr ""

src/mlx/gui/flight.py

@@ -3269 +3269 @@
         """Update the sensitivity state of the buttons."""
         gui = self._wizard.gui
+        faultsExplained = gui.faultsFullyExplained
+        timesCorrect = self.flightType is None or \
+                       not self._tooBigTimeDifference or \
+                       gui.hasComments or gui.hasDelayCode
         sensitive = self._flightType.get_active()>=0 and \
                     (self._gatesModel.get_iter_first() is None or
                      self._gate.get_active()>=0) and \
-                    (not self._tooBigTimeDifference or
-                     gui.hasComments or gui.hasDelayCode) and \
-                    gui.faultsFullyExplained
+                     faultsExplained and timesCorrect
+
+        self._updateHelp(faultsExplained, timesCorrect)
 
         wasSensitive = self._saveButton.get_sensitive()
@@ -3511 +3515 @@
         self._tooBigTimeDifference = departureError or arrivalError
 
-        if self._tooBigTimeDifference and self.flightType is not None:
-            self.setHelp(xstr("finish_help") + xstr("finish_help_wrongtime"))
-        else:
-            self.setHelp(xstr("finish_help") + xstr("finish_help_goodtime"))
-
         self._depTime.set_markup(self._formatTime(bookedFlight.departureTime,
                                                   flight.blockTimeStart,
@@ -3527 +3526 @@
 
         self.updateButtons()
+
+    def _updateHelp(self, faultsExplained, timesCorrect):
+        """Update the help text according to the actual situation."""
+        if not faultsExplained:
+            self.setHelp(xstr("finish_help") + xstr("finish_help_faults"))
+        elif not timesCorrect:
+            self.setHelp(xstr("finish_help") + xstr("finish_help_wrongtime"))
+        else:
+            self.setHelp(xstr("finish_help") + xstr("finish_help_goodtime"))
+
 
 #-----------------------------------------------------------------------------