Separation of bookmarks and normal toolbars.

2004-06-08  Christian Persch  <chpe@cvs.gnome.org>

	Separation of bookmarks and normal toolbars.

	* lib/egg/egg-editable-toolbar.c: (find_action), (create_item),
	(egg_editable_toolbar_construct), (egg_editable_toolbar_realize),
	(egg_editable_toolbar_unrealize), (egg_editable_toolbar_set_model),
	(egg_editable_toolbar_set_merge),
	(egg_editable_toolbar_set_property),
	(egg_editable_toolbar_get_property),
	(egg_editable_toolbar_class_init), (egg_editable_toolbar_init),
	(egg_editable_toolbar_set_edit_mode):
	* lib/egg/egg-editable-toolbar.h:
	* lib/egg/egg-toolbars-model.c: (egg_toolbars_model_load),
	(egg_toolbars_model_init):

	Only construct the toolbar on realize. When setting a different model,
	unrealize the toolbar. Connect to model only while realized, fixes
	crashes when setting flags on the toolbars model.

	* data/ui/epiphany-bookmarksbar.xml:
	* data/ui/epiphany-fs-toolbar.xml:
	* data/ui/epiphany-toolbar.xml:

	Separated. Fix root name to be "toolbars" which is the name we
	save the model with.

	* src/bookmarks/ephy-bookmarksbar-model.c:
	(ephy_bookmarksbar_model_get_type), (get_toolbar_and_item_pos),
	(get_toolbar_pos), (ephy_bookmarksbar_model_get_action_name),
	(ephy_bookmarksbar_model_get_node),
	(ephy_bookmarksbar_model_add_bookmark),
	(ephy_bookmarksbar_model_remove_bookmark),
	(ephy_bookmarksbar_model_has_bookmark), (save_changes_idle),
	(save_changes), (update_flags_and_save_changes),
	(bookmark_destroy_cb), (item_added_cb), (impl_add_item),
	(impl_get_item_id), (impl_get_item_type), (load_toolbars),
	(ephy_bookmarksbar_model_init), (ephy_bookmarksbar_model_finalize),
	(ephy_bookmarksbar_model_set_property),
	(ephy_bookmarksbar_model_get_property),
	(ephy_bookmarksbar_model_class_init),
	(ephy_bookmarksbar_model_new):
	* src/bookmarks/ephy-bookmarksbar-model.h:
	* src/ephy-toolbars-model.c: (save_changes_idle), (save_changes),
	(update_flags_and_save_changes), (get_toolbar_pos),
	(load_toolbars), (ephy_toolbars_model_init),
	(ephy_toolbars_model_finalize), (ephy_toolbars_model_class_init),
	(ephy_toolbars_model_new):
	* src/ephy-toolbars-model.h:

	Split toolbars model in bookmarks and non-bookmarks parts.

	* src/bookmarks/ephy-bookmarksbar.c: (ephy_bookmarksbar_get_type),
	(go_location_cb), (bookmark_destroy_cb),
	(ephy_bookmarksbar_action_request), (toolbar_added_cb),
	(ephy_bookmarksbar_set_window), (ephy_bookmarksbar_realize),
	(ephy_bookmarksbar_unrealize), (ephy_bookmarksbar_init),
	(ephy_bookmarksbar_finalize), (ephy_bookmarksbar_set_property),
	(ephy_bookmarksbar_get_property), (ephy_bookmarksbar_class_init),
	(ephy_bookmarksbar_new):
	* src/bookmarks/ephy-bookmarksbar.h:
	* src/toolbar.c: (go_location_cb), (toolbar_set_property),
	(toolbar_get_property), (toolbar_class_init), (toolbar_set_window),
	(toolbar_init), (toolbar_new), (toolbar_set_location),
	(toolbar_update_navigation_actions):
	* src/toolbar.h:
	* src/ephy-window.c: (get_chromes_visibility),
	(sync_chromes_visibility), (ephy_window_fullscreen),
	(ephy_window_unfullscreen), (action_request_forward_cb),
	(ephy_window_init), (ephy_window_get_toolbar),
	(ephy_window_get_bookmarksbar):
	* src/ephy-window.h:
	* src/window-commands.c: (window_cmd_view_fullscreen),
	(toolbar_editor_destroy_cb), (toolbar_editor_response_cb),
	(window_cmd_edit_toolbar):

	Split toolbars in bookmarks and non-bookmarks toolbars.

	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init_defaults),
	(ephy_bookmarks_get_toolbars_model), (ephy_bookmarks_set_property),
	(ephy_bookmarks_get_property), (ephy_bookmarks_class_init),
	(ephy_bookmarks_finalize):
	* src/bookmarks/ephy-bookmarks.h:
	* src/ephy-shell.c: (ephy_shell_get_toolbars_model):
	* src/ephy-shell.h:

	Made bookmarksbar toolbars model a service of EphyBookmarks.

	* src/bookmarks/ephy-bookmark-properties.c:
	(ephy_bookmark_properties_set_property),
	(toolbar_checkbox_changed_cb), (build_ui),
	(ephy_bookmark_properties_init):
	* src/bookmarks/ephy-bookmarks-editor.c:
	(cmd_show_in_bookmarks_bar), (ephy_bookmarks_editor_update_menu),
	(toolbar_items_changed_cb), (ephy_bookmarks_editor_init):

	Adapt to changes above.

	* data/ui/Makefile.am:
	* src/Makefile.am:
	* src/bookmarks/Makefile.am:

	Makefile changes.

