Changeset 744:39e770edda2e

Timestamp:

01/02/16 12:29:48 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Added a callback to display the credentials window for logging in to the MAVA website (re #283).

Files:

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

locale/en/mlx.po

@@ -232 +232 @@
 msgid "button_reconnect"
 msgstr "_Reconnect"
+
+msgid "login_title"
+msgstr "Login"
+
+msgid "login_info"
+msgstr ""
+"Enter your MAVA pilot's ID and password to\n"
+"log in to the MAVA website."
 
 msgid "login"

locale/hu/mlx.po

@@ -233 +233 @@
 msgstr "Újra_kapcsolódás"
 
+msgid "login_title"
+msgstr "Bejelentkezés"
+
+msgid "login_info"
+msgstr ""
+"Írd be a MAVA pilóta azonosítódat és a\n"
+"bejelentkezéshez használt jelszavadat."
+
 msgid "login"
 msgstr "Bejelentkezés"

src/mlx/gui/gui.py

@@ -89 +89 @@
         self._sendPIREPCallback = None
         self._sendBugReportCallback = None
+
+        self._credentialsCondition = threading.Condition()
+        self._credentialsAvailable = False
+        self._credentialsUserName = None
+        self._credentialsPassword = None
 
         self.webHandler = web.Handler()
@@ -1635 +1640 @@
         """Set the anti-ice on indicator."""
         self._wizard.landingAntiIceOn = value
+
+    def _getCredentialsCallback(self):
+        """Called when the web handler asks for the credentials."""
+        # FIXME: this is almost the same as
+        # SimBriefSetupPage._getCredentialsCallback
+        with self._credentialsCondition:
+            self._credentialsAvailable = False
+
+            gobject.idle_add(self._getCredentials)
+
+            while not self._credentialsAvailable:
+                self._credentialsCondition.wait()
+
+            return (self._credentialsUserName, self._credentialsPassword)
+
+    def _getCredentials(self):
+        """Get the credentials."""
+        # FIXME: this is almost the same as
+        # SimBriefSetupPage._getCredentials
+        with self._credentialsCondition:
+            config = self.config
+
+            dialog = CredentialsDialog(self, config.pilotID, config.password,
+                                       xstr("login_title"),
+                                       xstr("button_cancel"),
+                                       xstr("button_ok"),
+                                       xstr("label_pilotID"),
+                                       xstr("login_pilotID_tooltip"),
+                                       xstr("label_password"),
+                                       xstr("login_password_tooltip"),
+                                       xstr("login_info"),
+                                       config.rememberPassword,
+                                       xstr("remember_password"),
+                                       xstr("login_remember_tooltip"))
+            response = dialog.run()
+
+            if response==RESPONSETYPE_OK:
+                self._credentialsUserName = dialog.userName
+                self._credentialsPassword = dialog.password
+                rememberPassword = dialog.rememberPassword
+
+                config.pilotID = self._credentialsUserName
+
+                config.password = \
+                  self._credentialsPassword if rememberPassword else ""
+                config.rememberPassword = rememberPassword
+
+                config.save()
+            else:
+                self._credentialsUserName = None
+                self._credentialsPassword = None
+
+            self._credentialsAvailable = True
+            self._credentialsCondition.notify()