LinGui: Add queue save/restore

- 2 instances of libhb are used. One for queue activities and one for scanning
new sources prior to adding to the queue.
- Improve chapter entry usability. In addition to "return" advancing to the
next chapter for editing, up and down arrows will advance to prev/next and
put the cell in edit mode.
- Add an accelerator key to jump to the destination entry box.
- Fix a queue window resize problem.



git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1668 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 1972 insertions, 0 deletions

diff --git a/gtk/src/ghbcellrenderertext.c b/gtk/src/ghbcellrenderertext.c
new file mode 100644
index 000000000..849cdd242
--- /dev/null
+++ b/gtk/src/ghbcellrenderertext.c
@@ -0,0 +1,1972 @@
+/* gtkcellrenderertext.c
+ * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <[email protected]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n-lib.h>
+#include <gtk/gtkmarshal.h>
+//#include <gtk/gtkeditable.h>
+//#include <gtk/gtkentry.h>
+//#include <gtk/gtkintl.h>
+//#include <gtk/gtkprivate.h>
+//#include <gtk/gtktreeprivate.h>
+//#include <gtk/gtkalias.h>
+
+#include "marshalers.h"
+#include "ghbcellrenderertext.h"
+
+#ifdef ENABLE_NLS
+#define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String)
+#else
+#define P_(String) (String)
+#endif
+
+#define I_(string) g_intern_static_string (string)
+
+#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+
+
+
+static void ghb_cell_renderer_text_finalize   (GObject                  *object);
+
+static void ghb_cell_renderer_text_get_property  (GObject                  *object,
+						  guint                     param_id,
+						  GValue                   *value,
+						  GParamSpec               *pspec);
+static void ghb_cell_renderer_text_set_property  (GObject                  *object,
+						  guint                     param_id,
+						  const GValue             *value,
+						  GParamSpec               *pspec);
+static void ghb_cell_renderer_text_get_size   (GtkCellRenderer          *cell,
+					       GtkWidget                *widget,
+					       GdkRectangle             *cell_area,
+					       gint                     *x_offset,
+					       gint                     *y_offset,
+					       gint                     *width,
+					       gint                     *height);
+static void ghb_cell_renderer_text_render     (GtkCellRenderer          *cell,
+					       GdkWindow                *window,
+					       GtkWidget                *widget,
+					       GdkRectangle             *background_area,
+					       GdkRectangle             *cell_area,
+					       GdkRectangle             *expose_area,
+					       GtkCellRendererState      flags);
+
+static GtkCellEditable *ghb_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
+							      GdkEvent             *event,
+							      GtkWidget            *widget,
+							      const gchar          *path,
+							      GdkRectangle         *background_area,
+							      GdkRectangle         *cell_area,
+							      GtkCellRendererState  flags);
+
+enum {
+  EDITED,
+  KEYPRESS,
+  LAST_SIGNAL
+};
+
+enum {
+  PROP_0,
+
+  PROP_TEXT,
+  PROP_MARKUP,
+  PROP_ATTRIBUTES,
+  PROP_SINGLE_PARAGRAPH_MODE,
+  PROP_WIDTH_CHARS,
+  PROP_WRAP_WIDTH,
+  PROP_ALIGN,
+  
+  /* Style args */
+  PROP_BACKGROUND,
+  PROP_FOREGROUND,
+  PROP_BACKGROUND_GDK,
+  PROP_FOREGROUND_GDK,
+  PROP_FONT,
+  PROP_FONT_DESC,
+  PROP_FAMILY,
+  PROP_STYLE,
+  PROP_VARIANT,
+  PROP_WEIGHT,
+  PROP_STRETCH,
+  PROP_SIZE,
+  PROP_SIZE_POINTS,
+  PROP_SCALE,
+  PROP_EDITABLE,
+  PROP_STRIKETHROUGH,
+  PROP_UNDERLINE,
+  PROP_RISE,
+  PROP_LANGUAGE,
+  PROP_ELLIPSIZE,
+  PROP_WRAP_MODE,
+  
+  /* Whether-a-style-arg-is-set args */
+  PROP_BACKGROUND_SET,
+  PROP_FOREGROUND_SET,
+  PROP_FAMILY_SET,
+  PROP_STYLE_SET,
+  PROP_VARIANT_SET,
+  PROP_WEIGHT_SET,
+  PROP_STRETCH_SET,
+  PROP_SIZE_SET,
+  PROP_SCALE_SET,
+  PROP_EDITABLE_SET,
+  PROP_STRIKETHROUGH_SET,
+  PROP_UNDERLINE_SET,
+  PROP_RISE_SET,
+  PROP_LANGUAGE_SET,
+  PROP_ELLIPSIZE_SET,
+  PROP_ALIGN_SET
+};
+
+static guint text_cell_renderer_signals [LAST_SIGNAL];
+
+#define GHB_CELL_RENDERER_TEXT_PATH "gtk-cell-renderer-text-path"
+
+#define GHB_CELL_RENDERER_TEXT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GHB_TYPE_CELL_RENDERER_TEXT, GhbCellRendererTextPrivate))
+
+typedef struct _GhbCellRendererTextPrivate GhbCellRendererTextPrivate;
+struct _GhbCellRendererTextPrivate
+{
+  guint single_paragraph : 1;
+  guint language_set : 1;
+  guint markup_set : 1;
+  guint ellipsize_set : 1;
+  guint align_set : 1;
+  
+  gulong focus_out_id;
+  PangoLanguage *language;
+  PangoEllipsizeMode ellipsize;
+  PangoWrapMode wrap_mode;
+  PangoAlignment align;
+  
+  gulong populate_popup_id;
+  gulong entry_menu_popdown_timeout;
+  gboolean in_entry_menu;
+  
+  gint width_chars;
+  gint wrap_width;
+  
+  GtkWidget *entry;
+};
+
+G_DEFINE_TYPE (GhbCellRendererText, ghb_cell_renderer_text, GTK_TYPE_CELL_RENDERER)
+
+static void
+ghb_cell_renderer_text_init (GhbCellRendererText *celltext)
+{
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (celltext);
+
+  GTK_CELL_RENDERER (celltext)->xalign = 0.0;
+  GTK_CELL_RENDERER (celltext)->yalign = 0.5;
+  GTK_CELL_RENDERER (celltext)->xpad = 2;
+  GTK_CELL_RENDERER (celltext)->ypad = 2;
+  celltext->font_scale = 1.0;
+  celltext->fixed_height_rows = -1;
+  celltext->font = pango_font_description_new ();
+
+  priv->width_chars = -1;
+  priv->wrap_width = -1;
+  priv->wrap_mode = PANGO_WRAP_CHAR;
+  priv->align = PANGO_ALIGN_LEFT;
+  priv->align_set = FALSE;
+}
+
+static void
+ghb_cell_renderer_text_class_init (GhbCellRendererTextClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
+
+  object_class->finalize = ghb_cell_renderer_text_finalize;
+  
+  object_class->get_property = ghb_cell_renderer_text_get_property;
+  object_class->set_property = ghb_cell_renderer_text_set_property;
+
+  cell_class->get_size = ghb_cell_renderer_text_get_size;
+  cell_class->render = ghb_cell_renderer_text_render;
+  cell_class->start_editing = ghb_cell_renderer_text_start_editing;
+
+  g_object_class_install_property (object_class,
+                                   PROP_TEXT,
+                                   g_param_spec_string ("text",
+                                                        P_("Text"),
+                                                        P_("Text to render"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_MARKUP,
+                                   g_param_spec_string ("markup",
+                                                        P_("Markup"),
+                                                        P_("Marked up text to render"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  g_object_class_install_property (object_class,
+				   PROP_ATTRIBUTES,
+				   g_param_spec_boxed ("attributes",
+						       P_("Attributes"),
+						       P_("A list of style attributes to apply to the text of the renderer"),
+						       PANGO_TYPE_ATTR_LIST,
+						       GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_SINGLE_PARAGRAPH_MODE,
+                                   g_param_spec_boolean ("single-paragraph-mode",
+                                                         P_("Single Paragraph Mode"),
+                                                         P_("Whether or not to keep all text in a single paragraph"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+
+  
+  g_object_class_install_property (object_class,
+                                   PROP_BACKGROUND,
+                                   g_param_spec_string ("background",
+                                                        P_("Background color name"),
+                                                        P_("Background color as a string"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_BACKGROUND_GDK,
+                                   g_param_spec_boxed ("background-gdk",
+                                                       P_("Background color"),
+                                                       P_("Background color as a GdkColor"),
+                                                       GDK_TYPE_COLOR,
+                                                       GTK_PARAM_READWRITE));  
+
+  g_object_class_install_property (object_class,
+                                   PROP_FOREGROUND,
+                                   g_param_spec_string ("foreground",
+                                                        P_("Foreground color name"),
+                                                        P_("Foreground color as a string"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_FOREGROUND_GDK,
+                                   g_param_spec_boxed ("foreground-gdk",
+                                                       P_("Foreground color"),
+                                                       P_("Foreground color as a GdkColor"),
+                                                       GDK_TYPE_COLOR,
+                                                       GTK_PARAM_READWRITE));
+
+
+  g_object_class_install_property (object_class,
+                                   PROP_EDITABLE,
+                                   g_param_spec_boolean ("editable",
+                                                         P_("Editable"),
+                                                         P_("Whether the text can be modified by the user"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_FONT,
+                                   g_param_spec_string ("font",
+                                                        P_("Font"),
+                                                        P_("Font description as a string, e.g. \"Sans Italic 12\""),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_FONT_DESC,
+                                   g_param_spec_boxed ("font-desc",
+                                                       P_("Font"),
+                                                       P_("Font description as a PangoFontDescription struct"),
+                                                       PANGO_TYPE_FONT_DESCRIPTION,
+                                                       GTK_PARAM_READWRITE));
+
+  
+  g_object_class_install_property (object_class,
+                                   PROP_FAMILY,
+                                   g_param_spec_string ("family",
+                                                        P_("Font family"),
+                                                        P_("Name of the font family, e.g. Sans, Helvetica, Times, Monospace"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_STYLE,
+                                   g_param_spec_enum ("style",
+                                                      P_("Font style"),
+                                                      P_("Font style"),
+                                                      PANGO_TYPE_STYLE,
+                                                      PANGO_STYLE_NORMAL,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_VARIANT,
+                                   g_param_spec_enum ("variant",
+                                                     P_("Font variant"),
+                                                     P_("Font variant"),
+                                                      PANGO_TYPE_VARIANT,
+                                                      PANGO_VARIANT_NORMAL,
+                                                      GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_WEIGHT,
+                                   g_param_spec_int ("weight",
+                                                     P_("Font weight"),
+                                                     P_("Font weight"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     PANGO_WEIGHT_NORMAL,
+                                                     GTK_PARAM_READWRITE));
+
+   g_object_class_install_property (object_class,
+                                   PROP_STRETCH,
+                                   g_param_spec_enum ("stretch",
+                                                      P_("Font stretch"),
+                                                      P_("Font stretch"),
+                                                      PANGO_TYPE_STRETCH,
+                                                      PANGO_STRETCH_NORMAL,
+                                                      GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_SIZE,
+                                   g_param_spec_int ("size",
+                                                     P_("Font size"),
+                                                     P_("Font size"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_SIZE_POINTS,
+                                   g_param_spec_double ("size-points",
+                                                        P_("Font points"),
+                                                        P_("Font size in points"),
+                                                        0.0,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GTK_PARAM_READWRITE));  
+
+  g_object_class_install_property (object_class,
+                                   PROP_SCALE,
+                                   g_param_spec_double ("scale",
+                                                        P_("Font scale"),
+                                                        P_("Font scaling factor"),
+                                                        0.0,
+                                                        G_MAXDOUBLE,
+                                                        1.0,
+                                                        GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_RISE,
+                                   g_param_spec_int ("rise",
+                                                     P_("Rise"),
+                                                     P_("Offset of text above the baseline "
+							"(below the baseline if rise is negative)"),
+                                                     -G_MAXINT,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+
+  g_object_class_install_property (object_class,
+                                   PROP_STRIKETHROUGH,
+                                   g_param_spec_boolean ("strikethrough",
+                                                         P_("Strikethrough"),
+                                                         P_("Whether to strike through the text"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_UNDERLINE,
+                                   g_param_spec_enum ("underline",
+                                                      P_("Underline"),
+                                                      P_("Style of underline for this text"),
+                                                      PANGO_TYPE_UNDERLINE,
+                                                      PANGO_UNDERLINE_NONE,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_LANGUAGE,
+                                   g_param_spec_string ("language",
+                                                        P_("Language"),
+                                                        P_("The language this text is in, as an ISO code. "
+							   "Pango can use this as a hint when rendering the text. "
+							   "If you don't understand this parameter, you probably don't need it"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+
+  /**
+   * GhbCellRendererText:ellipsize:
+   *
+   * Specifies the preferred place to ellipsize the string, if the cell renderer 
+   * does not have enough room to display the entire string. Setting it to 
+   * %PANGO_ELLIPSIZE_NONE turns off ellipsizing. See the wrap-width property
+   * for another way of making the text fit into a given width.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_ELLIPSIZE,
+                                   g_param_spec_enum ("ellipsize",
+						      P_("Ellipsize"),
+						      P_("The preferred place to ellipsize the string, "
+							 "if the cell renderer does not have enough room "
+							 "to display the entire string"),
+						      PANGO_TYPE_ELLIPSIZE_MODE,
+						      PANGO_ELLIPSIZE_NONE,
+						      GTK_PARAM_READWRITE));
+
+  /**
+   * GhbCellRendererText:width-chars:
+   * 
+   * The desired width of the cell, in characters. If this property is set to
+   * -1, the width will be calculated automatically, otherwise the cell will
+   * request either 3 characters or the property value, whichever is greater.
+   * 
+   * Since: 2.6
+   **/
+  g_object_class_install_property (object_class,
+                                   PROP_WIDTH_CHARS,
+                                   g_param_spec_int ("width-chars",
+                                                     P_("Width In Characters"),
+                                                     P_("The desired width of the label, in characters"),
+                                                     -1,
+                                                     G_MAXINT,
+                                                     -1,
+                                                     GTK_PARAM_READWRITE));
+  
+  /**
+   * GhbCellRendererText:wrap-mode:
+   *
+   * Specifies how to break the string into multiple lines, if the cell 
+   * renderer does not have enough room to display the entire string. 
+   * This property has no effect unless the wrap-width property is set.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_WRAP_MODE,
+                                   g_param_spec_enum ("wrap-mode",
+						      P_("Wrap mode"),
+						      P_("How to break the string into multiple lines, "
+							 "if the cell renderer does not have enough room "
+							 "to display the entire string"),
+						      PANGO_TYPE_WRAP_MODE,
+						      PANGO_WRAP_CHAR,
+						      GTK_PARAM_READWRITE));
+
+  /**
+   * GhbCellRendererText:wrap-width:
+   *
+   * Specifies the width at which the text is wrapped. The wrap-mode property can 
+   * be used to influence at what character positions the line breaks can be placed.
+   * Setting wrap-width to -1 turns wrapping off.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+				   PROP_WRAP_WIDTH,
+				   g_param_spec_int ("wrap-width",
+						     P_("Wrap width"),
+						     P_("The width at which the text is wrapped"),
+						     -1,
+						     G_MAXINT,
+						     -1,
+						     GTK_PARAM_READWRITE));
+
+  /**
+   * GhbCellRendererText:alignment:
+   *
+   * Specifies how to align the lines of text with respect to each other. 
+   *
+   * Note that this property describes how to align the lines of text in 
+   * case there are several of them. The "xalign" property of #GtkCellRenderer, 
+   * on the other hand, sets the horizontal alignment of the whole text.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_ALIGN,
+                                   g_param_spec_enum ("alignment",
+						      P_("Alignment"),
+						      P_("How to align the lines"),
+						      PANGO_TYPE_ALIGNMENT,
+						      PANGO_ALIGN_LEFT,
+						      GTK_PARAM_READWRITE));
+  
+  /* Style props are set or not */
+
+#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, GTK_PARAM_READWRITE))
+
+  ADD_SET_PROP ("background-set", PROP_BACKGROUND_SET,
+                P_("Background set"),
+                P_("Whether this tag affects the background color"));
+
+  ADD_SET_PROP ("foreground-set", PROP_FOREGROUND_SET,
+                P_("Foreground set"),
+                P_("Whether this tag affects the foreground color"));
+  
+  ADD_SET_PROP ("editable-set", PROP_EDITABLE_SET,
+                P_("Editability set"),
+                P_("Whether this tag affects text editability"));
+
+  ADD_SET_PROP ("family-set", PROP_FAMILY_SET,
+                P_("Font family set"),
+                P_("Whether this tag affects the font family"));  
+
+  ADD_SET_PROP ("style-set", PROP_STYLE_SET,
+                P_("Font style set"),
+                P_("Whether this tag affects the font style"));
+
+  ADD_SET_PROP ("variant-set", PROP_VARIANT_SET,
+                P_("Font variant set"),
+                P_("Whether this tag affects the font variant"));
+
+  ADD_SET_PROP ("weight-set", PROP_WEIGHT_SET,
+                P_("Font weight set"),
+                P_("Whether this tag affects the font weight"));
+
+  ADD_SET_PROP ("stretch-set", PROP_STRETCH_SET,
+                P_("Font stretch set"),
+                P_("Whether this tag affects the font stretch"));
+
+  ADD_SET_PROP ("size-set", PROP_SIZE_SET,
+                P_("Font size set"),
+                P_("Whether this tag affects the font size"));
+
+  ADD_SET_PROP ("scale-set", PROP_SCALE_SET,
+                P_("Font scale set"),
+                P_("Whether this tag scales the font size by a factor"));
+  
+  ADD_SET_PROP ("rise-set", PROP_RISE_SET,
+                P_("Rise set"),
+                P_("Whether this tag affects the rise"));
+
+  ADD_SET_PROP ("strikethrough-set", PROP_STRIKETHROUGH_SET,
+                P_("Strikethrough set"),
+                P_("Whether this tag affects strikethrough"));
+
+  ADD_SET_PROP ("underline-set", PROP_UNDERLINE_SET,
+                P_("Underline set"),
+                P_("Whether this tag affects underlining"));
+
+  ADD_SET_PROP ("language-set", PROP_LANGUAGE_SET,
+                P_("Language set"),
+                P_("Whether this tag affects the language the text is rendered as"));
+
+  ADD_SET_PROP ("ellipsize-set", PROP_ELLIPSIZE_SET,
+                P_("Ellipsize set"),
+                P_("Whether this tag affects the ellipsize mode"));
+
+  ADD_SET_PROP ("align-set", PROP_ALIGN_SET,
+                P_("Align set"),
+                P_("Whether this tag affects the alignment mode"));
+
+  /**
+   * GhbCellRendererText::edited
+   * @renderer: the object which received the signal
+   * @path: the path identifying the edited cell
+   * @new_text: the new text
+   *
+   * This signal is emitted after @renderer has been edited.
+   *
+   * It is the responsibility of the application to update the model
+   * and store @new_text at the position indicated by @path.
+   */
+  text_cell_renderer_signals [EDITED] =
+    g_signal_new (I_("edited"),
+		  G_OBJECT_CLASS_TYPE (object_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (GhbCellRendererTextClass, edited),
+		  NULL, NULL,
+		  ghb_marshal_VOID__STRING_STRING,
+		  G_TYPE_NONE, 2,
+		  G_TYPE_STRING,
+		  G_TYPE_STRING);
+
+  text_cell_renderer_signals [KEYPRESS] =
+    g_signal_new (I_("key-press-event"),
+		  G_OBJECT_CLASS_TYPE (object_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (GhbCellRendererTextClass, keypress),
+		  NULL, NULL,
+		  ghb_marshal_BOOLEAN__BOXED,
+		  G_TYPE_BOOLEAN, 1,
+		  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+  g_type_class_add_private (object_class, sizeof (GhbCellRendererTextPrivate));
+}
+
+static void
+ghb_cell_renderer_text_finalize (GObject *object)
+{
+  GhbCellRendererText *celltext = GHB_CELL_RENDERER_TEXT (object);
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (object);
+
+  pango_font_description_free (celltext->font);
+
+  g_free (celltext->text);
+
+  if (celltext->extra_attrs)
+    pango_attr_list_unref (celltext->extra_attrs);
+
+  if (priv->language)
+    g_object_unref (priv->language);
+
+  (* G_OBJECT_CLASS (ghb_cell_renderer_text_parent_class)->finalize) (object);
+}
+
+static PangoFontMask
+get_property_font_set_mask (guint prop_id)
+{
+  switch (prop_id)
+    {
+    case PROP_FAMILY_SET:
+      return PANGO_FONT_MASK_FAMILY;
+    case PROP_STYLE_SET:
+      return PANGO_FONT_MASK_STYLE;
+    case PROP_VARIANT_SET:
+      return PANGO_FONT_MASK_VARIANT;
+    case PROP_WEIGHT_SET:
+      return PANGO_FONT_MASK_WEIGHT;
+    case PROP_STRETCH_SET:
+      return PANGO_FONT_MASK_STRETCH;
+    case PROP_SIZE_SET:
+      return PANGO_FONT_MASK_SIZE;
+    }
+
+  return 0;
+}
+
+static void
+ghb_cell_renderer_text_get_property (GObject        *object,
+				     guint           param_id,
+				     GValue         *value,
+				     GParamSpec     *pspec)
+{
+  GhbCellRendererText *celltext = GHB_CELL_RENDERER_TEXT (object);
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (object);
+
+  switch (param_id)
+    {
+    case PROP_TEXT:
+      g_value_set_string (value, celltext->text);
+      break;
+
+    case PROP_ATTRIBUTES:
+      g_value_set_boxed (value, celltext->extra_attrs);
+      break;
+
+    case PROP_SINGLE_PARAGRAPH_MODE:
+      g_value_set_boolean (value, priv->single_paragraph);
+      break;
+
+    case PROP_BACKGROUND_GDK:
+      {
+        GdkColor color;
+        
+        color.red = celltext->background.red;
+        color.green = celltext->background.green;
+        color.blue = celltext->background.blue;
+        
+        g_value_set_boxed (value, &color);
+      }
+      break;
+
+    case PROP_FOREGROUND_GDK:
+      {
+        GdkColor color;
+        
+        color.red = celltext->foreground.red;
+        color.green = celltext->foreground.green;
+        color.blue = celltext->foreground.blue;
+        
+        g_value_set_boxed (value, &color);
+      }
+      break;
+
+    case PROP_FONT:
+        g_value_take_string (value, pango_font_description_to_string (celltext->font));
+      break;
+      
+    case PROP_FONT_DESC:
+      g_value_set_boxed (value, celltext->font);
+      break;
+
+    case PROP_FAMILY:
+      g_value_set_string (value, pango_font_description_get_family (celltext->font));
+      break;
+
+    case PROP_STYLE:
+      g_value_set_enum (value, pango_font_description_get_style (celltext->font));
+      break;
+
+    case PROP_VARIANT:
+      g_value_set_enum (value, pango_font_description_get_variant (celltext->font));
+      break;
+
+    case PROP_WEIGHT:
+      g_value_set_int (value, pango_font_description_get_weight (celltext->font));
+      break;
+
+    case PROP_STRETCH:
+      g_value_set_enum (value, pango_font_description_get_stretch (celltext->font));
+      break;
+
+    case PROP_SIZE:
+      g_value_set_int (value, pango_font_description_get_size (celltext->font));
+      break;
+
+    case PROP_SIZE_POINTS:
+      g_value_set_double (value, ((double)pango_font_description_get_size (celltext->font)) / (double)PANGO_SCALE);
+      break;
+
+    case PROP_SCALE:
+      g_value_set_double (value, celltext->font_scale);
+      break;
+      
+    case PROP_EDITABLE:
+      g_value_set_boolean (value, celltext->editable);
+      break;
+
+    case PROP_STRIKETHROUGH:
+      g_value_set_boolean (value, celltext->strikethrough);
+      break;
+
+    case PROP_UNDERLINE:
+      g_value_set_enum (value, celltext->underline_style);
+      break;
+
+    case PROP_RISE:
+      g_value_set_int (value, celltext->rise);
+      break;  
+
+    case PROP_LANGUAGE:
+      g_value_set_static_string (value, pango_language_to_string (priv->language));
+      break;
+
+    case PROP_ELLIPSIZE:
+      g_value_set_enum (value, priv->ellipsize);
+      break;
+      
+    case PROP_WRAP_MODE:
+      g_value_set_enum (value, priv->wrap_mode);
+      break;
+
+    case PROP_WRAP_WIDTH:
+      g_value_set_int (value, priv->wrap_width);
+      break;
+      
+    case PROP_ALIGN:
+      g_value_set_enum (value, priv->align);
+      break;
+
+    case PROP_BACKGROUND_SET:
+      g_value_set_boolean (value, celltext->background_set);
+      break;
+
+    case PROP_FOREGROUND_SET:
+      g_value_set_boolean (value, celltext->foreground_set);
+      break;
+
+    case PROP_FAMILY_SET:
+    case PROP_STYLE_SET:
+    case PROP_VARIANT_SET:
+    case PROP_WEIGHT_SET:
+    case PROP_STRETCH_SET:
+    case PROP_SIZE_SET:
+      {
+	PangoFontMask mask = get_property_font_set_mask (param_id);
+	g_value_set_boolean (value, (pango_font_description_get_set_fields (celltext->font) & mask) != 0);
+	
+	break;
+      }
+
+    case PROP_SCALE_SET:
+      g_value_set_boolean (value, celltext->scale_set);
+      break;
+      
+    case PROP_EDITABLE_SET:
+      g_value_set_boolean (value, celltext->editable_set);
+      break;
+
+    case PROP_STRIKETHROUGH_SET:
+      g_value_set_boolean (value, celltext->strikethrough_set);
+      break;
+
+    case PROP_UNDERLINE_SET:
+      g_value_set_boolean (value, celltext->underline_set);
+      break;
+
+    case  PROP_RISE_SET:
+      g_value_set_boolean (value, celltext->rise_set);
+      break;
+
+    case PROP_LANGUAGE_SET:
+      g_value_set_boolean (value, priv->language_set);
+      break;
+
+    case PROP_ELLIPSIZE_SET:
+      g_value_set_boolean (value, priv->ellipsize_set);
+      break;
+
+    case PROP_ALIGN_SET:
+      g_value_set_boolean (value, priv->align_set);
+      break;
+      
+    case PROP_WIDTH_CHARS:
+      g_value_set_int (value, priv->width_chars);
+      break;  
+
+    case PROP_BACKGROUND:
+    case PROP_FOREGROUND:
+    case PROP_MARKUP:
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+
+static void
+set_bg_color (GhbCellRendererText *celltext,
+              GdkColor            *color)
+{
+  if (color)
+    {
+      if (!celltext->background_set)
+        {
+          celltext->background_set = TRUE;
+          g_object_notify (G_OBJECT (celltext), "background-set");
+        }
+      
+      celltext->background.red = color->red;
+      celltext->background.green = color->green;
+      celltext->background.blue = color->blue;
+    }
+  else
+    {
+      if (celltext->background_set)
+        {
+          celltext->background_set = FALSE;
+          g_object_notify (G_OBJECT (celltext), "background-set");
+        }
+    }
+}
+
+
+static void
+set_fg_color (GhbCellRendererText *celltext,
+              GdkColor            *color)
+{
+  if (color)
+    {
+      if (!celltext->foreground_set)
+        {
+          celltext->foreground_set = TRUE;
+          g_object_notify (G_OBJECT (celltext), "foreground-set");
+        }
+      
+      celltext->foreground.red = color->red;
+      celltext->foreground.green = color->green;
+      celltext->foreground.blue = color->blue;
+    }
+  else
+    {
+      if (celltext->foreground_set)
+        {
+          celltext->foreground_set = FALSE;
+          g_object_notify (G_OBJECT (celltext), "foreground-set");
+        }
+    }
+}
+
+static PangoFontMask
+set_font_desc_fields (PangoFontDescription *desc,
+		      PangoFontMask         to_set)
+{
+  PangoFontMask changed_mask = 0;
+  
+  if (to_set & PANGO_FONT_MASK_FAMILY)
+    {
+      const char *family = pango_font_description_get_family (desc);
+      if (!family)
+	{
+	  family = "sans";
+	  changed_mask |= PANGO_FONT_MASK_FAMILY;
+	}
+
+      pango_font_description_set_family (desc, family);
+    }
+  if (to_set & PANGO_FONT_MASK_STYLE)
+    pango_font_description_set_style (desc, pango_font_description_get_style (desc));
+  if (to_set & PANGO_FONT_MASK_VARIANT)
+    pango_font_description_set_variant (desc, pango_font_description_get_variant (desc));
+  if (to_set & PANGO_FONT_MASK_WEIGHT)
+    pango_font_description_set_weight (desc, pango_font_description_get_weight (desc));
+  if (to_set & PANGO_FONT_MASK_STRETCH)
+    pango_font_description_set_stretch (desc, pango_font_description_get_stretch (desc));
+  if (to_set & PANGO_FONT_MASK_SIZE)
+    {
+      gint size = pango_font_description_get_size (desc);
+      if (size <= 0)
+	{
+	  size = 10 * PANGO_SCALE;
+	  changed_mask |= PANGO_FONT_MASK_SIZE;
+	}
+      
+      pango_font_description_set_size (desc, size);
+    }
+
+  return changed_mask;
+}
+
+static void
+notify_set_changed (GObject       *object,
+		    PangoFontMask  changed_mask)
+{
+  if (changed_mask & PANGO_FONT_MASK_FAMILY)
+    g_object_notify (object, "family-set");
+  if (changed_mask & PANGO_FONT_MASK_STYLE)
+    g_object_notify (object, "style-set");
+  if (changed_mask & PANGO_FONT_MASK_VARIANT)
+    g_object_notify (object, "variant-set");
+  if (changed_mask & PANGO_FONT_MASK_WEIGHT)
+    g_object_notify (object, "weight-set");
+  if (changed_mask & PANGO_FONT_MASK_STRETCH)
+    g_object_notify (object, "stretch-set");
+  if (changed_mask & PANGO_FONT_MASK_SIZE)
+    g_object_notify (object, "size-set");
+}
+
+static void
+notify_fields_changed (GObject       *object,
+		       PangoFontMask  changed_mask)
+{
+  if (changed_mask & PANGO_FONT_MASK_FAMILY)
+    g_object_notify (object, "family");
+  if (changed_mask & PANGO_FONT_MASK_STYLE)
+    g_object_notify (object, "style");
+  if (changed_mask & PANGO_FONT_MASK_VARIANT)
+    g_object_notify (object, "variant");
+  if (changed_mask & PANGO_FONT_MASK_WEIGHT)
+    g_object_notify (object, "weight");
+  if (changed_mask & PANGO_FONT_MASK_STRETCH)
+    g_object_notify (object, "stretch");
+  if (changed_mask & PANGO_FONT_MASK_SIZE)
+    g_object_notify (object, "size");
+}
+
+static void
+set_font_description (GhbCellRendererText  *celltext,
+                      PangoFontDescription *font_desc)
+{
+  GObject *object = G_OBJECT (celltext);
+  PangoFontDescription *new_font_desc;
+  PangoFontMask old_mask, new_mask, changed_mask, set_changed_mask;
+  
+  if (font_desc)
+    new_font_desc = pango_font_description_copy (font_desc);
+  else
+    new_font_desc = pango_font_description_new ();
+
+  old_mask = pango_font_description_get_set_fields (celltext->font);
+  new_mask = pango_font_description_get_set_fields (new_font_desc);
+
+  changed_mask = old_mask | new_mask;
+  set_changed_mask = old_mask ^ new_mask;
+
+  pango_font_description_free (celltext->font);
+  celltext->font = new_font_desc;
+  
+  g_object_freeze_notify (object);
+
+  g_object_notify (object, "font-desc");
+  g_object_notify (object, "font");
+  
+  if (changed_mask & PANGO_FONT_MASK_FAMILY)
+    g_object_notify (object, "family");
+  if (changed_mask & PANGO_FONT_MASK_STYLE)
+    g_object_notify (object, "style");
+  if (changed_mask & PANGO_FONT_MASK_VARIANT)
+    g_object_notify (object, "variant");
+  if (changed_mask & PANGO_FONT_MASK_WEIGHT)
+    g_object_notify (object, "weight");
+  if (changed_mask & PANGO_FONT_MASK_STRETCH)
+    g_object_notify (object, "stretch");
+  if (changed_mask & PANGO_FONT_MASK_SIZE)
+    {
+      g_object_notify (object, "size");
+      g_object_notify (object, "size-points");
+    }
+
+  notify_set_changed (object, set_changed_mask);
+  
+  g_object_thaw_notify (object);
+}
+
+static void
+ghb_cell_renderer_text_set_property (GObject      *object,
+				     guint         param_id,
+				     const GValue *value,
+				     GParamSpec   *pspec)
+{
+  GhbCellRendererText *celltext = GHB_CELL_RENDERER_TEXT (object);
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (object);
+
+  switch (param_id)
+    {
+    case PROP_TEXT:
+      g_free (celltext->text);
+
+      if (priv->markup_set)
+        {
+          if (celltext->extra_attrs)
+            pango_attr_list_unref (celltext->extra_attrs);
+          celltext->extra_attrs = NULL;
+          priv->markup_set = FALSE;
+        }
+
+      celltext->text = g_strdup (g_value_get_string (value));
+      g_object_notify (object, "text");
+      break;
+
+    case PROP_ATTRIBUTES:
+      if (celltext->extra_attrs)
+	pango_attr_list_unref (celltext->extra_attrs);
+
+      celltext->extra_attrs = g_value_get_boxed (value);
+      if (celltext->extra_attrs)
+        pango_attr_list_ref (celltext->extra_attrs);
+      break;
+    case PROP_MARKUP:
+      {
+	const gchar *str;
+	gchar *text = NULL;
+	GError *error = NULL;
+	PangoAttrList *attrs = NULL;
+
+	str = g_value_get_string (value);
+	if (str && !pango_parse_markup (str,
+					-1,
+					0,
+					&attrs,
+					&text,
+					NULL,
+					&error))
+	  {
+	    g_warning ("Failed to set text from markup due to error parsing markup: %s",
+		       error->message);
+	    g_error_free (error);
+	    return;
+	  }
+
+	g_free (celltext->text);
+
+	if (celltext->extra_attrs)
+	  pango_attr_list_unref (celltext->extra_attrs);
+
+	celltext->text = text;
+	celltext->extra_attrs = attrs;
+        priv->markup_set = TRUE;
+      }
+      break;
+
+    case PROP_SINGLE_PARAGRAPH_MODE:
+      priv->single_paragraph = g_value_get_boolean (value);
+      break;
+      
+    case PROP_BACKGROUND:
+      {
+        GdkColor color;
+
+        if (!g_value_get_string (value))
+          set_bg_color (celltext, NULL);       /* reset to background_set to FALSE */
+        else if (gdk_color_parse (g_value_get_string (value), &color))
+          set_bg_color (celltext, &color);
+        else
+          g_warning ("Don't know color `%s'", g_value_get_string (value));
+
+        g_object_notify (object, "background-gdk");
+      }
+      break;
+      
+    case PROP_FOREGROUND:
+      {
+        GdkColor color;
+
+        if (!g_value_get_string (value))
+          set_fg_color (celltext, NULL);       /* reset to foreground_set to FALSE */
+        else if (gdk_color_parse (g_value_get_string (value), &color))
+          set_fg_color (celltext, &color);
+        else
+          g_warning ("Don't know color `%s'", g_value_get_string (value));
+
+        g_object_notify (object, "foreground-gdk");
+      }
+      break;
+
+    case PROP_BACKGROUND_GDK:
+      /* This notifies the GObject itself. */
+      set_bg_color (celltext, g_value_get_boxed (value));
+      break;
+
+    case PROP_FOREGROUND_GDK:
+      /* This notifies the GObject itself. */
+      set_fg_color (celltext, g_value_get_boxed (value));
+      break;
+
+    case PROP_FONT:
+      {
+        PangoFontDescription *font_desc = NULL;
+        const gchar *name;
+
+        name = g_value_get_string (value);
+
+        if (name)
+          font_desc = pango_font_description_from_string (name);
+
+        set_font_description (celltext, font_desc);
+
+	pango_font_description_free (font_desc);
+        
+	if (celltext->fixed_height_rows != -1)
+	  celltext->calc_fixed_height = TRUE;
+      }
+      break;
+
+    case PROP_FONT_DESC:
+      set_font_description (celltext, g_value_get_boxed (value));
+      
+      if (celltext->fixed_height_rows != -1)
+	celltext->calc_fixed_height = TRUE;
+      break;
+
+    case PROP_FAMILY:
+    case PROP_STYLE:
+    case PROP_VARIANT:
+    case PROP_WEIGHT:
+    case PROP_STRETCH:
+    case PROP_SIZE:
+    case PROP_SIZE_POINTS:
+      {
+	PangoFontMask old_set_mask = pango_font_description_get_set_fields (celltext->font);
+	
+	switch (param_id)
+	  {
+	  case PROP_FAMILY:
+	    pango_font_description_set_family (celltext->font,
+					       g_value_get_string (value));
+	    break;
+	  case PROP_STYLE:
+	    pango_font_description_set_style (celltext->font,
+					      g_value_get_enum (value));
+	    break;
+	  case PROP_VARIANT:
+	    pango_font_description_set_variant (celltext->font,
+						g_value_get_enum (value));
+	    break;
+	  case PROP_WEIGHT:
+	    pango_font_description_set_weight (celltext->font,
+					       g_value_get_int (value));
+	    break;
+	  case PROP_STRETCH:
+	    pango_font_description_set_stretch (celltext->font,
+						g_value_get_enum (value));
+	    break;
+	  case PROP_SIZE:
+	    pango_font_description_set_size (celltext->font,
+					     g_value_get_int (value));
+	    g_object_notify (object, "size-points");
+	    break;
+	  case PROP_SIZE_POINTS:
+	    pango_font_description_set_size (celltext->font,
+					     g_value_get_double (value) * PANGO_SCALE);
+	    g_object_notify (object, "size");
+	    break;
+	  }
+	
+	if (celltext->fixed_height_rows != -1)
+	  celltext->calc_fixed_height = TRUE;
+	
+	notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (celltext->font));
+	g_object_notify (object, "font-desc");
+	g_object_notify (object, "font");
+
+	break;
+      }
+      
+    case PROP_SCALE:
+      celltext->font_scale = g_value_get_double (value);
+      celltext->scale_set = TRUE;
+      if (celltext->fixed_height_rows != -1)
+	celltext->calc_fixed_height = TRUE;
+      g_object_notify (object, "scale-set");
+      break;
+      
+    case PROP_EDITABLE:
+      celltext->editable = g_value_get_boolean (value);
+      celltext->editable_set = TRUE;
+      if (celltext->editable)
+        GTK_CELL_RENDERER (celltext)->mode = GTK_CELL_RENDERER_MODE_EDITABLE;
+      else
+        GTK_CELL_RENDERER (celltext)->mode = GTK_CELL_RENDERER_MODE_INERT;
+      g_object_notify (object, "editable-set");
+      break;
+
+    case PROP_STRIKETHROUGH:
+      celltext->strikethrough = g_value_get_boolean (value);
+      celltext->strikethrough_set = TRUE;
+      g_object_notify (object, "strikethrough-set");
+      break;
+
+    case PROP_UNDERLINE:
+      celltext->underline_style = g_value_get_enum (value);
+      celltext->underline_set = TRUE;
+      g_object_notify (object, "underline-set");
+            
+      break;
+
+    case PROP_RISE:
+      celltext->rise = g_value_get_int (value);
+      celltext->rise_set = TRUE;
+      g_object_notify (object, "rise-set");
+      if (celltext->fixed_height_rows != -1)
+	celltext->calc_fixed_height = TRUE;
+      break;  
+
+    case PROP_LANGUAGE:
+      priv->language_set = TRUE;
+      if (priv->language)
+        g_object_unref (priv->language);
+      priv->language = pango_language_from_string (g_value_get_string (value));
+      g_object_notify (object, "language-set");
+      break;
+
+    case PROP_ELLIPSIZE:
+      priv->ellipsize = g_value_get_enum (value);
+      priv->ellipsize_set = TRUE;
+      g_object_notify (object, "ellipsize-set");
+      break;
+      
+    case PROP_WRAP_MODE:
+      priv->wrap_mode = g_value_get_enum (value);
+      break;
+      
+    case PROP_WRAP_WIDTH:
+      priv->wrap_width = g_value_get_int (value);
+      break;
+            
+    case PROP_WIDTH_CHARS:
+      priv->width_chars = g_value_get_int (value);
+      break;  
+
+    case PROP_ALIGN:
+      priv->align = g_value_get_enum (value);
+      priv->align_set = TRUE;
+      g_object_notify (object, "align-set");
+      break;
+
+    case PROP_BACKGROUND_SET:
+      celltext->background_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_FOREGROUND_SET:
+      celltext->foreground_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_FAMILY_SET:
+    case PROP_STYLE_SET:
+    case PROP_VARIANT_SET:
+    case PROP_WEIGHT_SET:
+    case PROP_STRETCH_SET:
+    case PROP_SIZE_SET:
+      if (!g_value_get_boolean (value))
+	{
+	  pango_font_description_unset_fields (celltext->font,
+					       get_property_font_set_mask (param_id));
+	}
+      else
+	{
+	  PangoFontMask changed_mask;
+	  
+	  changed_mask = set_font_desc_fields (celltext->font,
+					       get_property_font_set_mask (param_id));
+	  notify_fields_changed (G_OBJECT (celltext), changed_mask);
+	}
+      break;
+
+    case PROP_SCALE_SET:
+      celltext->scale_set = g_value_get_boolean (value);
+      break;
+      
+    case PROP_EDITABLE_SET:
+      celltext->editable_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_STRIKETHROUGH_SET:
+      celltext->strikethrough_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_UNDERLINE_SET:
+      celltext->underline_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_RISE_SET:
+      celltext->rise_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_LANGUAGE_SET:
+      priv->language_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_ELLIPSIZE_SET:
+      priv->ellipsize_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_ALIGN_SET:
+      priv->align_set = g_value_get_boolean (value);
+      break;
+      
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+/**
+ * ghb_cell_renderer_text_new:
+ * 
+ * Creates a new #GhbCellRendererText. Adjust how text is drawn using
+ * object properties. Object properties can be
+ * set globally (with g_object_set()). Also, with #GtkTreeViewColumn,
+ * you can bind a property to a value in a #GtkTreeModel. For example,
+ * you can bind the "text" property on the cell renderer to a string
+ * value in the model, thus rendering a different string in each row
+ * of the #GtkTreeView
+ * 
+ * Return value: the new cell renderer
+ **/
+GtkCellRenderer *
+ghb_cell_renderer_text_new (void)
+{
+  return g_object_new (GHB_TYPE_CELL_RENDERER_TEXT, NULL);
+}
+
+static void
+add_attr (PangoAttrList  *attr_list,
+          PangoAttribute *attr)
+{
+  attr->start_index = 0;
+  attr->end_index = G_MAXINT;
+  
+  pango_attr_list_insert (attr_list, attr);
+}
+
+static PangoLayout*
+get_layout (GhbCellRendererText *celltext,
+            GtkWidget           *widget,
+            gboolean             will_render,
+            GtkCellRendererState flags)
+{
+  PangoAttrList *attr_list;
+  PangoLayout *layout;
+  PangoUnderline uline;
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (celltext);
+  
+  layout = gtk_widget_create_pango_layout (widget, celltext->text);
+
+  if (celltext->extra_attrs)
+    attr_list = pango_attr_list_copy (celltext->extra_attrs);
+  else
+    attr_list = pango_attr_list_new ();
+
+  pango_layout_set_single_paragraph_mode (layout, priv->single_paragraph);
+
+  if (will_render)
+    {
+      /* Add options that affect appearance but not size */
+      
+      /* note that background doesn't go here, since it affects
+       * background_area not the PangoLayout area
+       */
+      
+      if (celltext->foreground_set
+	  && (flags & GTK_CELL_RENDERER_SELECTED) == 0)
+        {
+          PangoColor color;
+
+          color = celltext->foreground;
+          
+          add_attr (attr_list,
+                    pango_attr_foreground_new (color.red, color.green, color.blue));
+        }
+
+      if (celltext->strikethrough_set)
+        add_attr (attr_list,
+                  pango_attr_strikethrough_new (celltext->strikethrough));
+    }
+
+  add_attr (attr_list, pango_attr_font_desc_new (celltext->font));
+
+  if (celltext->scale_set &&
+      celltext->font_scale != 1.0)
+    add_attr (attr_list, pango_attr_scale_new (celltext->font_scale));
+  
+  if (celltext->underline_set)
+    uline = celltext->underline_style;
+  else
+    uline = PANGO_UNDERLINE_NONE;
+
+  if (priv->language_set)
+    add_attr (attr_list, pango_attr_language_new (priv->language));
+  
+  if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT)
+    {
+      switch (uline)
+        {
+        case PANGO_UNDERLINE_NONE:
+          uline = PANGO_UNDERLINE_SINGLE;
+          break;
+
+        case PANGO_UNDERLINE_SINGLE:
+          uline = PANGO_UNDERLINE_DOUBLE;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  if (uline != PANGO_UNDERLINE_NONE)
+    add_attr (attr_list, pango_attr_underline_new (celltext->underline_style));
+
+  if (celltext->rise_set)
+    add_attr (attr_list, pango_attr_rise_new (celltext->rise));
+
+  if (priv->ellipsize_set)
+    pango_layout_set_ellipsize (layout, priv->ellipsize);
+  else
+    pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_NONE);
+
+  if (priv->wrap_width != -1)
+    {
+      pango_layout_set_width (layout, priv->wrap_width * PANGO_SCALE);
+      pango_layout_set_wrap (layout, priv->wrap_mode);
+    }
+  else
+    {
+      pango_layout_set_width (layout, -1);
+      pango_layout_set_wrap (layout, PANGO_WRAP_CHAR);
+    }
+
+  if (priv->align_set)
+    pango_layout_set_alignment (layout, priv->align);
+  else
+    {
+      PangoAlignment align;
+
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+	align = PANGO_ALIGN_RIGHT;
+      else
+	align = PANGO_ALIGN_LEFT;
+
+      pango_layout_set_alignment (layout, align);
+    }
+
+  pango_layout_set_attributes (layout, attr_list);
+
+  pango_attr_list_unref (attr_list);
+  
+  return layout;
+}
+
+static void
+get_size (GtkCellRenderer *cell,
+	  GtkWidget       *widget,
+	  GdkRectangle    *cell_area,
+	  PangoLayout     *layout,
+	  gint            *x_offset,
+	  gint            *y_offset,
+	  gint            *width,
+	  gint            *height)
+{
+  GhbCellRendererText *celltext = (GhbCellRendererText *) cell;
+  PangoRectangle rect;
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
+
+  if (celltext->calc_fixed_height)
+    {
+      PangoContext *context;
+      PangoFontMetrics *metrics;
+      PangoFontDescription *font_desc;
+      gint row_height;
+
+      font_desc = pango_font_description_copy_static (widget->style->font_desc);
+      pango_font_description_merge_static (font_desc, celltext->font, TRUE);
+
+      if (celltext->scale_set)
+	pango_font_description_set_size (font_desc,
+					 celltext->font_scale * pango_font_description_get_size (font_desc));
+
+      context = gtk_widget_get_pango_context (widget);
+
+      metrics = pango_context_get_metrics (context,
+					   font_desc,
+					   pango_context_get_language (context));
+      row_height = (pango_font_metrics_get_ascent (metrics) +
+		    pango_font_metrics_get_descent (metrics));
+      pango_font_metrics_unref (metrics);
+
+      pango_font_description_free (font_desc);
+
+      gtk_cell_renderer_set_fixed_size (cell,
+					cell->width, 2*cell->ypad +
+					celltext->fixed_height_rows * PANGO_PIXELS (row_height));
+      
+      if (height)
+	{
+	  *height = cell->height;
+	  height = NULL;
+	}
+      celltext->calc_fixed_height = FALSE;
+      if (width == NULL)
+	return;
+    }
+  
+  if (layout)
+    g_object_ref (layout);
+  else
+    layout = get_layout (celltext, widget, FALSE, 0);
+
+  pango_layout_get_extents (layout, NULL, &rect);
+  pango_extents_to_pixels (&rect, NULL);
+
+  if (height)
+    *height = cell->ypad * 2 + rect.height;
+
+  /* The minimum size for ellipsized labels is ~ 3 chars */
+  if (width)
+    {
+      if (priv->ellipsize || priv->width_chars > 0)
+	{
+	  PangoContext *context;
+	  PangoFontMetrics *metrics;
+	  gint char_width;
+
+	  context = pango_layout_get_context (layout);
+	  metrics = pango_context_get_metrics (context, widget->style->font_desc, pango_context_get_language (context));
+
+	  char_width = pango_font_metrics_get_approximate_char_width (metrics);
+	  pango_font_metrics_unref (metrics);
+	  
+	  *width = cell->xpad * 2 + (PANGO_PIXELS (char_width) * MAX (priv->width_chars, 3));
+	}
+      else
+	{
+	  *width = cell->xpad * 2 + rect.x + rect.width;
+	}	  
+    }
+
+  if (cell_area)
+    {
+      if (x_offset)
+	{
+	  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+	    *x_offset = (1.0 - cell->xalign) * (cell_area->width - (rect.x + rect.width + (2 * cell->xpad)));
+	  else 
+	    *x_offset = cell->xalign * (cell_area->width - (rect.x + rect.width + (2 * cell->xpad)));
+
+	  if ((priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE) || priv->wrap_width != -1)
+	    *x_offset = MAX(*x_offset, 0);
+	}
+      if (y_offset)
+	{
+	  *y_offset = cell->yalign * (cell_area->height - (rect.height + (2 * cell->ypad)));
+	  *y_offset = MAX (*y_offset, 0);
+	}
+    }
+  else
+    {
+      if (x_offset) *x_offset = 0;
+      if (y_offset) *y_offset = 0;
+    }
+
+  g_object_unref (layout);
+}
+
+
+static void
+ghb_cell_renderer_text_get_size (GtkCellRenderer *cell,
+				 GtkWidget       *widget,
+				 GdkRectangle    *cell_area,
+				 gint            *x_offset,
+				 gint            *y_offset,
+				 gint            *width,
+				 gint            *height)
+{
+  get_size (cell, widget, cell_area, NULL,
+	    x_offset, y_offset, width, height);
+}
+
+static void
+ghb_cell_renderer_text_render (GtkCellRenderer      *cell,
+			       GdkDrawable          *window,
+			       GtkWidget            *widget,
+			       GdkRectangle         *background_area,
+			       GdkRectangle         *cell_area,
+			       GdkRectangle         *expose_area,
+			       GtkCellRendererState  flags)
+
+{
+  GhbCellRendererText *celltext = (GhbCellRendererText *) cell;
+  PangoLayout *layout;
+  GtkStateType state;
+  gint x_offset;
+  gint y_offset;
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
+
+  layout = get_layout (celltext, widget, TRUE, flags);
+  get_size (cell, widget, cell_area, layout, &x_offset, &y_offset, NULL, NULL);
+
+  if (!cell->sensitive) 
+    {
+      state = GTK_STATE_INSENSITIVE;
+    }
+  else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
+    {
+      if (GTK_WIDGET_HAS_FOCUS (widget))
+	state = GTK_STATE_SELECTED;
+      else
+	state = GTK_STATE_ACTIVE;
+    }
+  else if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT &&
+	   GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT)
+    {
+      state = GTK_STATE_PRELIGHT;
+    }
+  else
+    {
+      if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
+	state = GTK_STATE_INSENSITIVE;
+      else
+	state = GTK_STATE_NORMAL;
+    }
+
+  if (celltext->background_set && 
+      (flags & GTK_CELL_RENDERER_SELECTED) == 0)
+    {
+      cairo_t *cr = gdk_cairo_create (window);
+
+      if (expose_area)
+	{
+	  gdk_cairo_rectangle (cr, expose_area);
+	  cairo_clip (cr);
+	}
+
+      gdk_cairo_rectangle (cr, background_area);
+      cairo_set_source_rgb (cr,
+			    celltext->background.red / 65535.,
+			    celltext->background.green / 65535.,
+			    celltext->background.blue / 65535.);
+      cairo_fill (cr);
+      
+      cairo_destroy (cr);
+    }
+
+  if (priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE)
+    pango_layout_set_width (layout, 
+			    (cell_area->width - x_offset - 2 * cell->xpad) * PANGO_SCALE);
+  else if (priv->wrap_width == -1)
+    pango_layout_set_width (layout, -1);
+
+  gtk_paint_layout (widget->style,
+                    window,
+                    state,
+		    TRUE,
+                    expose_area,
+                    widget,
+                    "cellrenderertext",
+                    cell_area->x + x_offset + cell->xpad,
+                    cell_area->y + y_offset + cell->ypad,
+                    layout);
+
+  g_object_unref (layout);
+}
+
+static gboolean
+ghb_cell_renderer_text_keypress(
+	GtkCellEditable *entry,
+	GdkEventKey *event,
+	gpointer data)
+{
+	gboolean result;
+	g_signal_emit(
+		data, text_cell_renderer_signals[KEYPRESS], 0, event, &result);
+	return result;
+}
+
+static void
+ghb_cell_renderer_text_editing_done (GtkCellEditable *entry,
+				     gpointer         data)
+{
+  const gchar *path;
+  const gchar *new_text;
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (data);
+
+  priv->entry = NULL;
+
+  if (priv->focus_out_id > 0)
+    {
+      g_signal_handler_disconnect (entry, priv->focus_out_id);
+      priv->focus_out_id = 0;
+    }
+
+  if (priv->populate_popup_id > 0)
+    {
+      g_signal_handler_disconnect (entry, priv->populate_popup_id);
+      priv->populate_popup_id = 0;
+    }
+
+  if (priv->entry_menu_popdown_timeout)
+    {
+      g_source_remove (priv->entry_menu_popdown_timeout);
+      priv->entry_menu_popdown_timeout = 0;
+    }
+
+  gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (data), 
+				  GTK_ENTRY (entry)->editing_canceled);
+  if (GTK_ENTRY (entry)->editing_canceled)
+    return;
+
+  path = g_object_get_data (G_OBJECT (entry), GHB_CELL_RENDERER_TEXT_PATH);
+  new_text = gtk_entry_get_text (GTK_ENTRY (entry));
+
+  g_signal_emit (data, text_cell_renderer_signals[EDITED], 0, path, new_text);
+}
+
+static gboolean
+popdown_timeout (gpointer data)
+{
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (data);
+
+  priv->entry_menu_popdown_timeout = 0;
+
+  if (!GTK_WIDGET_HAS_FOCUS (priv->entry))
+    ghb_cell_renderer_text_editing_done (GTK_CELL_EDITABLE (priv->entry), data);
+
+  return FALSE;
+}
+
+static void
+ghb_cell_renderer_text_popup_unmap (GtkMenu *menu,
+                                    gpointer data)
+{
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (data);
+
+  priv->in_entry_menu = FALSE;
+
+  if (priv->entry_menu_popdown_timeout)
+    return;
+
+  priv->entry_menu_popdown_timeout = gdk_threads_add_timeout (500, popdown_timeout,
+                                                    data);
+}
+
+static void
+ghb_cell_renderer_text_populate_popup (GtkEntry *entry,
+                                       GtkMenu  *menu,
+                                       gpointer  data)
+{
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (data);
+
+  if (priv->entry_menu_popdown_timeout)
+    {
+      g_source_remove (priv->entry_menu_popdown_timeout);
+      priv->entry_menu_popdown_timeout = 0;
+    }
+
+  priv->in_entry_menu = TRUE;
+
+  g_signal_connect (menu, "unmap",
+                    G_CALLBACK (ghb_cell_renderer_text_popup_unmap), data);
+}
+
+static gboolean
+ghb_cell_renderer_text_focus_out_event (GtkWidget *entry,
+		                        GdkEvent  *event,
+					gpointer   data)
+{
+  GhbCellRendererTextPrivate *priv;
+
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (data);
+
+  if (priv->in_entry_menu)
+    return FALSE;
+
+  GTK_ENTRY (entry)->editing_canceled = TRUE;
+  gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry));
+  gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry));
+
+  /* entry needs focus-out-event */
+  return FALSE;
+}
+
+static GtkCellEditable *
+ghb_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
+				      GdkEvent             *event,
+				      GtkWidget            *widget,
+				      const gchar          *path,
+				      GdkRectangle         *background_area,
+				      GdkRectangle         *cell_area,
+				      GtkCellRendererState  flags)
+{
+  GtkRequisition requisition;
+  GhbCellRendererText *celltext;
+  GhbCellRendererTextPrivate *priv;
+
+  celltext = GHB_CELL_RENDERER_TEXT (cell);
+  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
+
+  /* If the cell isn't editable we return NULL. */
+  if (celltext->editable == FALSE)
+    return NULL;
+
+  priv->entry = g_object_new (GTK_TYPE_ENTRY,
+			      "has-frame", FALSE,
+			      "xalign", cell->xalign,
+			      NULL);
+
+  if (celltext->text)
+    gtk_entry_set_text (GTK_ENTRY (priv->entry), celltext->text);
+  g_object_set_data_full (G_OBJECT (priv->entry), I_(GHB_CELL_RENDERER_TEXT_PATH), g_strdup (path), g_free);
+  
+  gtk_editable_select_region (GTK_EDITABLE (priv->entry), 0, -1);
+  
+  gtk_widget_size_request (priv->entry, &requisition);
+  if (requisition.height < cell_area->height)
+    {
+      GtkBorder *style_border;
+      GtkBorder border;
+
+      gtk_widget_style_get (priv->entry,
+			    "inner-border", &style_border,
+			    NULL);
+
+      if (style_border)
+        {
+	  border = *style_border;
+	  g_boxed_free (GTK_TYPE_BORDER, style_border);
+	}
+      else
+        {
+	  /* Since boxed style properties can't have default values ... */
+	  border.left = 2;
+	  border.right = 2;
+	}
+
+      border.top = (cell_area->height - requisition.height) / 2;
+      border.bottom = (cell_area->height - requisition.height) / 2;
+      gtk_entry_set_inner_border (GTK_ENTRY (priv->entry), &border);
+    }
+
+  priv->in_entry_menu = FALSE;
+  if (priv->entry_menu_popdown_timeout)
+    {
+      g_source_remove (priv->entry_menu_popdown_timeout);
+      priv->entry_menu_popdown_timeout = 0;
+    }
+
+  g_signal_connect (priv->entry,
+		    "key-press-event",
+		    G_CALLBACK (ghb_cell_renderer_text_keypress),
+		    celltext);
+  g_signal_connect (priv->entry,
+		    "editing_done",
+		    G_CALLBACK (ghb_cell_renderer_text_editing_done),
+		    celltext);
+  priv->focus_out_id = g_signal_connect_after (priv->entry, "focus_out_event",
+					       G_CALLBACK (ghb_cell_renderer_text_focus_out_event),
+					       celltext);
+  priv->populate_popup_id =
+    g_signal_connect (priv->entry, "populate_popup",
+                      G_CALLBACK (ghb_cell_renderer_text_populate_popup),
+                      celltext);
+ 
+  gtk_widget_show (priv->entry);
+
+  return GTK_CELL_EDITABLE (priv->entry);
+}
+
+/**
+ * ghb_cell_renderer_text_set_fixed_height_from_font:
+ * @renderer: A #GhbCellRendererText
+ * @number_of_rows: Number of rows of text each cell renderer is allocated, or -1
+ * 
+ * Sets the height of a renderer to explicitly be determined by the "font" and
+ * "y_pad" property set on it.  Further changes in these properties do not
+ * affect the height, so they must be accompanied by a subsequent call to this
+ * function.  Using this function is unflexible, and should really only be used
+ * if calculating the size of a cell is too slow (ie, a massive number of cells
+ * displayed).  If @number_of_rows is -1, then the fixed height is unset, and
+ * the height is determined by the properties again.
+ **/
+void
+ghb_cell_renderer_text_set_fixed_height_from_font (GhbCellRendererText *renderer,
+						   gint                 number_of_rows)
+{
+  g_return_if_fail (GHB_IS_CELL_RENDERER_TEXT (renderer));
+  g_return_if_fail (number_of_rows == -1 || number_of_rows > 0);
+
+  if (number_of_rows == -1)
+    {
+      gtk_cell_renderer_set_fixed_size (GTK_CELL_RENDERER (renderer),
+					GTK_CELL_RENDERER (renderer)->width,
+					-1);
+    }
+  else
+    {
+      renderer->fixed_height_rows = number_of_rows;
+      renderer->calc_fixed_height = TRUE;
+    }
+}
+