From e107b8c04820a45b8b4daca62e767cdfd8e62e23 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 16 Jun 2004 12:31:08 +0000 Subject: Go back to construction the toolbar when the model is set, fixes bug 2004-06-16 Christian Persch * lib/egg/egg-editable-toolbar.c: (egg_editable_toolbar_disconnect_model), (egg_editable_toolbar_deconstruct), (egg_editable_toolbar_set_model), (egg_editable_toolbar_class_init), (egg_editable_toolbar_finalize), (egg_editable_toolbar_new), (egg_editable_toolbar_new_with_model), (egg_editable_toolbar_set_fixed): * lib/egg/egg-editable-toolbar.h: * lib/egg/egg-toolbars-model.c: (egg_toolbars_model_get_flags), (parse_toolbars): * src/bookmarks/ephy-bookmarksbar.c: (ephy_bookmarksbar_set_window), (ephy_bookmarksbar_class_init): * src/ephy-window.c: (ephy_window_fullscreen), (ephy_window_unfullscreen), (ephy_window_init): * src/toolbar.c: (toolbar_style_changed_cb), (parent_set_cb), (toolbar_init), (toolbar_finalize), (toolbar_new): Go back to construction the toolbar when the model is set, fixes bug #144191. 2004-06-15 Marco Pesenti Gritti --- lib/egg/egg-editable-toolbar.c | 131 +++++++++++++++++++++-------------------- lib/egg/egg-editable-toolbar.h | 15 +++-- 2 files changed, 78 insertions(+), 68 deletions(-) (limited to 'lib/egg') diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index 0b4ed7a45..1006a1e02 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -1,5 +1,6 @@ /* - * Copyright (C) 2003 Marco Pesenti Gritti + * Copyright (C) 2003-2004 Marco Pesenti Gritti + * Copyright (C) 2004 Christian Persch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -78,6 +79,7 @@ struct EggEditableToolbarPrivate EggToolbarsModel *model; gboolean edit_mode; GtkWidget *selected_toolbar; + GtkToolItem *fixed; GtkWidget *fixed_toolbar; gboolean pending; @@ -949,38 +951,10 @@ egg_editable_toolbar_construct (EggEditableToolbar *t) } static void -egg_editable_toolbar_realize (GtkWidget *widget) +egg_editable_toolbar_disconnect_model (EggEditableToolbar *toolbar) { - EggEditableToolbar *toolbar = EGG_EDITABLE_TOOLBAR (widget); EggToolbarsModel *model = toolbar->priv->model; - GTK_WIDGET_CLASS (parent_class)->realize (widget); - - g_return_if_fail (model != NULL); - - egg_editable_toolbar_construct (toolbar); - - g_signal_connect (model, "item_added", - G_CALLBACK (item_added_cb), toolbar); - g_signal_connect (model, "item_removed", - G_CALLBACK (item_removed_cb), toolbar); - g_signal_connect (model, "toolbar_added", - G_CALLBACK (toolbar_added_cb), toolbar); - g_signal_connect (model, "toolbar_removed", - G_CALLBACK (toolbar_removed_cb), toolbar); - g_signal_connect (model, "toolbar_changed", - G_CALLBACK (toolbar_changed_cb), toolbar); -} - -static void -egg_editable_toolbar_unrealize (GtkWidget *widget) -{ - EggEditableToolbar *toolbar = EGG_EDITABLE_TOOLBAR (widget); - EggToolbarsModel *model = toolbar->priv->model; - GList *children, *l; - - g_return_if_fail (model != NULL); - g_signal_handlers_disconnect_by_func (model, G_CALLBACK (item_added_cb), toolbar); g_signal_handlers_disconnect_by_func @@ -991,6 +965,15 @@ egg_editable_toolbar_unrealize (GtkWidget *widget) (model, G_CALLBACK (toolbar_removed_cb), toolbar); g_signal_handlers_disconnect_by_func (model, G_CALLBACK (toolbar_changed_cb), toolbar); +} + +static void +egg_editable_toolbar_deconstruct (EggEditableToolbar *toolbar) +{ + EggToolbarsModel *model = toolbar->priv->model; + GList *children, *l; + + g_return_if_fail (model != NULL); if (toolbar->priv->fixed_toolbar) { @@ -1006,11 +989,9 @@ egg_editable_toolbar_unrealize (GtkWidget *widget) } g_list_free (children); - - GTK_WIDGET_CLASS (parent_class)->unrealize (widget); } -static void +void egg_editable_toolbar_set_model (EggEditableToolbar *toolbar, EggToolbarsModel *model) { @@ -1018,25 +999,32 @@ egg_editable_toolbar_set_model (EggEditableToolbar *toolbar, g_return_if_fail (EGG_IS_TOOLBARS_MODEL (model)); g_return_if_fail (EGG_IS_EDITABLE_TOOLBAR (toolbar)); + g_return_if_fail (toolbar->priv->merge); if (toolbar->priv->model == model) return; - if (GTK_WIDGET_VISIBLE (widget)) - { - gtk_widget_hide (widget); - } - - if(GTK_WIDGET_REALIZED (widget)) - { - gtk_widget_unrealize (widget); - } - if (toolbar->priv->model) { + egg_editable_toolbar_disconnect_model (toolbar); + egg_editable_toolbar_deconstruct (toolbar); + g_object_unref (toolbar->priv->model); } toolbar->priv->model = g_object_ref (model); + + egg_editable_toolbar_construct (toolbar); + + g_signal_connect (model, "item_added", + G_CALLBACK (item_added_cb), toolbar); + g_signal_connect (model, "item_removed", + G_CALLBACK (item_removed_cb), toolbar); + g_signal_connect (model, "toolbar_added", + G_CALLBACK (toolbar_added_cb), toolbar); + g_signal_connect (model, "toolbar_removed", + G_CALLBACK (toolbar_removed_cb), toolbar); + g_signal_connect (model, "toolbar_changed", + G_CALLBACK (toolbar_changed_cb), toolbar); } static void @@ -1097,7 +1085,6 @@ static void egg_editable_toolbar_class_init (EggEditableToolbarClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); parent_class = g_type_class_peek_parent (klass); @@ -1105,9 +1092,6 @@ egg_editable_toolbar_class_init (EggEditableToolbarClass *klass) object_class->set_property = egg_editable_toolbar_set_property; object_class->get_property = egg_editable_toolbar_get_property; - widget_class->realize = egg_editable_toolbar_realize; - widget_class->unrealize = egg_editable_toolbar_unrealize; - egg_editable_toolbar_signals[ACTION_REQUEST] = g_signal_new ("action_request", G_OBJECT_CLASS_TYPE (object_class), @@ -1157,6 +1141,7 @@ egg_editable_toolbar_finalize (GObject *object) if (t->priv->model) { + egg_editable_toolbar_disconnect_model (t); g_object_unref (t->priv->model); } @@ -1164,15 +1149,22 @@ egg_editable_toolbar_finalize (GObject *object) } GtkWidget * -egg_editable_toolbar_new (GtkUIManager *merge, - EggToolbarsModel *model) +egg_editable_toolbar_new (GtkUIManager *merge) { return GTK_WIDGET (g_object_new (EGG_TYPE_EDITABLE_TOOLBAR, - "ToolbarsModel", model, "MenuMerge", merge, NULL)); } +GtkWidget * +egg_editable_toolbar_new_with_model (GtkUIManager *merge, + EggToolbarsModel *model) +{ + return GTK_WIDGET (g_object_new (EGG_TYPE_EDITABLE_TOOLBAR, + "MenuMerge", merge, + "ToolbarsModel", model, + NULL)); +} gboolean egg_editable_toolbar_get_edit_mode (EggEditableToolbar *etoolbar) { @@ -1273,26 +1265,37 @@ egg_editable_toolbar_hide (EggEditableToolbar *etoolbar, } } -GtkToolbar * -egg_editable_toolbar_set_fixed (EggEditableToolbar *etoolbar, - GtkWidget *fixed) +void +egg_editable_toolbar_set_fixed (EggEditableToolbar *toolbar, + GtkToolItem *fixed) { - GtkWidget *fixed_item; + g_return_if_fail (EGG_IS_EDITABLE_TOOLBAR (toolbar)); + g_return_if_fail (!fixed || GTK_IS_TOOL_ITEM (fixed)); - etoolbar->priv->fixed_toolbar = gtk_toolbar_new (); - gtk_toolbar_set_show_arrow (GTK_TOOLBAR (etoolbar->priv->fixed_toolbar), FALSE); - g_object_ref (etoolbar->priv->fixed_toolbar); - gtk_object_sink (GTK_OBJECT (etoolbar->priv->fixed_toolbar)); + if (!toolbar->priv->fixed_toolbar) + { + toolbar->priv->fixed_toolbar = gtk_toolbar_new (); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar->priv->fixed_toolbar), FALSE); + g_object_ref (toolbar->priv->fixed_toolbar); + gtk_object_sink (GTK_OBJECT (toolbar->priv->fixed_toolbar)); + } - fixed_item = GTK_WIDGET (gtk_tool_item_new ()); - gtk_toolbar_insert (GTK_TOOLBAR (etoolbar->priv->fixed_toolbar), - GTK_TOOL_ITEM (fixed_item), 0); + if (toolbar->priv->fixed) + { + gtk_container_remove (GTK_CONTAINER (toolbar->priv->fixed_toolbar), + GTK_WIDGET (toolbar->priv->fixed)); + g_object_unref (toolbar->priv->fixed); + } - gtk_container_add (GTK_CONTAINER (fixed_item), fixed); + toolbar->priv->fixed = fixed; - update_fixed (etoolbar); + if (fixed) + { + g_object_ref (fixed); + gtk_object_sink (GTK_OBJECT (fixed)); - return GTK_TOOLBAR (etoolbar->priv->fixed_toolbar); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar->priv->fixed_toolbar), fixed, 0); + } } void diff --git a/lib/egg/egg-editable-toolbar.h b/lib/egg/egg-editable-toolbar.h index 0e5b72cd9..d0dfb9811 100755 --- a/lib/egg/egg-editable-toolbar.h +++ b/lib/egg/egg-editable-toolbar.h @@ -1,5 +1,6 @@ /* - * Copyright (C) 2003 Marco Pesenti Gritti + * Copyright (C) 2003-2004 Marco Pesenti Gritti + * Copyright (C) 2004 Christian Persch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +15,8 @@ * 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. + * + * $Id$ */ #ifndef EGG_EDITABLE_TOOLBAR_H @@ -24,6 +27,7 @@ #include #include #include +#include #include G_BEGIN_DECLS @@ -58,7 +62,10 @@ struct EggEditableToolbarClass }; GType egg_editable_toolbar_get_type (void); -GtkWidget *egg_editable_toolbar_new (GtkUIManager *merge, +GtkWidget *egg_editable_toolbar_new (GtkUIManager *merge); +GtkWidget *egg_editable_toolbar_new_with_model (GtkUIManager *merge, + EggToolbarsModel *model); +void egg_editable_toolbar_set_model (EggEditableToolbar *etoolbar, EggToolbarsModel *model); EggToolbarsModel *egg_editable_toolbar_get_model (EggEditableToolbar *etoolbar); void egg_editable_toolbar_set_edit_mode (EggEditableToolbar *etoolbar, @@ -72,8 +79,8 @@ void egg_editable_toolbar_set_drag_dest (EggEditableToolbar *etoolbar, const GtkTargetEntry *targets, gint n_targets, const char *toolbar_name); -GtkToolbar *egg_editable_toolbar_set_fixed (EggEditableToolbar *etoolbar, - GtkWidget *fixed); +void egg_editable_toolbar_set_fixed (EggEditableToolbar *etoolbar, + GtkToolItem *fixed); /* Private Functions */ -- cgit v1.2.3