gnue/gnuef src/GFForm.py src/UIbase.py src/UIwx...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/05/15 08:13:22

Modified files:
        gnuef/src      : GFForm.py UIbase.py UIwxpython.py 
        gnuef/client   : gfclient 

Log message:
        Made minor changes due to changes in gnue-common.  Preparing for 
migration to new dbdriver/datasource format.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.93&tr2=1.94&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIbase.py.diff?cvsroot=OldCVS&tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/client/gfclient.diff?cvsroot=OldCVS&tr1=1.40&tr2=1.41&r1=text&r2=text

Patches:
Index: gnue/gnuef/client/gfclient
diff -u gnue/gnuef/client/gfclient:1.40 gnue/gnuef/client/gfclient:1.41
--- gnue/gnuef/client/gfclient:1.40     Fri May 11 18:42:30 2001
+++ gnue/gnuef/client/gfclient  Tue May 15 08:13:22 2001
@@ -16,7 +16,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: gfclient,v 1.40 2001/05/12 01:42:30 jcater Exp $
+# $Id: gfclient,v 1.41 2001/05/15 15:13:22 jcater Exp $
 #
 
 import pstats
@@ -476,6 +476,8 @@
     #
     ui.registerEventListener(self.processEvent)
     self.registerEventListener(ui.processEvent)
+
+    self.setLoginHandler(ui.getLoginHandler())
     
     #
     # get the form file handler
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.93 gnue/gnuef/src/GFForm.py:1.94
--- gnue/gnuef/src/GFForm.py:1.93       Mon May 14 13:04:20 2001
+++ gnue/gnuef/src/GFForm.py    Tue May 15 08:13:21 2001
@@ -152,8 +152,8 @@
       # This is a temporary hack :(
       if hasattr(object,'database') and not \
         self._databaseDictionary.has_key(object.database) and \
-        self._connections.hasConnection(object.database): 
-        conn = self._connections.getConnection(object.database)
+        self._connections.hasConnectionParameters(object.database): 
+        conn = self._connections.getConnectionParameters(object.database)
         self._databaseDictionary[object.database] = GFDatabase()
         self._databaseDictionary[object.database].name = object.database
         for attr in conn.keys():  
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.36 gnue/gnuef/src/UIbase.py:1.37
--- gnue/gnuef/src/UIbase.py:1.36       Mon May 14 13:04:20 2001
+++ gnue/gnuef/src/UIbase.py    Tue May 15 08:13:21 2001
@@ -76,6 +76,7 @@
                     'GFButton'    : UI.UIButton,
                     'GFScrollBar' : UI.UIScrollBar}
 
+    self._loginHandler = None
 
 
     self._formToUI = {}                   # the GFObj to UI widget cross ref
@@ -118,6 +119,13 @@
     self.buildUI()
     
 
+  #
+  # getLoginHandler
+  #
+  # Returns the login handler for this session
+  #
+  def getLoginHandler(self): 
+    return self._loginHandler
 
   #
   # buildUI
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.86 gnue/gnuef/src/UIwxpython.py:1.87
--- gnue/gnuef/src/UIwxpython.py:1.86   Mon May 14 13:04:20 2001
+++ gnue/gnuef/src/UIwxpython.py        Tue May 15 08:13:22 2001
@@ -36,7 +36,7 @@
 
 import sys
 import string
-from gnue.common import GDebug
+from gnue.common import GDebug, GLoginHandler
 import GFOptions
 
 #
@@ -57,6 +57,8 @@
     wxApp.__init__(self,0)
     GFUserInterfaceBase.__init__(self)
 
+    self._loginHandler = wxLoginHandler()
+
     self.keyEvents = {WXK_PRIOR:  GFEvent('requestPREVBLOCK'),
                       WXK_NEXT:   GFEvent('requestNEXTBLOCK'),
                       WXK_TAB:    GFEvent('requestNEXTENTRY'),                 
       
@@ -810,4 +812,29 @@
 class UIMessageBox(wxMessageDialog, UIHelper):
   def __init__(self, interface, message, caption):
     wxMessageDialog.__init__(self, interface, message, caption, 
style=wxOK|wxICON_EXCLAMATION)
+
+
+
+#
+# LoginHandler
+#
+# The Login Handler for this user interface 
+# Will be used with new db provider interface
+#
+
+class wxLoginHandler(GLoginHandler.LoginHandler): 
+  # Obviously, this needs to be replaced with a dialog implementation :)
+  def getLogin(self, loginData): 
+    try:
+      print "*"*60
+      print 'Attempting to log into "%s":' % (loginData[1] or loginData[0])
+      print 
+      val = {} 
+      for prompt in loginData[2]: 
+         val[prompt[0]] = raw_input("  %s: " % prompt[1])
+      print 
+      print "*"*60
+      return val
+    except KeyboardInterrupt: 
+      raise GLoginHandler.UserCanceledLogin