]> git.sur5r.net Git - glabels/blobdiff - src/object-editor-text-page.c
Imported Upstream version 3.0.0
[glabels] / src / object-editor-text-page.c
index d28353127baacf7434b6695f25f7a24cae6bf068..7c82ec900740d3583a8d140c05f120d4bf70305b 100644 (file)
@@ -1,57 +1,59 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  object-editor.c:  object properties editor module
+ *  object-editor-text-page.c
+ *  Copyright (C) 2003-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 2003  Jim Evins <evins@snaught.com>.
+ *  This file is part of gLabels.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  gLabels is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  gLabels 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *  along with gLabels.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include <config.h>
 
 #include "object-editor.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 #include <math.h>
 
 #include "prefs.h"
-#include "mygal/widget-color-combo.h"
+#include "color-combo.h"
 #include "color.h"
-#include "util.h"
+#include "font-combo.h"
+#include "font-util.h"
+#include "field-button.h"
+#include "builder-util.h"
 
 #include "object-editor-private.h"
 
 #include "debug.h"
 
+
 /*===========================================*/
 /* Private macros                            */
 /*===========================================*/
 
+
 /*===========================================*/
 /* Private data types                        */
 /*===========================================*/
 
+
 /*===========================================*/
 /* Private globals                           */
 /*===========================================*/
 
+
 /*===========================================*/
 /* Local function prototypes                 */
 /*===========================================*/
@@ -67,52 +69,48 @@ static void text_radio_toggled_cb              (glObjectEditor        *editor);
 void
 gl_object_editor_prepare_text_page (glObjectEditor       *editor)
 {
-       GList        *family_names = NULL;
-
        gl_debug (DEBUG_EDITOR, "START");
 
        /* Extract widgets from XML tree. */
-       editor->priv->text_page_vbox =
-               glade_xml_get_widget (editor->priv->gui, "text_page_vbox");
-       editor->priv->text_family_combo =
-               glade_xml_get_widget (editor->priv->gui, "text_family_combo");
-       editor->priv->text_size_spin =
-               glade_xml_get_widget (editor->priv->gui, "text_size_spin");
-       editor->priv->text_bold_toggle =
-               glade_xml_get_widget (editor->priv->gui, "text_bold_toggle");
-       editor->priv->text_italic_toggle =
-               glade_xml_get_widget (editor->priv->gui, "text_italic_toggle");
-       editor->priv->text_color_combo =
-               glade_xml_get_widget (editor->priv->gui, "text_color_combo");
-       editor->priv->text_color_radio =
-               glade_xml_get_widget (editor->priv->gui, "text_color_radio");
-       editor->priv->text_color_key_radio =
-               glade_xml_get_widget (editor->priv->gui, "text_color_key_radio");
-       editor->priv->text_color_key_combo =
-               glade_xml_get_widget (editor->priv->gui, "text_color_key_combo");
-       editor->priv->text_left_toggle =
-               glade_xml_get_widget (editor->priv->gui, "text_left_toggle");
-       editor->priv->text_center_toggle =
-               glade_xml_get_widget (editor->priv->gui, "text_center_toggle");
-       editor->priv->text_right_toggle =
-               glade_xml_get_widget (editor->priv->gui, "text_right_toggle");
-       editor->priv->text_line_spacing_spin =
-               glade_xml_get_widget (editor->priv->gui, "text_line_spacing_spin");
-       editor->priv->text_auto_shrink_check =
-               glade_xml_get_widget (editor->priv->gui, "text_auto_shrink_check");
-
-       gl_util_combo_box_add_text_model ( GTK_COMBO_BOX(editor->priv->text_family_combo));
-       gl_util_combo_box_add_text_model ( GTK_COMBO_BOX(editor->priv->text_color_key_combo));
-
-       /* Load family names */
-       family_names = gl_util_get_font_family_list ();
-       gl_util_combo_box_set_strings (GTK_COMBO_BOX(editor->priv->text_family_combo),
-                                      family_names);
+        gl_builder_util_get_widgets (editor->priv->builder,
+                                     "text_page_vbox",         &editor->priv->text_page_vbox,
+                                     "text_family_hbox",       &editor->priv->text_family_hbox,
+                                     "text_size_spin",         &editor->priv->text_size_spin,
+                                     "text_bold_toggle",       &editor->priv->text_bold_toggle,
+                                     "text_italic_toggle",     &editor->priv->text_italic_toggle,
+                                     "text_color_hbox",        &editor->priv->text_color_hbox,
+                                     "text_color_radio",       &editor->priv->text_color_radio,
+                                     "text_color_key_radio",   &editor->priv->text_color_key_radio,
+                                     "text_color_key_hbox",    &editor->priv->text_color_key_hbox,
+                                     "text_left_toggle",       &editor->priv->text_left_toggle,
+                                     "text_center_toggle",     &editor->priv->text_center_toggle,
+                                     "text_right_toggle",      &editor->priv->text_right_toggle,
+                                     "text_line_spacing_spin", &editor->priv->text_line_spacing_spin,
+                                     "text_auto_shrink_check", &editor->priv->text_auto_shrink_check,
+                                     NULL);
+
+       editor->priv->text_family_combo = gl_font_combo_new ("Sans");
+        gtk_box_pack_start (GTK_BOX (editor->priv->text_family_hbox),
+                            editor->priv->text_family_combo,
+                            TRUE, TRUE, 0);
+
+       editor->priv->text_color_combo = gl_color_combo_new (_("Default"),
+                                                             GL_COLOR_TEXT_DEFAULT,
+                                                             gl_prefs_model_get_default_text_color (gl_prefs));
+        gtk_box_pack_start (GTK_BOX (editor->priv->text_color_hbox),
+                            editor->priv->text_color_combo,
+                            FALSE, FALSE, 0);
+
+        editor->priv->text_color_key_combo = gl_field_button_new (NULL);
+        gtk_box_pack_start (GTK_BOX (editor->priv->text_color_key_hbox),
+                            editor->priv->text_color_key_combo,
+                            TRUE, TRUE, 0);
+
 
        /* Modify widgets */
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->priv->text_color_radio), TRUE);
        gtk_widget_set_sensitive (editor->priv->text_color_combo, TRUE);
