gnue designer/TODO gnue-common/TODO gnue-common...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/11/14 12:56:10

Modified files:
        designer       : TODO 
        gnue-common    : TODO 
        gnue-common/etc: sample.gnue.conf 
        gnuef          : TODO 
        gnuef/src      : GFClient.py UIwxpython.py 
Removed files:
        gnue-common/etc: sample-windows.gnue.conf 

Log message:
        gnue.conf alterations
        Updated TODOs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/TODO.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/TODO.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/etc/sample.gnue.conf.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/TODO.diff?cvsroot=OldCVS&tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFClient.py.diff?cvsroot=OldCVS&tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.117&tr2=1.118&r1=text&r2=text

Patches:
Index: gnue/designer/TODO
diff -u gnue/designer/TODO:1.5 gnue/designer/TODO:1.6
--- gnue/designer/TODO:1.5      Sat Nov 10 17:01:08 2001
+++ gnue/designer/TODO  Wed Nov 14 12:56:10 2001
@@ -38,7 +38,6 @@
 ?.?.?
   add support for Reports 
   more introspection of data source (tree views of them)
-  setup.exe install on windows
 
 
 
Index: gnue/gnue-common/TODO
diff -u gnue/gnue-common/TODO:1.4 gnue/gnue-common/TODO:1.5
--- gnue/gnue-common/TODO:1.4   Tue Nov  6 05:24:16 2001
+++ gnue/gnue-common/TODO       Wed Nov 14 12:56:10 2001
@@ -29,4 +29,3 @@
    basic gcomm support
    gsetup system
    world peace
-   setup.exe install on windows
Index: gnue/gnue-common/etc/sample.gnue.conf
diff -u gnue/gnue-common/etc/sample.gnue.conf:1.7 
gnue/gnue-common/etc/sample.gnue.conf:1.8
--- gnue/gnue-common/etc/sample.gnue.conf:1.7   Wed Aug 29 20:23:12 2001
+++ gnue/gnue-common/etc/sample.gnue.conf       Wed Nov 14 12:56:10 2001
@@ -20,9 +20,11 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place 
 # - Suite 330, Boston, MA 02111-1307, USA.
 
+# Note: pointers to files and dirs are relative to the installation
+#       location of GNUe
+
 [forms]
-prefix=/usr/local/gnue  
-FormDir =%(prefix)s/forms
+FormDir = forms
                           
 # Create new records in blocks automagically when you hit the bottom
 autoCreate = 1
@@ -47,18 +49,18 @@
 Encoding=DEFAULT
                           
 # Startup graphic
-splashScreenPNG=%(prefix)s/shared/images/gnue-splash.png
+splashScreenPNG=shared/images/gnue-splash.png
 
 #GNUe Tool Bar Buttons
-tb_commit=%(prefix)s/shared/images/tb_save.png
-tb_insert=%(prefix)s/shared/images/tb_new.png
-tb_rollback=%(prefix)s/shared/images/tb_undo.png
-tb_delete=%(prefix)s/shared/images/tb_trash.png
-tb_previous=%(prefix)s/shared/images/tb_left_arrow.png
-tb_next=%(prefix)s/shared/images/tb_right_arrow.png
-tb_query_prep=%(prefix)s/shared/images/tb_preferences.png
-tb_query=%(prefix)s/shared/images/tb_search.png
-tb_help=%(prefix)s/shared/images/tb_help.png
+tb_commit=shared/images/tb_save.png
+tb_insert=shared/images/tb_new.png
+tb_rollback=shared/images/tb_undo.png
+tb_delete=shared/images/tb_trash.png
+tb_previous=shared/images/tb_left_arrow.png
+tb_next=shared/images/tb_right_arrow.png
+tb_query_prep=shared/images/tb_preferences.png
+tb_query=shared/images/tb_search.png
+tb_help=shared/images/tb_help.png
 
 #GNUe Menu/Toolbar Status Bar Messages
 msg_commit=Save all changes to database.
@@ -80,7 +82,7 @@
 GEASDIR=/usr/local/
 
 # GNUe logo
-smallPNG=%(prefix)s/shared/images/gnue.png
+smallPNG=shared/images/gnue.png
 
 # Might need altered but I doubt it
 # The default height of widgets for widgets that don't specify height in .gfd 
file
@@ -96,18 +98,12 @@
 # Font size if fixedWidthFont = 1 (ignored otherwise)
 pointSize = 14
 
-# Do not alter below here unless you really, really want to (and you know what 
you are doing)
-
-DEBUG = 0
-
 _msgNOTSAVED = Data not saved. Commit or rollback changes.
 _msgDETAILNOTSAVED = This record's detail information is not saved.
 
+# Do not alter below here unless you really, really want to (and you know what 
you are doing)
+
 # Fudge factor for altering widget size - should no longer be needed
 borderPercentage = 100
 textPercentage = 100
-
-# Version
-VERSION = pre-0.0.8
-
 
Index: gnue/gnuef/TODO
diff -u gnue/gnuef/TODO:1.60 gnue/gnuef/TODO:1.61
--- gnue/gnuef/TODO:1.60        Mon Nov  5 21:29:50 2001
+++ gnue/gnuef/TODO     Wed Nov 14 12:56:10 2001
@@ -105,5 +105,4 @@
 ?.?.?
   Security System
   Migrate to common trigger system
-  setup.exe install on windows 
 
