gnue/forms doc/Events.txt src/GFDisplayHandler....

[Jason Cater]

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

Modified files:
        forms/doc      : Events.txt 
        forms/src      : GFDisplayHandler.py GFForm.py GFInstance.py 

Log message:
        fixed focus change issues w/prev + next block

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/doc/Events.txt.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.151&tr2=1.152&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: gnue/forms/doc/Events.txt
diff -c gnue/forms/doc/Events.txt:1.1 gnue/forms/doc/Events.txt:1.2
*** gnue/forms/doc/Events.txt:1.1       Sat Feb 16 12:59:22 2002
--- gnue/forms/doc/Events.txt   Mon Feb 18 13:17:44 2002
***************
*** 185,191 ****
  
  
  requestSELECTLEFT
! -------------
  
    Description:
       This event signals to the current entry's input handler to
--- 185,191 ----
  
  
  requestSELECTLEFT
! -----------------
  
    Description:
       This event signals to the current entry's input handler to
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.8 
gnue/forms/src/GFDisplayHandler.py:1.9
*** gnue/forms/src/GFDisplayHandler.py:1.8      Mon Feb 18 00:11:37 2002
--- gnue/forms/src/GFDisplayHandler.py  Mon Feb 18 13:17:44 2002
***************
*** 50,56 ****
    #
  
    def setValue(self, value):
!     print "Setting value"
      self.modified = 0
      self.value = value
      self._buildDisplay()
--- 50,56 ----
    #
  
    def setValue(self, value):
!    ## print "Setting value"
      self.modified = 0
      self.value = value
      self._buildDisplay()
***************
*** 69,75 ****
  
  
    def generateRefreshEvent(self):
