[gnue] r10249 - in trunk/gnue-forms: . src/GFObjects
[email protected] Thu, 2 Dec 2010 09:05:31 -0600 (CST)
| Newsgroups | gmane.comp.cms.gnue.cvs |
|---|---|
| Message-ID | <[email protected]> |
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=C3=BCller <[email protected]> properties:=20 branch-nick: forms + timestamp: 2010-12-02 15:52:10.857000113 +0100 committer: Reinhard M=C3=BCller <[email protected]> properties:=20 branch-nick: forms Name: bzr:file-ids - src/GFInstance.py 1201@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2F= gnue-forms:src%2FGFInstance.py + src/GFObjects/GFBlock.py 1459@3a364389-8fce-0310-8f11-cc363fde16c7:t= runk%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-8= fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10059 + src/GFObjects/GFBlock.py [email protected]= -kou0f0zchuws25al Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/GFObjects/GFBlock.py 2010-12-02 12:53:11 UTC (re= v 10248) +++ trunk/gnue-forms/src/GFObjects/GFBlock.py 2010-12-02 15:05:31 UTC (re= v 10249) @@ -472,16 +472,17 @@ record. """ =20 - if self.__visible_start =3D=3D 0 and adjustment < 0: - # Already at top: move database cursor instead of scrolling. - self.jump_records(adjustment) - return + if self.__resultset.getRecordNumber() !=3D -1: + if self.__visible_start =3D=3D 0 and adjustment < 0: + # Already at top: move database cursor instead of scroll= ing. + self.jump_records(adjustment) + return =20 - if self.__visible_start + self._rows >=3D self.__record_count \ - and adjustment > 0: - # Already at bottom: move database cursor instead of scrolli= ng. - self.jump_records(adjustment) - return + if self.__visible_start + self._rows >=3D self.__record_coun= t \ + and adjustment > 0: + # Already at bottom: move database cursor instead of scr= olling. + self.jump_records(adjustment) + return =20 self._event_scroll_to_record(self.__visible_start + adjustment) =20 @@ -864,6 +865,9 @@ @param count: the number of records to move from the current rec= ord. """ =20 + if count =3D=3D 0: + return + if self._dataSourceLink.type =3D=3D 'unbound': return =20 @@ -873,7 +877,13 @@ if self.__resultset is None: return =20 - record_number =3D self.__resultset.getRecordNumber() + count + if self.__resultset.getRecordNumber() =3D=3D -1: + if count > 0: + record_number =3D count + else: + record_number =3D self.__resultset.getRecordCount() - c= ount + else: + record_number =3D self.__resultset.getRecordNumber() + count =20 record_number =3D max(record_number, 0) record_number =3D min(record_number, self.__resultset.getRecordC= ount())