-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-/**
- * (GLABELS) Label and Business Card Creation program for GNOME
- *
- * property-bar.c: gLabels property bar
+/*
+ * ui-property-bar.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 "ui-property-bar.h"
#include <glib/gi18n.h>
-#include <glade/glade-xml.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktoggletoolbutton.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
#include <string.h>
-#include "util.h"
-#include "mygal/widget-color-combo.h"
-#include "stock-pixmaps/stockpixbufs.h"
+#include "builder-util.h"
+#include "font-combo.h"
+#include "color-combo-button.h"
#include "prefs.h"
#include "color.h"
#include "debug.h"
+
/*===========================================================================*/
/* Private macros and constants. */
/*===========================================================================*/
+
/*===========================================================================*/
/* Private data types */
/*===========================================================================*/
struct _glUIPropertyBarPrivate {
- glView *view;
+ glLabel *label;
- GladeXML *gui;
+ GtkBuilder *builder;
GtkWidget *tool_bar;
/* Font selection */
+ GtkWidget *font_family_eventbox;
GtkWidget *font_family_combo;
GtkWidget *font_size_spin;
GtkWidget *font_bold_toggle;
GtkWidget *text_align_right_radio;
/* Color combos */
- GtkWidget *text_color_combo;
- GtkWidget *fill_color_combo;
- GtkWidget *line_color_combo;
+ GtkWidget *text_color_eventbox;
+ GtkWidget *text_color_button;
+ GtkWidget *fill_color_eventbox;
+ GtkWidget *fill_color_button;
+ GtkWidget *line_color_eventbox;
+ GtkWidget *line_color_button;
/* Line width */
GtkWidget *line_width_spin;
/* Private globals */
/*===========================================================================*/
+
/*===========================================================================*/
/* Local function prototypes */
/*===========================================================================*/
static void gl_ui_property_bar_finalize (GObject *object);
-static void gl_ui_property_bar_construct (glUIPropertyBar *property_bar);
+static void gl_ui_property_bar_construct (glUIPropertyBar *this);
-static void selection_changed_cb (glUIPropertyBar *property_bar);
+static void selection_changed_cb (glUIPropertyBar *this,
+ glLabel *label);
static void font_family_changed_cb (GtkComboBox *combo,
- glUIPropertyBar *property_bar);
+ glUIPropertyBar *this);
static void font_size_changed_cb (GtkSpinButton *spin,
- glUIPropertyBar *property_bar);
+ glUIPropertyBar *this);
-static void text_color_changed_cb (ColorCombo *cc,
- GdkColor *gdk_color,
- gboolean custom,
- gboolean by_user,
+static void text_color_changed_cb (glColorComboButton *cc,
+ guint color,
gboolean is_default,
- glUIPropertyBar *property_bar);
+ glUIPropertyBar *this);
-static void fill_color_changed_cb (ColorCombo *cc,
- GdkColor *gdk_color,
- gboolean custom,
- gboolean by_user,
+static void fill_color_changed_cb (glColorComboButton *cc,
+ guint color,
gboolean is_default,
- glUIPropertyBar *property_bar);
+ glUIPropertyBar *this);
-static void line_color_changed_cb (ColorCombo *cc,
- GdkColor *gdk_color,
- gboolean custom,
- gboolean by_user,
+static void line_color_changed_cb (glColorComboButton *cc,
+ guint color,
gboolean is_default,
- glUIPropertyBar *property_bar);
+ glUIPropertyBar *this);
static void line_width_changed_cb (GtkSpinButton *spin,
- glUIPropertyBar *property_bar);
+ glUIPropertyBar *this);
static void font_bold_toggled_cb (GtkToggleToolButton *toggle,
- glUIPropertyBar *property_bar);
+ glUIPropertyBar *this);
static void font_italic_toggled_cb (GtkToggleToolButton *toggle,
- glUIPropertyBar *property_bar);
+ glUIPropertyBar *this);
static void text_align_toggled_cb (GtkToggleToolButton *toggle,
- glUIPropertyBar *property_bar);
+ glUIPropertyBar *this);
-static void set_doc_items_sensitive (glUIPropertyBar *property_bar,
+static void set_doc_items_sensitive (glUIPropertyBar *this,
gboolean state);
-static void set_text_items_sensitive (glUIPropertyBar *property_bar,
+static void set_text_items_sensitive (glUIPropertyBar *this,
gboolean state);
-static void set_fill_items_sensitive (glUIPropertyBar *property_bar,
+static void set_fill_items_sensitive (glUIPropertyBar *this,
gboolean state);
-static void set_line_color_items_sensitive (glUIPropertyBar *property_bar,
+static void set_line_color_items_sensitive (glUIPropertyBar *this,
gboolean state);
-static void set_line_width_items_sensitive (glUIPropertyBar *property_bar,
+static void set_line_width_items_sensitive (glUIPropertyBar *this,
gboolean state);
-\f
+
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-G_DEFINE_TYPE (glUIPropertyBar, gl_ui_property_bar, GTK_TYPE_HBOX);
+G_DEFINE_TYPE (glUIPropertyBar, gl_ui_property_bar, GTK_TYPE_HBOX)
+
static void
gl_ui_property_bar_class_init (glUIPropertyBarClass *class)
gl_debug (DEBUG_PROPERTY_BAR, "END");
}
+
static void
-gl_ui_property_bar_init (glUIPropertyBar *property_bar)
+gl_ui_property_bar_init (glUIPropertyBar *this)
{
gl_debug (DEBUG_PROPERTY_BAR, "START");
- property_bar->priv = g_new0 (glUIPropertyBarPrivate, 1);
+ this->priv = g_new0 (glUIPropertyBarPrivate, 1);
gl_debug (DEBUG_PROPERTY_BAR, "END");
}
+
static void
gl_ui_property_bar_finalize (GObject *object)
{
- glUIPropertyBar *property_bar = GL_UI_PROPERTY_BAR (object);
+ glUIPropertyBar *this = GL_UI_PROPERTY_BAR (object);
gl_debug (DEBUG_PROPERTY_BAR, "START");
g_return_if_fail (object != NULL);
g_return_if_fail (GL_IS_UI_PROPERTY_BAR (object));
- if (property_bar->priv->view)
+ if (this->priv->label)
{
- g_object_unref (G_OBJECT(property_bar->priv->view));
+ g_object_unref (G_OBJECT(this->priv->label));
}
- if (property_bar->priv->gui)
+ if (this->priv->builder)
{
- g_object_unref (G_OBJECT(property_bar->priv->gui));
+ g_object_unref (G_OBJECT(this->priv->builder));
}
- g_free (property_bar->priv);
+ g_free (this->priv);
G_OBJECT_CLASS (gl_ui_property_bar_parent_class)->finalize (object);
gl_debug (DEBUG_PROPERTY_BAR, "END");
}
+
/****************************************************************************/
/* Create a NEW property_bar. */
/****************************************************************************/
GtkWidget *
gl_ui_property_bar_new (void)
{
- glUIPropertyBar *property_bar;
+ glUIPropertyBar *this;
gl_debug (DEBUG_PROPERTY_BAR, "START");
- property_bar = g_object_new (GL_TYPE_UI_PROPERTY_BAR, NULL);
+ this = g_object_new (GL_TYPE_UI_PROPERTY_BAR, NULL);
- gl_ui_property_bar_construct (property_bar);
+ gl_ui_property_bar_construct (this);
gl_debug (DEBUG_PROPERTY_BAR, "END");
- return GTK_WIDGET (property_bar);
+ return GTK_WIDGET (this);
}
+
/******************************************************************************/
/* Initialize property toolbar. */
/******************************************************************************/
static void
-gl_ui_property_bar_construct (glUIPropertyBar *property_bar)
+gl_ui_property_bar_construct (glUIPropertyBar *this)
{
- GladeXML *gui;
- GList *family_names = NULL;
- GList *family_node;
- GdkColor *gdk_color;
+ gchar *builder_filename;
+ GtkBuilder *builder;
+ static gchar *object_ids[] = { "property_toolbar",
+ "adjustment1", "adjustment2",
+ NULL };
+ GError *error = NULL;
gl_debug (DEBUG_PROPERTY_BAR, "START");
- property_bar->priv->stop_signals = TRUE;
-
- gui = glade_xml_new (GLABELS_GLADE_DIR "property-bar.glade",
- "property_toolbar", NULL);
+ this->priv->stop_signals = TRUE;
- if (!gui)
- {
- g_critical ("Could not open property-bar.glade. gLabels may not be installed correctly!");
+ builder = gtk_builder_new ();
+ builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "property-bar.ui", NULL);
+ gtk_builder_add_objects_from_file (builder, builder_filename, object_ids, &error);
+ g_free (builder_filename);
+ if (error) {
+ g_critical ("%s\n\ngLabels may not be installed correctly!", error->message);
+ g_error_free (error);
return;
}
- property_bar->priv->tool_bar = glade_xml_get_widget (gui, "property_toolbar");
- gtk_container_add (GTK_CONTAINER (property_bar), property_bar->priv->tool_bar);
-
- property_bar->priv->font_family_combo =
- glade_xml_get_widget (gui, "font_family_combo");
- property_bar->priv->font_size_spin =
- glade_xml_get_widget (gui, "font_size_spin");
- property_bar->priv->font_bold_toggle =
- glade_xml_get_widget (gui, "font_bold_toggle");
- property_bar->priv->font_italic_toggle =
- glade_xml_get_widget (gui, "font_italic_toggle");
- property_bar->priv->text_align_left_radio =
- glade_xml_get_widget (gui, "text_align_left_radio");
- property_bar->priv->text_align_center_radio =
- glade_xml_get_widget (gui, "text_align_center_radio");
- property_bar->priv->text_align_right_radio =
- glade_xml_get_widget (gui, "text_align_right_radio");
- property_bar->priv->text_color_combo =
- glade_xml_get_widget (gui, "text_color_combo");
- property_bar->priv->fill_color_combo =
- glade_xml_get_widget (gui, "fill_color_combo");
- property_bar->priv->line_color_combo =
- glade_xml_get_widget (gui, "line_color_combo");
- property_bar->priv->line_width_spin =
- glade_xml_get_widget (gui, "line_width_spin");
+ gl_builder_util_get_widgets (builder,
+ "property_toolbar", &this->priv->tool_bar,
+ "font_family_eventbox", &this->priv->font_family_eventbox,
+ "font_size_spin", &this->priv->font_size_spin,
+ "font_bold_toggle", &this->priv->font_bold_toggle,
+ "font_italic_toggle", &this->priv->font_italic_toggle,
+ "text_align_left_radio", &this->priv->text_align_left_radio,
+ "text_align_center_radio", &this->priv->text_align_center_radio,
+ "text_align_right_radio", &this->priv->text_align_right_radio,
+ "text_color_eventbox", &this->priv->text_color_eventbox,
+ "fill_color_eventbox", &this->priv->fill_color_eventbox,
+ "line_color_eventbox", &this->priv->line_color_eventbox,
+ "line_width_spin", &this->priv->line_width_spin,
+ NULL);
+
+ gtk_container_add (GTK_CONTAINER (this), this->priv->tool_bar);
+
+ this->priv->font_family_combo =
+ gl_font_combo_new (gl_prefs_model_get_default_font_family (gl_prefs));
+ gtk_container_add (GTK_CONTAINER (this->priv->font_family_eventbox),
+ this->priv->font_family_combo);
+
+ this->priv->text_color_button =
+ gl_color_combo_button_new ("glabels-text",
+ _("Default"),
+ GL_COLOR_TEXT_DEFAULT,
+ gl_prefs_model_get_default_text_color (gl_prefs));
+ gl_color_combo_button_set_relief (GL_COLOR_COMBO_BUTTON(this->priv->text_color_button),
+ GTK_RELIEF_NONE);
+ gtk_container_add (GTK_CONTAINER (this->priv->text_color_eventbox),
+ this->priv->text_color_button);
+
+ this->priv->fill_color_button =
+ gl_color_combo_button_new ("glabels-bucket-fill",
+ _("No Fill"),
+ GL_COLOR_NO_FILL,
+ gl_prefs_model_get_default_fill_color (gl_prefs));
+ gl_color_combo_button_set_relief (GL_COLOR_COMBO_BUTTON(this->priv->fill_color_button),
+ GTK_RELIEF_NONE);
+ gtk_container_add (GTK_CONTAINER (this->priv->fill_color_eventbox),
+ this->priv->fill_color_button);
+
+ this->priv->line_color_button =
+ gl_color_combo_button_new ("glabels-pencil",
+ _("No Line"),
+ GL_COLOR_NO_LINE,
+ gl_prefs_model_get_default_line_color (gl_prefs));
+ gl_color_combo_button_set_relief (GL_COLOR_COMBO_BUTTON(this->priv->line_color_button),
+ GTK_RELIEF_NONE);
+ gtk_container_add (GTK_CONTAINER (this->priv->line_color_eventbox),
+ this->priv->line_color_button);
/* Save reference to gui tree so we don't lose tooltips */
- property_bar->priv->gui = gui;
+ this->priv->builder = builder;
- set_doc_items_sensitive (property_bar, FALSE);
+ set_doc_items_sensitive (this, FALSE);
/* Font family entry widget */
- gl_util_combo_box_add_text_model (GTK_COMBO_BOX (property_bar->priv->font_family_combo));
- family_names = gl_util_get_font_family_list ();
- gl_util_combo_box_set_strings (GTK_COMBO_BOX (property_bar->priv->font_family_combo),
- family_names);
- gtk_widget_set_size_request (property_bar->priv->font_family_combo, 200, -1);
-
- /* Make sure we have a valid font. if not provide a good default. */
- family_node = g_list_find_custom (family_names,
- gl_prefs->default_font_family,
- (GCompareFunc)g_utf8_collate);
- if (family_node)
- {
- gtk_combo_box_set_active (GTK_COMBO_BOX (property_bar->priv->font_family_combo),
- g_list_position (family_names,
- family_node));
- }
- else
- {
- gtk_combo_box_set_active (GTK_COMBO_BOX (property_bar->priv->font_family_combo), 0);
- }
-
- g_signal_connect (G_OBJECT (property_bar->priv->font_family_combo),
- "changed", G_CALLBACK (font_family_changed_cb), property_bar);
+ g_signal_connect (G_OBJECT (this->priv->font_family_combo),
+ "changed", G_CALLBACK (font_family_changed_cb), this);
/* Font size entry widget */
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(property_bar->priv->font_size_spin),
- gl_prefs->default_font_size);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON(this->priv->font_size_spin),
+ gl_prefs_model_get_default_font_size (gl_prefs));
- g_signal_connect (G_OBJECT (property_bar->priv->font_size_spin),
- "changed", G_CALLBACK (font_size_changed_cb), property_bar);
+ g_signal_connect (G_OBJECT (this->priv->font_size_spin),
+ "changed", G_CALLBACK (font_size_changed_cb), this);
/* Bold and Italic toggles */
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->font_bold_toggle),
- (gl_prefs->default_font_weight == PANGO_WEIGHT_BOLD));
- g_signal_connect (G_OBJECT (property_bar->priv->font_bold_toggle),
- "toggled", G_CALLBACK (font_bold_toggled_cb), property_bar);
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->font_italic_toggle),
- gl_prefs->default_font_italic_flag);
- g_signal_connect (G_OBJECT (property_bar->priv->font_italic_toggle),
- "toggled", G_CALLBACK (font_italic_toggled_cb), property_bar);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->font_bold_toggle),
+ (gl_prefs_model_get_default_font_weight (gl_prefs) == PANGO_WEIGHT_BOLD));
+ g_signal_connect (G_OBJECT (this->priv->font_bold_toggle),
+ "toggled", G_CALLBACK (font_bold_toggled_cb), this);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->font_italic_toggle),
+ gl_prefs_model_get_default_font_italic_flag (gl_prefs));
+ g_signal_connect (G_OBJECT (this->priv->font_italic_toggle),
+ "toggled", G_CALLBACK (font_italic_toggled_cb), this);
/* Text alignment radio group */
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_left_radio),
- (gl_prefs->default_text_alignment == PANGO_ALIGN_LEFT));
- g_signal_connect (G_OBJECT (property_bar->priv->text_align_left_radio),
- "toggled", G_CALLBACK (text_align_toggled_cb), property_bar);
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_center_radio),
- (gl_prefs->default_text_alignment == PANGO_ALIGN_CENTER));
- g_signal_connect (G_OBJECT (property_bar->priv->text_align_center_radio),
- "toggled", G_CALLBACK (text_align_toggled_cb), property_bar);
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_right_radio),
- (gl_prefs->default_text_alignment == PANGO_ALIGN_RIGHT));
- g_signal_connect (G_OBJECT (property_bar->priv->text_align_right_radio),
- "toggled", G_CALLBACK (text_align_toggled_cb), property_bar);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_left_radio),
+ (gl_prefs_model_get_default_text_alignment (gl_prefs) == PANGO_ALIGN_LEFT));
+ g_signal_connect (G_OBJECT (this->priv->text_align_left_radio),
+ "toggled", G_CALLBACK (text_align_toggled_cb), this);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_center_radio),
+ (gl_prefs_model_get_default_text_alignment (gl_prefs) == PANGO_ALIGN_CENTER));
+ g_signal_connect (G_OBJECT (this->priv->text_align_center_radio),
+ "toggled", G_CALLBACK (text_align_toggled_cb), this);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_right_radio),
+ (gl_prefs_model_get_default_text_alignment (gl_prefs) == PANGO_ALIGN_RIGHT));
+ g_signal_connect (G_OBJECT (this->priv->text_align_right_radio),
+ "toggled", G_CALLBACK (text_align_toggled_cb), this);
/* Text color widget */
- gdk_color = gl_color_to_gdk_color (gl_prefs->default_text_color);
- color_combo_set_color (COLOR_COMBO (property_bar->priv->text_color_combo), gdk_color);
- g_free (gdk_color);
- g_signal_connect (G_OBJECT (property_bar->priv->text_color_combo),
+ gl_color_combo_button_set_color (GL_COLOR_COMBO_BUTTON (this->priv->text_color_button),
+ gl_prefs_model_get_default_text_color (gl_prefs));
+ g_signal_connect (G_OBJECT (this->priv->text_color_button),
"color_changed",
- G_CALLBACK (text_color_changed_cb), property_bar);
+ G_CALLBACK (text_color_changed_cb), this);
/* Fill color widget */
- gdk_color = gl_color_to_gdk_color (gl_prefs->default_fill_color);
- color_combo_set_color (COLOR_COMBO (property_bar->priv->fill_color_combo), gdk_color);
- g_free (gdk_color);
- g_signal_connect (G_OBJECT (property_bar->priv->fill_color_combo),
+ gl_color_combo_button_set_color (GL_COLOR_COMBO_BUTTON (this->priv->fill_color_button),
+ gl_prefs_model_get_default_fill_color (gl_prefs));
+ g_signal_connect (G_OBJECT (this->priv->fill_color_button),
"color_changed",
- G_CALLBACK (fill_color_changed_cb), property_bar);
+ G_CALLBACK (fill_color_changed_cb), this);
/* Line color widget */
- gdk_color = gl_color_to_gdk_color (gl_prefs->default_line_color);
- color_combo_set_color (COLOR_COMBO (property_bar->priv->line_color_combo), gdk_color);
- g_free (gdk_color);
- g_signal_connect (G_OBJECT (property_bar->priv->line_color_combo),
+ gl_color_combo_button_set_color (GL_COLOR_COMBO_BUTTON (this->priv->line_color_button),
+ gl_prefs_model_get_default_line_color (gl_prefs));
+ g_signal_connect (G_OBJECT (this->priv->line_color_button),
"color_changed",
- G_CALLBACK (line_color_changed_cb), property_bar);
+ G_CALLBACK (line_color_changed_cb), this);
/* Line width entry widget */
- g_signal_connect (G_OBJECT (property_bar->priv->line_width_spin),
+ g_signal_connect (G_OBJECT (this->priv->line_width_spin),
"changed",
- G_CALLBACK (line_width_changed_cb), property_bar);
+ G_CALLBACK (line_width_changed_cb), this);
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
gl_debug (DEBUG_PROPERTY_BAR, "END");
}
+
/****************************************************************************/
/* Fill widgets with default values. */
/****************************************************************************/
static void
-reset_to_default_properties (glView *view,
- glUIPropertyBar *property_bar)
+reset_to_default_properties (glLabel *label,
+ glUIPropertyBar *this)
{
- GList *family_names;
- gchar *good_font_family;
- GdkColor *gdk_color;
-
- /* Make sure we have a valid font. if not provide a good default. */
- family_names = gl_util_get_font_family_list ();
- if (g_list_find_custom (family_names,
- view->default_font_family,
- (GCompareFunc)g_utf8_collate))
- {
- good_font_family = g_strdup (view->default_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 (property_bar->priv->font_family_combo),
- good_font_family);
- g_free (good_font_family);
-
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(property_bar->priv->font_size_spin),
- view->default_font_size);
-
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->font_bold_toggle),
- (view->default_font_weight == PANGO_WEIGHT_BOLD));
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->font_italic_toggle),
- view->default_font_italic_flag);
-
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_left_radio),
- (view->default_text_alignment == PANGO_ALIGN_LEFT));
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_center_radio),
- (view->default_text_alignment == PANGO_ALIGN_CENTER));
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_right_radio),
- (view->default_text_alignment == PANGO_ALIGN_RIGHT));
-
- gdk_color = gl_color_to_gdk_color (view->default_text_color);
- color_combo_set_color (COLOR_COMBO(property_bar->priv->text_color_combo), gdk_color);
- g_free (gdk_color);
-
- gdk_color = gl_color_to_gdk_color (view->default_fill_color);
- color_combo_set_color (COLOR_COMBO(property_bar->priv->fill_color_combo), gdk_color);
- g_free (gdk_color);
-
- gdk_color = gl_color_to_gdk_color (view->default_line_color);
- color_combo_set_color (COLOR_COMBO(property_bar->priv->line_color_combo), gdk_color);
- g_free (gdk_color);
-
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(property_bar->priv->line_width_spin),
- view->default_line_width);
-}
+ gchar *family;
-/****************************************************************************/
-/* Set view associated with property_bar. */
-/****************************************************************************/
-void
-gl_ui_property_bar_set_view (glUIPropertyBar *property_bar,
- glView *view)
-{
- glLabel *label;
+ family = gl_label_get_default_font_family (label);
+ gl_font_combo_set_family (GL_FONT_COMBO (this->priv->font_family_combo), family);
+ g_free (family);
- gl_debug (DEBUG_PROPERTY_BAR, "START");
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON(this->priv->font_size_spin),
+ gl_label_get_default_font_size (label));
- g_return_if_fail (view && GL_IS_VIEW (view));
- label = view->label;
- g_return_if_fail (label && GL_IS_LABEL (label));
-
- set_doc_items_sensitive (property_bar, TRUE);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->font_bold_toggle),
+ (gl_label_get_default_font_weight (label) == PANGO_WEIGHT_BOLD));
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->font_italic_toggle),
+ gl_label_get_default_font_italic_flag (label));
- property_bar->priv->view = GL_VIEW (g_object_ref (G_OBJECT (view)));
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_left_radio),
+ (gl_label_get_default_text_alignment (label) == PANGO_ALIGN_LEFT));
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_center_radio),
+ (gl_label_get_default_text_alignment (label) == PANGO_ALIGN_CENTER));
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_right_radio),
+ (gl_label_get_default_text_alignment (label) == PANGO_ALIGN_RIGHT));
- reset_to_default_properties (view, property_bar);
+ gl_color_combo_button_set_color (GL_COLOR_COMBO_BUTTON(this->priv->text_color_button),
+ gl_label_get_default_text_color (label));
- g_signal_connect_swapped (G_OBJECT(view), "selection_changed",
- G_CALLBACK(selection_changed_cb), property_bar);
+ gl_color_combo_button_set_color (GL_COLOR_COMBO_BUTTON(this->priv->fill_color_button),
+ gl_label_get_default_fill_color (label));
- g_signal_connect_swapped (G_OBJECT(view->label), "changed",
- G_CALLBACK(selection_changed_cb), property_bar);
+ gl_color_combo_button_set_color (GL_COLOR_COMBO_BUTTON(this->priv->line_color_button),
+ gl_label_get_default_line_color (label));
- gl_debug (DEBUG_PROPERTY_BAR, "END");
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON(this->priv->line_width_spin),
+ gl_label_get_default_line_width (label));
}
+
/****************************************************************************/
-/** Set visiblity of property bar's tooltips. */
+/* Set label associated with property_bar. */
/****************************************************************************/
void
-gl_ui_property_bar_set_tooltips (glUIPropertyBar *property_bar,
- gboolean state)
+gl_ui_property_bar_set_label (glUIPropertyBar *this,
+ glLabel *label)
{
- GtkTooltipsData *data;
-
gl_debug (DEBUG_PROPERTY_BAR, "START");
- g_return_if_fail (property_bar && GL_IS_UI_PROPERTY_BAR(property_bar));
+ g_return_if_fail (label && GL_IS_LABEL (label));
- /* HACK: peek into one of our widgets to get the tooltips group created by libglade. */
- data = gtk_tooltips_data_get (property_bar->priv->font_size_spin);
- g_return_if_fail (data);
+ set_doc_items_sensitive (this, TRUE);
- if (state)
- {
- gtk_tooltips_enable (data->tooltips);
- }
- else
- {
- gtk_tooltips_disable (data->tooltips);
- }
+ reset_to_default_properties (label, this);
+
+ this->priv->label = GL_LABEL (g_object_ref (G_OBJECT (label)));
+
+ g_signal_connect_swapped (G_OBJECT(label), "selection_changed",
+ G_CALLBACK(selection_changed_cb), this);
+
+ g_signal_connect_swapped (G_OBJECT(label), "changed",
+ G_CALLBACK(selection_changed_cb), this);
gl_debug (DEBUG_PROPERTY_BAR, "END");
}
+
/*---------------------------------------------------------------------------*/
-/* PRIVATE. View "selection state changed" callback. */
+/* PRIVATE. Label "selection state changed" callback. */
/*---------------------------------------------------------------------------*/
static void
-update_text_properties (glView *view,
- glUIPropertyBar *property_bar)
+update_text_properties (glLabel *label,
+ glUIPropertyBar *this)
{
gboolean can_text, is_first_object;
gboolean is_same_font_family, is_same_font_size;
gboolean is_same_text_color, is_same_is_italic;
gboolean is_same_is_bold, is_same_align;
+ GList *selection_list;
GList *p;
glLabelObject *object;
gchar *selection_font_family, *font_family;
gboolean selection_is_italic, is_italic;
gboolean selection_is_bold, is_bold;
PangoAlignment selection_align, align;
- GdkColor *gdk_color;
- can_text = gl_view_can_selection_text (view);
- set_text_items_sensitive (property_bar, can_text);
+ can_text = gl_label_can_selection_text (label);
+ set_text_items_sensitive (this, can_text);
if (!can_text)
return;
is_first_object = TRUE;
- for (p = view->selected_object_list; p != NULL; p = p->next)
+ selection_list = gl_label_get_selection_list (label);
+ for (p = selection_list; p != NULL; p = p->next)
{
- object = gl_view_object_get_object(GL_VIEW_OBJECT (p->data));
+ object = GL_LABEL_OBJECT (p->data);
if (!gl_label_object_can_text (object))
continue;
is_first_object = FALSE;
}
+ g_list_free (selection_list);
+
if (is_same_font_family && (selection_font_family != NULL))
gl_debug (DEBUG_PROPERTY_BAR, "same font family = %s",
selection_font_family);
- gl_util_combo_box_set_active_text (GTK_COMBO_BOX (property_bar->priv->font_family_combo),
- is_same_font_family?selection_font_family:"");
+ gl_font_combo_set_family (GL_FONT_COMBO (this->priv->font_family_combo),
+ is_same_font_family?selection_font_family:"");
g_free (selection_font_family);
if (is_same_font_size)
{
gl_debug (DEBUG_PROPERTY_BAR, "same font size = %g",
selection_font_size);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (property_bar->priv->font_size_spin),
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (this->priv->font_size_spin),
selection_font_size);
}
else
{
- gtk_entry_set_text (GTK_ENTRY (property_bar->priv->font_size_spin), "");
+ gtk_entry_set_text (GTK_ENTRY (this->priv->font_size_spin), "");
}
if (is_same_text_color)
{
gl_debug (DEBUG_PROPERTY_BAR, "same text color = %08x", selection_text_color);
- gdk_color = gl_color_to_gdk_color (selection_text_color);
- color_combo_set_color (COLOR_COMBO (property_bar->priv->text_color_combo),
- gdk_color);
- g_free (gdk_color);
+ gl_color_combo_button_set_color (GL_COLOR_COMBO_BUTTON (this->priv->text_color_button),
+ selection_text_color);
}
if (is_same_is_italic)
gl_debug (DEBUG_PROPERTY_BAR, "same italic flag = %d",
selection_is_italic);
}
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->font_italic_toggle),
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->font_italic_toggle),
selection_is_italic && is_same_is_italic);
if (is_same_is_bold)
gl_debug (DEBUG_PROPERTY_BAR, "same bold flag = %d",
selection_is_bold);
}
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->font_bold_toggle),
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->font_bold_toggle),
selection_is_bold && is_same_is_bold);
if (is_same_align)
gl_debug (DEBUG_PROPERTY_BAR, "same align");
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_left_radio),
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_left_radio),
(selection_align == PANGO_ALIGN_LEFT) &&
is_same_align);
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_center_radio),
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_center_radio),
(selection_align == PANGO_ALIGN_CENTER) &&
is_same_align);
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_right_radio),
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_right_radio),
(selection_align == PANGO_ALIGN_RIGHT) &&
is_same_align);
}
+
static void
-update_fill_color (glView *view,
- glUIPropertyBar *property_bar)
+update_fill_color (glLabel *label,
+ glUIPropertyBar *this)
{
gboolean can, is_first_object;
gboolean is_same_fill_color;
+ GList *selection_list;
GList *p;
glLabelObject *object;
guint selection_fill_color, fill_color;
- GdkColor *gdk_color;
glColorNode *fill_color_node;
- can = gl_view_can_selection_fill (view);
- set_fill_items_sensitive (property_bar, can);
+ can = gl_label_can_selection_fill (label);
+ set_fill_items_sensitive (this, can);
if (!can)
return;
is_same_fill_color = TRUE;
is_first_object = TRUE;
selection_fill_color = 0;
+
+ selection_list = gl_label_get_selection_list (label);
- for (p = view->selected_object_list; p != NULL; p = p->next)
+ for (p = selection_list; p != NULL; p = p->next)
{
- object = gl_view_object_get_object(GL_VIEW_OBJECT (p->data));
+ object = GL_LABEL_OBJECT (p->data);
if (!gl_label_object_can_fill (object))
continue;
is_first_object = FALSE;
}
+ g_list_free (selection_list);
+
if (is_same_fill_color)
{
gl_debug (DEBUG_PROPERTY_BAR, "same fill color = %08x", selection_fill_color);
- gdk_color = gl_color_to_gdk_color (selection_fill_color);
- color_combo_set_color (COLOR_COMBO (property_bar->priv->fill_color_combo),
- gdk_color);
- g_free (gdk_color);
+ gl_color_combo_button_set_color (GL_COLOR_COMBO_BUTTON (this->priv->fill_color_button),
+ selection_fill_color);
}
}
+
static void
-update_line_color (glView *view,
- glUIPropertyBar *property_bar)
+update_line_color (glLabel *label,
+ glUIPropertyBar *this)
{
gboolean can, is_first_object;
gboolean is_same_line_color;
+ GList *selection_list;
GList *p;
glLabelObject *object;
guint selection_line_color, line_color;
glColorNode *line_color_node;
- GdkColor *gdk_color;
- can = gl_view_can_selection_line_color (view);
- set_line_color_items_sensitive (property_bar, can);
+ can = gl_label_can_selection_line_color (label);
+ set_line_color_items_sensitive (this, can);
if (!can)
return;
is_same_line_color = TRUE;
is_first_object = TRUE;
selection_line_color = 0;
+
+ selection_list = gl_label_get_selection_list (label);
- for (p = view->selected_object_list; p != NULL; p = p->next)
+ for (p = selection_list; p != NULL; p = p->next)
{
- object = gl_view_object_get_object(GL_VIEW_OBJECT (p->data));
+ object = GL_LABEL_OBJECT (p->data);
if (!gl_label_object_can_line_color (object))
continue;
is_first_object = FALSE;
}
+ g_list_free (selection_list);
+
if (is_same_line_color)
{
gl_debug (DEBUG_PROPERTY_BAR, "same line color = %08x", selection_line_color);
- gdk_color = gl_color_to_gdk_color (selection_line_color);
- color_combo_set_color (COLOR_COMBO (property_bar->priv->line_color_combo),
- gdk_color);
- g_free (gdk_color);
+ gl_color_combo_button_set_color (GL_COLOR_COMBO_BUTTON (this->priv->line_color_button),
+ selection_line_color);
}
}
+
static void
-update_line_width (glView *view,
- glUIPropertyBar *property_bar)
+update_line_width (glLabel *label,
+ glUIPropertyBar *this)
{
gboolean can, is_first_object;
gboolean is_same_line_width;
+ GList *selection_list;
GList *p;
glLabelObject *object;
gdouble selection_line_width, line_width;
- can = gl_view_can_selection_line_width (view);
- set_line_width_items_sensitive (property_bar, can);
+ can = gl_label_can_selection_line_width (label);
+ set_line_width_items_sensitive (this, can);
if (!can)
return;
is_same_line_width = TRUE;
is_first_object = TRUE;
selection_line_width = 0;
+
+ selection_list = gl_label_get_selection_list (label);
- for (p = view->selected_object_list; p != NULL; p = p->next)
+ for (p = selection_list; p != NULL; p = p->next)
{
- object = gl_view_object_get_object(GL_VIEW_OBJECT (p->data));
+ object = GL_LABEL_OBJECT (p->data);
if (!gl_label_object_can_line_width (object))
continue;
is_first_object = FALSE;
}
+ g_list_free (selection_list);
+
if (is_same_line_width)
{
gl_debug (DEBUG_PROPERTY_BAR, "same line width = %g", selection_line_width);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (property_bar->priv->line_width_spin),
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (this->priv->line_width_spin),
selection_line_width);
}
else
{
- gtk_entry_set_text (GTK_ENTRY (property_bar->priv->line_width_spin), "");
+ gtk_entry_set_text (GTK_ENTRY (this->priv->line_width_spin), "");
}
}
+
static void
-selection_changed_cb (glUIPropertyBar *property_bar)
+selection_changed_cb (glUIPropertyBar *this,
+ glLabel *label)
{
- glView *view = property_bar->priv->view;
-
- g_return_if_fail (view && GL_IS_VIEW (view));
- g_return_if_fail (property_bar && GL_IS_UI_PROPERTY_BAR (property_bar));
+ g_return_if_fail (label && GL_IS_LABEL (label));
+ g_return_if_fail (this && GL_IS_UI_PROPERTY_BAR (this));
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
- if (gl_view_is_selection_empty (view))
+ if (gl_label_is_selection_empty (label))
{
/* No selection: make all controls active. */
- reset_to_default_properties (view, property_bar);
- set_doc_items_sensitive (property_bar, TRUE);
+ reset_to_default_properties (label, this);
+ set_doc_items_sensitive (this, TRUE);
}
else
{
- update_text_properties (view, property_bar);
- update_fill_color (view, property_bar);
- update_line_color (view, property_bar);
- update_line_width (view, property_bar);
+ update_text_properties (label, this);
+ update_fill_color (label, this);
+ update_line_color (label, this);
+ update_line_width (label, this);
}
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
+
/*--------------------------------------------------------------------------*/
/* PRIVATE. Font family entry changed. */
/*--------------------------------------------------------------------------*/
static void
font_family_changed_cb (GtkComboBox *combo,
- glUIPropertyBar *property_bar)
+ glUIPropertyBar *this)
{
gchar *font_family;
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
- font_family = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo));
- if ( strlen(font_family) )
+ font_family = gl_font_combo_get_family (GL_FONT_COMBO (combo));
+ if ( *font_family != '\0' )
{
- gl_view_set_selection_font_family (property_bar->priv->view,
- font_family);
- gl_view_set_default_font_family (property_bar->priv->view,
- font_family);
- }
- g_free (font_family);
+ gl_label_set_selection_font_family (this->priv->label, font_family);
+ gl_label_set_default_font_family (this->priv->label, font_family);
+ }
+ g_free (font_family);
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
+
/*--------------------------------------------------------------------------*/
/* PRIVATE. Font size spin button changed. */
/*--------------------------------------------------------------------------*/
static void
font_size_changed_cb (GtkSpinButton *spin,
- glUIPropertyBar *property_bar)
+ glUIPropertyBar *this)
{
gdouble font_size;
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
font_size = gtk_spin_button_get_value (spin);
- gl_view_set_selection_font_size (property_bar->priv->view,
- font_size);
- gl_view_set_default_font_size (property_bar->priv->view,
- font_size);
+ gl_label_set_selection_font_size (this->priv->label,
+ font_size);
+ gl_label_set_default_font_size (this->priv->label,
+ font_size);
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
+
/*--------------------------------------------------------------------------*/
/* PRIVATE. Text color combo changed. */
/*--------------------------------------------------------------------------*/
static void
-text_color_changed_cb (ColorCombo *cc,
- GdkColor *gdk_color,
- gboolean custom,
- gboolean by_user,
+text_color_changed_cb (glColorComboButton *cc,
+ guint color,
gboolean is_default,
- glUIPropertyBar *property_bar)
+ glUIPropertyBar *this)
{
glColorNode *text_color_node;
- g_return_if_fail (property_bar && GL_IS_UI_PROPERTY_BAR (property_bar));
+ g_return_if_fail (this && GL_IS_UI_PROPERTY_BAR (this));
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
text_color_node = gl_color_node_new_default ();
- text_color_node->color = gl_color_from_gdk_color (gdk_color);
+ text_color_node->color = color;
- gl_debug (DEBUG_PROPERTY_BAR, "Color=%08x, Custom=%d, By_User=%d, Is_default=%d",
- text_color_node->color, custom, by_user, is_default);
+ gl_debug (DEBUG_PROPERTY_BAR, "Color=%08x, Is_default=%d",
+ color, is_default);
if (is_default)
{
- text_color_node->color = gl_prefs->default_text_color;
- gl_view_set_selection_text_color (property_bar->priv->view,
- text_color_node);
- gl_view_set_default_text_color (property_bar->priv->view,
- gl_prefs->default_text_color);
+ text_color_node->color = gl_prefs_model_get_default_text_color (gl_prefs);
+ gl_label_set_selection_text_color (this->priv->label,
+ text_color_node);
+ gl_label_set_default_text_color (this->priv->label,
+ text_color_node->color);
}
else
{
- gl_view_set_selection_text_color (property_bar->priv->view,
- text_color_node);
- gl_view_set_default_text_color (property_bar->priv->view,
- text_color_node->color);
+ gl_label_set_selection_text_color (this->priv->label,
+ text_color_node);
+ gl_label_set_default_text_color (this->priv->label,
+ text_color_node->color);
}
gl_color_node_free (&text_color_node);
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
+
/*--------------------------------------------------------------------------*/
/* PRIVATE. Fill color combo changed. */
/*--------------------------------------------------------------------------*/
static void
-fill_color_changed_cb (ColorCombo *cc,
- GdkColor *gdk_color,
- gboolean custom,
- gboolean by_user,
+fill_color_changed_cb (glColorComboButton *cc,
+ guint color,
gboolean is_default,
- glUIPropertyBar *property_bar)
+ glUIPropertyBar *this)
{
glColorNode *fill_color_node;
- g_return_if_fail (property_bar && GL_IS_UI_PROPERTY_BAR (property_bar));
+ g_return_if_fail (this && GL_IS_UI_PROPERTY_BAR (this));
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
fill_color_node = gl_color_node_new_default ();
- fill_color_node->color = gl_color_from_gdk_color (gdk_color);
+ fill_color_node->color = color;
- gl_debug (DEBUG_PROPERTY_BAR, "Color=%08x, Custom=%d, By_User=%d, Is_default=%d",
- fill_color_node->color, custom, by_user, is_default);
+ gl_debug (DEBUG_PROPERTY_BAR, "Color=%08x, Is_default=%d",
+ color, is_default);
if (is_default)
{
fill_color_node->color = GL_COLOR_NONE;
- gl_view_set_selection_fill_color (property_bar->priv->view,
- fill_color_node);
- gl_view_set_default_fill_color (property_bar->priv->view,
- fill_color_node->color);
+ gl_label_set_selection_fill_color (this->priv->label,
+ fill_color_node);
+ gl_label_set_default_fill_color (this->priv->label,
+ fill_color_node->color);
}
else
{
- gl_view_set_selection_fill_color (property_bar->priv->view,
- fill_color_node);
- gl_view_set_default_fill_color (property_bar->priv->view,
- fill_color_node->color);
+ gl_label_set_selection_fill_color (this->priv->label,
+ fill_color_node);
+ gl_label_set_default_fill_color (this->priv->label,
+ fill_color_node->color);
}
gl_color_node_free (&fill_color_node);
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
+
/*--------------------------------------------------------------------------*/
/* PRIVATE. Line color combo changed. */
/*--------------------------------------------------------------------------*/
static void
-line_color_changed_cb (ColorCombo *cc,
- GdkColor *gdk_color,
- gboolean custom,
- gboolean by_user,
+line_color_changed_cb (glColorComboButton *cc,
+ guint color,
gboolean is_default,
- glUIPropertyBar *property_bar)
+ glUIPropertyBar *this)
{
glColorNode *line_color_node;
- g_return_if_fail (property_bar && GL_IS_UI_PROPERTY_BAR (property_bar));
+ g_return_if_fail (this && GL_IS_UI_PROPERTY_BAR (this));
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
line_color_node = gl_color_node_new_default ();
- line_color_node->color = gl_color_from_gdk_color (gdk_color);
+ line_color_node->color = color;
- gl_debug (DEBUG_PROPERTY_BAR, "Color=%08x, Custom=%d, By_User=%d, Is_default=%d",
- line_color_node->color, custom, by_user, is_default);
+ gl_debug (DEBUG_PROPERTY_BAR, "Color=%08x, Is_default=%d",
+ color, is_default);
if (is_default)
{
line_color_node->color = GL_COLOR_NONE;
- gl_view_set_selection_line_color (property_bar->priv->view,
- line_color_node);
- gl_view_set_default_line_color (property_bar->priv->view,
- line_color_node->color);
+ gl_label_set_selection_line_color (this->priv->label,
+ line_color_node);
+ gl_label_set_default_line_color (this->priv->label,
+ line_color_node->color);
}
else
{
- gl_view_set_selection_line_color (property_bar->priv->view,
- line_color_node);
- gl_view_set_default_line_color (property_bar->priv->view,
- line_color_node->color);
+ gl_label_set_selection_line_color (this->priv->label,
+ line_color_node);
+ gl_label_set_default_line_color (this->priv->label,
+ line_color_node->color);
}
gl_color_node_free (&line_color_node);
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
+
/*--------------------------------------------------------------------------*/
/* PRIVATE. Line width spin button changed. */
/*--------------------------------------------------------------------------*/
static void
line_width_changed_cb (GtkSpinButton *spin,
- glUIPropertyBar *property_bar)
+ glUIPropertyBar *this)
{
gdouble line_width;
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
- if (property_bar->priv->view)
+ if (this->priv->label)
{
line_width = gtk_spin_button_get_value (spin);
- gl_view_set_selection_line_width (property_bar->priv->view,
- line_width);
- gl_view_set_default_line_width (property_bar->priv->view,
- line_width);
+ gl_label_set_selection_line_width (this->priv->label,
+ line_width);
+ gl_label_set_default_line_width (this->priv->label,
+ line_width);
}
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
+
/*---------------------------------------------------------------------------*/
/* PRIVATE. Font bold toggled callback. */
/*---------------------------------------------------------------------------*/
static void
font_bold_toggled_cb (GtkToggleToolButton *toggle,
- glUIPropertyBar *property_bar)
+ glUIPropertyBar *this)
{
gboolean state;
PangoWeight weight;
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
weight = state ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL;
- gl_view_set_selection_font_weight (property_bar->priv->view, weight);
- gl_view_set_default_font_weight (property_bar->priv->view, weight);
+ gl_label_set_selection_font_weight (this->priv->label, weight);
+ gl_label_set_default_font_weight (this->priv->label, weight);
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
+
/*---------------------------------------------------------------------------*/
/* PRIVATE. Font italic toggled callback. */
/*---------------------------------------------------------------------------*/
static void
font_italic_toggled_cb (GtkToggleToolButton *toggle,
- glUIPropertyBar *property_bar)
+ glUIPropertyBar *this)
{
gboolean state;
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
state = gtk_toggle_tool_button_get_active (toggle);
- gl_view_set_selection_font_italic_flag (property_bar->priv->view, state);
- gl_view_set_default_font_italic_flag (property_bar->priv->view, state);
+ gl_label_set_selection_font_italic_flag (this->priv->label, state);
+ gl_label_set_default_font_italic_flag (this->priv->label, state);
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
-
+
+
/*---------------------------------------------------------------------------*/
/* PRIVATE. Text align toggled callback. */
/*---------------------------------------------------------------------------*/
static void
text_align_toggled_cb (GtkToggleToolButton *toggle,
- glUIPropertyBar *property_bar)
+ glUIPropertyBar *this)
{
- if (property_bar->priv->stop_signals) return;
- property_bar->priv->stop_signals = TRUE;
+ if (this->priv->stop_signals) return;
+ this->priv->stop_signals = TRUE;
gl_debug (DEBUG_PROPERTY_BAR, "START");
- if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_left_radio)))
+ if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_left_radio)))
{
- gl_view_set_selection_text_alignment (property_bar->priv->view,
- PANGO_ALIGN_LEFT);
- gl_view_set_default_text_alignment (property_bar->priv->view,
- PANGO_ALIGN_LEFT);
+ gl_label_set_selection_text_alignment (this->priv->label,
+ PANGO_ALIGN_LEFT);
+ gl_label_set_default_text_alignment (this->priv->label,
+ PANGO_ALIGN_LEFT);
}
- if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_center_radio)))
+ if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_center_radio)))
{
- gl_view_set_selection_text_alignment (property_bar->priv->view,
- PANGO_ALIGN_CENTER);
- gl_view_set_default_text_alignment (property_bar->priv->view,
- PANGO_ALIGN_CENTER);
+ gl_label_set_selection_text_alignment (this->priv->label,
+ PANGO_ALIGN_CENTER);
+ gl_label_set_default_text_alignment (this->priv->label,
+ PANGO_ALIGN_CENTER);
}
- if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (property_bar->priv->text_align_right_radio)))
+ if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (this->priv->text_align_right_radio)))
{
- gl_view_set_selection_text_alignment (property_bar->priv->view,
- PANGO_ALIGN_RIGHT);
- gl_view_set_default_text_alignment (property_bar->priv->view,
- PANGO_ALIGN_RIGHT);
+ gl_label_set_selection_text_alignment (this->priv->label,
+ PANGO_ALIGN_RIGHT);
+ gl_label_set_default_text_alignment (this->priv->label,
+ PANGO_ALIGN_RIGHT);
}
gl_debug (DEBUG_PROPERTY_BAR, "END");
- property_bar->priv->stop_signals = FALSE;
+ this->priv->stop_signals = FALSE;
}
-/*****************************************************************************/
-/* Construct color combo "Custom widget". */
-/*****************************************************************************/
-GtkWidget *
-gl_ui_property_bar_construct_color_combo (gchar *name,
- gchar *string1,
- gchar *string2,
- gint int1,
- gint int2)
-{
- GtkWidget *color_combo;
- ColorGroup *cg;
- gchar *cg_name;
- GdkColor *gdk_color;
- gchar *no_color;
- GdkPixbuf *pixbuf = NULL;
-
- switch (int1) {
-
- case 0:
- cg_name = "text_color_group";
- gdk_color = gl_color_to_gdk_color (gl_prefs->default_text_color);
- no_color = _("Default");
- pixbuf = gdk_pixbuf_new_from_inline (-1, stock_text_24, FALSE, NULL);
- break;
-
- case 2:
- cg_name = "line_color_group";
- gdk_color = NULL;
- no_color = _("No line");
- pixbuf = gdk_pixbuf_new_from_inline (-1, stock_pencil_24, FALSE, NULL);
- break;
-
- case 1:
- default:
- cg_name = "fill_color_group";
- gdk_color = NULL;
- no_color = _("No fill");
- pixbuf = gdk_pixbuf_new_from_inline (-1, stock_bucket_fill_24, FALSE, NULL);
- break;
-
- }
-
- cg = color_group_fetch (cg_name, NULL);
- color_combo = color_combo_new (pixbuf, no_color, gdk_color, cg);
- g_free (gdk_color);
-
- color_combo_box_set_preview_relief (COLOR_COMBO(color_combo), GTK_RELIEF_NORMAL);
-
- g_object_unref (G_OBJECT (pixbuf));
-
- return color_combo;
-}
-
/*---------------------------------------------------------------------------*/
/* PRIVATE. Set sensitivity of doc controls. */
/*---------------------------------------------------------------------------*/
static void
-set_doc_items_sensitive (glUIPropertyBar *property_bar,
+set_doc_items_sensitive (glUIPropertyBar *this,
gboolean state)
{
- gtk_widget_set_sensitive (property_bar->priv->font_family_combo, state);
- gtk_widget_set_sensitive (property_bar->priv->font_size_spin, state);
- gtk_widget_set_sensitive (property_bar->priv->font_bold_toggle, state);
- gtk_widget_set_sensitive (property_bar->priv->font_italic_toggle, state);
- gtk_widget_set_sensitive (property_bar->priv->text_align_left_radio, state);
- gtk_widget_set_sensitive (property_bar->priv->text_align_center_radio, state);
- gtk_widget_set_sensitive (property_bar->priv->text_align_right_radio, state);
- gtk_widget_set_sensitive (property_bar->priv->text_color_combo, state);
- gtk_widget_set_sensitive (property_bar->priv->fill_color_combo, state);
- gtk_widget_set_sensitive (property_bar->priv->line_color_combo, state);
- gtk_widget_set_sensitive (property_bar->priv->line_width_spin, state);
+ gtk_widget_set_sensitive (this->priv->font_family_combo, state);
+ gtk_widget_set_sensitive (this->priv->font_size_spin, state);
+ gtk_widget_set_sensitive (this->priv->font_bold_toggle, state);
+ gtk_widget_set_sensitive (this->priv->font_italic_toggle, state);
+ gtk_widget_set_sensitive (this->priv->text_align_left_radio, state);
+ gtk_widget_set_sensitive (this->priv->text_align_center_radio, state);
+ gtk_widget_set_sensitive (this->priv->text_align_right_radio, state);
+ gtk_widget_set_sensitive (this->priv->text_color_button, state);
+ gtk_widget_set_sensitive (this->priv->fill_color_button, state);
+ gtk_widget_set_sensitive (this->priv->line_color_button, state);
+ gtk_widget_set_sensitive (this->priv->line_width_spin, state);
}
+
/*---------------------------------------------------------------------------*/
/* PRIVATE. Set sensitivity of text related controls. */
/*---------------------------------------------------------------------------*/
static void
-set_text_items_sensitive (glUIPropertyBar *property_bar,
+set_text_items_sensitive (glUIPropertyBar *this,
gboolean state)
{
- gtk_widget_set_sensitive (property_bar->priv->font_family_combo, state);
- gtk_widget_set_sensitive (property_bar->priv->font_size_spin, state);
- gtk_widget_set_sensitive (property_bar->priv->font_bold_toggle, state);
- gtk_widget_set_sensitive (property_bar->priv->font_italic_toggle, state);
- gtk_widget_set_sensitive (property_bar->priv->text_align_left_radio, state);
- gtk_widget_set_sensitive (property_bar->priv->text_align_center_radio, state);
- gtk_widget_set_sensitive (property_bar->priv->text_align_right_radio, state);
- gtk_widget_set_sensitive (property_bar->priv->text_color_combo, state);
+ gtk_widget_set_sensitive (this->priv->font_family_combo, state);
+ gtk_widget_set_sensitive (this->priv->font_size_spin, state);
+ gtk_widget_set_sensitive (this->priv->font_bold_toggle, state);
+ gtk_widget_set_sensitive (this->priv->font_italic_toggle, state);
+ gtk_widget_set_sensitive (this->priv->text_align_left_radio, state);
+ gtk_widget_set_sensitive (this->priv->text_align_center_radio, state);
+ gtk_widget_set_sensitive (this->priv->text_align_right_radio, state);
+ gtk_widget_set_sensitive (this->priv->text_color_button, state);
}
+
/*---------------------------------------------------------------------------*/
/* PRIVATE. Set sensitivity of fill related controls. */
/*---------------------------------------------------------------------------*/
static void
-set_fill_items_sensitive (glUIPropertyBar *property_bar,
+set_fill_items_sensitive (glUIPropertyBar *this,
gboolean state)
{
- gtk_widget_set_sensitive (property_bar->priv->fill_color_combo, state);
+ gtk_widget_set_sensitive (this->priv->fill_color_button, state);
}
+
/*---------------------------------------------------------------------------*/
/* PRIVATE. Set sensitivity of line color related controls. */
/*---------------------------------------------------------------------------*/
static void
-set_line_color_items_sensitive (glUIPropertyBar *property_bar,
+set_line_color_items_sensitive (glUIPropertyBar *this,
gboolean state)
{
- gtk_widget_set_sensitive (property_bar->priv->line_color_combo, state);
+ gtk_widget_set_sensitive (this->priv->line_color_button, state);
}
+
/*---------------------------------------------------------------------------*/
/* PRIVATE. Set sensitivity of line width related controls. */
/*---------------------------------------------------------------------------*/
static void
-set_line_width_items_sensitive (glUIPropertyBar *property_bar,
+set_line_width_items_sensitive (glUIPropertyBar *this,
gboolean state)
{
- gtk_widget_set_sensitive (property_bar->priv->line_width_spin, state);
+ gtk_widget_set_sensitive (this->priv->line_width_spin, state);
}
+
+/*
+ * Local Variables: -- emacs
+ * mode: C -- emacs
+ * c-basic-offset: 8 -- emacs
+ * tab-width: 8 -- emacs
+ * indent-tabs-mode: nil -- emacs
+ * End: -- emacs
+ */
projects / glabels / blobdiff