!     print "Refreshing!!"
      self.dispatchEvent(GFEvent('updateEntryEditor',
             object = self.entry,
             display=self.display,
--- 69,75 ----
  
  
    def generateRefreshEvent(self):
!    ## print "Refreshing!!"
      self.dispatchEvent(GFEvent('updateEntryEditor',
             object = self.entry,
             display=self.display,
***************
*** 85,91 ****
    #
  
    def beginEdit(self, event):
!     print "beginEdit.. %s" % self.display
      self.editing = 1
      self.modified = 0
  
--- 85,91 ----
    #
  
    def beginEdit(self, event):
!    ## print "beginEdit.. %s" % self.display
      self.editing = 1
      self.modified = 0
  
***************
*** 101,107 ****
  
  
    def endEdit(self, event):
!     print "endEdit.. %s"
  
      # If this event returns __error__, then
      # the input was invalid and the entry is
--- 101,107 ----
  
  
    def endEdit(self, event):
!    ## print "endEdit.. %s" % self.display
  
      # If this event returns __error__, then
      # the input was invalid and the entry is
***************
*** 336,345 ****
  
    # Copy to the clipboard
    def clipboardCopy(self, event):
!     print "Copy"
      if self.selection1 != None:
        sel1, sel2 = self.getSelectionArea()
!       print self.display[sel1:sel2]
        self.dispatchEvent(GFEvent('setClipboard',
                 text=self.display[sel1:sel2]))
  
--- 336,345 ----
  
    # Copy to the clipboard
    def clipboardCopy(self, event):
!    ## print "Copy"
      if self.selection1 != None:
        sel1, sel2 = self.getSelectionArea()
!      ## print self.display[sel1:sel2]
        self.dispatchEvent(GFEvent('setClipboard',
                 text=self.display[sel1:sel2]))
  
***************
*** 347,360 ****
  
  
    def clipboardCut(self, event):
!     print "Cut"
      self.clipboardCopy(event)
      edevent = GFEvent("requestKEYPRESS", text="")
      self.dispatchEvent(edevent)
  
  
    def clipboardPaste(self, event):
!     print "Paste"
      event.text = self.dispatchEvent(GFEvent('getClipboard'))
      if event.text != None:
        self.addText(event)
--- 347,360 ----
  
  
    def clipboardCut(self, event):
!    ## print "Cut"
      self.clipboardCopy(event)
      edevent = GFEvent("requestKEYPRESS", text="")
      self.dispatchEvent(edevent)
  
  
    def clipboardPaste(self, event):
!    ## print "Paste"
      event.text = self.dispatchEvent(GFEvent('getClipboard'))
      if event.text != None:
        self.addText(event)
***************
*** 463,469 ****
  
    # TODO: Replace with format mask
    def _buildDisplayHelper(self, value, editing):
!     print "building display for '%s'" % value
      if value in (None,""):
        return ""
      value = float(value)
--- 463,469 ----
  
    # TODO: Replace with format mask
    def _buildDisplayHelper(self, value, editing):
!    ## print "building display for '%s'" % value
      if value in (None,""):
        return ""
      value = float(value)
***************
*** 516,522 ****
      if not hasattr(self.entry,'_allowedValues'):
        self.entry.allowedValues()
  
!     print "beginEdit.. %s" % self.display
      self.editing = 1
      self.modified = 0
  
--- 516,522 ----
      if not hasattr(self.entry,'_allowedValues'):
        self.entry.allowedValues()
  
!    ## print "beginEdit.. %s" % self.display
      self.editing = 1
      self.modified = 0
  
***************
*** 540,546 ****
  
    # TODO: Replace with format mask
    def _buildDisplayHelper(self, value, editing):
!     print "building display for '%s'" % value
      self._dropdownIndex = 0
      if value in (None,""):
        return ""
--- 540,546 ----
  
    # TODO: Replace with format mask
    def _buildDisplayHelper(self, value, editing):
!    ## print "building display for '%s'" % value
      self._dropdownIndex = 0
      if value in (None,""):
        return ""
***************
*** 551,564 ****
        for disp in self.entry._allowedValuesDescr:
          if disp[:len(val)] == val:
            display = 
self.entry._allowedValues[self.entry._allowedValuesReverse[disp]]
- #          self.selection1 = len(val)
- #          self.selection2 = len(display)
            self._dropdownIndex = i
!           return display
  
!       return value
      else:
!       return self.entry._allowedValues[value]
  
    def _buildDisplay(self):
      if self.editing:
--- 551,562 ----
        for disp in self.entry._allowedValuesDescr:
          if disp[:len(val)] == val:
            display = 
self.entry._allowedValues[self.entry._allowedValuesReverse[disp]]
            self._dropdownIndex = i
!           return str(display)
  
!       return str(value)
      else:
!       return str(self.entry._allowedValues[value])
  
    def _buildDisplay(self):
      if self.editing:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.151 gnue/forms/src/GFForm.py:1.152
*** gnue/forms/src/GFForm.py:1.151      Sun Feb 17 13:25:32 2002
--- gnue/forms/src/GFForm.py    Mon Feb 18 13:17:44 2002
***************
*** 200,205 ****
--- 200,207 ----
          if entry:
            break
  
+     return entry
+ 
    #
    # findAndChangeFocus
    #
***************
*** 823,828 ****
--- 825,832 ----
        nextBlock = self._blockList[self._blockList.index(self._currentBlock)+1]
      except IndexError:
        nextBlock = self._blockList[0]
+ 
+     print "switching to block %s" % nextBlock.name
  
      self.findAndChangeFocus(nextBlock)
  
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.32 gnue/forms/src/GFInstance.py:1.33
*** gnue/forms/src/GFInstance.py:1.32   Sun Feb 17 19:34:57 2002
--- gnue/forms/src/GFInstance.py        Mon Feb 18 13:17:44 2002
***************
*** 157,162 ****
--- 157,163 ----
        # Refresh entry display if appropriate
        if event.refreshDisplay:
          handler.generateRefreshEvent()
+         self.updateRecordStatus()
  
        # If the entry needs an error message displayed,
        # then the proxied event should set this to the
***************
*** 576,590 ****
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateRecordCounter()
- ##
- ##  def replaceValue(self,event):
- ##    replacement = ""
- ##    object = event.data[0]
- ##    value = event.data[1]
- ##    self._form.replaceValue(object,value)
- ##
- ##    # Hack!
- ##    
self.dispatchEvent(GFEvent('updateDETAILBLOCK',self._form._currentBlock))
  
    #
    # fireTrigger
--- 577,582 ----
***************
*** 593,612 ****
      self._form.fireTrigger(event.data)
  
  
- ##  def toggleCheckBox(self, event):
- ##    object = event.data[0]
- ##    value = event.data[1]
- ##    object.setValue(value)
  
    #
    #  Activate this puppy...
    #
    def activate(self):
      ui = self._uiinstance =  
self._uimodule.GFUserInterface(self.eventController, self._disableSplash)
- ##    ui = self._uiinstance
- ##    ui.registerEventListener(self.processEvent)
- ##    self.registerEventListener(ui.processEvent)
- 
      ui.buildForm(self._form)
      ui.activateForm(self._form)
  
--- 585,596 ----