Changeset 755:2b64e14287fc

Timestamp:

01/06/16 14:16:46 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added a check for any signs of a previous running of the program, and if none found, a question about registration (re #285)

Files:

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

locale/en/mlx.po

@@ -2123 +2123 @@
 msgstr "There was some communication error, try again later."
 
+msgid "register_ask"
+msgstr "Would you like to register with MAVA?"
+
+msgid "register_ask_sec"
+msgstr ""
+"It seems, you have not run the program\n"
+"on this computer, or at least not logged in yet.\n"
+"\n"
+"If you would like to register, click the\n"
+"<b>Register</b> button below and fill the form."
+
 msgid "register_title"
 msgstr "Registration"

locale/hu/mlx.po

@@ -2137 +2137 @@
 msgstr "Valamilyen kommunikációs probléma adódott, próbáld újra később."
 
+msgid "register_ask"
+msgstr "Szeretnél regisztrálni?"
+
+msgid "register_ask_sec"
+msgstr ""
+"Úgy tűnik, nem futtattad még a programot ezen a\n"
+"számítógépen, vagy legalábbis nem jelentkeztél még be.\n"
+"\n"
+"Ha szeretnél regisztrálni, kattints a <b>Regisztráció</b>\n"
+"gombra, majd töltsd ki a megjelenő űrlapot."
+
 msgid "register_title"
 msgstr "Regisztráció"

src/mlx/gui/gui.py

@@ -447 +447 @@
                                     self._mainWindow)
             self._updater.start()
+        else:
+            self.updateDone()
 
         cef.initialize(self._programDirectory, self._cefInitialized)
@@ -457 +459 @@
 
         self._disconnect()
+
+    def updateDone(self):
+        """Called when the update is done (and there is no need to restart)."""
+        gobject.idle_add(self._updateDone)
 
     def connected(self, fsType, descriptor):
@@ -1694 +1700 @@
             self._credentialsAvailable = True
             self._credentialsCondition.notify()
+
+    def _updateDone(self):
+        """Called when the update is done.
+
+        It checks if we already know the PID, and if not, asks the user whether
+        to register."""
+        if not self.config.pilotID and not self.config.password:
+            dialog = gtk.MessageDialog(parent = self._mainWindow,
+                                       type = MESSAGETYPE_QUESTION,
+                                       message_format = xstr("register_ask"))
+
+            dialog.set_title(WINDOW_TITLE_BASE)
+            dialog.format_secondary_markup(xstr("register_ask_sec"))
+
+            dialog.add_button(xstr("button_cancel"), 0)
+            dialog.add_button(xstr("button_register"), 1)
+            dialog.set_default_response(1)
+
+            result = dialog.run()
+            dialog.hide()
+            if result == 1:
+                self._wizard.jumpPage("register")

src/mlx/gui/update.py

@@ -124 +124 @@
         if not self._waitAfterFinish:
             gobject.idle_add(self._progressWindow.hide)
+            self._gui.updateDone()
 
     def downloadingManifest(self):
@@ -286 +287 @@
         if self._restart:
             self._gui.restart()
+        else:
+            self._gui.updateDone()
 
 #-------------------------------------------------------------------------------