From 97084e9c8c3435b994cdafe546b9f86e281ced5b Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 8 Jun 2004 19:38:36 +0000 Subject: Separation of bookmarks and normal toolbars. 2004-06-08 Christian Persch 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. --- src/bookmarks/ephy-bookmarksbar-model.h | 76 +++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100755 src/bookmarks/ephy-bookmarksbar-model.h (limited to 'src/bookmarks/ephy-bookmarksbar-model.h') diff --git a/src/bookmarks/ephy-bookmarksbar-model.h b/src/bookmarks/ephy-bookmarksbar-model.h new file mode 100755 index 000000000..ac39f9325 --- /dev/null +++ b/src/bookmarks/ephy-bookmarksbar-model.h @@ -0,0 +1,76 @@ +/* + * 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$ + */ + +#ifndef EPHY_BOOKMARKSBAR_MODEL_H +#define EPHY_BOOKMARKSBAR_MODEL_H + +#include "egg-toolbars-model.h" +#include "ephy-bookmarks.h" + +G_BEGIN_DECLS + +#define EPHY_TYPE_BOOKMARKSBAR_MODEL (ephy_bookmarksbar_model_get_type ()) +#define EPHY_BOOKMARKSBAR_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_BOOKMARKSBAR_MODEL, EphyBookmarksBarModel)) +#define EPHY_BOOKMARKSBAR_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_BOOKMARKSBAR_MODEL, EphyBookmarksBarModelClass)) +#define EPHY_IS_BOOKMARKSBAR_MODEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_BOOKMARKSBAR_MODEL)) +#define EPHY_IS_BOOKMARKSBAR_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_BOOKMARKSBAR_MODEL)) +#define EPHY_BOOKMARKSBAR_MODEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_BOOKMARKSBAR_MODEL, EphyBookmarksBarModelClass)) + +typedef struct EphyBookmarksBarModelClass EphyBookmarksBarModelClass; +typedef struct EphyBookmarksBarModel EphyBookmarksBarModel; +typedef struct EphyBookmarksBarModelPrivate EphyBookmarksBarModelPrivate; + +struct EphyBookmarksBarModel +{ + EggToolbarsModel parent_object; + + /*< private >*/ + EphyBookmarksBarModelPrivate *priv; +}; + +struct EphyBookmarksBarModelClass +{ + EggToolbarsModelClass parent_class; +}; + +GType ephy_bookmarksbar_model_get_type (void); + +EggToolbarsModel *ephy_bookmarksbar_model_new (EphyBookmarks *bookmarks); + +char *ephy_bookmarksbar_model_get_action_name (EphyBookmarksBarModel *model, + long id); + +EphyNode *ephy_bookmarksbar_model_get_node (EphyBookmarksBarModel *model, + const char *action_name); + +void ephy_bookmarksbar_model_add_bookmark (EphyBookmarksBarModel *model, + gboolean topic, + long id); + +void ephy_bookmarksbar_model_remove_bookmark (EphyBookmarksBarModel *model, + long id); + +gboolean ephy_bookmarksbar_model_has_bookmark (EphyBookmarksBarModel *model, + long id); + +G_END_DECLS + +#endif -- cgit v1.2.3