Changeset 828:b5013b5bffb1

Timestamp:

09/25/16 08:13:34 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The pending flights window gets closed automatically if no pending flights remain (re #307).

Files:

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

locale/en/mlx.po

@@ -2476 +2476 @@
 msgid "flight_delete_question"
 msgstr "Are you sure to delete the selected flight(s)?"
+
+msgid "error_communication"
+msgstr "Communication error"
+
+msgid "error_communication_secondary"
+msgstr "Communication failed with the MAVA website. Try again later or file a bug report, if the problem persists."

locale/hu/mlx.po

@@ -2493 +2493 @@
 msgid "flight_delete_question"
 msgstr "Biztosan törölni szerednéd a kiválasztott járato(ka)t?"
+
+msgid "error_communication"
+msgstr "Kommunikációs hiba"
+
+msgid "error_communication_secondary"
+msgstr "Nem sikerült kommunikálni a MAVA weboldalával. Próbáld meg később, vagy jelents hibát, ha a probléma nem szűnik meg."

src/mlx/gui/common.py

@@ -495 +495 @@
 
 #------------------------------------------------------------------------------
+
+def errroDialog(message, parent = None, secondary = None,
+                title = WINDOW_TITLE_BASE):
+    """Display an error dialog box with the given message."""
+    dialog = gtk.MessageDialog(parent = parent,
+                               type = MESSAGETYPE_ERROR,
+                               message_format = message)
+    dialog.add_button(xstr("button_ok"), RESPONSETYPE_OK)
+    dialog.set_title(title)
+    if secondary is not None:
+        dialog.format_secondary_markup(secondary)
+
+    dialog.run()
+    dialog.hide()
+
+#------------------------------------------------------------------------------
+
+def communicationErrorDialog(parent = None, title = WINDOW_TITLE_BASE):
+    """Display a communication error dialog."""
+    errroDialog(xstr("error_communication"), parent = parent,
+                secondary = xstr("error_communication_secondary"),
+                title = title)
+
+#------------------------------------------------------------------------------

src/mlx/gui/flightlist.py

@@ -342 +342 @@
             for flight in flights:
                 self._wizard.reflyFlight(flight)
+            self._window.checkFlights()
+        else:
+            communicationErrorDialog()
 
     def _deleteClicked(self, button):
@@ -378 +381 @@
             for flight in flights:
                 self._wizard.deleteFlight(flight)
+            self._window.checkFlights()
+        else:
+            communicationErrorDialog()
 
 #-----------------------------------------------------------------------------
@@ -439 +445 @@
         self._rejectedFrame.addFlight(flight)
 
+    def checkFlights(self):
+        """Check if there are any flights in any of the lists, and close the
+        window if not."""
+        if not self.hasFlights:
+            self.emit("delete-event", None)
+
     def _closeClicked(self, button):
         """Called when the Close button is clicked.