-    gtk_widget_set_sensitive (editor->priv->text_color_key_combo, FALSE);
+        gtk_widget_set_sensitive (editor->priv->text_color_key_combo, FALSE);
 
        /* Un-hide */
        gtk_widget_show_all (editor->priv->text_page_vbox);
@@ -123,7 +121,7 @@ gl_object_editor_prepare_text_page (glObjectEditor       *editor)
                                  G_CALLBACK (gl_object_editor_changed_cb),
                                  G_OBJECT (editor));
        g_signal_connect_swapped (G_OBJECT (editor->priv->text_size_spin),
-                                 "changed",
+                                 "value-changed",
                                  G_CALLBACK (gl_object_editor_changed_cb),
                                  G_OBJECT (editor));
        g_signal_connect_swapped (G_OBJECT (editor->priv->text_bold_toggle),
@@ -165,7 +163,7 @@ gl_object_editor_prepare_text_page (glObjectEditor       *editor)
                          G_OBJECT (editor));
 
        g_signal_connect_swapped (G_OBJECT (editor->priv->text_line_spacing_spin),
-                                 "changed",
+                                 "value-changed",
                                  G_CALLBACK (gl_object_editor_changed_cb),
                                  G_OBJECT (editor));
 
@@ -177,6 +175,7 @@ gl_object_editor_prepare_text_page (glObjectEditor       *editor)
        gl_debug (DEBUG_EDITOR, "END");
 }
 
+
 /*--------------------------------------------------------------------------*/
 /* PRIVATE.  Alignment togglebutton callback.                               */
 /*--------------------------------------------------------------------------*/
