gnue/forms/src GFDisplayHandler.py GFForm.py GF...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/02/18 17:45:51

Modified files:
        forms/src      : GFDisplayHandler.py GFForm.py GFInstance.py 
        forms/src/GFObjects: GFBlock.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        more fixes to combo boxes and block-change refreshing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.152&tr2=1.153&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBlock.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.148&tr2=1.149&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.10 
gnue/forms/src/GFDisplayHandler.py:1.11
*** gnue/forms/src/GFDisplayHandler.py:1.10     Mon Feb 18 15:11:39 2002
--- gnue/forms/src/GFDisplayHandler.py  Mon Feb 18 17:45:51 2002
***************
*** 134,139 ****
--- 134,150 ----
  
      value = event.text
  
+     if (self.entry.readonly and not self.entry._block.mode=='query'):
+       event.__error__ = 1
+       event.__errortext__ = "Cannot modify field.  Form is read only"
+       return
+     elif self.entry.editOnNull and \
+          self.value != None and \
+          self.value != "" and \
+          not self.entry._block._resultSet.current.isPending():
+       event.__error__ = 1
+       event.__errortext__ = "Cannot modify field after initial creation."
+       return
  
      # Do some appropriate checks on the text
      # TODO: This will be moved to the mask system!!
***************
*** 568,577 ****
  
  
    def replaceText(self, event):
!     self.work = event.text
!     self.modified = 1
! 
!     self._buildDisplay()
  
  
    def _buildValue(self):
--- 579,587 ----
  
  
    def replaceText(self, event):
!     self.selection1 = 0
!     self.selection2 = len(self.display)
!     self.addText(event)
  
  
    def _buildValue(self):
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.152 gnue/forms/src/GFForm.py:1.153
*** gnue/forms/src/GFForm.py:1.152      Mon Feb 18 13:17:44 2002
--- gnue/forms/src/GFForm.py    Mon Feb 18 17:45:51 2002
***************
*** 260,265 ****
--- 260,268 ----
        self._currentBlock = self._currentEntry._block
        self._currentPage = self._currentBlock._page
  
+       if blockChange:
+         self.refreshBlockDisplay(self._currentBlock)
+ 
        self.dispatchEvent(GFEvent('updateENTRY', oldEntry))
        self.dispatchEvent(GFEvent('updateENTRY', self._currentEntry))
  
***************
*** 811,816 ****
--- 814,831 ----
      except TriggerError, t:
        print "Got to the exception handler!"
        self.TriggerErrorFunc(t)
+ 
+   #
+   # refreshBlockDisplay
+   #
+   def refreshBlockDisplay(self, block):
+     block.walk(self.__refreshBlockDisplay)
+ 
+ 
+   def __refreshBlockDisplay(self, object):
+     if object._type == 'GFEntry':
+       self.dispatchEvent(GFEvent('updateENTRY',object))
+ 
  
  
    #
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.33 gnue/forms/src/GFInstance.py:1.34
*** gnue/forms/src/GFInstance.py:1.33   Mon Feb 18 13:17:44 2002
--- gnue/forms/src/GFInstance.py        Mon Feb 18 17:45:51 2002
***************
*** 158,163 ****
--- 158,164 ----
        if event.refreshDisplay:
          handler.generateRefreshEvent()
          self.updateRecordStatus()
+         print "updating record status"
  
        # If the entry needs an error message displayed,
        # then the proxied event should set this to the
***************
*** 406,411 ****
--- 407,413 ----
    #
    def executeRollback(self,event):
      self._form.rollback()
+     self._form.refreshBlockDisplay(self._form)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateRecordCounter()
***************
*** 534,539 ****
--- 536,542 ----
        messageBox = GFMsgBox(self, message)
        messageBox.show()
        return
+ 
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
  
      self.updateRecordStatus()
***************
*** 552,557 ****
--- 555,562 ----
        messageBox = GFMsgBox(self,message)
        messageBox.show()
        return
+ 
+     self._form.refreshBlockDisplay(self._form._currentBlock)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateStatus()
  
***************
*** 563,568 ****
--- 568,574 ----
        messageBox = GFMsgBox(self,message)
        messageBox.show()
        return
+     self._form.refreshBlockDisplay(self._form._currentBlock)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateRecordCounter()
***************
*** 574,579 ****
--- 580,586 ----
      if message:
        messageBox = GFMsgBox(self,message)
        messageBox.show()
+     self._form.refreshBlockDisplay(self._form._currentBlock)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateRecordCounter()
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.38 
gnue/forms/src/GFObjects/GFBlock.py:1.39
*** gnue/forms/src/GFObjects/GFBlock.py:1.38    Sun Feb 17 01:25:32 2002
--- gnue/forms/src/GFObjects/GFBlock.py Mon Feb 18 17:45:51 2002
***************
*** 4,10 ****
  # This file is part of GNU Enterprise.
  #
  # GNU Enterprise is free software; you can redistribute it 
! # and/or modify it under the terms of the GNU General Public 
  # License as published by the Free Software Foundation; either
  # version 2, or (at your option) any later version.
  #
--- 4,10 ----
  # This file is part of GNU Enterprise.
  #
  # GNU Enterprise is free software; you can redistribute it 
! # and/or modify it under the terms of the GNU General Public
  # License as published by the Free Software Foundation; either
  # version 2, or (at your option) any later version.
  #
***************
*** 195,202 ****
        # TODO: This means no results were returned from a query.
        # TODO: It probably shouldn't create a new record :)  Display a message?
        self.newRecord()
- 
- 
  
    #
    # isEmpty()
--- 195,200 ----
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.148 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.149
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.148       Mon Feb 18 00:24:09 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Feb 18 17:45:51 2002
***************
*** 910,916 ****
      object = _eventObjTowxWindow(event)
      
      # compute the location of the character in the widget
!     x,y = event.GetPosition()
      cursorPosition = 1 + x/_charWidth
  
      # Move to proper object
--- 910,916 ----
      object = _eventObjTowxWindow(event)
      
      # compute the location of the character in the widget
!     x,y = event.GetPositionTuple()
      cursorPosition = 1 + x/_charWidth
  
      # Move to proper object