aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-06-09 03:38:36 +0800
committerChristian Persch <chpe@src.gnome.org>2004-06-09 03:38:36 +0800
commit97084e9c8c3435b994cdafe546b9f86e281ced5b (patch)
treefc81b5bbf9fb267549d05e60a9d9b1382c427d85 /data
parent433c44cb19de1d0d40579155380fd435140b59fb (diff)
downloadgsoc2013-epiphany-97084e9c8c3435b994cdafe546b9f86e281ced5b.tar
gsoc2013-epiphany-97084e9c8c3435b994cdafe546b9f86e281ced5b.tar.gz
gsoc2013-epiphany-97084e9c8c3435b994cdafe546b9f86e281ced5b.tar.bz2
gsoc2013-epiphany-97084e9c8c3435b994cdafe546b9f86e281ced5b.tar.lz
gsoc2013-epiphany-97084e9c8c3435b994cdafe546b9f86e281ced5b.tar.xz
gsoc2013-epiphany-97084e9c8c3435b994cdafe546b9f86e281ced5b.tar.zst
gsoc2013-epiphany-97084e9c8c3435b994cdafe546b9f86e281ced5b.zip
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.
Diffstat (limited to 'data')
-rw-r--r--data/ui/epiphany-bookmarksbar.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/data/ui/epiphany-bookmarksbar.xml b/data/ui/epiphany-bookmarksbar.xml
new file mode 100644
index 000000000..2f8a1684a
--- /dev/null
+++ b/data/ui/epiphany-bookmarksbar.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<toolbars version="1.0">
+<toolbar name="BookmarksBar"/>
+</toolbars>