[gnue] r7528 - in trunk: gnue-common/src/datasources/drivers/DBSIG2 gnue-forms/src/uidrivers/gtk2 gnue-forms/src/uidrivers/wx

[btami]

Author: btami
Date: 2005-05-05 05:27:07 -0500 (Thu, 05 May 2005)
New Revision: 7528

Modified:
   trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
   trunk/gnue-forms/src/uidrivers/gtk2/dialogs.py
   trunk/gnue-forms/src/uidrivers/wx/dialogs.py
Log:
fixed login dialog problems with empty login fields

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py      
2005-05-05 08:07:40 UTC (rev 7527)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py      
2005-05-05 10:27:07 UTC (rev 7528)
@@ -406,8 +406,8 @@
   # ---------------------------------------------------------------------------
 
   def _getLoginFields (self):
-    return [(_('User Name'), '_username', 'string', None, None, []),
-            (_('Password'), '_password', 'password', None, None, [])]
+    return [(u_('User Name'), '_username', 'string', None, None, []),
+            (u_('Password'), '_password', 'password', None, None, [])]
 
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/dialogs.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/dialogs.py      2005-05-05 08:07:40 UTC 
(rev 7527)
+++ trunk/gnue-forms/src/uidrivers/gtk2/dialogs.py      2005-05-05 10:27:07 UTC 
(rev 7528)
@@ -278,9 +278,8 @@
     entry.set_visibility (not password)
     entry.set_activates_default (True)
 
-    if default:
-      entry.set_text (default)
-      self.inputData [name] = default
+    entry.set_text (default or '')
+    self.inputData [name] = default or ''
 
     if tips and tips [0][0]:
       self.__tooltips.set_tip (entry, tips [0][0])

Modified: trunk/gnue-forms/src/uidrivers/wx/dialogs.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/dialogs.py        2005-05-05 08:07:40 UTC 
(rev 7527)
+++ trunk/gnue-forms/src/uidrivers/wx/dialogs.py        2005-05-05 10:27:07 UTC 
(rev 7528)
@@ -185,7 +185,7 @@
     self.__maxLabelWidth = 0
     for (label, name, fieldtype, default, master, elements) in fields:
       if not fieldtype.lower () in self._NO_LABELS:
-        newLabel = wxStaticText (self, -1, label)
+        newLabel = wxStaticText (self, -1, wxEncode (label))
         self.__maxLabelWidth = max (self.__maxLabelWidth,
                                     newLabel.GetSizeTuple () [0])
         self.__labels.append (newLabel)
@@ -258,8 +258,7 @@
     if password:
       style |= wxTE_PASSWORD
 
-    if default:
-      self.inputData [name] = default
+    self.inputData [name] = default or ''
 
     entry = wxTextCtrl (self, -1, default or '', style = style)
     entry._field = name