Changeset 106

Timestamp:

02/02/06 14:36:58 (18 years ago)

Author:

jerome

Message:

Data retrieval now is correct.
Password input box now hides what is typed.
Looks good !

Location:

pykoticon/trunk

Files:

• bin/pykoticon (modified) (4 diffs)
• tests/test.py (modified) (1 diff)

pykoticon/trunk/bin/pykoticon

@@ -95 +95 @@
         while self.frame.dialogAnswer is None :
             time.sleep(0.1)
-        # TODO : add value extraction and return a mapping
         retcode = self.frame.dialogAnswer    
         self.frame.dialogAnswer = None # prepare for next call, just in case
@@ -151 +150 @@
                      | wx.DIALOG_MODAL)
 
+        self.variables = []
         vsizer = wx.BoxSizer(wx.VERTICAL)
         for i in range(len(varnames)) :
@@ -161 +161 @@
             varid = wx.NewId()
             label = wx.StaticText(self, labelid, label)
-            variable = wx.TextCtrl(self, varid, varvalues.get(varname, ""))
+            if varname.lower().find("password") != -1 :
+                variable = wx.TextCtrl(self, varid, varvalues.get(varname, ""), style=wx.TE_PASSWORD)
+            else :
+                variable = wx.TextCtrl(self, varid, varvalues.get(varname, ""))
+            self.variables.append(variable)    
             hsizer = wx.BoxSizer(wx.HORIZONTAL)
             hsizer.Add(label, 0, wx.ALIGN_CENTER | wx.ALIGN_RIGHT | wx.ALL, 5)
@@ -263 +267 @@
         self.dialogAnswer = None
         dialog = GenericInputDialog(self, wx.ID_ANY, labels, varnames, varvalues)
-        self.dialogAnswer = ((dialog.ShowModal() == wx.ID_OK) and "OK") or "CANCEL"
-        print "Result ===> %s" % self.dialogAnswer
+        retvalues = {}
+        if dialog.ShowModal() == wx.ID_OK :
+            retvalues["isValid"] = True
+            for i in range(len(varnames)) :
+                retvalues[varnames[i]] = dialog.variables[i].GetValue()
+        else :        
+            retvalues["isValid"] = False
+            for k in varvalues.keys() :
+                retvalues[k] = ""
+        self.dialogAnswer = retvalues
         dialog.Destroy()
         

pykoticon/trunk/tests/test.py

@@ -50 +50 @@
 
     server = xmlrpclib.ServerProxy("http://%s:%s" % (arguments[0], arguments[1]))
-    result = server.showDialog(message, yesno)
-    """
+    #result = server.showDialog(message, yesno)
+    #"""
     result = server.askDatas(["Username", "Password", "Billing code"], \
                              ["username", "password", "billingcode"], \
                              {"username": username, \
-                              "password": "******", \
+                              "password": "cccccc", \
                               "billingcode" : billingcode})
-    """                          
+    #"""                          
     #server.quitApplication()
-    print result # printing OK is safe.
+    if result["isValid"] :
+        print result # printing OK is safe.
+    else :    
+        print "the end user closed the dialog box !"
         
 if __name__ == "__main__" :