[gnue] r10249 - in trunk/gnue-forms: . src/GFObjects

[reinhard]

Author: reinhard
Date: 2010-12-02 09:05:31 -0600 (Thu, 02 Dec 2010)
New Revision: 10249

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Don't move the record pointer in a grid with the mouse wheel if there is no
current record.



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-12-02 13:51:50.415999889 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2010-12-02 15:52:10.857000113 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/GFInstance.py  address@hidden:trunk%2Fgnue-forms:src%2FGFInstance.py

   + src/GFObjects/GFBlock.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden

Name: bzr:text-parents
   - src/GFInstance.py  
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10059

   + src/GFObjects/GFBlock.py   address@hidden


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2010-12-02 12:53:11 UTC (rev 
10248)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2010-12-02 15:05:31 UTC (rev 
10249)
@@ -472,16 +472,17 @@
             record.
         """
   
-        if self.__visible_start == 0 and adjustment < 0:
-            # Already at top: move database cursor instead of scrolling.
-            self.jump_records(adjustment)
-            return
+        if self.__resultset.getRecordNumber() != -1:
+            if self.__visible_start == 0 and adjustment < 0:
+                # Already at top: move database cursor instead of scrolling.
+                self.jump_records(adjustment)
+                return
 
-        if self.__visible_start + self._rows >= self.__record_count \
-                and adjustment > 0:
-            # Already at bottom: move database cursor instead of scrolling.
-            self.jump_records(adjustment)
-            return
+            if self.__visible_start + self._rows >= self.__record_count \
+                    and adjustment > 0:
+                # Already at bottom: move database cursor instead of scrolling.
+                self.jump_records(adjustment)
+                return
 
         self._event_scroll_to_record(self.__visible_start + adjustment)
 
@@ -864,6 +865,9 @@
         @param count: the number of records to move from the current record.
         """
 
+        if count == 0:
+            return
+
         if self._dataSourceLink.type == 'unbound':
             return
 
@@ -873,7 +877,13 @@
         if self.__resultset is None:
             return
 
-        record_number = self.__resultset.getRecordNumber() + count
+        if self.__resultset.getRecordNumber() == -1:
+            if count > 0:
+                record_number = count
+            else:
+                record_number = self.__resultset.getRecordCount()  - count
+        else:
+            record_number = self.__resultset.getRecordNumber() + count
 
         record_number = max(record_number, 0)
         record_number = min(record_number, self.__resultset.getRecordCount())