Changeset 45:0938977d6603

Timestamp:

03/18/12 16:50:52 (12 years ago)

Author:

István Váradi <locvais@…>

Branch:

default

Phase:

public

Message:

Added option to remember the password as well as mnemonics and tooltips

Location:

src/mlx

Files:

• config.py (modified) (4 diffs)
• gui/flight.py (modified) (4 diffs)

src/mlx/config.py

@@ -23 +23 @@
         self._pilotID = ""
         self._password = ""
+        self._rememberPassword = False
 
         self._autoUpdate = True        
@@ -51 +52 @@
         if password!=self._password:
             self._password = password
+            self._modified = True
+
+    @property
+    def rememberPassword(self):
+        """Get if we should remember the password."""
+        return self._rememberPassword
+
+    @rememberPassword.setter
+    def rememberPassword(self, rememberPassword):
+        """Set if we should remember the password."""
+        if rememberPassword!=self._rememberPassword:
+            self._rememberPassword = rememberPassword
             self._modified = True
 
@@ -84 +97 @@
         self._pilotID = self._get(config, "login", "id", "")
         self._password = self._get(config, "login", "password", "")
+        self._rememberPassword = self._getBoolean(config, "login",
+                                                  "rememberPassword", False)
 
         self._autoUpdate = self._getBoolean(config, "update", "auto", True)
@@ -100 +115 @@
         config.set("login", "id", self._pilotID)
         config.set("login", "password", self._password)
+        config.set("login", "rememberPassword",
+                   "yes" if self._rememberPassword else "no")
 
         config.add_section("update")
-        config.set("update", "auto", self._autoUpdate)
+        config.set("update", "auto",
+                   "yes" if self._autoUpdate else "no")
         config.set("update", "url", self._updateURL)
 

src/mlx/gui/flight.py

@@ -85 +85 @@
         super(LoginPage, self).__init__(wizard, "Login", help)
 
-        table = gtk.Table(2, 2)
+        table = gtk.Table(2, 3)
         table.set_row_spacings(4)
         table.set_col_spacings(32)
@@ -91 +91 @@
 
         labelAlignment = gtk.Alignment(xalign=1.0, xscale=0.0)
-        labelAlignment.add(gtk.Label("Pilot ID:"))
+        label = gtk.Label("Pilot _ID:")
+        label.set_use_underline(True)
+        labelAlignment.add(label)
         table.attach(labelAlignment, 0, 1, 0, 1)
 
         self._pilotID = gtk.Entry()
         self._pilotID.connect("changed", self._setLoginButton)
+        self._pilotID.set_tooltip_text("Enter your MAVA pilot's ID. This "
+                                       "usually starts with a "
+                                       "'P' followed by 3 digits.")
         table.attach(self._pilotID, 1, 2, 0, 1)
+        label.set_mnemonic_widget(self._pilotID)
 
         labelAlignment = gtk.Alignment(xalign=1.0, xscale=0.0)
-        labelAlignment.add(gtk.Label("Password:"))
+        label = gtk.Label("_Password:")
+        label.set_use_underline(True)
+        labelAlignment.add(label)
         table.attach(labelAlignment, 0, 1, 1, 2)
 
@@ -105 +113 @@
         self._password.set_visibility(False)
         self._password.connect("changed", self._setLoginButton)
+        self._password.set_tooltip_text("Enter the password for your pilot's ID")
         table.attach(self._password, 1, 2, 1, 2)
-
-        self._loginButton = self.addButton("Login")
+        label.set_mnemonic_widget(self._password)
+
+        self._rememberButton = gtk.CheckButton("_Remember password")
+        self._rememberButton.set_use_underline(True)
+        self._rememberButton.set_tooltip_text("If checked, your password will "
+                                              "be stored, so that you should "
+                                              "not have to enter it every time. "
+                                              "Note, however, that the password "
+                                              "is stored as text, and anybody "
+                                              "who can access your files will "
+                                              "be able to read it.")
+        table.attach(self._rememberButton, 1, 2, 2, 3, ypadding = 8)
+
+        self._loginButton = self.addButton("_Login")
         self._loginButton.set_sensitive(False)
+        self._loginButton.set_use_underline(True)
         self._loginButton.connect("clicked", self._loginClicked)
+        self._loginButton.set_tooltip_text("Click to log in.")
         
         config = self._wizard.gui.config
         self._pilotID.set_text(config.pilotID)
         self._password.set_text(config.password)
+        self._rememberButton.set_active(config.rememberPassword)
 
     def _setLoginButton(self, entry):
@@ -138 +162 @@
             if result.loggedIn:
                 config = self._wizard.gui.config
+
                 config.pilotID = self._pilotID.get_text()
-                config.password = self._password.get_text()
+
+                rememberPassword = self._rememberButton.get_active()                
+                config.password = self._password.get_text() if rememberPassword  \
+                                  else ""
+
+                config.rememberPassword = rememberPassword
+                
                 config.save()
                 self._wizard.nextPage()