gnue/gnuef TODO src/GFClient.py src/GFEvent.py ...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/06/06 18:46:53

Modified files:
        gnuef          : TODO 
        gnuef/src      : GFClient.py GFEvent.py GFForm.py GFInstance.py 
                         GFObjects.py GFParser.py GFTrigger.py 
                         UIwxpython.py 
Removed files:
        gnuef          : setup_cvs_devel.sh 

Log message:
        Added support for transparentBlock boolean on blocks
        Moved most stuff from GFOptions to GConfig
        Removed old developer setup script

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/TODO.diff?cvsroot=OldCVS&tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFClient.py.diff?cvsroot=OldCVS&tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFEvent.py.diff?cvsroot=OldCVS&tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.96&tr2=1.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFInstance.py.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects.py.diff?cvsroot=OldCVS&tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFTrigger.py.diff?cvsroot=OldCVS&tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.91&tr2=1.92&r1=text&r2=text

Patches:
Index: gnue/gnuef/TODO
diff -u gnue/gnuef/TODO:1.51 gnue/gnuef/TODO:1.52
--- gnue/gnuef/TODO:1.51        Sat Jun  2 18:29:45 2001
+++ gnue/gnuef/TODO     Wed Jun  6 18:46:53 2001
@@ -41,8 +41,6 @@
 
     menus should disable options not available via events 
 
-    ability for ui/forms to launch other ui/forms
-
     Go thru UIwxpython and UIcurses and pull out everything possible
       that can be put in UIbase.  Maybe adjust UIpython to use NC*style
       ojbects so that most of the core functionality can be moved to UIbase
Index: gnue/gnuef/src/GFClient.py
diff -u gnue/gnuef/src/GFClient.py:1.19 gnue/gnuef/src/GFClient.py:1.20
--- gnue/gnuef/src/GFClient.py:1.19     Mon Jun  4 20:25:23 2001
+++ gnue/gnuef/src/GFClient.py  Wed Jun  6 18:46:53 2001
@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: GFClient.py,v 1.19 2001/06/05 03:25:23 jamest Exp $
+# $Id: GFClient.py,v 1.20 2001/06/07 01:46:53 jamest Exp $
 #
 
 import pstats
@@ -43,6 +43,7 @@
 import sys
 import urllib
 import gnue.forms.GFOptions
+
 from gnue.forms.GFGetOpt import *
 from gnue.forms.GFInstance import *
 from gnue.forms.GFForm import *
@@ -59,7 +60,7 @@
   #
   # GClientApp() overrides
   #
-  VERSION = GFOptions.VERSION
+  VERSION = 'pre-0.0.8'
   COMMAND = "gfclient"
   NAME = "GNUe Forms"
   USAGE = "gfclient [options] file" 
Index: gnue/gnuef/src/GFEvent.py
diff -u gnue/gnuef/src/GFEvent.py:1.14 gnue/gnuef/src/GFEvent.py:1.15
--- gnue/gnuef/src/GFEvent.py:1.14      Mon May 14 13:04:20 2001
+++ gnue/gnuef/src/GFEvent.py   Wed Jun  6 18:46:53 2001
@@ -27,7 +27,6 @@
 # NOTES:
 #  
 
-import GFOptions
 from gnue.common import GDebug
 
 #
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.96 gnue/gnuef/src/GFForm.py:1.97
--- gnue/gnuef/src/GFForm.py:1.96       Sat Jun  2 18:29:45 2001
+++ gnue/gnuef/src/GFForm.py    Wed Jun  6 18:46:53 2001
@@ -31,7 +31,8 @@
 import os
 import string
 from gnue.common import GDebug
-import GFOptions            
+from gnue.common import GConfig            
+import GFOptions
 import traceback
 
 from GFObjects import *
@@ -218,7 +219,7 @@
     message = None
     for block in self._blockList:
       if not block.isSaved():
