Author: reinhard Date: 2010-12-02 14:47:36 -0600 (Thu, 02 Dec 2010) New Revision: 10250
Modified: trunk/gnue-forms/ trunk/gnue-forms/src/GFObjects/GFObj.py trunk/gnue-forms/src/GFObjects/GFTabStop.py trunk/gnue-forms/src/input/displayHandlers/Cursor.py Log: Some cleanup of GFTabStop._visibleIndex handling in preparation for handling of a _visibleIndex of None. Property changes on: trunk/gnue-forms ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2010-12-02 15:52:10.857000113 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms + timestamp: 2010-12-02 17:00:21.529000044 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms Name: bzr:file-ids - src/GFObjects/GFBlock.py 1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py + src/GFObjects/GFObj.py 1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFObj.py src/GFObjects/GFTabStop.py 3...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFTabStop.py src/input/displayHandlers/Cursor.py 7...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Finput%2FdisplayHandlers%2FCursor.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] + 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] Name: bzr:text-parents - src/GFObjects/GFBlock.py [email protected] + src/GFObjects/GFObj.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10149 src/GFObjects/GFTabStop.py [email protected] src/input/displayHandlers/Cursor.py [email protected] Modified: trunk/gnue-forms/src/GFObjects/GFObj.py =================================================================== --- trunk/gnue-forms/src/GFObjects/GFObj.py 2010-12-02 15:05:31 UTC (rev 10249) +++ trunk/gnue-forms/src/GFObjects/GFObj.py 2010-12-02 20:47:36 UTC (rev 10250) @@ -67,7 +67,6 @@ self.hidden = False self.name = "%s%x" % (("%s" % self.__class__).split('.')[-1][:-2], id(self)) - self._visibleIndex = 0 self._rows = 1 self._gap = 0 self._inits = [self.phase_1_init] Modified: trunk/gnue-forms/src/GFObjects/GFTabStop.py =================================================================== --- trunk/gnue-forms/src/GFObjects/GFTabStop.py 2010-12-02 15:05:31 UTC (rev 10249) +++ trunk/gnue-forms/src/GFObjects/GFTabStop.py 2010-12-02 20:47:36 UTC (rev 10250) @@ -78,6 +78,7 @@ self._gap = 0 self.__first_visible_record = 0 + self._visibleIndex = 0 self.__last_enabled_row = None self.__current_row_enabled = True @@ -733,6 +734,20 @@ self.uiWidget._ui_set_choices_(index, choices) + # ------------------------------------------------------------------------- + # Set the display data for the user interface (while editing) + # ------------------------------------------------------------------------- + + 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, + cursor_position) + if selected_area is not None: + s1, s2 = selected_area + self.uiWidget._ui_set_selected_area_(self._visibleIndex, s1, s2) + + # ============================================================================= # Exceptions # ============================================================================= Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py =================================================================== --- trunk/gnue-forms/src/input/displayHandlers/Cursor.py 2010-12-02 15:05:31 UTC (rev 10249) +++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py 2010-12-02 20:47:36 UTC (rev 10250) @@ -122,16 +122,9 @@ else: cursor=self._cursor - index = self.entry._visibleIndex + self.entry.ui_set_display_data(self.display, cursor, + self.getSelectionArea()) - self.entry.uiWidget._ui_set_value_(index, self.display) - self.entry.uiWidget._ui_set_cursor_position_(index, cursor) - - selection = self.getSelectionArea() - if selection is not None: - selection1, selection2 = selection - self.entry.uiWidget._ui_set_selected_area_(index, selection1, selection2) - ##################### # # Editing methods _______________________________________________ commit-gnue mailing list [email protected] http://lists.gnu.org/mailman/listinfo/commit-gnue
