Changeset 830:d0e4741cda76

Timestamp:

12/30/16 15:39:17 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

A PIREP for a pending flight can be viewed (re #307)

Files:

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

locale/en/mlx.po

@@ -383 +383 @@
 msgid "flightsel_prehelp_rep_rej"
 msgstr ""
-"<span color=\"red\">You have %d rejected and %d reported flight(s).</span>\n\n "
+"<span color=\"red\">You have %d reported and %d rejected flight(s).</span>\n\n "
 
 msgid "flightsel_help"
@@ -2445 +2445 @@
 
 msgid "pendflt_edit_reported"
-msgstr "_View/Edit..."
+msgstr "_Edit..."
 
 msgid "pendflt_refly_reported"
@@ -2456 +2456 @@
 msgstr "Rejected"
 
-msgid "pendflt_edit_rejected"
-msgstr "V_iew/Edit..."
+msgid "pendflt_view_rejected"
+msgstr "_View..."
 
 msgid "pendflt_refly_rejected"
-msgstr "R_efly"
+msgstr "Re_fly"
 
 msgid "pendflt_delete_rejected"

locale/hu/mlx.po

@@ -383 +383 @@
 msgid "flightsel_prehelp_rep_rej"
 msgstr ""
-"<span color=\"red\">%d visszautasított és %d jelentett járatod van.</span>\n\n "
+"<span color=\"red\">%d jelentett és %d visszautasított járatod van.</span>\n\n "
 
 msgid "flightsel_help"
@@ -2473 +2473 @@
 msgstr "Elutasított"
 
-msgid "pendflt_edit_rejected"
-msgstr "S_zerkesztés..."
+msgid "pendflt_view_rejected"
+msgstr "_Megtekintés..."
 
 msgid "pendflt_refly_rejected"

src/mlx/gui/flightlist.py

@@ -243 +243 @@
     ]
 
-    def __init__(self, which, wizard, window):
+    def __init__(self, which, wizard, window, pirepEditable = False):
         """Construct the frame with the given title."""
         super(PendingFlightsFrame, self).__init__(xstr("pendflt_title_" + which))
@@ -250 +250 @@
         self._wizard = wizard
         self._window = window
+        self._pirepEditable = pirepEditable
 
         alignment = gtk.Alignment(xscale = 1.0, yscale = 1.0)
@@ -267 +268 @@
         buttonBox = gtk.VBox()
 
-        self._editButton = gtk.Button(xstr("pendflt_edit_" + which))
+        self._editButton = gtk.Button(xstr("pendflt_" +
+                                           ("edit" if pirepEditable else
+                                            "view") + "_" + which))
         self._editButton.set_sensitive(False)
+        self._editButton.connect("clicked", self._editClicked)
         buttonBox.pack_start(self._editButton, False, False, 2)
 
@@ -306 +310 @@
         self._reflyButton.set_sensitive(len(selectedIndexes)>0)
         self._deleteButton.set_sensitive(len(selectedIndexes)>0)
+
+    def _editClicked(self, button):
+        """Called when the Edit button is clicked."""
+        gui = self._wizard.gui
+        gui.beginBusy(xstr("pendflt_pirep_busy"))
+        self.set_sensitive(False)
+
+        indexes = self._flightList.selectedIndexes
+        assert(len(indexes)==1)
+
+        flightID = self._flights[indexes[0]].id
+        gui.webHandler.getPIREP(self._pirepResultCallback, flightID)
+
+    def _pirepResultCallback(self, returned, result):
+        """Called when the PIREP query result is available."""
+        gobject.idle_add(self._handlePIREPResult, returned, result)
+
+    def _handlePIREPResult(self, returned, result):
+        """Handle the refly result."""
+
+        self.set_sensitive(True)
+        gui = self._wizard.gui
+        gui.endBusy()
+
+        if returned:
+            if self._pirepEditable:
+                gui.editPIREP(result.pirep)
+            else:
+                gui.viewPIREP(result.pirep)
 
     def _reflyClicked(self, button):
@@ -408 +441 @@
         vbox = gtk.VBox()
 
-        self._reportedFrame = PendingFlightsFrame("reported", wizard, self)
+        self._reportedFrame = PendingFlightsFrame("reported", wizard, self,
+                                                  True)
         vbox.pack_start(self._reportedFrame, True, True, 2)
 

src/mlx/gui/gui.py

@@ -1252 +1252 @@
             else:
                 simulator.disableTimeSync()
+
+    def viewPIREP(self, pirep):
+        """Display the PIREP viewer window with the given PIREP."""
+        self._pirepViewer.setPIREP(pirep)
+        self._pirepViewer.show_all()
+        self._pirepViewer.run()
+        self._pirepViewer.hide()
+
+    def editPIREP(self, pirep):
+        """Display the PIREP editor window and allow editing the PIREP."""
+        self.viewPIREP(pirep)
 
     def _loadPIREP(self, menuItem):