gnue common/images/tb_new.png common/images/tb_...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/05/08 23:03:44

Modified files:
        common/images  : tb_new.png tb_save.png tb_search.png 
                         tb_undo.png 
        common/src     : GDataSource.py 
        forms/samples/zipcode: states.gfd 
        forms/src      : GFConfig.py GFInstance.py 
        forms/src/uidrivers/wx: UIdriver.py 
Added files:
        common/images  : tb_bottom.png tb_delete.png tb_down_arrow.png 
                         tb_exec.png tb_exit.png tb_first.png 
                         tb_jump-to.png tb_top.png tb_up_arrow.png 

Log message:
        Added gnome2 icons in place of old gnome1 icons(mailing tigert for 
final approval)
        Added more toolbar icons for events
        Fixed prequery datasource support

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_bottom.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_delete.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_down_arrow.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_exec.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_exit.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_first.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_jump-to.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_top.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_up_arrow.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_new.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_save.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_search.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/images/tb_undo.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataSource.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/zipcode/states.gfd.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFConfig.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.167&tr2=1.168&r1=text&r2=text

Patches:
Index: gnue/common/images/tb_new.png
Index: gnue/common/images/tb_save.png
Index: gnue/common/images/tb_search.png
Index: gnue/common/images/tb_undo.png
Index: gnue/common/src/GDataSource.py
diff -c gnue/common/src/GDataSource.py:1.31 gnue/common/src/GDataSource.py:1.32
*** gnue/common/src/GDataSource.py:1.31 Sat May  4 12:46:25 2002
--- gnue/common/src/GDataSource.py      Wed May  8 23:03:44 2002
***************
*** 59,65 ****
      self._unboundFieldReferences = {}
      self._defaultValues = {}
  
!     self._inits =[self.primaryInit, self.secondaryInit]
      self._currentResultSet = None
      self._resultSetListeners = []
      self._toplevelParent = self._type # Needs to be set by subclass
--- 59,65 ----
      self._unboundFieldReferences = {}
      self._defaultValues = {}
  
!     self._inits =[self.primaryInit, self.secondaryInit, self.tertiaryInit]
      self._currentResultSet = None
      self._resultSetListeners = []
      self._toplevelParent = self._type # Needs to be set by subclass
***************
*** 229,234 ****
--- 229,235 ----
    # TODO: should contain a getDatasourceDict()?
    #
    def secondaryInit(self):
+ 
      if hasattr(self, 'master') and self.master:
        self.master = string.lower(self.master)
        GDebug.printMesg(3,"Linking detail '%s' to master '%s'" \
***************
*** 243,248 ****
--- 244,253 ----
             _("Detail source '%s' references non-existant master '%s'") \
                           % (self.name, self.master)
  
+   def tertiaryInit(self):
+     if hasattr(self, 'prequery'):
+       if not self.hasMaster() and self.prequery:
+         self.createResultSet()
  
    #
    # Hooks for record-level triggers
Index: gnue/forms/samples/zipcode/states.gfd
diff -c gnue/forms/samples/zipcode/states.gfd:1.21 
gnue/forms/samples/zipcode/states.gfd:1.22
*** gnue/forms/samples/zipcode/states.gfd:1.21  Fri Jan  4 17:56:59 2002
--- gnue/forms/samples/zipcode/states.gfd       Wed May  8 23:03:44 2002
***************
*** 8,14 ****
      <option value="0.0.2" name="version"/>
    </options>
    <datasource cache="15" database="gnue" name="dsstate" order_by="state"
!               table="state"/>
    <datasource master="dsstate" order_by="city" cache="15" database="gnue"
                name="dscities" table="zipcode" masterlink="state" 
detaillink="state"/>
    <page name="Page_1">
--- 8,14 ----
      <option value="0.0.2" name="version"/>
    </options>
    <datasource cache="15" database="gnue" name="dsstate" order_by="state"
!               table="state" prequery=""/>
    <datasource master="dsstate" order_by="city" cache="15" database="gnue"
                name="dscities" table="zipcode" masterlink="state" 
detaillink="state"/>
    <page name="Page_1">
Index: gnue/forms/src/GFConfig.py
diff -c gnue/forms/src/GFConfig.py:1.5 gnue/forms/src/GFConfig.py:1.6
*** gnue/forms/src/GFConfig.py:1.5      Mon May  6 21:13:49 2002
--- gnue/forms/src/GFConfig.py  Wed May  8 23:03:44 2002
***************
*** 119,161 ****
      'Comment'    : 'Location of "Delete" toolbar icon (PNG format)',
      'Description': 'Location of "Delete" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_trash.png' },
    { 'Name'       : 'tb_previous',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Previous Record" toolbar icon (PNG format)',
      'Description': 'Location of "Previous Record" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_left_arrow.png' },
    { 'Name'       : 'tb_next',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Next Record" toolbar icon (PNG format)',
      'Description': 'Location of "Next Record" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_right_arrow.png' },
    { 'Name'       : 'tb_query_prep',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Prepare Query" toolbar icon (PNG format)',
      'Description': 'Location of "Prepare Query" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_preferences.png' },
    { 'Name'       : 'tb_query',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Prepare Query" toolbar icon (PNG format)',
      'Description': 'Location of "Prepare Query" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_search.png' },
    { 'Name'       : 'tb_insert',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Execute Query" toolbar icon (PNG format)',
      'Description': 'Location of "Execute Query" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_search.png' },