@@ -184,8 +183,6 @@ static void
 align_toggle_cb (GtkToggleButton *toggle,
                 glObjectEditor  *editor)
 {
-        if (editor->priv->stop_signals) return;
-
         if (gtk_toggle_button_get_active (toggle)) {
  
                 if (GTK_WIDGET (toggle) == GTK_WIDGET (editor->priv->text_left_toggle)) {
@@ -213,12 +210,12 @@ align_toggle_cb (GtkToggleButton *toggle,
                                                       FALSE);
                 }
 
-               /* Emit our "changed" signal */
-               g_signal_emit (G_OBJECT (editor), gl_object_editor_signals[CHANGED], 0);
+                gl_object_editor_changed_cb (editor);
         }
 
 }
 
+
 /*****************************************************************************/
 /* Set font family.                                                          */
 /*****************************************************************************/
@@ -226,41 +223,39 @@ void
 gl_object_editor_set_font_family (glObjectEditor      *editor,
                                  const gchar         *font_family)
 {
-        GList    *family_names;
        gchar    *old_font_family;
-       gchar    *good_font_family;
+
+        if (font_family == NULL)
+        {
+                return;
+        }
 
        gl_debug (DEBUG_EDITOR, "START");
 
-        editor->priv->stop_signals = TRUE;
 
-       old_font_family = gtk_combo_box_get_active_text (GTK_COMBO_BOX (editor->priv->text_family_combo));
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_family_combo),
+                                         gl_object_editor_changed_cb, editor);
+
+
+       old_font_family = gl_font_combo_get_family (GL_FONT_COMBO (editor->priv->text_family_combo));
 
         if ( !old_font_family || g_utf8_collate( old_font_family, font_family ) )
         {
-
-                /* Make sure we have a valid font family.  if not provide a good default. */
-                family_names = gl_util_get_font_family_list ();
-                if (g_list_find_custom (family_names, font_family, (GCompareFunc)g_utf8_collate)) {
-                        good_font_family = g_strdup (font_family);
-                } else {
-                        if (family_names != NULL) {
-                                good_font_family = g_strdup (family_names->data); /* 1st entry */
-                        } else {
-                                good_font_family = NULL;
-                        }
-                }
-                gl_util_combo_box_set_active_text (GTK_COMBO_BOX (editor->priv->text_family_combo), good_font_family);
-                g_free (good_font_family);
+                gl_font_combo_set_family (GL_FONT_COMBO (editor->priv->text_family_combo),
+                                          font_family);
         }
 
         g_free (old_font_family);
 
-        editor->priv->stop_signals = FALSE;
+
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_family_combo),
+                                           gl_object_editor_changed_cb, editor);
+
 
        gl_debug (DEBUG_EDITOR, "END");
 }
 
+
 /*****************************************************************************/
 /* Query font family.                                                        */
 /*****************************************************************************/
@@ -271,13 +266,14 @@ gl_object_editor_get_font_family (glObjectEditor      *editor)
 
        gl_debug (DEBUG_EDITOR, "START");
 
-       font_family = gtk_combo_box_get_active_text (GTK_COMBO_BOX (editor->priv->text_family_combo));
+       font_family = gl_font_combo_get_family (GL_FONT_COMBO (editor->priv->text_family_combo));
 
        gl_debug (DEBUG_EDITOR, "END");
 
        return font_family;
 }
 
+
 /*****************************************************************************/
 /* Set font size.                                                            */
 /*****************************************************************************/
@@ -287,16 +283,23 @@ gl_object_editor_set_font_size (glObjectEditor      *editor,
 {
        gl_debug (DEBUG_EDITOR, "START");
 
-        editor->priv->stop_signals = TRUE;
+
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_size_spin),
+                                         gl_object_editor_changed_cb, editor);
+
 
         gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->priv->text_size_spin),
                                    font_size);
 
-        editor->priv->stop_signals = FALSE;
+
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_size_spin),
+                                           gl_object_editor_changed_cb, editor);
+
 
        gl_debug (DEBUG_EDITOR, "END");
 }
 
