gnue/forms samples/intro/intro.gfd src/GFInstan...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/05/20 17:42:23

Modified files:
        forms/samples/intro: intro.gfd 
        forms/src      : GFInstance.py GFKeyMapper.py 

Log message:
        implementing NEXTPAGE/PREVPAGE

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/intro/intro.gfd.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFKeyMapper.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: gnue/forms/samples/intro/intro.gfd
diff -c gnue/forms/samples/intro/intro.gfd:1.19 
gnue/forms/samples/intro/intro.gfd:1.20
*** gnue/forms/samples/intro/intro.gfd:1.19     Thu Feb 27 01:59:24 2003
--- gnue/forms/samples/intro/intro.gfd  Tue May 20 17:42:23 2003
***************
*** 89,98 ****
  SampleBlock.FortuneEntry.set(val)
  ]]></trigger>
    <logic>
-     <block name="Block_1">
-       <field name="Entry_1" default="Press 'Page Down' for a demo"/>
-     </block>
      <block name="SampleBlock">
        <field name="NameEntry">
          <trigger name="Trigger_1" src="PigLatin" type="PRE-FOCUSOUT"/>
        </field>
--- 89,96 ----
  SampleBlock.FortuneEntry.set(val)
  ]]></trigger>
    <logic>
      <block name="SampleBlock">
+       <field name="Entry_1" default="Press 'Ctrl+Page Down' for a demo"/>
        <field name="NameEntry">
          <trigger name="Trigger_1" src="PigLatin" type="PRE-FOCUSOUT"/>
        </field>
***************
*** 118,124 ****
               c:x="3" c:y="6"/>
        <label name="Label_10" text="or by typing 'gnue-forms &lt;file&gt;'."
               c:width="34" c:x="3" c:y="7"/>
!       <entry block="Block_1" field="Entry_1" c:width="34" c:x="3" c:y="9"/>
      </page>
      <page name="Sample">
        <box name="Box_2" c:height="8" label="Sample" c:width="38" c:x="1"
--- 116,122 ----
               c:x="3" c:y="6"/>
        <label name="Label_10" text="or by typing 'gnue-forms &lt;file&gt;'."
               c:width="34" c:x="3" c:y="7"/>
!       <entry block="SampleBlock" field="Entry_1" c:width="34" c:x="3" 
c:y="9"/>
      </page>
      <page name="Sample">
        <box name="Box_2" c:height="8" label="Sample" c:width="38" c:x="1"
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.111 gnue/forms/src/GFInstance.py:1.112
*** gnue/forms/src/GFInstance.py:1.111  Mon May 19 20:13:50 2003
--- gnue/forms/src/GFInstance.py        Tue May 20 17:42:23 2003
***************
*** 70,75 ****
--- 70,77 ----
                             # Focus-related events
                             'requestNEXTENTRY'    : self.nextEntry,
                             'requestPREVENTRY'    : self.previousEntry,
+                            'requestNEXTPAGE'    : self.nextPage,
+                            'requestPREVPAGE'    : self.previousPage,
                             'requestNEXTBLOCK'    : self.nextBlock,
                             'requestPREVBLOCK'    : self.previousBlock,
                             'requestFIRSTRECORD'  : self.firstRecord,
***************
*** 536,541 ****
--- 538,573 ----
      if not event._form.endEditing():
        return
      event._form.previousBlock()
+     self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
+     self.updateStatus(event._form)
+ 
+   #
+   # nextPage
+   #
+   # Called to make the form jump to the next page
+   #
+   def nextPage(self,event):
+     if not event._form.endEditing():
+       return
+     currentIndex = 
event._form._layout._pageList.index(event._form._currentPage)
+     if currentIndex == len(event._form._layout._pageList)-1:
+       nextIndex = 0
+     else:
+       nextIndex = currentIndex+1
+     event._form.findAndChangeFocus(event._form._layout._pageList[nextIndex])
+     self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
+     self.updateStatus(event._form)
+ 
+   #
+   # previousPage
+   #
+   # Called to make the form jump to the previous page
+   #
+   def previousPage(self,event):
+     if not event._form.endEditing():
+       return
+     currentIndex = 
event._form._layout._pageList.index(event._form._currentPage)
+     
event._form.findAndChangeFocus(event._form._layout._pageList[currentIndex-1])
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
      self.updateStatus(event._form)
  
Index: gnue/forms/src/GFKeyMapper.py
diff -c gnue/forms/src/GFKeyMapper.py:1.18 gnue/forms/src/GFKeyMapper.py:1.19
*** gnue/forms/src/GFKeyMapper.py:1.18  Mon Mar 10 17:40:13 2003
--- gnue/forms/src/GFKeyMapper.py       Tue May 20 17:42:23 2003
***************
*** 272,277 ****
--- 272,279 ----
  DefaultMapping = {
  
        # (Key, Shifted, Ctrl'd, Meta/Alt'd)
+       (vk.PAGEUP,   0, 1, 0) : 'PREVPAGE',
+       (vk.PAGEDOWN, 0, 1, 0) : 'NEXTPAGE',
        (vk.PAGEUP,   0, 0, 0) : 'PREVBLOCK',
        (vk.PAGEDOWN, 0, 0, 0) : 'NEXTBLOCK',
        (vk.TAB,      0, 0, 0) : 'NEXTENTRY',