Index: gnue/gnuef/src/GFClient.py
diff -u gnue/gnuef/src/GFClient.py:1.29 gnue/gnuef/src/GFClient.py:1.30
--- gnue/gnuef/src/GFClient.py:1.29     Sun Nov  4 13:36:33 2001
+++ gnue/gnuef/src/GFClient.py  Wed Nov 14 12:56:10 2001
@@ -87,7 +87,7 @@
       formfile = self.ARGUMENTS[0]
     except:
       if sys.argv[0][-11:] != 'GFClient.py':
-        formfile = 
GConfig.get('FormDir')+"/"+os.path.basename(sys.argv[0])+".gfd"
+        formfile = 
os.environ['INSTALL_PREFIX']+'/'+GConfig.get('FormDir')+"/"+os.path.basename(sys.argv[0])+".gfd"
       else:
         self.handleStartupError ("No Forms Definition File Specified.")
 
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.117 gnue/gnuef/src/UIwxpython.py:1.118
--- gnue/gnuef/src/UIwxpython.py:1.117  Wed Nov  7 21:47:15 2001
+++ gnue/gnuef/src/UIwxpython.py        Wed Nov 14 12:56:10 2001
@@ -34,8 +34,10 @@
 from GFEvent import *
 from UIbase import *
 
+import os
 import sys
 import string
+from gnue.forms import VERSION
 from gnue.common import GDebug, GLoginHandler
 from gnue.common import GConfig
 
@@ -165,7 +167,7 @@
     # SplashScreen
     # 
     if not self._disableSplash:
-      self.splash = 
SplashScreen(None,bitmapfile=GConfig.get('splashScreenPNG'),
+      self.splash = 
SplashScreen(None,bitmapfile=os.environ['INSTALL_PREFIX']+'/'+GConfig.get('splashScreenPNG'),
                                  # duration=65535, callback=self.onMain,
                                  duration = 4000, callback=self.onCloseSplash, 
                                  style=wxSIMPLE_BORDER|wxCENTRE_ON_SCREEN )
@@ -183,7 +185,7 @@
 
       self.splash.SetFont(wxFont(10,wxSWISS,wxNORMAL,wxBOLD))
 
-      text = "Version %s" % GConfig.get('VERSION')
+      text = "Version %s" % VERSION
       twidth,theight = self.splash.GetTextExtent(text)
       wxStaticText(parent=self.splash, id=-1, label=str(text),
                    size=wxSize(swidth,theight), 
pos=wxPoint(1,25),style=wxALIGN_CENTRE)
@@ -294,17 +296,17 @@
       mainToolBar = 
self.mainWindow.CreateToolBar(wxTB_HORIZONTAL|wxTB_DOCKABLE)
 
     mainToolBar.SetToolBitmapSize(wxSize(24,24))
-    mainToolBar.AddSimpleTool(100, wxImage(GConfig.get('tb_commit'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Commit Changes", 
GConfig.get('msg_commit'))
-    mainToolBar.AddSimpleTool(203, wxImage(GConfig.get('tb_insert'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Insert Record", 
GConfig.get('msg_insert'))
-    mainToolBar.AddSimpleTool(204, wxImage(GConfig.get('tb_delete'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Delete Record", 
GConfig.get('msg_delete'))
+    mainToolBar.AddSimpleTool(100, 
wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('tb_commit'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Commit Changes", 
GConfig.get('msg_commit'))
+    mainToolBar.AddSimpleTool(203, 
wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('tb_insert'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Insert Record", 
GConfig.get('msg_insert'))
+    mainToolBar.AddSimpleTool(204, 
wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('tb_delete'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Delete Record", 
GConfig.get('msg_delete'))
     mainToolBar.AddSeparator()
-    mainToolBar.AddSimpleTool(202, wxImage(GConfig.get('tb_previous'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Previous 
Record",GConfig.get('msg_previous'))
-    mainToolBar.AddSimpleTool(201, wxImage(GConfig.get('tb_next'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Next Record",GConfig.get('msg_next'))
+    mainToolBar.AddSimpleTool(202, 
wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('tb_previous'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Previous 
Record",GConfig.get('msg_previous'))
+    mainToolBar.AddSimpleTool(201, 
wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('tb_next'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Next Record",GConfig.get('msg_next'))
     mainToolBar.AddSeparator()
-    mainToolBar.AddSimpleTool(207, wxImage(GConfig.get('tb_query_prep'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Prepare Query", 
GConfig.get('msg_query_prep'))
-    mainToolBar.AddSimpleTool(208, wxImage(GConfig.get('tb_query'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Execute Query", GConfig.get('msg_query'))
+    mainToolBar.AddSimpleTool(207, 
wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('tb_query_prep'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Prepare Query", 
GConfig.get('msg_query_prep'))
+    mainToolBar.AddSimpleTool(208, 
wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('tb_query'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Execute Query", GConfig.get('msg_query'))
     mainToolBar.AddSeparator()
-    mainToolBar.AddSimpleTool(102, wxImage(GConfig.get('tb_rollback'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Rollback Changes", 
GConfig.get('msg_rollback'))
+    mainToolBar.AddSimpleTool(102, 
wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('tb_rollback'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Rollback Changes", 
GConfig.get('msg_rollback'))
     mainToolBar.Realize()
 
     self.mainWindow.panel = wxPanel(self.mainWindow,-1, 
wxDefaultPosition,self.mainWindow.GetSize())
@@ -939,7 +941,7 @@
       self.dlg = wxDialog(NULL, -1, "GNU Enterprise: Login")
       self.dlg.SetAutoLayout(true)
     
-      bmp = wxImage(GConfig.get('smallPNG'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap()
+      bmp = wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('smallPNG'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap()
 
       self.textctrlList = []
       messageField = wxStaticText(self.dlg, 1010, str(loginMesg))