Changeset 393:977efa7a177b

Timestamp:

12/22/12 10:23:19 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added the automatic saving of the PIREP (re #163)

Files:

• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/gui/flight.py (modified) (4 diffs)
• src/mlx/gui/gui.py (modified) (1 diff)
• src/mlx/pirep.py (modified) (1 diff)

locale/en/mlx.po

@@ -951 +951 @@
 msgstr "The PIREP was saved successfully"
 
+msgid "finish_save_done_sec"
+msgstr "Path: %s"
+
 msgid "finish_save_failed"
 msgstr "Failed to save the PIREP"
 
 msgid "finish_save_failed_sec"
-msgstr "See the debug log for the details."
+msgstr "Error: %s."
+
+msgid "finish_autosave_busy"
+msgstr "Saving PIREP automatically..."
 
 msgid "info_comments"

locale/hu/mlx.po

@@ -954 +954 @@
 msgstr "A PIREP mentése sikerült"
 
+msgid "finish_save_done_sec"
+msgstr "Elérési út: %s"
+
 msgid "finish_save_failed"
 msgstr "A PIREP mentése nem sikerült"
 
 msgid "finish_save_failed_sec"
-msgstr "A részleteket lásd a debug naplóban."
+msgstr "A hiba: %s."
+
+msgid "finish_autosave_busy"
+msgstr "A PIREP automatikus mentése..."
 
 msgid "info_comments"

src/mlx/gui/flight.py

@@ -15 +15 @@
 import datetime
 import time
+import os
 
 #-----------------------------------------------------------------------------
@@ -2872 +2873 @@
                      self._gate.get_active()>=0)
 
+        wasSensitive = self._saveButton.get_sensitive()
+
+        gui = self._wizard.gui
+        config = gui.config
+        if config.pirepAutoSave and sensitive and not wasSensitive:
+            self._lastSavePath = os.path.join(config.pirepDirectory,
+                                              self._getDefaultPIREPName())
+            self._lastSavePath = text2unicode(self._lastSavePath)
+            self._savePIREP(automatic = True)
+
         self._saveButton.set_sensitive(sensitive)
         self._sendButton.set_sensitive(sensitive and
@@ -2903 +2914 @@
         gui.reset()
 
+    def _getDefaultPIREPName(self):
+        """Get the default name of the PIREP."""
+        gui = self._wizard.gui
+
+        bookedFlight = gui.bookedFlight
+        tm = time.gmtime()
+
+        pilotID = self._wizard.pilotID
+        if pilotID: pilotID += " "
+        return "%s%s %02d%02d %s-%s.pirep" % \
+               (pilotID, str(bookedFlight.departureTime.date()),
+                tm.tm_hour, tm.tm_min,
+                bookedFlight.departureICAO, bookedFlight.arrivalICAO)
+
+
     def _saveClicked(self, button):
         """Called when the Save PIREP button is clicked."""
         gui = self._wizard.gui
 
-        bookedFlight = gui.bookedFlight
-        tm = time.gmtime()
-
-        pilotID = self._wizard.pilotID
-        if pilotID: pilotID += " "
-        fileName = "%s%s %02d%02d %s-%s.pirep" % \
-                   (pilotID, str(bookedFlight.departureTime.date()),
-                    tm.tm_hour, tm.tm_min,
-                    bookedFlight.departureICAO,
-                    bookedFlight.arrivalICAO)
+        fileName = self._getDefaultPIREPName()
 
         dialog = self._getSaveDialog()
@@ -2932 +2949 @@
 
         if result==RESPONSETYPE_OK:
-            pirep = PIREP(gui.flight)
-
             self._lastSavePath = text2unicode(dialog.get_filename())
-
-            if pirep.save(self._lastSavePath):
-                type = MESSAGETYPE_INFO
-                message = xstr("finish_save_done")
+            self._savePIREP()
+
+    def _savePIREP(self, automatic = False):
+        """Perform the saving of the PIREP."""
+
+        gui = self._wizard.gui
+
+        if automatic:
+            gui.beginBusy(xstr("finish_autosave_busy"))
+
+        pirep = PIREP(gui.flight)
+        error = pirep.save(self._lastSavePath)
+
+        if automatic:
+            gui.endBusy()
+
+        if error:
+            type = MESSAGETYPE_ERROR
+            message = xstr("finish_save_failed")
+            secondary = xstr("finish_save_failed_sec") % (text2unicode(error),)
+        else:
+            type = MESSAGETYPE_INFO
+            message = xstr("finish_save_done")
+            if automatic:
+                secondary = xstr("finish_save_done_sec") % (self._lastSavePath,)
+            else:
                 secondary = None
-                self._pirepSaved = True
-            else:
-                type = MESSAGETYPE_ERROR
-                message = xstr("finish_save_failed")
-                secondary = xstr("finish_save_failed_sec")
-
-            dialog = gtk.MessageDialog(parent = gui.mainWindow,
-                                       type = type, message_format = message)
-            dialog.add_button(xstr("button_ok"), RESPONSETYPE_OK)
-            dialog.set_title(WINDOW_TITLE_BASE)
-            if secondary is not None:
-                dialog.format_secondary_markup(secondary)
-
-            dialog.run()
-            dialog.hide()
+            self._pirepSaved = True
+
+        dialog = gtk.MessageDialog(parent = gui.mainWindow,
+                                   type = type, message_format = message)
+        dialog.add_button(xstr("button_ok"), RESPONSETYPE_OK)
+        dialog.set_title(WINDOW_TITLE_BASE)
+        if secondary is not None:
+            dialog.format_secondary_markup(secondary)
+
+        dialog.run()
+        dialog.hide()
 
     def _getSaveDialog(self):

src/mlx/gui/gui.py

@@ -48 +48 @@
     _authors = [ (u"Váradi", u"István", "prog_test"),
                  (u"Galyassy", u"Tamás", "negotiation"),
-                 (u"Petrovszki", u"Gábor", "test"),
-                 (u"Zsebényi-Loksa", u"Gergely", "test"),
                  (u"Kurják", u"Ákos", "test"),
                  (u"Nagy", u"Dániel", "test"),
-                 (u"Radó", u"Iván", "test") ]
+                 (u"Radó", u"Iván", "test"),
+                 (u"Petrovszki", u"Gábor", "test"),
+                 (u"Serfőző", u"Tamás", "test"),
+                 (u"Szebenyi", u"Bálint", "test"),
+                 (u"Zsebényi-Loksa", u"Gergely", "test") ]
 
     def __init__(self, programDirectory, config):

src/mlx/pirep.py

@@ -155 +155 @@
             with open(path, "wb") as f:
                 pickle.dump(self, f)
-            return True
+            return None
         except Exception, e:
-            print "Failed saving PIREP to %s: %s" % (path, str(e))
-            return False
+            error = str(e)
+            #print u"Failed saving PIREP to %s: %s" % (path, error)
+            return error