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 <[email protected]> properties: branch-nick: forms + timestamp: 2010-12-02 15:52:10.857000113 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms Name: bzr:file-ids - src/GFInstance.py 1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFInstance.py + src/GFObjects/GFBlock.py 1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py Name: bzr:revision-id:v4 - 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] 3148 [email protected] 3149 [email protected] 3150 [email protected] 3151 [email protected] 3152 [email protected] 3153 [email protected] 3154 [email protected] 3155 [email protected] 3156 [email protected] 3157 [email protected] 3158 [email protected] 3159 [email protected] + 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] 3148 [email protected] 3149 [email protected] 3150 [email protected] 3151 [email protected] 3152 [email protected] 3153 [email protected] 3154 [email protected] 3155 [email protected] 3156 [email protected] 3157 [email protected] 3158 [email protected] 3159 [email protected] 3160 [email protected] Name: bzr:text-parents - src/GFInstance.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10059 + src/GFObjects/GFBlock.py [email protected] 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()) _______________________________________________ commit-gnue mailing list [email protected] http://lists.gnu.org/mailman/listinfo/commit-gnue
