gnue/forms/src GFInstance.py GFKeyMapper.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/03/10 17:40:13

Modified files:
        forms/src      : GFInstance.py GFKeyMapper.py 

Log message:
        deleted record status now shown properly
        cancel query moved to shift-f9

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFKeyMapper.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.99 gnue/forms/src/GFInstance.py:1.100
*** gnue/forms/src/GFInstance.py:1.99   Mon Mar 10 00:42:55 2003
--- gnue/forms/src/GFInstance.py        Mon Mar 10 17:40:13 2003
***************
*** 351,362 ****
      self.updateStatusBar(tip=tip, form=form)
  
    def updateRecordStatus(self, form):
!     if form._currentBlock._resultSet.current.isPending():
        status = 'modified'
      elif form._currentBlock.mode == 'query':
        status = 'query'
-     elif form._currentBlock._resultSet.current.isDeleted():
-       status = 'deleted'
      else:
        status = 'saved'
      self.updateStatusBar(recordStatus=status, form= form)
--- 351,362 ----
      self.updateStatusBar(tip=tip, form=form)
  
    def updateRecordStatus(self, form):
!     if form._currentBlock._resultSet.current.isDeleted():
!       status = 'deleted'
!     elif form._currentBlock._resultSet.current.isPending():
        status = 'modified'
      elif form._currentBlock.mode == 'query':
        status = 'query'
      else:
        status = 'saved'
      self.updateStatusBar(recordStatus=status, form= form)
Index: gnue/forms/src/GFKeyMapper.py
diff -c gnue/forms/src/GFKeyMapper.py:1.17 gnue/forms/src/GFKeyMapper.py:1.18
*** gnue/forms/src/GFKeyMapper.py:1.17  Mon Mar 10 15:57:26 2003
--- gnue/forms/src/GFKeyMapper.py       Mon Mar 10 17:40:13 2003
***************
*** 299,305 ****
        (vk.F8,       0, 0, 0) : 'ENTERQUERY',
        (vk.F8,       1, 0, 0) : 'COPYQUERY',
        (vk.F9,       0, 0, 0) : 'EXECQUERY',
!       (vk.F10,      1, 0, 0) : 'CANCELQUERY',
        (vk.F11,      0, 0, 0) : 'ROLLBACK',
        (vk.F12,      0, 0, 0) : 'NEWRECORD',
        (vk.ENTER,    1, 0, 0) : 'NEWLINE',
--- 299,305 ----
        (vk.F8,       0, 0, 0) : 'ENTERQUERY',
        (vk.F8,       1, 0, 0) : 'COPYQUERY',
        (vk.F9,       0, 0, 0) : 'EXECQUERY',
!       (vk.F9,       1, 0, 0) : 'CANCELQUERY',
        (vk.F11,      0, 0, 0) : 'ROLLBACK',
        (vk.F12,      0, 0, 0) : 'NEWRECORD',
        (vk.ENTER,    1, 0, 0) : 'NEWLINE',