Added. Allows you to attach an ECompletion to an EEntry, and have that

2001-02-19  Jon Trowbridge  <trow@ximian.com>

        * gal/e-text/e-entry.c (e_entry_enable_completion_full): Added.
        Allows you to attach an ECompletion to an EEntry, and have that
        ECompletion be used for (obviously enough) completions.

        * gal/e-text/e-completion-view.h, gal/e-text/e-completion-view.c:
        Added.  ECompletionView is a widget for displaying the results of
        a completion request in a format that is appropriate for a
        drop-down window.

        * gal/e-text/e-completion.h, gal/e-text/e-completion.c: Added.
        ECompletion is a "pure virtual base class" for completion-type
        operations.  It is implemented so that completions can be either
        synchronous or asynchronous.

        * gal/e-text/e-text.c: Lots of changes to accomodate the
        ETextModel changes.  First of all, we render embedded text objects
        as being underlined.  We also cause the model to emit the
        appropriate object activation signal when an embedded object is
        double-clicked.  Also, all of the code that moves the cursor in
        response to user input has been removed.  Instead, the EText now
        listens for "reposition" events from the underlying model, and
        bases all cursor motions on those.
        (get_bounds_item_relative): Fixed bug in the handling of
        differently-anchored text.  Being differently-anchored is not a
        crime or a perversion --- it is an alternative lifestyle that we
        have to respect.

        * gal/e-text/e-text-model-uri.h, gal/e-text/e-text-model-uri.c: A
        sample ETextModel that converts URIs into embedded objects that
        get opened in the browser when you double-click them.

        * gal/e-text/e-text-model-repos.h,
        gal/e-text/e-text-model-repos.c: Added.  A group of simple
        structures & functions for handling various cursor movement rules.
        These are the sorts of things that are passed as arguments to
        ETextModel "reposition" event handlers.

        * gal/e-text/e-text-model.h, gal/e-text/e-text-model.c: Privitized
        the ETextModel struct and "methodized" all of the operations, so
        that derived classes can do arbitrarily respond to get/set
        requests in arbitrarily strange ways.  Also added the concept of
        declaring regions of the text as "embedded text objects".
        Finally, caused operations that change the text to emit a
        "reposition" signal that passes information that can be used by a
        view (like an EText) to move the cursor or selection in an
        intelligent way in response to those changes.  This means that you
        can now open two ETexts that look at the same ETextModel, and have
        the cursor in one do the right thing when you edit the other.  (As
	opposed to producing a lot of potential segfaults, as it was
	before.)

svn path=/trunk/; revision=8280

1 files changed, 31 insertions, 27 deletions

diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c
index 0b88552a05..9bf73962b0 100644
--- a/widgets/text/e-text-model-test.c
+++ b/widgets/text/e-text-model-test.c
@@ -19,50 +19,54 @@ describe_model (ETextModel *model)
   N = e_text_model_object_count (model);
 
   g_print ("text: %s\n", e_text_model_get_text (model));
-  if (N > 0) {
-    gchar *s = e_text_model_strdup_expanded_text (model);
-    g_print ("expd: %s\n", s);
-    g_free (s);
-  }
   g_print ("objs: %d\n", N);
 
-  for (i=0; i<N; ++i)
-    g_print ("obj%d: %s\n", i, e_text_model_get_nth_object (model, i));
+  for (i=0; i<N; ++i) {
+    gchar *s = e_text_model_strdup_nth_object (model, i);
+    g_print ("obj%d: %s\n", i, s);
+    g_free (s);
+  }
 }
 #endif
 
 int
 main (int argc, gchar **argv)
 {
-  GtkWidget *win, *canvas;
-  GnomeCanvasItem *item;
+  GtkWidget *win[2], *canvas[2];
+  GnomeCanvasItem *item[2];
   ETextModel *model;
+  gint i;
 
   gnome_init ("ETextModelTest", "0.0", argc, argv);
 
   model = e_text_model_uri_new ();
-  e_text_model_set_text (model, "My favorite website is http://www.ximian.com.  My next favorite is http://www.gnome.org.");
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  e_text_model_set_text (model, "My favorite website is http://www.ximian.com.  My next favorite www.assbarn.com.");
+
+  //  describe_model (model);
+  
+  for (i=0; i<2; ++i) {
+    win[i] = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   
-  gtk_widget_push_visual (gdk_rgb_get_visual ());
-  gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-  canvas = e_canvas_new ();
-  gtk_widget_pop_visual ();
-  gtk_widget_pop_colormap ();
+    gtk_widget_push_visual (gdk_rgb_get_visual ());
+    gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+    canvas[i] = e_canvas_new ();
+    gtk_widget_pop_visual ();
+    gtk_widget_pop_colormap ();
 
-  item = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-				e_text_get_type (),
-				"model", model,
-				"font", "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1",
-				"anchor", GTK_ANCHOR_SOUTH_WEST,
-				"line_wrap", TRUE,
-				"width", 150.0,
-				"editable", TRUE,
-				NULL);
+    item[i] = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas[i])),
+				     e_text_get_type (),
+				     "model", model,
+				     "font", "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1",
+				     "anchor", GTK_ANCHOR_NORTH,
+				     "line_wrap", TRUE,
+				     "width", 150.0,
+				     "editable", TRUE,
+				     NULL);
 
-  gtk_container_add (GTK_CONTAINER (win), canvas);
-  gtk_widget_show_all (win);
+    gtk_container_add (GTK_CONTAINER (win[i]), canvas[i]);
+    gtk_widget_show_all (win[i]);
+  }
 
   gtk_main ();