!   { 'Name'       : 'tb_help',
      'Type'       : 'Setting',
!     'Comment'    : 'Location of "Help" toolbar icon (PNG format)',
!     'Description': 'Location of "Help" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_help.png' },
    { 'Name'       : 'SmallPNG',
      'Type'       : 'Setting',
      'Comment'    : 'Location of GNUe logo (PNG format)',
--- 119,179 ----
      'Comment'    : 'Location of "Delete" toolbar icon (PNG format)',
      'Description': 'Location of "Delete" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_delete.png' },
    { 'Name'       : 'tb_previous',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Previous Record" toolbar icon (PNG format)',
      'Description': 'Location of "Previous Record" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_up_arrow.png' },
    { 'Name'       : 'tb_next',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Next Record" toolbar icon (PNG format)',
      'Description': 'Location of "Next Record" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_down_arrow.png' },
!   { 'Name'       : 'tb_first',
!     'Type'       : 'Setting',
!     'Comment'    : 'Location of "First Record" toolbar icon (PNG format)',
!     'Description': 'Location of "First Record" toolbar icon (PNG format)',
!     'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_top.png' },
!   { 'Name'       : 'tb_last',
!     'Type'       : 'Setting',
!     'Comment'    : 'Location of "Last Record" toolbar icon (PNG format)',
!     'Description': 'Location of "Last Record" toolbar icon (PNG format)',
!     'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_bottom.png' },
!   { 'Name'       : 'tb_jump',
!     'Type'       : 'Setting',
!     'Comment'    : 'Location of "Jump to Record" toolbar icon (PNG format)',
!     'Description': 'Location of "Jump to Record" toolbar icon (PNG format)',
!     'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_jump-to.png' },
    { 'Name'       : 'tb_query_prep',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Prepare Query" toolbar icon (PNG format)',
      'Description': 'Location of "Prepare Query" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_search.png' },
    { 'Name'       : 'tb_query',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Prepare Query" toolbar icon (PNG format)',
      'Description': 'Location of "Prepare Query" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_exec.png' },
    { 'Name'       : 'tb_insert',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Execute Query" toolbar icon (PNG format)',
      'Description': 'Location of "Execute Query" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_new.png' },
