gnue/gnuef client/gfclient src/UIbase.py src/UI...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/04/05 21:33:47

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

Log message:
        Moved rollback button away from new record
        crude autoresize of status bar boxes
        status bar update bug fixed

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/client/gfclient.diff?r1=1.29&r2=1.30
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIbase.py.diff?r1=1.28&r2=1.29
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.77&r2=1.78

Patches:
Index: gnue/gnuef/client/gfclient
diff -u gnue/gnuef/client/gfclient:1.29 gnue/gnuef/client/gfclient:1.30
--- gnue/gnuef/client/gfclient:1.29     Thu Mar 22 18:25:50 2001
+++ gnue/gnuef/client/gfclient  Thu Apr  5 21:33:46 2001
@@ -16,7 +16,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: gfclient,v 1.29 2001/03/23 02:25:50 dneighbors Exp $
+# $Id: gfclient,v 1.30 2001/04/06 04:33:46 jamest Exp $
 #
 
 import pstats
@@ -386,9 +386,6 @@
       return
     self.dispatchEvent(GFEvent('gotoENTRY',{'object':self.form.currentEntry}))
     self.updateStatus()
-
-
-
                             
   def executeCommit(self, event):
     message = self.form.commit()
@@ -534,6 +531,7 @@
     # pass control to UI
     ui.buildForm(self.form)
     ui.activateForm(self.form)
+    self.updateStatus()
     ui.mainLoop()
       
 if __name__ == '__main__':
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.28 gnue/gnuef/src/UIbase.py:1.29
--- gnue/gnuef/src/UIbase.py:1.28       Thu Mar 29 08:54:15 2001
+++ gnue/gnuef/src/UIbase.py    Thu Apr  5 21:33:47 2001
@@ -172,7 +172,7 @@
     if recordStatus != None:
       status = statusValues[recordStatus]
 
-    insertValue = ""
+    insertValue = None
     if insertMode != None:
       if int(insertMode) == 1:
         insertValue = 'INS'
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.77 gnue/gnuef/src/UIwxpython.py:1.78
--- gnue/gnuef/src/UIwxpython.py:1.77   Tue Mar 20 18:58:31 2001
+++ gnue/gnuef/src/UIwxpython.py        Thu Apr  5 21:33:47 2001
@@ -152,7 +152,7 @@
     
     self.statusBar = self.mainWindow.CreateStatusBar()
     self.statusBar.SetFieldsCount(5)
-    self.statusBar.SetStatusWidths([-1,50,50,100,100])
+    self.statusBar.SetStatusWidths([-1,50,50,75,75])
     
self.statusBar.SetFont(wxFont(GFOptions.pointSize,wxMODERN,wxNORMAL,wxNORMAL))
     
     self.mainWindow.SetStatusText( "Let's get started" )
@@ -210,7 +210,6 @@
     mainToolBar.SetToolBitmapSize(wxSize(24,24))
     mainToolBar.AddSimpleTool(100, wxImage(GFOptions.tb_commit, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Commit Changes", GFOptions.msg_commit)
     mainToolBar.AddSimpleTool(203, wxImage(GFOptions.tb_insert, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Insert Record", GFOptions.msg_insert)
-    mainToolBar.AddSimpleTool(102, wxImage(GFOptions.tb_rollback, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Rollback Changes", 
GFOptions.msg_rollback)
     mainToolBar.AddSimpleTool(204, wxImage(GFOptions.tb_delete, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Delete Record", GFOptions.msg_delete)
     mainToolBar.AddSeparator()
     mainToolBar.AddSimpleTool(202, wxImage(GFOptions.tb_previous, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Previous Record",GFOptions.msg_previous)
@@ -219,7 +218,7 @@
     mainToolBar.AddSimpleTool(207, wxImage(GFOptions.tb_query_prep, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Prepare Query", GFOptions.msg_query_prep)
     mainToolBar.AddSimpleTool(208, wxImage(GFOptions.tb_query, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Execute Query", GFOptions.msg_query)
     mainToolBar.AddSeparator()
-    mainToolBar.AddSimpleTool(300, wxImage(GFOptions.tb_help, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Help", GFOptions.msg_help)
+    mainToolBar.AddSimpleTool(102, wxImage(GFOptions.tb_rollback, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Rollback Changes", 
GFOptions.msg_rollback)
     mainToolBar.Realize()
 
 
@@ -271,7 +270,6 @@
   # _setStatusBar
   # 
   def _setStatusBar(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
-    
     if tip != None: self.statusBar.SetStatusText(str(tip),0)
 
     if statusValue != None:
@@ -285,6 +283,29 @@
 
     if currentPage != None and  maxPage != None:
       self.statusBar.SetStatusText(string.strip("%s/%s" % 
(currentPage,maxPage)),4)
+      
+    #
+    # Adjust the status fields to reflect width of text in them
+    #
+    # This is a hack
+    #
+    tipWidth = -1 # Fill whatever remains
+    statusWidth,unused = 
self.statusBar.GetTextExtent(self.statusBar.GetStatusText(1))
+    insertWidth,unused = 
self.statusBar.GetTextExtent(self.statusBar.GetStatusText(2))
+    recordWidth,unused = 
self.statusBar.GetTextExtent(self.statusBar.GetStatusText(3))
+    pageWidth,unused = 
self.statusBar.GetTextExtent(self.statusBar.GetStatusText(4))
+
+    statusWidth = statusWidth * 2
+    insertWidth = insertWidth * 2
+    recordWidth = recordWidth * 2
+    pageWidth = pageWidth * 2
+
+    if statusWidth == 0:      statusWidth = 5
+    if insertWidth == 0:      insertWidth = 5
+    if recordWidth == 0:      recordWidth = 5
+    if pageWidth == 0:        pageWidth = 5
+      
+    
self.statusBar.SetStatusWidths([tipWidth,statusWidth,insertWidth,recordWidth,pageWidth])
     
   #############################################################################
   #