From a7899ecce3adcf1bc9fe4f59430acc35de88e2a8 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sun, 4 Jan 2004 04:18:02 +0000 Subject: [PATCH] 2004-01-03 Jim Evins * AUTHORS: Added acknowledgement of contributions by Wayne Schuller. * src/commands.c: (gl_cmd_file_print): Create extra reference to print dialog, so that it can be properly re-used. * src/mygal/mygal-combo-box.h: * src/mygal/mygal-combo-box.c: (mygal_combo_box_popup_hide_unconditional), (mygal_combo_box_popup_display), (mygal_combo_box_set_display), (gtk_combo_set_tearoff_state), (mygal_combo_box_construct), (mygal_combo_box_set_arrow_relief), (mygal_combo_box_set_title), (mygal_combo_box_set_tearable): Changed all occurances of GTK_IS_COMBO_BOX to MYGAL_IS_COMBO_BOX, to complete the rename of this widget to prevent namespace collisions with Gtk+-2.3. * src/prefs-dialog.glade: Fixed alignment of Fill/Color widgets. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@402 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/AUTHORS | 5 +- glabels2/ChangeLog | 22 ++++++ glabels2/src/commands.c | 5 +- glabels2/src/mygal/mygal-combo-box.c | 16 ++--- glabels2/src/mygal/mygal-combo-box.h | 2 +- glabels2/src/prefs-dialog.glade | 104 ++++++++++++--------------- 6 files changed, 82 insertions(+), 72 deletions(-) diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS index 7fd7952a..04470697 100644 --- a/glabels2/AUTHORS +++ b/glabels2/AUTHORS @@ -21,8 +21,8 @@ canvas item: Raph Levien , Lauris Kaplinski -Glabels includes modified versions of several widgets from the GAL library. These are -copyright: +Glabels includes modified versions of several widgets from the GAL library. +These are copyright: * Copyright 2000, 2001, Ximian, Inc. * Copyright 2000, Michael Levy @@ -34,6 +34,7 @@ Glabels includes gnome-recent objects. The author: Glabels includes contributions from: Emmanuel Pacaud + Wayne Schuller Akkana nestor di -- excellent splash screen that first appeared in diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index d40fddd9..6c57d4a3 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,25 @@ +2004-01-03 Jim Evins + + * AUTHORS: + Added acknowledgement of contributions by Wayne Schuller. + + * src/commands.c: (gl_cmd_file_print): + Create extra reference to print dialog, so that it can be properly re-used. + + * src/mygal/mygal-combo-box.h: + * src/mygal/mygal-combo-box.c: + (mygal_combo_box_popup_hide_unconditional), + (mygal_combo_box_popup_display), (mygal_combo_box_set_display), + (gtk_combo_set_tearoff_state), (mygal_combo_box_construct), + (mygal_combo_box_set_arrow_relief), (mygal_combo_box_set_title), + (mygal_combo_box_set_tearable): + Changed all occurances of GTK_IS_COMBO_BOX to MYGAL_IS_COMBO_BOX, to + complete the rename of this widget to prevent namespace collisions + with Gtk+-2.3. + + * src/prefs-dialog.glade: + Fixed alignment of Fill/Color widgets. + 2004-01-03 Jim Evins * data/avery-iso-templates.xml: diff --git a/glabels2/src/commands.c b/glabels2/src/commands.c index caf4d2fb..b6a706ff 100644 --- a/glabels2/src/commands.c +++ b/glabels2/src/commands.c @@ -163,8 +163,9 @@ gl_cmd_file_print (BonoboUIComponent *uic, } else { GL_VIEW(window->view)->print_dialog = - gl_print_dialog_new (GL_VIEW(window->view)->label, - BONOBO_WINDOW(window)); + g_object_ref ( + gl_print_dialog_new (GL_VIEW(window->view)->label, + BONOBO_WINDOW(window)) ); gtk_widget_show (GL_VIEW(window->view)->print_dialog); } diff --git a/glabels2/src/mygal/mygal-combo-box.c b/glabels2/src/mygal/mygal-combo-box.c index daa6466b..e476618d 100644 --- a/glabels2/src/mygal/mygal-combo-box.c +++ b/glabels2/src/mygal/mygal-combo-box.c @@ -207,7 +207,7 @@ mygal_combo_box_popup_hide_unconditional (MygalComboBox *combo_box) gboolean popup_info_destroyed = FALSE; g_return_if_fail (combo_box != NULL); - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); + g_return_if_fail (MYGAL_IS_COMBO_BOX (combo_box)); gtk_widget_hide (combo_box->priv->toplevel); gtk_widget_hide (combo_box->priv->popup); @@ -287,7 +287,7 @@ mygal_combo_box_popup_display (MygalComboBox *combo_box) int x, y; g_return_if_fail (combo_box != NULL); - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); + g_return_if_fail (MYGAL_IS_COMBO_BOX (combo_box)); /* * If we have no widget to display on the popdown, @@ -471,7 +471,7 @@ void mygal_combo_box_set_display (MygalComboBox *combo_box, GtkWidget *display_widget) { g_return_if_fail (combo_box != NULL); - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); + g_return_if_fail (MYGAL_IS_COMBO_BOX (combo_box)); g_return_if_fail (display_widget != NULL); g_return_if_fail (GTK_IS_WIDGET (display_widget)); @@ -573,7 +573,7 @@ gtk_combo_set_tearoff_state (MygalComboBox *combo, gboolean torn_off) { g_return_if_fail (combo != NULL); - g_return_if_fail (GTK_IS_COMBO_BOX (combo)); + g_return_if_fail (MYGAL_IS_COMBO_BOX (combo)); if (combo->priv->torn_off != torn_off) { combo->priv->torn_off = torn_off; @@ -717,7 +717,7 @@ mygal_combo_box_construct (MygalComboBox *combo_box, GtkWidget *display_widget, GtkWidget *vbox; g_return_if_fail (combo_box != NULL); - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); + g_return_if_fail (MYGAL_IS_COMBO_BOX (combo_box)); g_return_if_fail (display_widget != NULL); g_return_if_fail (GTK_IS_WIDGET (display_widget)); @@ -768,7 +768,7 @@ void mygal_combo_box_set_arrow_relief (MygalComboBox *cc, GtkReliefStyle relief) { g_return_if_fail (cc != NULL); - g_return_if_fail (GTK_IS_COMBO_BOX (cc)); + g_return_if_fail (MYGAL_IS_COMBO_BOX (cc)); gtk_button_set_relief (GTK_BUTTON (cc->priv->arrow_button), relief); } @@ -792,7 +792,7 @@ mygal_combo_box_set_title (MygalComboBox *combo, const gchar *title) { g_return_if_fail (combo != NULL); - g_return_if_fail (GTK_IS_COMBO_BOX (combo)); + g_return_if_fail (MYGAL_IS_COMBO_BOX (combo)); g_object_set_data_full (G_OBJECT (combo), "gtk-combo-title", g_strdup (title), (GDestroyNotify) g_free); @@ -826,7 +826,7 @@ void mygal_combo_box_set_tearable (MygalComboBox *combo, gboolean tearable) { g_return_if_fail (combo != NULL); - g_return_if_fail (GTK_IS_COMBO_BOX (combo)); + g_return_if_fail (MYGAL_IS_COMBO_BOX (combo)); if (tearable){ gtk_widget_show (combo->priv->tearable); diff --git a/glabels2/src/mygal/mygal-combo-box.h b/glabels2/src/mygal/mygal-combo-box.h index 25a8df14..e1785f2d 100644 --- a/glabels2/src/mygal/mygal-combo-box.h +++ b/glabels2/src/mygal/mygal-combo-box.h @@ -36,7 +36,7 @@ extern "C" { #define MYGAL_COMBO_BOX_TYPE (mygal_combo_box_get_type()) #define MYGAL_COMBO_BOX(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, mygal_combo_box_get_type (), MygalComboBox) #define MYGAL_COMBO_BOX_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, mygal_combo_box_get_type (), MygalComboBoxClass) -#define GTK_IS_COMBO_BOX(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, mygal_combo_box_get_type ()) +#define MYGAL_IS_COMBO_BOX(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, mygal_combo_box_get_type ()) typedef struct _MygalComboBox MygalComboBox; typedef struct _MygalComboBoxPrivate MygalComboBoxPrivate; diff --git a/glabels2/src/prefs-dialog.glade b/glabels2/src/prefs-dialog.glade index 10d32ea7..5b7abf9f 100644 --- a/glabels2/src/prefs-dialog.glade +++ b/glabels2/src/prefs-dialog.glade @@ -1091,80 +1091,66 @@ - - 6 + True + 1 + 2 False - 12 + 12 + 12 - + + 90 True - 1 - 2 - False - 0 - 0 + Color: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - 90 - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - + + + True + False + 12 - + True - False - 12 - - - - True - gl_object_editor_construct_color_combo - 0 - 0 - Sun, 23 Nov 2003 15:43:12 GMT - - - 0 - False - False - - + gl_object_editor_construct_color_combo + 0 + 0 + Sun, 23 Nov 2003 15:43:12 GMT - 1 - 2 - 0 - 1 - fill + 0 + False + False - 0 - True - True + 1 + 2 + 0 + 1 + fill -- 2.39.5