+
 /*****************************************************************************/
 /* Query font size.                                                          */
 /*****************************************************************************/
@@ -315,6 +318,7 @@ gl_object_editor_get_font_size (glObjectEditor      *editor)
        return font_size;
 }
 
+
 /*****************************************************************************/
 /* Set font weight.                                                          */
 /*****************************************************************************/
@@ -324,16 +328,23 @@ gl_object_editor_set_font_weight (glObjectEditor      *editor,
 {
        gl_debug (DEBUG_EDITOR, "START");
 
-        editor->priv->stop_signals = TRUE;
+
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_bold_toggle),
+                                         gl_object_editor_changed_cb, editor);
+
 
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->priv->text_bold_toggle),
                                       (font_weight == PANGO_WEIGHT_BOLD));
 
-        editor->priv->stop_signals = FALSE;
+
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_bold_toggle),
+                                           gl_object_editor_changed_cb, editor);
+
 
        gl_debug (DEBUG_EDITOR, "END");
 }
 
+
 /*****************************************************************************/
 /* Query font weight.                                                        */
 /*****************************************************************************/
@@ -356,6 +367,7 @@ gl_object_editor_get_font_weight (glObjectEditor      *editor)
        return font_weight;
 }
 
+
 /*****************************************************************************/
 /* Set font italic flag.                                                     */
 /*****************************************************************************/
@@ -365,16 +377,23 @@ gl_object_editor_set_font_italic_flag (glObjectEditor      *editor,
 {
        gl_debug (DEBUG_EDITOR, "START");
 
-        editor->priv->stop_signals = TRUE;
+
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_italic_toggle),
+                                         gl_object_editor_changed_cb, editor);
+
 
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->priv->text_italic_toggle),
                                       font_italic_flag);
 
-        editor->priv->stop_signals = FALSE;
+
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_italic_toggle),
+                                           gl_object_editor_changed_cb, editor);
+
 
        gl_debug (DEBUG_EDITOR, "END");
 }
 
+
 /*****************************************************************************/
 /* Query font italic flag.                                                   */
 /*****************************************************************************/
@@ -394,6 +413,7 @@ gl_object_editor_get_font_italic_flag (glObjectEditor      *editor)
        return italic_flag;
 }
 
+
 /*****************************************************************************/
 /* Set text alignment.                                                       */
 /*****************************************************************************/
@@ -403,7 +423,11 @@ gl_object_editor_set_text_alignment (glObjectEditor      *editor,
 {
        gl_debug (DEBUG_EDITOR, "START");
 
-        editor->priv->stop_signals = TRUE;
+
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_left_toggle), align_toggle_cb, editor);
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_center_toggle), align_toggle_cb, editor);
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_right_toggle), align_toggle_cb, editor);
+
 
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->priv->text_left_toggle),
                                       (align == PANGO_ALIGN_LEFT));
@@ -412,11 +436,16 @@ gl_object_editor_set_text_alignment (glObjectEditor      *editor,
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->priv->text_right_toggle),
                                       (align == PANGO_ALIGN_RIGHT));
 
-        editor->priv->stop_signals = FALSE;
+
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_left_toggle), align_toggle_cb, editor);
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_center_toggle), align_toggle_cb, editor);
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_right_toggle), align_toggle_cb, editor);
+
 
        gl_debug (DEBUG_EDITOR, "END");
 }
 
+
 /*****************************************************************************/
 /* Query text alignment.                                                     */
 /*****************************************************************************/
@@ -447,6 +476,7 @@ gl_object_editor_get_text_alignment (glObjectEditor      *editor)
        return align;
 }
 
+
 /*****************************************************************************/
 /* Set text color.                                                           */
 /*****************************************************************************/
