gnue/forms/src GFForm.py GFInstance.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/02/20 09:56:46

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

Log message:
        fixed page changing issue w/new events system

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.154 gnue/forms/src/GFForm.py:1.155
*** gnue/forms/src/GFForm.py:1.154      Tue Feb 19 00:47:49 2002
--- gnue/forms/src/GFForm.py    Wed Feb 20 09:56:46 2002
***************
*** 260,265 ****
--- 260,268 ----
        self._currentBlock = self._currentEntry._block
        self._currentPage = self._currentBlock._page
  
+       if pageChange:
+         self.dispatchEvent(GFEvent('gotoPAGE',self._currentPage));
+ 
        if blockChange:
          self.refreshDisplay(self._currentBlock)
  
***************
*** 857,877 ****
      self.dispatchEvent(event)
      return not event.__error__
  
- 
-   def gotoPage(self, index):
-     for object in self._blockList:
-       pageWidget = object
-       while pageWidget.getObjectType() != 'GFPage':
-         pageWidget = pageWidget._parent
- 
-       if self._pageList[index] == pageWidget:
-         self._currentPage = self._pageList[index]
-         self._currentBlock = object
-         break
- 
-     # reset current entry
-     self._currentEntry = None
-     self._currentBlock.walk(self.setFocus)
  
    def prevRecord(self):
      if self._currentBlock.mode == 'query':
--- 860,865 ----
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.36 gnue/forms/src/GFInstance.py:1.37
*** gnue/forms/src/GFInstance.py:1.36   Tue Feb 19 00:47:49 2002
--- gnue/forms/src/GFInstance.py        Wed Feb 20 09:56:46 2002
***************
*** 209,215 ****
      if not self._form.endEditing():
        return
      self._form.nextBlock()
-     self.dispatchEvent(GFEvent('gotoPAGE',self._form._currentPage));
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
  
      self.updateStatus()
--- 209,214 ----
***************
*** 224,230 ****
      if not self._form.endEditing():
        return
      self._form.previousBlock()
-     self.dispatchEvent(GFEvent('gotoPAGE',self._form._currentPage));
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateStatus()
  
--- 223,228 ----
***************
*** 236,243 ****
    def gotoPage(self,event):
      if not self._form.endEditing():
        return
!     self._form.gotoPage(event.data)
!     self.dispatchEvent(GFEvent('gotoPAGE',self._form._currentPage));
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateStatus()
  
--- 234,240 ----
    def gotoPage(self,event):
      if not self._form.endEditing():
        return
!     self._form.findAndChangeFocus(self._form._pageList[event.data])
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateStatus()