Changeset 819:024e8697000e

Timestamp:

09/25/16 06:40:16 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

The basics of the pending flight window work (re #307).

Files:

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

locale/en/mlx.po

@@ -371 +371 @@
 
 msgid "flightsel_prehelp_nopending"
-msgstr ""
+msgstr " "
 
 msgid "flightsel_prehelp_0rep_rej"
@@ -402 +402 @@
 msgid "flightsel_to"
 msgstr "To"
+
+msgid "flightsel_pending"
+msgstr "_Pending flights..."
+
+msgid "flightsel_pending_tooltip"
+msgstr "Click here to review the list of the flights you have "
+"reported, but are either not reviewed yet or have been rejected."
 
 msgid "flightsel_save"
@@ -2430 +2437 @@
 "to your mentor at MAVA, who can arrange for your flight "
 "to be accepted."
+
+msgid "pendflt_title"
+msgstr "Pending Flights"
+
+msgid "pendflt_title_reported"
+msgstr "Not yet reviewed"
+
+msgid "pendflt_edit_reported"
+msgstr "_View/Edit..."
+
+msgid "pendflt_refly_reported"
+msgstr "_Refly"
+
+msgid "pendflt_delete_reported"
+msgstr "_Delete"
+
+msgid "pendflt_title_rejected"
+msgstr "Rejected"
+
+msgid "pendflt_edit_rejected"
+msgstr "V_iew/Edit..."
+
+msgid "pendflt_refly_rejected"
+msgstr "R_efly"
+
+msgid "pendflt_delete_rejected"
+msgstr "De_lete"
+
+msgid "pendflt_acft"
+msgstr "Aircraft"
+
+msgid "pendflt_refly_busy"
+msgstr "Marking flights(s) for reflying"

locale/hu/mlx.po

@@ -371 +371 @@
 
 msgid "flightsel_prehelp_nopending"
-msgstr ""
+msgstr " "
 
 msgid "flightsel_prehelp_0rep_rej"
@@ -402 +402 @@
 msgid "flightsel_to"
 msgstr "Hová"
+
+msgid "flightsel_pending"
+msgstr "Fü_ggő járatok..."
+
+msgid "flightsel_pending_tooltip"
+msgstr "Ide kattinva megnézheted azokat a járataidat, amelyeket "
+"már jelentettél, de még nem fogadták el vagy utasították vissza."
 
 msgid "flightsel_save"
@@ -2447 +2454 @@
 "elküldheted a mentorodnak, aki tesz róla, hogy elfogadják az "
 "ellenőrző repülésedet."
+
+msgid "pendflt_title"
+msgstr "Függő járatok"
+
+msgid "pendflt_title_reported"
+msgstr "Még nem elfogadott"
+
+msgid "pendflt_edit_reported"
+msgstr "_Szerkesztés..."
+
+msgid "pendflt_refly_reported"
+msgstr "_Újra"
+
+msgid "pendflt_delete_reported"
+msgstr "_Törlés"
+
+msgid "pendflt_title_rejected"
+msgstr "Elutasított"
+
+msgid "pendflt_edit_rejected"
+msgstr "S_zerkesztés..."
+
+msgid "pendflt_refly_rejected"
+msgstr "Ú_jra"
+
+msgid "pendflt_delete_rejected"
+msgstr "Tö_rlés"
+
+msgid "pendflt_acft"
+msgstr "Repülőgép"
+
+msgid "pendflt_refly_busy"
+msgstr "A járatok megjelölése újrarepülésre"

src/mlx/gui/flight.py

@@ -2 +2 @@
 from mlx.gui.common import *
 import mlx.gui.cef as cef
-from mlx.gui.flightlist import ColumnDescriptor, FlightList
+from mlx.gui.flightlist import ColumnDescriptor, FlightList, PendingFlightsWindow
 
 import mlx.const as const
@@ -453 +453 @@
         self.setMainWidget(self._flightList)
 
+        self._pendingButton = self.addButton(xstr("flightsel_pending"),
+                                             sensitive = False,
+                                             clicked = self._pendingClicked,
+                                             tooltip = xstr("flightsel_pending_tooltip"))
+
         self._saveButton = self.addButton(xstr("flightsel_save"),
                                           sensitive = False,
@@ -474 +479 @@
 
         self._flights = []
+
+        self._pendingFlightsWindow = PendingFlightsWindow(self._wizard)
+        self._pendingFlightsWindowShown = False
+        self._pendingFlightsWindow.connect("delete-event",
+                                           self._deletePendingFlightsWindow)
 
     def activate(self):
@@ -514 +524 @@
         self._flights = []
         self._flightList.clear()
+        self._pendingFlightsWindow.clear()
+        loginResult = self._wizard.loginResult
         if self._wizard.loggedIn:
-            for flight in self._wizard.loginResult.flights:
+            for flight in loginResult.flights:
                 self._addFlight(flight)
+            for flight in loginResult.reportedFlights:
+                self._pendingFlightsWindow.addReportedFlight(flight)
+            for flight in loginResult.rejectedFlights:
+                self._pendingFlightsWindow.addRejectedFlight(flight)
+
+        self._updatePendingButton()
 
     def _addFlight(self, flight):
@@ -522 +540 @@
         self._flights.append(flight)
         self._flightList.addFlight(flight)
+
+    def _pendingClicked(self, button):
+        """Called when the Pending flights button is clicked."""
+        self._pendingFlightsWindow.show_all()
+        self._pendingFlightsWindowShown = True
+        self._updateNextButton()
+
+    def _deletePendingFlightsWindow(self, window, event):
+        """Called when the pending flights window is closed."""
+        self._pendingFlightsWindow.hide()
+        self._pendingFlightsWindowShown = False
+        self._updateNextButton()
+        return True
 
     def _saveClicked(self, button):
@@ -575 +606 @@
         selected = index is not None
         self._saveButton.set_sensitive(selected)
-        self._button.set_sensitive(selected)
+        self._updateNextButton()
+
+    def _updatePendingButton(self):
+        """Update the senstivity of the Pending button."""
+        self._pendingButton.set_sensitive(self._pendingFlightsWindow.hasFlights)
+
+    def _updateNextButton(self):
+        """Update the sensitivity of the Next button."""
+        sensitive = self._flightList.selectedIndex is not None and \
+          not self._pendingFlightsWindowShown
+        self._button.set_sensitive(sensitive)
 
     def _loadButtonClicked(self, loadButton):

src/mlx/gui/flightlist.py

@@ -4 +4 @@
 
 from mlx.gui.common import *
+
+import mlx.const as const
 
 #-----------------------------------------------------------------------------
@@ -50 +52 @@
         value = getattr(flight, self._attribute)
         return self._type(value) if self._convertFn is None \
-            else self._convertFn(value)
+            else self._convertFn(value, flight)
 
 #-----------------------------------------------------------------------------
@@ -195 +197 @@
 
 #-----------------------------------------------------------------------------
+
+class PendingFlightsFrame(gtk.Frame):
+    """A frame for a list of pending (reported or rejected) flights.
+
+    It contains the list and the buttons available."""
+    def getAircraft(tailNumber, bookedFlight):
+        """Get the aircraft from the given booked flight.
+
+        This is the tail number followed by the ICAO code of the aircraft's
+        type."""
+        return tailNumber + \
+            " (" + const.icaoCodes[bookedFlight.aircraftType] + ")"
+
+    columnDescriptors = [
+        ColumnDescriptor("callsign", xstr("flightsel_no")),
+        ColumnDescriptor("departureTime", xstr("flightsel_deptime"),
+                         sortable = True),
+        ColumnDescriptor("departureICAO", xstr("flightsel_from"),
+                         sortable = True),
+        ColumnDescriptor("arrivalICAO", xstr("flightsel_to"),
+                         sortable = True),
+        ColumnDescriptor("tailNumber", xstr("pendflt_acft"),
+                         convertFn = getAircraft)
+    ]
+
+    def __init__(self, which, wizard):
+        """Construct the frame with the given title."""
+        super(PendingFlightsFrame, self).__init__(xstr("pendflt_title_" + which))
+
+        self._which = which
+        self._wizard = wizard
+
+        alignment = gtk.Alignment(xscale = 1.0, yscale = 1.0)
+        alignment.set_padding(padding_top = 2, padding_bottom = 8,
+                              padding_left = 4, padding_right = 4)
+
+        hbox = gtk.HBox()
+
+        self._flights = []
+        self._flightList = FlightList(columnDescriptors =
+                                      PendingFlightsFrame.columnDescriptors,
+                                      widthRequest = 500)
+        self._flightList.connect("selection-changed", self._selectionChanged)
+
+        hbox.pack_start(self._flightList, True, True, 4)
+
+        buttonBox = gtk.VBox()
+
+        self._editButton = gtk.Button(xstr("pendflt_edit_" + which))
+        self._editButton.set_sensitive(False)
+        buttonBox.pack_start(self._editButton, False, False, 2)
+
+        self._reflyButton = gtk.Button(xstr("pendflt_refly_" + which))
+        self._reflyButton.set_sensitive(False)
+        buttonBox.pack_start(self._reflyButton, False, False, 2)
+
+        self._deleteButton = gtk.Button(xstr("pendflt_delete_" + which))
+        self._deleteButton.set_sensitive(False)
+        buttonBox.pack_start(self._deleteButton, False, False, 2)
+
+        hbox.pack_start(buttonBox, False, False, 4)
+
+        alignment.add(hbox)
+        self.add(alignment)
+
+    @property
+    def hasFlights(self):
+        """Determine if there are any flights in the list."""
+        return self._flightList.hasFlights
+
+    def clear(self):
+        """Clear the lists."""
+        self._flights = []
+        self._flightList.clear()
+
+    def addFlight(self, flight):
+        """Add a flight to the list."""
+        self._flights.append(flight)
+        self._flightList.addFlight(flight)
+
+    def _selectionChanged(self, flightList, selectedIndex):
+        """Called when the selection in the list has changed."""
+        sensitive = selectedIndex is not None
+        self._editButton.set_sensitive(sensitive)
+        self._reflyButton.set_sensitive(sensitive)
+        self._deleteButton.set_sensitive(sensitive)
+
+#-----------------------------------------------------------------------------
+
+class PendingFlightsWindow(gtk.Window):
+    """The window to display the lists of the pending (reported or rejected)
+    flights."""
+    def __init__(self, wizard):
+        """Construct the window"""
+        super(PendingFlightsWindow, self).__init__()
+
+        gui = wizard.gui
+
+        self.set_title(WINDOW_TITLE_BASE + " - " + xstr("pendflt_title"))
+        self.set_size_request(-1, 450)
+        self.set_transient_for(gui.mainWindow)
+        self.set_modal(True)
+
+        mainAlignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,
+                                      xscale = 1.0, yscale = 1.0)
+        mainAlignment.set_padding(padding_top = 0, padding_bottom = 12,
+                                  padding_left = 8, padding_right = 8)
+
+        vbox = gtk.VBox()
+
+        self._reportedFrame = PendingFlightsFrame("reported", wizard)
+        vbox.pack_start(self._reportedFrame, True, True, 2)
+
+        self._rejectedFrame = PendingFlightsFrame("rejected", wizard)
+        vbox.pack_start(self._rejectedFrame, True, True, 2)
+
+        alignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,
+                                  xscale = 0.0, yscale = 0.0)
+        self._closeButton = gtk.Button(xstr("button_ok"))
+        self._closeButton.connect("clicked", self._closeClicked)
+        alignment.add(self._closeButton)
+        vbox.pack_start(alignment, False, False, 2)
+
+        mainAlignment.add(vbox)
+
+        self.add(mainAlignment)
+
+        self.connect("key-press-event", self._keyPressed)
+
+    @property
+    def hasFlights(self):
+        """Determine if the window has any flights."""
+        return self._reportedFrame.hasFlights or self._rejectedFrame.hasFlights
+
+    def clear(self):
+        """Clear the lists."""
+        self._reportedFrame.clear()
+        self._rejectedFrame.clear()
+
+    def addReportedFlight(self, flight):
+        """Add a reported flight."""
+        self._reportedFrame.addFlight(flight)
+
+    def addRejectedFlight(self, flight):
+        """Add a rejected flight."""
+        self._rejectedFrame.addFlight(flight)
+
+    def _closeClicked(self, button):
+        """Called when the Close button is clicked.
+
+        A 'delete-event' is emitted to close the window."""
+        self.emit("delete-event", None)
+
+    def _keyPressed(self, window, event):
+        """Called when a key is pressed in the window.
+
+        If the Escape key is pressed, 'delete-event' is emitted to close the
+        window."""
+        if gdk.keyval_name(event.keyval) == "Escape":
+            self.emit("delete-event", None)
+            return True
+
+#-----------------------------------------------------------------------------