[gnue] r7926 - trunk/gnue-forms/src/uidrivers/gtk2/widgets

[johannes]

Author: johannes
Date: 2005-09-20 03:08:56 -0500 (Tue, 20 Sep 2005)
New Revision: 7926

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
Log:
Fixed some issues of multiline-edits


Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2005-09-20 
08:03:35 UTC (rev 7925)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2005-09-20 
08:08:56 UTC (rev 7926)
@@ -189,7 +189,7 @@
   def __createTextView (self, gfObject, event):
 
     newWidget = gtk.TextView ()
-    newWidget.set_wrap_mode (gtk.WRAP_CHAR)
+    # newWidget.set_wrap_mode (gtk.WRAP_CHAR)
     newWidget.set_pixels_above_lines (2)
     newWidget.set_left_margin (2)
 
@@ -197,7 +197,8 @@
       newWidget.set_editable (False)
 
     viewport  = gtk.ScrolledWindow ()
-    viewport.add_with_viewport (newWidget)
+    viewport.set_shadow_type (gtk.SHADOW_IN)
+    viewport.add (newWidget)
     viewport.set_policy (gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
     viewport.set_size_request (self.itemWidth, self.itemHeight)
 
@@ -224,7 +225,6 @@
     return newWidget
 
 
-
   # ---------------------------------------------------------------------------
   # Create a new text entry widget
   # ---------------------------------------------------------------------------
@@ -274,9 +274,10 @@
       entry.set_position (position)
 
     elif isinstance (entry, gtk.TextView):
+      entry.set_cursor_visible (True)
+
       tBuffer = widget.get_buffer ()
       tBuffer.place_cursor (tBuffer.get_iter_at_offset (position))
-      entry.set_cursor_visible (True)
       entry.scroll_mark_onscreen (tBuffer.get_insert ())
 
 
@@ -361,20 +362,18 @@
 
   def insertBufferHandler (self, tBuffer, iterator, newtext, length, widget):
 
-    assert gDebug (6, "gtk.TextBuffer insert '%s' at %s" % \
-               (newtext, iterator.get_offset ()))
-
+    position = iterator.get_offset ()
     gfObject = self._uiDriver._WidgetToGFObj [widget]
-    text = unicode (newtext, 'utf-8')
 
-    action = events.Event ('requestINSERTAT', text, text = text,
-                           position = iterator.get_offset (),
-                           _form = gfObject._form)
+    assert gDebug (6, "gtk.TextBuffer insert '%s' at %s" % \
+               (newtext, position))
 
+    text = unicode (newtext, 'utf-8')
     tBuffer.stop_emission ('insert-text')
-    self._eventHandler (action)
 
+    self._request ('INSERTAT', text = text, position = position)
 
+
   # ---------------------------------------------------------------------------
   # Handle deletes in a textView widget
   # ---------------------------------------------------------------------------
@@ -410,25 +409,21 @@
     if event.keyval == gtk.keysyms.Down:
       tBuffer = widget.get_buffer ()
 
-      currLine = tBuffer.get_iter_at_mark (tBuffer.get_insert ()).get_line ()
-      lastLine = tBuffer.get_end_iter ().get_line ()
-
-      if currLine != lastLine:
-        tBuffer.place_cursor (tBuffer.get_iter_at_line (currLine + 1))
+      cIter = tBuffer.get_iter_at_mark (tBuffer.get_insert ())
+      if widget.forward_display_line (cIter):
+        self._request ('CURSORMOVE', position = cIter.get_offset ())
       else:
-        widget.get_toplevel ().child_focus (gtk.DIR_TAB_FORWARD)
+        self._request ('NEXTENTRY')
 
       return True
 
     elif event.keyval == gtk.keysyms.Up:
       tBuffer = widget.get_buffer ()
-      currLine = tBuffer.get_iter_at_mark (tBuffer.get_insert ()).get_line ()
-
-      if currLine > 0:
-        tBuffer.place_cursor (tBuffer.get_iter_at_line (currLine - 1))
-
+      cIter = tBuffer.get_iter_at_mark (tBuffer.get_insert ())
+      if widget.backward_display_line (cIter):
+        self._request ('CURSORMOVE', position = cIter.get_offset ())
       else:
-        widget.get_toplevel ().child_focus (gtk.DIR_TAB_BACKWARD)
+        self._request ('PREVENTRY')
 
       return True