gnue/gnuef/src GFInstance.py GFObjects.py UIwxp...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/05/31 22:19:24

Modified files:
        gnuef/src      : GFInstance.py GFObjects.py UIwxpython.py 

Log message:
        Minor cosmetic changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFInstance.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects.py.diff?cvsroot=OldCVS&tr1=1.87&tr2=1.88&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.88&tr2=1.89&r1=text&r2=text

Patches:
Index: gnue/gnuef/src/GFInstance.py
diff -u gnue/gnuef/src/GFInstance.py:1.3 gnue/gnuef/src/GFInstance.py:1.4
--- gnue/gnuef/src/GFInstance.py:1.3    Thu May 31 21:55:54 2001
+++ gnue/gnuef/src/GFInstance.py        Thu May 31 22:19:24 2001
@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: GFInstance.py,v 1.3 2001/06/01 04:55:54 jcater Exp $
+# $Id: GFInstance.py,v 1.4 2001/06/01 05:19:24 jcater Exp $
 #
 
 import pstats
@@ -485,7 +485,7 @@
       while 1:
         try:
           #Login
-          loginData = ["gnue", "Test Database", 
+          loginData = [key, object.comment, 
              [["user", "Username", 0], 
               ["passwd", "Password", 1]]]
 
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.87 gnue/gnuef/src/GFObjects.py:1.88
--- gnue/gnuef/src/GFObjects.py:1.87    Mon May 14 13:04:20 2001
+++ gnue/gnuef/src/GFObjects.py Thu May 31 22:19:24 2001
@@ -786,6 +786,7 @@
     self.factory = factory()
     self._type = "GFDatabase"
     self.uniqueKey = None
+    self.comment = ""
 
   def initialize(self,user,passwd):
     self.link = self.factory.create(self.provider)
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.88 gnue/gnuef/src/UIwxpython.py:1.89
--- gnue/gnuef/src/UIwxpython.py:1.88   Thu May 31 21:29:21 2001
+++ gnue/gnuef/src/UIwxpython.py        Thu May 31 22:19:24 2001
@@ -572,7 +572,8 @@
 
 
     if len(self.loginData[1]): 
-      loginMesg = 'Login required for "%s" (%s)' % (self.loginData[1], 
self.loginData[0])
+#      loginMesg = 'Login required for "%s" (%s)' % (self.loginData[1], 
self.loginData[0])
+      loginMesg = 'Login required for "%s"' % (self.loginData[1])
     else: 
       loginMesg = 'Login required for %s' % (self.loginData[0])
 
@@ -596,7 +597,7 @@
     fieldLabelWidth = 0
 
     for prompt in self.loginData[2]: 
-      s = wxStaticText(self.dlg, 1010, prompt[1])
+      s = wxStaticText(self.dlg, 1010, '%s:' % prompt[1])
       labelList.append(s)
 
       t = wxTextCtrl(self.dlg, -1,"",wxPoint(1, 1), wxSize(150, 20))
@@ -605,10 +606,10 @@
       EVT_CHAR(t, LoginFieldHandler(self, myID).loginFieldEventTrap)
 
       fieldLabelWidth = getLargest(fieldLabelWidth, \
-           s.GetSize().GetWidth() + t.GetSize().GetWidth() + 6)   
+           s.GetSize().GetWidth() + t.GetSize().GetWidth() + 10)   
 
       dlgWidth = getLargest(dlgWidth, \
-           s.GetSize().GetWidth() + t.GetSize().GetWidth() + 6) 
+           s.GetSize().GetWidth() + t.GetSize().GetWidth() + 10) 
 
       xSpacing = getLargest(xSpacing, s.GetSize().GetWidth())
       ySpacing = getLargest(ySpacing, s.GetSize().GetHeight())
@@ -620,9 +621,9 @@
 
     EVT_BUTTON(self.dlg, 19998, self.loginButtonEventTrap)                
     EVT_BUTTON(self.dlg, 19999, self.loginCancelEventTrap)                
-
     dlgWidth = getLargest(dlgWidth, loginButton.GetSize().GetWidth() + 
                           cancelButton.GetSize().GetWidth() + 6) + 20
+
     dlgHeight = dlgHeight + \
                getLargest(loginButton.GetSize().GetHeight(), 
                           cancelButton.GetSize().GetHeight()) - 6
@@ -631,7 +632,7 @@
     lastY = firstY
     xSpacing = xSpacing + 10   # Add whitespace between widgets
     ySpacing = ySpacing + 6    # Add whitespace between widgets
-    xPos = dlgWidth/2 - fieldLabelWidth/2 + 10
+    xPos = dlgWidth/2 - fieldLabelWidth/2
 
 
     # Move the fields and labels into position
@@ -644,7 +645,7 @@
 
     # Create and position the logo
     wxStaticBitmap(self.dlg,-1, bmp, 
-                   wxPoint((dlgWidth-bmp.GetWidth())/2, 10),
+                   wxPoint((dlgWidth-bmp.GetWidth())/2, 12),
                    wxSize(bmp.GetWidth(), bmp.GetHeight()))