Author: reinhard Date: 2010-12-02 14:47:44 -0600 (Thu, 02 Dec 2010) New Revision: 10252
Modified: trunk/gnue-forms/ trunk/gnue-forms/src/GFObjects/GFTabStop.py trunk/gnue-forms/src/uidrivers/qt3/widgets/entry.py trunk/gnue-forms/src/uidrivers/qt4/widgets/entry.py trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py Log: Internal variable renaming for consistency. Property changes on: trunk/gnue-forms ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2010-12-02 18:46:43.677000046 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms + timestamp: 2010-12-02 19:02:14.151999950 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms Name: bzr:file-ids - src/GFForm.py 6...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFForm.py src/GFObjects/GFBlock.py 1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py src/GFObjects/GFEntry.py 1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFEntry.py src/GFObjects/GFField.py 1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFField.py src/GFObjects/GFTabStop.py 3...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFTabStop.py src/input/displayHandlers/Checkbox.py 7...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Finput%2FdisplayHandlers%2FCheckbox.py src/input/displayHandlers/Cursor.py 7...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Finput%2FdisplayHandlers%2FCursor.py + src/GFObjects/GFTabStop.py 3...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFTabStop.py src/uidrivers/qt3/widgets/entry.py 8...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt3%2Fwidgets%2Fentry.py src/uidrivers/qt4/widgets/entry.py 9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt4%2Fwidgets%2Fentry.py src/uidrivers/wx/widgets/entry.py 10...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fentry.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] 3160 [email protected] 3161 [email protected] 3162 [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] 3161 [email protected] 3162 [email protected] 3163 [email protected] Name: bzr:text-parents - src/GFForm.py [email protected] src/GFObjects/GFBlock.py [email protected] src/GFObjects/GFEntry.py [email protected] src/GFObjects/GFField.py [email protected] src/input/displayHandlers/Checkbox.py [email protected] + src/uidrivers/qt3/widgets/entry.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10108 src/uidrivers/qt4/widgets/entry.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10108 src/uidrivers/wx/widgets/entry.py [email protected] Modified: trunk/gnue-forms/src/GFObjects/GFTabStop.py =================================================================== --- trunk/gnue-forms/src/GFObjects/GFTabStop.py 2010-12-02 20:47:40 UTC (rev 10251) +++ trunk/gnue-forms/src/GFObjects/GFTabStop.py 2010-12-02 20:47:44 UTC (rev 10252) @@ -77,8 +77,8 @@ self._rows = 1 self._gap = 0 - self.__first_visible_record = 0 - self._visibleIndex = 0 + self.__visible_offset = 0 + self.__visible_index = 0 self.__last_enabled_row = None self.__current_row_enabled = True @@ -140,11 +140,11 @@ # another window to this one. We don't need to do anything in this # case. if self._form.get_focus_object() is self \ - and index == self._visibleIndex: + and index == self.__visible_index: return self._form._event_focus_changed(self, - self.__first_visible_record + index) + self.__visible_offset + index) # ------------------------------------------------------------------------- @@ -249,7 +249,7 @@ record number currently visible in the entry, or None if no record is visible (because there is no current record). """ - return self.__first_visible_record + return self.__visible_offset @property def visible_index(self): @@ -263,7 +263,7 @@ If this entry is not part of a grid, this property always contains 0. """ - return self._visibleIndex + return self.__visible_index # ------------------------------------------------------------------------- # Recalculate the visible index of an object @@ -274,7 +274,7 @@ Process a record pointer movement or a result set change for this entry. - This function sets the C{_visibleIndex} property of this entry. It also + This function sets the C{visible_index} property of this entry. It also takes care of disabling rows of this entry that are outside the actual number of available records, and it redisplays the contents of the entry as needed. @@ -297,9 +297,9 @@ if self._form.get_focus_object() is self: self.ui_focus_out() try: - old_visible_index = self._visibleIndex + old_visible_index = self.__visible_index - index = min(max(self._visibleIndex + adjustment, 0), + index = min(max(self.__visible_index + adjustment, 0), int(self._rows)-1) # Don't let the index pass the number of records @@ -312,7 +312,7 @@ if cur_record == 0: index = 0 - self._visibleIndex = index + self.__visible_index = index if self.uiWidget is not None: if self.__last_enabled_row is None: @@ -325,7 +325,7 @@ self.uiWidget._ui_set_enabled_(old_visible_index, True) self.__current_row_enabled = True - last_enabled_row = self._visibleIndex + \ + last_enabled_row = self.__visible_index + \ (rec_count - cur_record) - 1 last_enabled_row = min(last_enabled_row, self._rows - 1) @@ -341,19 +341,19 @@ # Disable current row if current record is -1 if cur_record == -1: - self.uiWidget._ui_set_enabled_(self._visibleIndex, False) + self.uiWidget._ui_set_enabled_(self.__visible_index, False) self.__current_row_enabled = False - first_visible_record = cur_record - self._visibleIndex - if first_visible_record != self.__first_visible_record: + first_visible_record = cur_record - self.__visible_index + if first_visible_record != self.__visible_offset: # If we have scrolled, redisplay all records refresh_start = 0 - self.__first_visible_record = first_visible_record + self.__visible_offset = first_visible_record else: if refresh == 'all': refresh_start = 0 elif refresh == 'current': - refresh_start = max(old_visible_index, self._visibleIndex) + refresh_start = max(old_visible_index, self.__visible_index) else: refresh_start = None @@ -449,7 +449,7 @@ Move the UI and GF focus to this object. """ - self._form.change_focus(self, self.__first_visible_record + index) + self._form.change_focus(self, self.__visible_offset + index) # ------------------------------------------------------------------------- @@ -522,7 +522,7 @@ focus. """ - self.uiWidget._ui_set_focus_(self._visibleIndex) + self.uiWidget._ui_set_focus_(self.__visible_index) # ------------------------------------------------------------------------- @@ -539,7 +539,7 @@ grid. """ - self.uiWidget._ui_focus_in_(self._visibleIndex) + self.uiWidget._ui_focus_in_(self.__visible_index) # ------------------------------------------------------------------------- @@ -560,7 +560,7 @@ (and the focus moves from the dropdown entry to the dropdown list). """ - self.uiWidget._ui_focus_out_(self._visibleIndex) + self.uiWidget._ui_focus_out_(self.__visible_index) # ------------------------------------------------------------------------- @@ -571,7 +571,7 @@ """ if self.__current_row_enabled: - self.uiWidget._ui_set_current_row_(self._visibleIndex) + self.uiWidget._ui_set_current_row_(self.__visible_index) else: self.uiWidget._ui_set_current_row_(-1) @@ -648,7 +648,7 @@ the database cursor is moved implicitly throug the set_focus magic. """ - self._block.jump_records(index - self._visibleIndex) + self._block.goto_record(self.visible_offset + index) # ------------------------------------------------------------------------- @@ -673,29 +673,29 @@ def cut(self): - if self.uiWidget is not None: - self.uiWidget._ui_cut_(self._visibleIndex) + if self.uiWidget is not None and self.visible_index is not None: + self.uiWidget._ui_cut_(self.visible_index) # ------------------------------------------------------------------------- def copy(self): - if self.uiWidget is not None: - self.uiWidget._ui_copy_(self._visibleIndex) + if self.uiWidget is not None and self.visible_index is not None: + self.uiWidget._ui_copy_(self.visible_index) # ------------------------------------------------------------------------- def paste(self): - if self.uiWidget is not None: - self.uiWidget._ui_paste_(self._visibleIndex) + if self.uiWidget is not None and self.visible_index is not None: + self.uiWidget._ui_paste_(self.visible_index) # ------------------------------------------------------------------------- def select_all(self): - if self.uiWidget is not None: - self.uiWidget._ui_select_all_(self._visibleIndex) + if self.uiWidget is not None and self.visible_index is not None: + self.uiWidget._ui_select_all_(self.visible_index) # ------------------------------------------------------------------------- @@ -725,7 +725,7 @@ def refresh_ui_current(self): - self.refresh_ui(self._visibleIndex, self._visibleIndex) + self.refresh_ui(self.visible_index, self.visible_index) # ------------------------------------------------------------------------- @@ -748,7 +748,7 @@ for index in range (from_index, to_index + 1): # Do not execute if we were editing - would overwrite unsaved change - if not (index == self._visibleIndex \ + if not (index == self.visible_index \ and self._displayHandler.editing): try: value = self._field.get_value(self.visible_offset + index) @@ -774,12 +774,12 @@ def ui_set_display_data(self, value, cursor_position, selected_area): - self.uiWidget._ui_set_value_(self._visibleIndex, value) - self.uiWidget._ui_set_cursor_position_(self._visibleIndex, + self.uiWidget._ui_set_value_(self.visible_index, value) + self.uiWidget._ui_set_cursor_position_(self.visible_index, cursor_position) if selected_area is not None: s1, s2 = selected_area - self.uiWidget._ui_set_selected_area_(self._visibleIndex, s1, s2) + self.uiWidget._ui_set_selected_area_(self.visible_index, s1, s2) # ============================================================================= Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/entry.py =================================================================== --- trunk/gnue-forms/src/uidrivers/qt3/widgets/entry.py 2010-12-02 20:47:40 UTC (rev 10251) +++ trunk/gnue-forms/src/uidrivers/qt3/widgets/entry.py 2010-12-02 20:47:44 UTC (rev 10252) @@ -463,7 +463,7 @@ else: # This entry is not focusable, so we at least move the # database cursor to the record behind this entry. - self.ui_widget._gfObject._event_jump_records(index) + self.ui_widget._gfObject._event_goto_record(index) break Modified: trunk/gnue-forms/src/uidrivers/qt4/widgets/entry.py =================================================================== --- trunk/gnue-forms/src/uidrivers/qt4/widgets/entry.py 2010-12-02 20:47:40 UTC (rev 10251) +++ trunk/gnue-forms/src/uidrivers/qt4/widgets/entry.py 2010-12-02 20:47:44 UTC (rev 10252) @@ -428,8 +428,7 @@ else: # This entry is not focusable, so we at least move the # database cursor to the record behind this entry. - self._gfObject._event_jump_records( - self.widgets.index(item)) + self._gfObject._event_goto_record(self.widgets.index(item)) break Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py =================================================================== --- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2010-12-02 20:47:40 UTC (rev 10251) +++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2010-12-02 20:47:44 UTC (rev 10252) @@ -261,8 +261,7 @@ else: # This entry is not focusable, so we at least move the # database cursor to the record behind this entry. - self._gfObject._event_jump_records( - self.widgets.index(item)) + self._gfObject._event_goto_record(self.widgets.index(item)) self._gfObject._event_click() break _______________________________________________ commit-gnue mailing list [email protected] http://lists.gnu.org/mailman/listinfo/commit-gnue