1 files changed, 400 insertions, 0 deletions

diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c
new file mode 100644
index 000000000..144d7c25e
--- /dev/null
+++ b/src/bookmarks/ephy-bookmarksbar.c
@@ -0,0 +1,400 @@
+/*
+ *  Copyright (C) 2001, 2002 Jorn Baayen
+ *  Copyright (C) 2003-2004 Marco Pesenti Gritti
+ *  Copyright (C) 2003-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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program 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.
+ *
+ *  $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ephy-bookmarksbar.h"
+#include "ephy-bookmarksbar-model.h"
+#include "ephy-bookmarks.h"
+#include "ephy-shell.h"
+#include "ephy-topic-action.h"
+#include "ephy-bookmark-action.h"
+#include "ephy-new-bookmark.h"
+#include "ephy-stock-icons.h"
+#include "ephy-dnd.h"
+#include "ephy-debug.h"
+
+#include <gtk/gtkuimanager.h>
+#include <gtk/gtktoolbar.h>
+#include <glib/gi18n.h>
+#include <string.h>
+
+static GtkTargetEntry drag_targets[] =
+{
+	{ EGG_TOOLBAR_ITEM_TYPE,	0,	0 },
+	{ EPHY_DND_TOPIC_TYPE,		0,	1 },
+	{ EPHY_DND_URL_TYPE,		0,	2 }
+};
+static int n_drag_targets = G_N_ELEMENTS (drag_targets);
+
+enum
+{
+	PROP_0,
+	PROP_BOOKMARKS,
+	PROP_WINDOW
+};
+
+static GObjectClass *parent_class = NULL;
+
+#define EPHY_BOOKMARKSBAR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARKSBAR, EphyBookmarksBarPrivate))
+
+struct EphyBookmarksBarPrivate
+{
+	EphyWindow *window;
+	GtkActionGroup *action_group;
+	EphyBookmarks *bookmarks;
+	EggToolbarsModel *toolbars_model;
+};
+
+static void ephy_bookmarksbar_class_init	(EphyBookmarksBarClass *klass);
+static void ephy_bookmarksbar_init		(EphyBookmarksBar *toolbar);
+
+GType
+ephy_bookmarksbar_get_type (void)
+{
+	static GType type = 0;
+
+	if (type == 0)
+	{
+		static const GTypeInfo our_info =
+		{
+			sizeof (EphyBookmarksBarClass),
+			NULL, /* base_init */
+			NULL, /* base_finalize */
+			(GClassInitFunc) ephy_bookmarksbar_class_init,
+			NULL,
+			NULL, /* class_data */
+			sizeof (EphyBookmarksBar),
+			0, /* n_preallocs */
+			(GInstanceInitFunc) ephy_bookmarksbar_init
+		};
+
+		type = g_type_register_static (EGG_TYPE_EDITABLE_TOOLBAR,
+					       "EphyBookmarksBar",
+					       &our_info, 0);
+	}
+
+	return type;
+}
+
+static void
+go_location_cb (GtkAction *action,
+		char *location,
+		EphyBookmarksBar *toolbar)
+{
+	EphyWindow *window = toolbar->priv->window;
+	GdkEvent *event;
+	gboolean new_tab = FALSE;
+
+	g_return_if_fail (window != NULL);
+
+	event = gtk_get_current_event ();
+	if (event != NULL)
+	{
+		if (event->type == GDK_BUTTON_RELEASE)
+		{
+			guint modifiers, button, state;
+
+			modifiers = gtk_accelerator_get_default_mod_mask ();
+			button = event->button.button;
+			state = event->button.state;
+
+			/* middle-click or control-click */
+			if ((button == 1 && ((state & modifiers) == GDK_CONTROL_MASK)) ||
+			    (button == 2))
+			{
+				new_tab = TRUE;
+			}
+		}
+
+		gdk_event_free (event);
+	}
+
+	if (new_tab)
+	{
+		ephy_shell_new_tab (ephy_shell, window,
+				    ephy_window_get_active_tab (window),
+				    location,
+				    EPHY_NEW_TAB_OPEN_PAGE |
+				    EPHY_NEW_TAB_IN_EXISTING_WINDOW);
+	}
+	else
+	{
+		ephy_window_load_url (window, location);
+	}
+}
+
+static void
+bookmark_destroy_cb (EphyNode *node,
+		     EphyBookmarksBar *toolbar)
+{
+	GtkAction *action;
+	char *name;
+	long id;
+
+	id = ephy_node_get_id (node);
+	name = ephy_bookmarksbar_model_get_action_name
+		(EPHY_BOOKMARKSBAR_MODEL (toolbar->priv->toolbars_model),
+		 id);
+
+	action = gtk_action_group_get_action (toolbar->priv->action_group, name);
+	g_return_if_fail (action != NULL);
+
+	gtk_action_group_remove_action (toolbar->priv->action_group, action);
+
+	g_free (name);
+}
+
+static void
+ephy_bookmarksbar_action_request (EggEditableToolbar *eggtoolbar,
+				       const char *name)
+{
+	EphyBookmarksBar *toolbar = EPHY_BOOKMARKSBAR (eggtoolbar);
+	GtkAction *action = NULL;
+	EphyNode *bmks, *topics;
+
+	bmks = ephy_bookmarks_get_bookmarks (toolbar->priv->bookmarks);
+	topics = ephy_bookmarks_get_keywords (toolbar->priv->bookmarks);
+
+	LOG ("Action request for action '%s'", name)
+
+	if (g_str_has_prefix (name, "GoBookmark-"))
+	{
+		EphyNode *node;
+
+		node = ephy_bookmarksbar_model_get_node
+			(EPHY_BOOKMARKSBAR_MODEL (toolbar->priv->toolbars_model),
+			 name);
+		g_return_if_fail (node != NULL);
+
+		if (ephy_node_has_child (topics, node))
+		{
+			action = ephy_topic_action_new (name, ephy_node_get_id (node));
+		}
+		else if (ephy_node_has_child (bmks, node))
+		{
+			action = ephy_bookmark_action_new (name, ephy_node_get_id (node));
+		}
+
+		g_return_if_fail (action != NULL);
+
+		g_signal_connect (action, "go_location",
+				  G_CALLBACK (go_location_cb), toolbar);
+		gtk_action_group_add_action (toolbar->priv->action_group, action);
+		g_object_unref (action);
+
+		ephy_node_signal_connect_object (node,
+						 EPHY_NODE_DESTROY,
+						 (EphyNodeCallback) bookmark_destroy_cb,
+						 G_OBJECT (toolbar));
+	}
+
+	if (EGG_EDITABLE_TOOLBAR_CLASS (parent_class)->action_request)
+	{
+		EGG_EDITABLE_TOOLBAR_CLASS (parent_class)->action_request (eggtoolbar, name);
+	}
+}
+
+static void
+toolbar_added_cb (EggToolbarsModel *model,
+		  int position,
+		  EggEditableToolbar *toolbar)
+{
+	const char *t_name;
+
+	t_name = egg_toolbars_model_toolbar_nth (model, position);
+	g_return_if_fail (t_name != NULL);
+
+	egg_editable_toolbar_set_drag_dest
+		(toolbar, drag_targets, n_drag_targets, t_name);
+}
+
+static void
+ephy_bookmarksbar_set_window (EphyBookmarksBar *toolbar,
+				   EphyWindow *window)
+{
+	EggToolbarsModel *model = toolbar->priv->toolbars_model;
+	GtkUIManager *manager = GTK_UI_MANAGER (window->ui_merge);
+
+	g_return_if_fail (toolbar->priv->window == NULL);
+	g_return_if_fail (model != NULL);
+
+	toolbar->priv->window = window;
+
+	toolbar->priv->action_group =
+		gtk_action_group_new ("BookmarksToolbarActions");
+
+	gtk_ui_manager_insert_action_group (manager,
+					    toolbar->priv->action_group, -1);
+
+	g_object_set (G_OBJECT (toolbar),
+		      "MenuMerge", manager,
+		      "ToolbarsModel", model,
+		      NULL);
+}
+
+static void
+ephy_bookmarksbar_realize (GtkWidget *widget)
+{
+	EggEditableToolbar *eggtoolbar = EGG_EDITABLE_TOOLBAR (widget);
+	EphyBookmarksBar *toolbar = EPHY_BOOKMARKSBAR (widget);
+	EggToolbarsModel *model = toolbar->priv->toolbars_model;
+	int i, n_toolbars;
+
+	GTK_WIDGET_CLASS (parent_class)->realize (widget);
+
+	g_signal_connect (model, "toolbar_added",
+			  G_CALLBACK (toolbar_added_cb), toolbar);
+
+	/* now that the toolbar has been constructed, set drag dests */
+	n_toolbars = egg_toolbars_model_n_toolbars (model);
+	for (i = 0; i < n_toolbars; i++)
+	{
+		const char *t_name;
+
+		t_name = egg_toolbars_model_toolbar_nth (model, i);
+		g_return_if_fail (t_name != NULL);
+
+		egg_editable_toolbar_set_drag_dest
+			(eggtoolbar, drag_targets, n_drag_targets, t_name);
+	}	
+}
+
+static void
+ephy_bookmarksbar_unrealize (GtkWidget *widget)
+{
+	EphyBookmarksBar *toolbar = EPHY_BOOKMARKSBAR (widget);
+	EggToolbarsModel *model = toolbar->priv->toolbars_model;
+
+	g_signal_handlers_disconnect_by_func
+		(model, G_CALLBACK (toolbar_added_cb), toolbar);
+
+	GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+}
+
+static void
+ephy_bookmarksbar_init (EphyBookmarksBar *toolbar)
+{
+	toolbar->priv = EPHY_BOOKMARKSBAR_GET_PRIVATE (toolbar);
+}
+
+static void
+ephy_bookmarksbar_finalize (GObject *object)
+{
+	EphyBookmarksBar *toolbar = EPHY_BOOKMARKSBAR (object);
+
+	g_object_unref (toolbar->priv->action_group);
+
+	g_signal_handlers_disconnect_by_func
+		(toolbar->priv->toolbars_model,
+		 G_CALLBACK (toolbar_added_cb),
+		 toolbar);
+
+	LOG ("EphyBookmarksBar %p finalised", object)
+
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+ephy_bookmarksbar_set_property (GObject *object,
+				     guint prop_id,
+				     const GValue *value,
+				     GParamSpec *pspec)
+{
+	EphyBookmarksBar *toolbar = EPHY_BOOKMARKSBAR (object);
+
+	switch (prop_id)
+	{
+		case PROP_BOOKMARKS:
+			toolbar->priv->bookmarks = g_value_get_object (value);
+			toolbar->priv->toolbars_model =
+				ephy_bookmarks_get_toolbars_model (toolbar->priv->bookmarks);
+			break;
+		case PROP_WINDOW:
+			ephy_bookmarksbar_set_window (toolbar, g_value_get_object (value));
+			break;
+	}
+}
+
+static void
+ephy_bookmarksbar_get_property (GObject *object,
+				     guint prop_id,
+				     GValue *value,
+				     GParamSpec *pspec)
+{
+	/* no readable properties */
+	g_assert_not_reached ();
+}
+
+static void
+ephy_bookmarksbar_class_init (EphyBookmarksBarClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+	EggEditableToolbarClass *eet_class = EGG_EDITABLE_TOOLBAR_CLASS (klass);
+
+	parent_class = g_type_class_peek_parent (klass);
+
+	object_class->finalize = ephy_bookmarksbar_finalize;
+	object_class->set_property = ephy_bookmarksbar_set_property;
+	object_class->get_property = ephy_bookmarksbar_get_property;
+
+	widget_class->realize = ephy_bookmarksbar_realize;
+	widget_class->unrealize = ephy_bookmarksbar_unrealize;
+
+	eet_class->action_request = ephy_bookmarksbar_action_request;
+
+	g_object_class_install_property (object_class,
+					 PROP_WINDOW,
+					 g_param_spec_object ("window",
+							      "Window",
+							      "Parent window",
+							      EPHY_TYPE_WINDOW,
+							      G_PARAM_WRITABLE |
+							      G_PARAM_CONSTRUCT_ONLY));
+
+	g_object_class_install_property (object_class,
+					 PROP_BOOKMARKS,
+					 g_param_spec_object ("bookmarks",
+							      "Bookmarks",
+							      "Bookmarks Model",
+							      EPHY_TYPE_BOOKMARKS,
+							      G_PARAM_WRITABLE |
+							      G_PARAM_CONSTRUCT_ONLY));
+
+	g_type_class_add_private (object_class, sizeof(EphyBookmarksBarPrivate));
+}
+
+GtkWidget *
+ephy_bookmarksbar_new (EphyWindow *window)
+{
+	EphyBookmarks *bookmarks;
+
+	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
+
+	return GTK_WIDGET (g_object_new (EPHY_TYPE_BOOKMARKSBAR,
+					 "bookmarks", bookmarks,
+					 "window", window,
+					 NULL));
+}