-        message = GFOptions._msgNOTSAVED
+        message = GConfig('_msgNOTSAVED')
     for block in self._blockList:
       block.processRollback()
       for entry in block._entryList:
@@ -478,8 +479,12 @@
     if not self._currentEntry.verifyValue(): return
     for object in self._currentEntry._parent._children:
       # Put the first field as the next to rollover
-      if object.getObjectType()=='GFEntry' and (not object.hidden) and ((not 
object.readonly) or self._currentBlock.mode=='query'):
-        if nextEntry == None: nextEntry = object
+      if (object.getObjectType()=='GFEntry' and
+          (not object.hidden) and ((not object.readonly) or
+                                   self._currentBlock.mode=='query')):
+        if nextEntry == None:
+          nextEntry = object
+          firstEntry = object
         
         if object == self._currentEntry:
           keepNext = 1
@@ -492,7 +497,10 @@
     try:
       self._currentEntry.processTrigger('Pre-FocusOut')
       nextEntry.processTrigger('Pre-FocusIn')
-      self._currentEntry = nextEntry
+      if self._currentBlock.transparentBlock and nextEntry == firstEntry: # 
Jump to the next block if block is tagged as transparent
+        self.nextBlock()
+      else:
+        self._currentEntry = nextEntry
 
       self._currentEntry.processTrigger('Post-FocusOut')
       nextEntry.processTrigger('Post-FocusIn')
@@ -514,6 +522,7 @@
     for object in self._currentEntry._parent._children:
       if object.getObjectType()=='GFEntry' and not object.hidden and (not 
object.readonly or self._currentBlock.mode=='query'):
         nextEntry = object
+        lastEntry = object
     
     keepNext = 0
     for object in self._currentEntry._parent._children:
@@ -526,6 +535,13 @@
     try:
       self._currentEntry.processTrigger('Pre-FocusOut')
       nextEntry.processTrigger('Pre-FocusIn')
+      if self._currentBlock.transparentBlock and nextEntry == lastEntry: # 
Jump to the prev block if block is tagged as transparent
+        self.previousBlock()
+        # Move to the new last record of the new current block
+        for object in self._currentEntry._parent._children:
+          if object.getObjectType()=='GFEntry' and not object.hidden and (not 
object.readonly or self._currentBlock.mode=='query'):
+            nextEntry = object
+            
       self._currentEntry = nextEntry
 
       self._currentEntry.processTrigger('Post-FocusOut')
@@ -612,7 +628,7 @@
         masterBlock,masterField = string.split(block.master,'.')
         if masterBlock == self._currentBlock.name:
           if not block.isSaved():
-            message = GFMsgBox(self, GFOptions._msgNOTSAVED)
+            message = GFMsgBox(self, GConfig.get('_msgNOTSAVED'))
             message.show()
             return    
     self._currentBlock.prevRecord()
@@ -623,7 +639,7 @@
         masterBlock,masterField = string.split(block.master,'.')
         if masterBlock == self._currentBlock.name:
           if not block.isSaved():
-            message = GFMsgBox(self, GFOptions._msgDETAILNOTSAVED )
+            message = GFMsgBox(self, GConfig.get('_msgDETAILNOTSAVED'))
             message.show()
             return    
     self._currentBlock.nextRecord()
Index: gnue/gnuef/src/GFInstance.py
diff -u gnue/gnuef/src/GFInstance.py:1.7 gnue/gnuef/src/GFInstance.py:1.8
--- gnue/gnuef/src/GFInstance.py:1.7    Sun Jun  3 19:05:12 2001
+++ gnue/gnuef/src/GFInstance.py        Wed Jun  6 18:46:53 2001
@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: GFInstance.py,v 1.7 2001/06/04 02:05:12 jcater Exp $
+# $Id: GFInstance.py,v 1.8 2001/06/07 01:46:53 jamest Exp $
 #
 
 import pstats
@@ -42,9 +42,9 @@
 import os.path
 import sys
 import urllib
