[gnue] r10250 - in trunk/gnue-forms: . src/GFObjects src/input/displayHandlers

[reinhard]

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 <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2010-12-02 17:00:21.529000044 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/GFObjects/GFBlock.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py

   + src/GFObjects/GFObj.py     
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFObj.py
src/GFObjects/GFTabStop.py      
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFTabStop.py
src/input/displayHandlers/Cursor.py     
address@hidden:trunk%2Fgnue-forms:src%2Finput%2FdisplayHandlers%2FCursor.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
3160 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
3161 address@hidden

Name: bzr:text-parents
   - src/GFObjects/GFBlock.py   address@hidden

   + src/GFObjects/GFObj.py     
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10149
src/GFObjects/GFTabStop.py      address@hidden
src/input/displayHandlers/Cursor.py     address@hidden


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