From 1ccd53c473f0a9037af0fdffa9c9b302c22554dd Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Mon, 21 Apr 2003 16:01:11 +0000 Subject: Revert the bookmarks toolbar implementation. We really need to integrate 2003-04-21 Marco Pesenti Gritti * data/ui/epiphany-ui.xml.in: * src/bookmarks/Makefile.am: * src/bookmarks/ephy-bookmarks-toolbar.c: * src/bookmarks/ephy-bookmarks-toolbar.h: * src/ephy-window.c: (ephy_window_init), (ephy_window_set_chrome): Revert the bookmarks toolbar implementation. We really need to integrate it with normal toolbars editor code. --- ChangeLog | 11 + data/ui/epiphany-ui.xml.in | 1 - src/bookmarks/Makefile.am | 2 - src/bookmarks/ephy-bookmarks-toolbar.c | 365 --------------------------------- src/bookmarks/ephy-bookmarks-toolbar.h | 58 ------ src/ephy-window.c | 5 - 6 files changed, 11 insertions(+), 431 deletions(-) delete mode 100644 src/bookmarks/ephy-bookmarks-toolbar.c delete mode 100644 src/bookmarks/ephy-bookmarks-toolbar.h diff --git a/ChangeLog b/ChangeLog index 76719af1c..7b0bdb57e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2003-04-21 Marco Pesenti Gritti + + * data/ui/epiphany-ui.xml.in: + * src/bookmarks/Makefile.am: + * src/bookmarks/ephy-bookmarks-toolbar.c: + * src/bookmarks/ephy-bookmarks-toolbar.h: + * src/ephy-window.c: (ephy_window_init), (ephy_window_set_chrome): + + Revert the bookmarks toolbar implementation. We really need to + integrate it with normal toolbars editor code. + 2003-04-21 David Bordoley * src/ephy-history-window.c: diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in index 0da96aa19..dc8e97242 100644 --- a/data/ui/epiphany-ui.xml.in +++ b/data/ui/epiphany-ui.xml.in @@ -33,7 +33,6 @@ - diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am index 2a889ef5f..04ecbe356 100644 --- a/src/bookmarks/Makefile.am +++ b/src/bookmarks/Makefile.am @@ -28,8 +28,6 @@ libephybookmarks_la_SOURCES = \ ephy-bookmarks-import.h \ ephy-bookmark-properties.c \ ephy-bookmark-properties.h \ - ephy-bookmarks-toolbar.c \ - ephy-bookmarks-toolbar.h \ ephy-new-bookmark.c \ ephy-new-bookmark.h \ ephy-topic-action.c \ diff --git a/src/bookmarks/ephy-bookmarks-toolbar.c b/src/bookmarks/ephy-bookmarks-toolbar.c deleted file mode 100644 index 97e3025d9..000000000 --- a/src/bookmarks/ephy-bookmarks-toolbar.c +++ /dev/null @@ -1,365 +0,0 @@ -/* - * Copyright (C) 2002 Ricardo Fernández Pascual - * - * 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. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "ephy-bookmarks-toolbar.h" -#include "ephy-bookmark-action.h" -#include "ephy-topic-action.h" -#include "ephy-gobject-misc.h" -#include "egg-menu-merge.h" -#include "ephy-shell.h" -#include "ephy-debug.h" - -#include -#include -#include - -/** - * Private data - */ -struct _EphyBookmarksToolbarPrivate -{ - EphyWindow *window; - EphyBookmarks *bookmarks; - EggActionGroup *action_group; - guint ui_id; -}; - -typedef struct -{ - EphyWindow *window; - const char *url; -} FavoriteData; - -/** - * Private functions, only availble from this file - */ -static void ephy_bookmarks_toolbar_class_init (EphyBookmarksToolbarClass *klass); -static void ephy_bookmarks_toolbar_init (EphyBookmarksToolbar *wrhm); -static void ephy_bookmarks_toolbar_finalize_impl (GObject *o); -static void ephy_bookmarks_toolbar_rebuild (EphyBookmarksToolbar *wrhm); -static void ephy_bookmarks_toolbar_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void ephy_bookmarks_toolbar_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - -enum -{ - PROP_0, - PROP_EPHY_WINDOW -}; - -static gpointer g_object_class; - -/** - * EphyBookmarksToolbar object - */ -MAKE_GET_TYPE (ephy_bookmarks_toolbar, - "EphyBookmarksToolbar", EphyBookmarksToolbar, - ephy_bookmarks_toolbar_class_init, ephy_bookmarks_toolbar_init, - G_TYPE_OBJECT); - -static void -ephy_bookmarks_toolbar_class_init (EphyBookmarksToolbarClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - G_OBJECT_CLASS (klass)->finalize = ephy_bookmarks_toolbar_finalize_impl; - g_object_class = g_type_class_peek_parent (klass); - - object_class->set_property = ephy_bookmarks_toolbar_set_property; - object_class->get_property = ephy_bookmarks_toolbar_get_property; - - g_object_class_install_property (object_class, - PROP_EPHY_WINDOW, - g_param_spec_object ("EphyWindow", - "EphyWindow", - "Parent window", - EPHY_WINDOW_TYPE, - G_PARAM_READWRITE)); -} - -static void -bookmarks_changed_cb (EphyNode *node, - EphyNode *child, - EphyBookmarksToolbar *bt) -{ - /* FIXME this is updating way too often, be smarter */ - - ephy_bookmarks_toolbar_update (bt); -} - -static void -ephy_bookmarks_toolbar_init (EphyBookmarksToolbar *wrhm) -{ - EphyBookmarksToolbarPrivate *p = g_new0 (EphyBookmarksToolbarPrivate, 1); - EphyNode *bms, *topics; - - wrhm->priv = p; - - wrhm->priv->bookmarks = ephy_shell_get_bookmarks (ephy_shell); - wrhm->priv->ui_id = -1; - wrhm->priv->action_group = NULL; - - bms = ephy_bookmarks_get_bookmarks (p->bookmarks); - topics = ephy_bookmarks_get_keywords (p->bookmarks); - - g_signal_connect (bms, "child_changed", - G_CALLBACK (bookmarks_changed_cb), wrhm); - g_signal_connect (topics, "child_changed", - G_CALLBACK (bookmarks_changed_cb), wrhm); -} - -static void -ephy_bookmarks_toolbar_clean (EphyBookmarksToolbar *wrhm) -{ - EphyBookmarksToolbarPrivate *p = wrhm->priv; - EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge); - - if (p->ui_id >= 0) - { - egg_menu_merge_remove_ui (merge, p->ui_id); - } - - if (p->action_group != NULL) - { - egg_menu_merge_remove_action_group (merge, p->action_group); - g_object_unref (p->action_group); - } -} - -static void -ephy_bookmarks_toolbar_finalize_impl (GObject *o) -{ - EphyBookmarksToolbar *wrhm = EPHY_BOOKMARKS_TOOLBAR (o); - EphyBookmarksToolbarPrivate *p = wrhm->priv; - - if (p->action_group != NULL) - { - egg_menu_merge_remove_action_group - (EGG_MENU_MERGE (p->window->ui_merge), - p->action_group); - g_object_unref (p->action_group); - } - - g_free (p); - - G_OBJECT_CLASS (g_object_class)->finalize (o); -} - -static void -ephy_bookmarks_toolbar_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - EphyBookmarksToolbar *m = EPHY_BOOKMARKS_TOOLBAR (object); - - switch (prop_id) - { - case PROP_EPHY_WINDOW: - m->priv->window = g_value_get_object (value); - ephy_bookmarks_toolbar_rebuild (m); - break; - } -} - -static void -ephy_bookmarks_toolbar_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - EphyBookmarksToolbar *m = EPHY_BOOKMARKS_TOOLBAR (object); - - switch (prop_id) - { - case PROP_EPHY_WINDOW: - g_value_set_object (value, m->priv->window); - break; - } -} - -static void -go_location_cb (EggAction *action, char *location, EphyWindow *window) -{ - EphyEmbed *embed; - - embed = ephy_window_get_active_embed (window); - g_return_if_fail (embed != NULL); - - ephy_embed_load_url (embed, location); -} - -EphyBookmarksToolbar * -ephy_bookmarks_toolbar_new (EphyWindow *window) -{ - EphyBookmarksToolbar *ret = g_object_new (EPHY_TYPE_BOOKMARKS_TOOLBAR, - "EphyWindow", window, - NULL); - return ret; -} - -static void -add_toolitem (const char *verb, - GString *xml) -{ - static int name_id = 0; - - name_id++; - - g_string_append (xml, "\n"); -} - -static void -ephy_bookmarks_toolbar_rebuild (EphyBookmarksToolbar *wrhm) -{ - EphyBookmarksToolbarPrivate *p = wrhm->priv; - GString *xml; - EphyNode *bms; - EphyNode *topics; - EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge); - GError *error = NULL; - GPtrArray *children; - gint i; - - LOG ("Rebuilding recent history menu") - - ephy_bookmarks_toolbar_clean (wrhm); - - bms = ephy_bookmarks_get_bookmarks (p->bookmarks); - topics = ephy_bookmarks_get_keywords (p->bookmarks); - - xml = g_string_new (NULL); - g_string_append (xml, ""); - - p->action_group = egg_action_group_new ("BookmarksToolbar"); - egg_menu_merge_insert_action_group (merge, p->action_group, 0); - - children = ephy_node_get_children (topics); - for (i = 0; i < children->len; i++) - { - gulong id; - char *verb; - EphyNode *child; - EggAction *action; - gboolean in_toolbar; - - child = g_ptr_array_index (children, i); - - in_toolbar = ephy_node_get_property_boolean - (child, EPHY_NODE_BMK_PROP_SHOW_IN_TOOLBAR); - if (!in_toolbar) continue; - - id = ephy_node_get_id (child); - verb = g_strdup_printf ("GoBookmark%ld", id); - - action = ephy_topic_action_new (verb, id); - egg_action_group_add_action (p->action_group, action); - g_object_unref (action); - - g_signal_connect (action, "go_location", - G_CALLBACK (go_location_cb), - p->window); - - add_toolitem (verb, xml); - - g_free (verb); - } - ephy_node_thaw (topics); - - children = ephy_node_get_children (bms); - for (i = 0; i < children->len; i++) - { - gulong id; - char *verb; - EphyNode *child; - EggAction *action; - gboolean in_toolbar; - - child = g_ptr_array_index (children, i); - - in_toolbar = ephy_node_get_property_boolean - (child, EPHY_NODE_BMK_PROP_SHOW_IN_TOOLBAR); - if (!in_toolbar) continue; - - id = ephy_node_get_id (child); - verb = g_strdup_printf ("GoBookmark%ld", id); - - action = ephy_bookmark_action_new (verb, id); - egg_action_group_add_action (p->action_group, action); - g_object_unref (action); - - g_signal_connect (action, "go_location", - G_CALLBACK (go_location_cb), - p->window); - - add_toolitem (verb, xml); - - g_free (verb); - } - ephy_node_thaw (bms); - - g_string_append (xml, ""); - - LOG ("Merging ui\n%s",xml->str); - p->ui_id = egg_menu_merge_add_ui_from_string - (merge, xml->str, -1, &error); - - egg_menu_merge_ensure_update (merge); - - g_string_free (xml, TRUE); -} - -void -ephy_bookmarks_toolbar_update (EphyBookmarksToolbar *wrhm) -{ - ephy_bookmarks_toolbar_rebuild (wrhm); -} - -void -ephy_bookmarks_toolbar_show (EphyBookmarksToolbar *wrhm) -{ - GtkWidget *widget; - EggMenuMerge *merge = EGG_MENU_MERGE (wrhm->priv->window->ui_merge); - - widget = egg_menu_merge_get_widget (merge, "/BookmarksToolbar"); - gtk_widget_show (widget); -} - -void -ephy_bookmarks_toolbar_hide (EphyBookmarksToolbar *wrhm) -{ - GtkWidget *widget; - EggMenuMerge *merge = EGG_MENU_MERGE (wrhm->priv->window->ui_merge); - - widget = egg_menu_merge_get_widget (merge, "/BookmarksToolbar"); - gtk_widget_hide (widget); -} diff --git a/src/bookmarks/ephy-bookmarks-toolbar.h b/src/bookmarks/ephy-bookmarks-toolbar.h deleted file mode 100644 index 826a09e0d..000000000 --- a/src/bookmarks/ephy-bookmarks-toolbar.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2002 Ricardo Fernández Pascual - * - * 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. - */ - -#ifndef EPHY_BOOKMARKS_TOOLBAR_H -#define EPHY_BOOKMARKS_TOOLBAR_H - -#include "ephy-window.h" - -typedef struct _EphyBookmarksToolbar EphyBookmarksToolbar; -typedef struct _EphyBookmarksToolbarClass EphyBookmarksToolbarClass; -typedef struct _EphyBookmarksToolbarPrivate EphyBookmarksToolbarPrivate; - -#define EPHY_TYPE_BOOKMARKS_TOOLBAR (ephy_bookmarks_toolbar_get_type()) -#define EPHY_BOOKMARKS_TOOLBAR(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EPHY_TYPE_BOOKMARKS_TOOLBAR, EphyBookmarksToolbar)) -#define EPHY_BOOKMARKS_TOOLBAR_CLASS(klass)(G_TYPE_CHECK_CLASS_CAST((klass), EPHY_TYPE_BOOKMARKS_TOOLBAR, EphyBookmarksToolbarClass)) -#define EPHY_IS_BOOKMARKS_TOOLBAR(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EPHY_TYPE_BOOKMARKS_TOOLBAR)) -#define EPHY_IS_BOOKMARKS_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EPHY_TYPE_BOOKMARKS_TOOLBAR)) -#define EPHY_BOOKMARKS_TOOLBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_BOOKMARKS_TOOLBAR, EphyBookmarksToolbarClass)) - -struct _EphyBookmarksToolbarClass -{ - GObjectClass parent_class; -}; - -struct _EphyBookmarksToolbar -{ - GObject parent_object; - - EphyBookmarksToolbarPrivate *priv; -}; - -GType ephy_bookmarks_toolbar_get_type (void); - -EphyBookmarksToolbar *ephy_bookmarks_toolbar_new (EphyWindow *window); - -void ephy_bookmarks_toolbar_update (EphyBookmarksToolbar *wrhm); - -void ephy_bookmarks_toolbar_show (EphyBookmarksToolbar *wrhm); - -void ephy_bookmarks_toolbar_hide (EphyBookmarksToolbar *wrhm); - -#endif - diff --git a/src/ephy-window.c b/src/ephy-window.c index 433b18288..50f5a0509 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -21,7 +21,6 @@ #endif #include "ephy-window.h" -#include "ephy-bookmarks-toolbar.h" #include "ephy-favorites-menu.h" #include "ephy-state.h" #include "ephy-gobject-misc.h" @@ -260,7 +259,6 @@ struct EphyWindowPrivate GtkWidget *statusbar; EggActionGroup *action_group; EggActionGroup *popups_action_group; - EphyBookmarksToolbar *bmk_toolbar; EphyFavoritesMenu *fav_menu; EphyEncodingMenu *enc_menu; PPViewToolbar *ppview_toolbar; @@ -570,7 +568,6 @@ ephy_window_init (EphyWindow *window) /* Setup the window and connect verbs */ setup_window (window); - window->priv->bmk_toolbar = ephy_bookmarks_toolbar_new (window); window->priv->fav_menu = ephy_favorites_menu_new (window); window->priv->enc_menu = ephy_encoding_menu_new (window); @@ -827,11 +824,9 @@ ephy_window_set_chrome (EphyWindow *window, if (flags & EMBED_CHROME_PERSONALTOOLBARON) { - ephy_bookmarks_toolbar_show (window->priv->bmk_toolbar); } else { - ephy_bookmarks_toolbar_hide (window->priv->bmk_toolbar); } if (flags & EMBED_CHROME_TOOLBARON) -- cgit v1.2.3