Changeset 810:2414e2751578

Timestamp:

09/08/16 07:33:24 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Information about the number of rejected and pending flights is dispayed on the flight selection page (re #307)

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

@@ -369 +369 @@
 msgid "flightsel_title"
 msgstr "Flight selection"
+
+msgid "flightsel_prehelp_nopending"
+msgstr ""
+
+msgid "flightsel_prehelp_0rep_rej"
+msgstr ""
+"<span color=\"red\">You have %d rejected flight(s).</span>\n\n "
+
+msgid "flightsel_prehelp_rep_0rej"
+msgstr ""
+"You have %d reported flight(s).\n\n "
+
+msgid "flightsel_prehelp_rep_rej"
+msgstr ""
+"<span color=\"red\">You have %d rejected and %d reported flight(s).</span>\n\n "
 
 msgid "flightsel_help"

locale/hu/mlx.po

@@ -369 +369 @@
 msgid "flightsel_title"
 msgstr "Járatválasztás"
+
+msgid "flightsel_prehelp_nopending"
+msgstr ""
+
+msgid "flightsel_prehelp_0rep_rej"
+msgstr ""
+"<span color=\"red\">%d visszautasított járatod van.</span>\n\n "
+
+msgid "flightsel_prehelp_rep_0rej"
+msgstr ""
+"%d jelentett járatod van.\n\n "
+
+msgid "flightsel_prehelp_rep_rej"
+msgstr ""
+"<span color=\"red\">%d visszautasított és %d jelentett járatod van.</span>\n\n "
 
 msgid "flightsel_help"

src/mlx/gui/flight.py

@@ -511 +511 @@
     def activate(self):
         """Fill the flight list."""
+        self._setupHelp()
         self._flightList.set_sensitive(True)
         self._loadButton.set_sensitive(True)
@@ -521 +522 @@
         self._loadButton.set_sensitive(False)
         self._refreshButton.set_sensitive(False)
+
+    def _setupHelp(self):
+        """Setup the help string"""
+        help = ""
+
+        if self._wizard.loggedIn:
+            numReported = len(self._wizard.loginResult.reportedFlights)
+            numRejected = len(self._wizard.loginResult.rejectedFlights)
+            if numReported==0 and numRejected==0:
+                help = xstr("flightsel_prehelp_nopending")
+            elif numReported>0 and numRejected==0:
+                help = xstr("flightsel_prehelp_rep_0rej") % (numReported,)
+            elif numReported==0 and numRejected>0:
+                help = xstr("flightsel_prehelp_0rep_rej") % (numRejected,)
+            else:
+                help = xstr("flightsel_prehelp_rep_rej") % \
+                       (numReported, numRejected)
+
+        help += xstr("flightsel_help")
+
+        self.setHelp(help)
 
     def _buildFlights(self):
@@ -581 +603 @@
     def _refreshCallback(self, returned, result):
         """Callback for the refresh."""
-        if returned and result.loggedIn:
-            self._buildFlights()
+        if returned:
+            self._setupHelp()
+            if result.loggedIn:
+                self._buildFlights()
 
     def _selectionChanged(self, selection):