-import gnue.forms.GFOptions
-from gnue.forms.GFGetOpt import *
+import gnue.common.GConfig
 from gnue.forms.GFForm import *
+from gnue.forms.GFGetOpt import *
 from gnue.forms.GFController import *
 from gnue.forms.GFParser import loadForm 
 from gnue.common import GDebug, GDataObjects
@@ -220,7 +220,7 @@
       
   def executeExit(self, event):
     if not self._form.isSaved():
-      message = GFMsgBox(self, GFOptions._msgNOTSAVED)
+      message = GFMsgBox(self, GConfig.get('_msgNOTSAVED'))
       message.show()
     else:
       # If above loop didn't cause function to return then exit
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.90 gnue/gnuef/src/GFObjects.py:1.91
--- gnue/gnuef/src/GFObjects.py:1.90    Mon Jun  4 20:25:23 2001
+++ gnue/gnuef/src/GFObjects.py Wed Jun  6 18:46:53 2001
@@ -35,7 +35,6 @@
 from gnue.common.dbdrivers.factory import factory
 from GFEvent import *
 from GFTrigger import *
-import GFOptions
 
 from gnue.common import GDebug
 from gnue.common import GConfig
@@ -141,7 +140,7 @@
     GFValue.__init__(self, parent, value)
     self._type = "GFLabel"
     self.alignment = "left"
-    self.height = 1 #GFOptions.widgetHeight
+    self.height = float(GConfig.get('widgetHeight'))
 
   def setValue(self, value):
     if not self._value:
@@ -298,7 +297,7 @@
     self._currentRecord = self._currentRecord + 1
     if self._currentRecord > self._recordCount :
       if int(GConfig.get('autocreate')) and 
(self._dataSourceLink.resultSetStatus[self._recordCount] != 'saved' or
-                
self._dataSourceLink.resultSet[self._recordCount].has_key(self._dataSourceLink.uniqueKey)
+                (hasattr(self._dataSourceLink,'uniqueKey') and 
self._dataSourceLink.resultSet[self._recordCount].has_key(self._dataSourceLink.uniqueKey))
                 ): 
         self.newRecord()
       else:
@@ -310,7 +309,7 @@
     self._currentRecord = self._currentRecord - 1
     if self._currentRecord < 0 :
       if int(GConfig.get('autocreate')) and 
(self._dataSourceLink.resultSetStatus[self._recordCount] != 'saved' or
-                
self._dataSourceLink.resultSet[self._recordCount].has_key(self._dataSourceLink.uniqueKey)
+                (hasattr(self._dataSourceLink,'uniqueKey') and 
self._dataSourceLink.resultSet[self._recordCount].has_key(self._dataSourceLink.uniqueKey))
                 ): 
         self.newRecord()
       else:
@@ -418,7 +417,7 @@
 
     self._value=""
     self._cursorPosition = len(self._value)
-    self.height = 1 #GFOptions.widgetHeight
+    self.height = float(GConfig.get('widgetHeight'))
     self._block = self.findParentOfType('GFBlock')
 
   def initialize(self):
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.27 gnue/gnuef/src/GFParser.py:1.28
--- gnue/gnuef/src/GFParser.py:1.27     Fri May 25 01:17:10 2001
+++ gnue/gnuef/src/GFParser.py  Wed Jun  6 18:46:53 2001
@@ -89,7 +89,8 @@
                                      'master':      (0, 0, char, None), 
                                      'detail':      (0, 0, char, None), 
                                      'rows':        (0, 0, int,  None), 