!   { 'Name'       : 'tb_exit',
      'Type'       : 'Setting',
!     'Comment'    : 'Location of "Exit" toolbar icon (PNG format)',
!     'Description': 'Location of "Exit" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : 'tb_exit.png' },
    { 'Name'       : 'SmallPNG',
      'Type'       : 'Setting',
      'Comment'    : 'Location of GNUe logo (PNG format)',
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.49 gnue/forms/src/GFInstance.py:1.50
*** gnue/forms/src/GFInstance.py:1.49   Tue May  7 13:24:13 2002
--- gnue/forms/src/GFInstance.py        Wed May  8 23:03:44 2002
***************
*** 273,279 ****
    #
    # nextRecord
    #
!   # Called enever an event source has requested that the
    # form advance to the next record in memory
    #
    def nextRecord(self, event):
--- 273,279 ----
    #
    # nextRecord
    #
!   # Called whenever an event source has requested that the
    # form advance to the next record in memory
    #
    def nextRecord(self, event):
***************
*** 598,603 ****
--- 598,604 ----
  
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.dispatchEvent(GFEvent('updateENTRY',self._form._currentEntry))
+     self._form.refreshDisplay(self._form)
      self.updateStatus()
      self._ui = ui
  
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.167 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.168
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.167       Sat May  4 12:45:08 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Wed May  8 23:03:44 2002
***************
*** 238,244 ****
      EVT_MENU(self._wxapp, 209, _PROMPTFORRECORD)
      dataMenu.Append( 203, "New Record              (F12)",_('Create a new 
record for data input.'))
      EVT_MENU(self._wxapp, 203, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEWRECORD')))
!     dataMenu.Append( 204, "Delete Record             (F5)",_('Mark record for 
removal at next commit.'))
      EVT_MENU(self._wxapp, 204, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestMARKFORDELETE')))
      dataMenu.AppendSeparator()
      dataMenu.Append( 205, "Next Block              (PgDn)",_('Navigate to 
next data block.'))
--- 238,244 ----
      EVT_MENU(self._wxapp, 209, _PROMPTFORRECORD)
      dataMenu.Append( 203, "New Record              (F12)",_('Create a new 
record for data input.'))
      EVT_MENU(self._wxapp, 203, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEWRECORD')))
!     dataMenu.Append( 204, "Mark Record for Delete   (F5)",_('Mark record for 
removal at next commit.'))
      EVT_MENU(self._wxapp, 204, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestMARKFORDELETE')))
      dataMenu.AppendSeparator()
      dataMenu.Append( 205, "Next Block              (PgDn)",_('Navigate to 
next data block.'))
***************
*** 278,290 ****
--- 278,294 ----
      mainToolBar.AddSimpleTool(203, wxImage(images_dir+gConfig('tb_insert'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Insert Record", _('Create a new record 
for data input.'))
      mainToolBar.AddSimpleTool(204, wxImage(images_dir+gConfig('tb_delete'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Delete Record", _('Mark record for 
removal at next commit.'))
      mainToolBar.AddSeparator()
+     mainToolBar.AddSimpleTool(211, wxImage(images_dir+gConfig('tb_first'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "First Record",_('Navigate to first 
record in memory.'))
      mainToolBar.AddSimpleTool(202, wxImage(images_dir+gConfig('tb_previous'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Previous Record",_('Navigate to previous 
record in memory.'))
      mainToolBar.AddSimpleTool(201, wxImage(images_dir+gConfig('tb_next'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Next Record",_('Navigate to next record 
in memory.'))
+     mainToolBar.AddSimpleTool(210, wxImage(images_dir+gConfig('tb_last'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Last Record",_('Navigate to last record 
in memory.'))
+     mainToolBar.AddSimpleTool(209, wxImage(images_dir+gConfig('tb_jump'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Jump to Record",_('Navigate to user 
specified record in memory.'))
      mainToolBar.AddSeparator()
      mainToolBar.AddSimpleTool(207, 
wxImage(images_dir+gConfig('tb_query_prep'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Prepare Query", _('Switch to input query 
mask mode.'))
      mainToolBar.AddSimpleTool(208, wxImage(images_dir+gConfig('tb_query'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Execute Query", _('Execute query using 
current mask.'))
      mainToolBar.AddSeparator()
      mainToolBar.AddSimpleTool(102, wxImage(images_dir+gConfig('tb_rollback'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Clear Form", _('Clear Form'))
+     mainToolBar.AddSimpleTool(101, wxImage(images_dir+gConfig('tb_exit'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Exit Form", _('Exit Form'))
      mainToolBar.Realize()
  
      self.mainWindow.panel = wxPanel(self.mainWindow,-1, 
wxDefaultPosition,self.mainWindow.GetSize())