@@ -455,57 +485,79 @@ gl_object_editor_set_text_color (glObjectEditor      *editor,
                                 gboolean             merge_flag,
                                 glColorNode         *text_color_node)
 {
-       GdkColor *gdk_color;
-
        gl_debug (DEBUG_EDITOR, "START");
 
-        editor->priv->stop_signals = TRUE;
+        if (text_color_node == NULL)
+        {
+                return;
+        }
+
 
-       gl_debug (DEBUG_EDITOR, "color field %s(%d) / %X", text_color_node->key, text_color_node->field_flag, text_color_node->color);
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_color_combo),
+                                         gl_object_editor_changed_cb, editor);
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_color_radio),
+                                         text_radio_toggled_cb, editor);
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_color_key_radio),
+                                         text_radio_toggled_cb, editor);
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_color_key_combo),
+                                         gl_object_editor_changed_cb, editor);
+
+
+       gl_debug (DEBUG_EDITOR, "color field %s(%d) / %X",
+                  text_color_node->key, text_color_node->field_flag, text_color_node->color);
        
        gtk_widget_set_sensitive (editor->priv->text_color_key_radio, merge_flag);
 
        if ( text_color_node->color == GL_COLOR_NONE ) {
 
-               color_combo_set_color_to_default (COLOR_COMBO(editor->priv->text_color_combo));
+               gl_color_combo_set_to_default (GL_COLOR_COMBO(editor->priv->text_color_combo));
 
        } else {
                
-        gdk_color = gl_color_to_gdk_color (text_color_node->color);
-        color_combo_set_color (COLOR_COMBO(editor->priv->text_color_combo), gdk_color);
-        g_free (gdk_color);
+                gl_color_combo_set_color (GL_COLOR_COMBO(editor->priv->text_color_combo),
+                                          text_color_node->color);
        }
        
-       if (!text_color_node->field_flag || !merge_flag) {
-               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
-                                                 (editor->priv->text_color_radio), TRUE); 
+       if (!text_color_node->field_flag || !merge_flag)
+        {
+               gl_debug (DEBUG_EDITOR, "color field false");
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->priv->text_color_radio), TRUE); 
                gtk_widget_set_sensitive (editor->priv->text_color_combo, TRUE);
-               gl_debug (DEBUG_EDITOR, "color field false 0");
                gtk_widget_set_sensitive (editor->priv->text_color_key_combo, FALSE);
                
-       } else {
-               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
-                                                 (editor->priv->text_color_key_radio), TRUE); 
+       }
+        else
+        {
+               gl_debug (DEBUG_EDITOR, "color field true");
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->priv->text_color_key_radio), TRUE); 
                gtk_widget_set_sensitive (editor->priv->text_color_combo, FALSE);
                gtk_widget_set_sensitive (editor->priv->text_color_key_combo, TRUE);
                
-               gl_debug (DEBUG_EDITOR, "color field true 1");
-               gl_util_combo_box_set_active_text (GTK_COMBO_BOX (editor->priv->text_color_key_combo), "");
-               gl_debug (DEBUG_EDITOR, "color field true 2");
+               gl_field_button_set_key (GL_FIELD_BUTTON (editor->priv->text_color_key_combo), "");
        }
 
-        editor->priv->stop_signals = FALSE;
+
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_color_combo),
+                                           gl_object_editor_changed_cb, editor);
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_color_radio),
+                                           text_radio_toggled_cb, editor);
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_color_key_radio),
+                                           text_radio_toggled_cb, editor);
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_color_key_combo),
+                                           gl_object_editor_changed_cb, editor);
+
 
        gl_debug (DEBUG_EDITOR, "END");
 }
 