-                                     'rowSpacer':   (0, 0, int,  None), 
+                                     'rowSpacer':   (0, 0, int,  None),
+                                     'transparentBlock':(0, 0, bool, 0),
                                      'datasource':  (0, 0, char, None)}, 1), 
       'label':      (GFLabel,      { 'text':        (1, 0, char, None), 
                                      'alignment':   (0, 0, char, None), 
Index: gnue/gnuef/src/GFTrigger.py
diff -u gnue/gnuef/src/GFTrigger.py:1.26 gnue/gnuef/src/GFTrigger.py:1.27
--- gnue/gnuef/src/GFTrigger.py:1.26    Sun Jun  3 19:05:12 2001
+++ gnue/gnuef/src/GFTrigger.py Wed Jun  6 18:46:53 2001
@@ -29,7 +29,6 @@
 #
 
 import sys
-import GFOptions
 from GFObjects import *
 from GFEvent import *
 from GFTriggerError import *
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.91 gnue/gnuef/src/UIwxpython.py:1.92
--- gnue/gnuef/src/UIwxpython.py:1.91   Fri Jun  1 15:02:04 2001
+++ gnue/gnuef/src/UIwxpython.py        Wed Jun  6 18:46:53 2001
@@ -37,14 +37,14 @@
 import sys
 import string
 from gnue.common import GDebug, GLoginHandler
-import GFOptions
+from gnue.common import GConfig
 
 #
 # Little global helper routine to set font according to options
 #
 def initFont(widget):
-  if GFOptions.fixedWidthFont:
-    widget.SetFont(wxFont(GFOptions.pointSize,wxMODERN,wxNORMAL,wxNORMAL))
+  if int(GConfig.get('fixedWidthFont')):
+    
widget.SetFont(wxFont(int(GConfig.get('pointSize')),wxMODERN,wxNORMAL,wxNORMAL))
 
 # Helps out with layout
 def getLargest(val1, val2): 
@@ -134,7 +134,7 @@
     # SplashScreen
     # 
     if not self._disableSplash:
-      self.splash = SplashScreen(None,bitmapfile=GFOptions.splashScreenPNG,
+      self.splash = 
SplashScreen(None,bitmapfile=GConfig.get('splashScreenPNG'),
                                  # duration=65535, callback=self.onMain,
                                  style=wxSIMPLE_BORDER|wxCENTRE_ON_SCREEN )
       swidth,sheight = self.splash.GetSizeTuple()
@@ -151,7 +151,7 @@
 
       self.splash.SetFont(wxFont(10,wxSWISS,wxNORMAL,wxBOLD))
 
-      text = "Version %s" % GFOptions.VERSION
+      text = "Version %s" % GConfig.get('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)
@@ -189,8 +189,8 @@
     self.charWidth = maxWidth+maxLeading
     self.charHeight = maxHeight+maxDescent
     
-    self.borderPercentage = (GFOptions.borderPercentage / 100.0)
-    self.textPercentage = (GFOptions.textPercentage / 100.0)
+    self.borderPercentage = (int(GConfig.get('borderPercentage')) / 100.0)
+    self.textPercentage = (int(GConfig.get('textPercentage')) / 100.0)
 
     self.widgetWidth = (self.charWidth * self.borderPercentage)
     self.widgetHeight = (self.charHeight * self.borderPercentage) + 3
@@ -207,36 +207,36 @@
     self.mainWindow.SetStatusText( "Let's get started" )
 
     fileMenu = wxMenu()
-    fileMenu.Append( 100, "Commit     (F6)",GFOptions.msg_commit)
+    fileMenu.Append( 100, "Commit     (F6)",GConfig.get('msg_commit'))
     EVT_MENU(self, 100, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestCOMMIT')))
-    fileMenu.Append( 102, "Rollback  (F11)",GFOptions.msg_rollback)
+    fileMenu.Append( 102, "Rollback  (F11)",GConfig.get('msg_rollback'))
     EVT_MENU(self, 102, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestROLLBACK')))
     fileMenu.AppendSeparator()
-    fileMenu.Append( 101, "E&xit",GFOptions.msg_exit)
+    fileMenu.Append( 101, "E&xit",GConfig.get('msg_exit'))
     EVT_MENU(self, 101,  self.menuExitEvent)
      
     dataMenu = wxMenu()
-    dataMenu.Append( 201, "Next Record             (Up)",GFOptions.msg_next)
+    dataMenu.Append( 201, "Next Record             
(Up)",GConfig.get('msg_next'))
     EVT_MENU(self, 201, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEXTRECORD')))
-    dataMenu.Append( 202, "Previous Record   (Down)",GFOptions.msg_previous)
+    dataMenu.Append( 202, "Previous Record   
(Down)",GConfig.get('msg_previous'))
     EVT_MENU(self, 202, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestPREVRECORD')))
-    dataMenu.Append( 203, "New Record           (F12)",GFOptions.msg_insert)
+    dataMenu.Append( 203, "New Record           
(F12)",GConfig.get('msg_insert'))
     EVT_MENU(self, 203, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEWRECORD')))
-    dataMenu.Append( 204, "Delete Record          (F5)",GFOptions.msg_delete)
+    dataMenu.Append( 204, "Delete Record          
(F5)",GConfig.get('msg_delete'))
     EVT_MENU(self, 204, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestMARKFORDELETE')))
     dataMenu.AppendSeparator()
-    dataMenu.Append( 205, "Next Block           
(PgDn)",GFOptions.msg_next_block)
+    dataMenu.Append( 205, "Next Block           
(PgDn)",GConfig.get('msg_next_block'))
     EVT_MENU(self, 205, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEXTBLOCK')))
-    dataMenu.Append( 206, "Previous Block     
(PgUp)",GFOptions.msg_previous_block)
+    dataMenu.Append( 206, "Previous Block     
(PgUp)",GConfig.get('msg_previous_block'))
     EVT_MENU(self, 206, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestPREVBLOCK')))
     dataMenu.AppendSeparator()
-    dataMenu.Append( 207, "Enter Query            
(F8)",GFOptions.msg_query_prep)
+    dataMenu.Append( 207, "Enter Query            
(F8)",GConfig.get('msg_query_prep'))
     EVT_MENU(self, 207, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestQUERY')))
-    dataMenu.Append( 208, "Execute Query        (F9)", GFOptions.msg_query)
+    dataMenu.Append( 208, "Execute Query        (F9)", 
GConfig.get('msg_query'))
     EVT_MENU(self, 208, lambda event, l=self: 
l.dispatchEvent(GFEvent('executeQUERY')))
     
     helpMenu = wxMenu()
-    helpMenu.Append( 300, "&About...", GFOptions.msg_help)
+    helpMenu.Append( 300, "&About...", GConfig.get('msg_help'))
     EVT_MENU(self, 300, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestABOUT')))
 
     menuBar = wxMenuBar()
@@ -257,17 +257,17 @@
       mainToolBar = 
self.mainWindow.CreateToolBar(wxTB_HORIZONTAL|wxTB_DOCKABLE)
 
     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(204, wxImage(GFOptions.tb_delete, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Delete Record", GFOptions.msg_delete)
+    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.AddSeparator()
-    mainToolBar.AddSimpleTool(202, wxImage(GFOptions.tb_previous, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Previous Record",GFOptions.msg_previous)
-    mainToolBar.AddSimpleTool(201, wxImage(GFOptions.tb_next, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Next Record",GFOptions.msg_next)
+    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.AddSeparator()
-    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.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.AddSeparator()
-    mainToolBar.AddSimpleTool(102, wxImage(GFOptions.tb_rollback, 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Rollback Changes", 
GFOptions.msg_rollback)
+    mainToolBar.AddSimpleTool(102, wxImage(GConfig.get('tb_rollback'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Rollback Changes", 
GConfig.get('msg_rollback'))
     mainToolBar.Realize()
 
 
@@ -579,7 +579,7 @@
 #    self.dlg.SetBackgroundColour(wxWHITE)
     self.dlg.SetAutoLayout(true)
     
-    bmp = wxImage(GFOptions.smallPNG, wxBITMAP_TYPE_PNG).ConvertToBitmap()
+    bmp = wxImage(GConfig.get('smallPNG'), wxBITMAP_TYPE_PNG).ConvertToBitmap()
 
 
     self.textctrlList = []