+
 /*****************************************************************************/
 /* Query text color.                                                         */
 /*****************************************************************************/
 glColorNode*
 gl_object_editor_get_text_color (glObjectEditor      *editor)
 {
-       GdkColor    *gdk_color;
+       guint        color;
        glColorNode *color_node;
        gboolean     is_default;
 
@@ -515,20 +567,20 @@ gl_object_editor_get_text_color (glObjectEditor      *editor)
        
        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->priv->text_color_key_radio))) {
                color_node->field_flag = TRUE;
-               color_node->color = gl_prefs->default_text_color;
+               color_node->color = gl_prefs_model_get_default_text_color (gl_prefs);
                color_node->key = 
-                       gtk_combo_box_get_active_text (GTK_COMBO_BOX (editor->priv->text_color_key_combo));
-    } else {
+                       gl_field_button_get_key (GL_FIELD_BUTTON (editor->priv->text_color_key_combo));
+        } else {
                color_node->field_flag = FALSE;
                color_node->key = NULL;
-               gdk_color = color_combo_get_color (COLOR_COMBO(editor->priv->text_color_combo),
-                                           &is_default);
+               color = gl_color_combo_get_color (GL_COLOR_COMBO(editor->priv->text_color_combo),
+                                                  &is_default);
 
-        if (is_default) {
-                color_node->color = gl_prefs->default_text_color;
-        } else {
-                color_node->color = gl_color_from_gdk_color (gdk_color);
-        }
+                if (is_default) {
+                        color_node->color = gl_prefs_model_get_default_text_color (gl_prefs);
+                } else {
+                        color_node->color = color;
+                }
        }      
 
        gl_debug (DEBUG_EDITOR, "END");
@@ -546,16 +598,23 @@ gl_object_editor_set_text_line_spacing (glObjectEditor      *editor,
 {
        gl_debug (DEBUG_EDITOR, "START");
 
-        editor->priv->stop_signals = TRUE;
+
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_line_spacing_spin),
+                                         gl_object_editor_changed_cb, editor);
+
 
         gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->priv->text_line_spacing_spin),
                                    text_line_spacing);
 
-        editor->priv->stop_signals = FALSE;
+
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_line_spacing_spin),
+                                           gl_object_editor_changed_cb, editor);
+
 
        gl_debug (DEBUG_EDITOR, "END");
 }
 
+
 /*****************************************************************************/
 /* Query text line spacing.                                                  */
 /*****************************************************************************/
@@ -574,6 +633,7 @@ gl_object_editor_get_text_line_spacing (glObjectEditor      *editor)
        return text_line_spacing;
 }
 
+
 /*****************************************************************************/
 /* Set auto shrink checkbox.                                                 */
 /*****************************************************************************/
@@ -583,16 +643,23 @@ gl_object_editor_set_text_auto_shrink (glObjectEditor      *editor,
 {
        gl_debug (DEBUG_EDITOR, "START");
 
-        editor->priv->stop_signals = TRUE;
+
+        g_signal_handlers_block_by_func (G_OBJECT (editor->priv->text_auto_shrink_check),
+                                         gl_object_editor_changed_cb, editor);
+
 
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->priv->text_auto_shrink_check),
                                       auto_shrink);
 
-        editor->priv->stop_signals = FALSE;
+
+        g_signal_handlers_unblock_by_func (G_OBJECT (editor->priv->text_auto_shrink_check),
+                                           gl_object_editor_changed_cb, editor);
+
 
        gl_debug (DEBUG_EDITOR, "END");
 }
 
+
 /*****************************************************************************/
 /* Query auto shrink checkbox.                                               */
 /*****************************************************************************/
@@ -610,14 +677,13 @@ gboolean    gl_object_editor_get_text_auto_shrink (glObjectEditor      *editor)
        return auto_shrink;
 }
 
+
 /*--------------------------------------------------------------------------*/
 /* PRIVATE.  color radio callback.                                           */
 /*--------------------------------------------------------------------------*/
 static void
 text_radio_toggled_cb (glObjectEditor *editor)
 {
-        if (editor->priv->stop_signals) return;
-
         gl_debug (DEBUG_EDITOR, "START");
        
        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->priv->text_color_radio))) {
@@ -629,8 +695,18 @@ text_radio_toggled_cb (glObjectEditor *editor)
                
        }
  
-        /* Emit our "changed" signal */
-        g_signal_emit (G_OBJECT (editor), gl_object_editor_signals[CHANGED], 0);
+        gl_object_editor_changed_cb (editor);
  
         gl_debug (DEBUG_EDITOR, "END");
 }
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */