aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks/ephy-bookmarks-editor.c
diff options
context:
space:
mode:
authorDavid Bordoley <bordoley@msu.edu>2003-04-28 22:21:56 +0800
committerDave Bordoley <Bordoley@src.gnome.org>2003-04-28 22:21:56 +0800
commiteeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef (patch)
tree59e4c84de0c540738807219b88ec645018309e58 /src/bookmarks/ephy-bookmarks-editor.c
parent2b4f4ce2f4d105ec1d24d236ed1508e7aa59ad12 (diff)
downloadgsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.gz
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.bz2
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.lz
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.xz
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.zst
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.zip
Consistent use of the term "Bookmarks Bar" in the code, ui and schema.
2003-04-28 David Bordoley <bordoley@msu.edu> * data/epiphany.schemas.in: * data/ui/epiphany-bookmark-editor-ui.xml.in: * data/ui/epiphany-toolbar.xml.in: * data/ui/epiphany-ui.xml.in: * embed/ephy-embed-types.h: * embed/mozilla/mozilla-embed.cpp: (mozilla_embed_new_window_cb): * lib/ephy-prefs.h: * src/ephy-toolbars-model.c: (ephy_toolbars_model_remove_bookmark), (ephy_toolbars_model_add_bookmark), (ephy_toolbars_model_has_bookmark): * src/ephy-window.c: (save_window_chrome), (translate_default_chrome), (update_layout_toggles), (ephy_window_set_chrome): * src/toolbar.c: (init_bookmarks_toolbar), (toolbar_set_visibility): * src/window-commands.c: (window_cmd_view_bookmarks_bar): * src/window-commands.h: * src/bookmarks/ephy-bookmark-properties.c: (build_ui): * src/bookmarks/ephy-bookmarks-editor.c: (cmd_show_in_bookmarks_bar), (ephy_bookmarks_editor_update_menu): Consistent use of the term "Bookmarks Bar" in the code, ui and schema. Replaces "Bookmarks Toolbar" and "Personal Toolbar." You'll probably have to delete your epiphany-toolbar.xml file to get the bm toolbar to work now.
Diffstat (limited to 'src/bookmarks/ephy-bookmarks-editor.c')
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 306392abe..cf4c7c619 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -89,7 +89,7 @@ static void cmd_open_bookmarks_in_tabs (EggAction *action,
EphyBookmarksEditor *editor);
static void cmd_open_bookmarks_in_browser (EggAction *action,
EphyBookmarksEditor *editor);
-static void cmd_show_in_the_toolbar (EggAction *action,
+static void cmd_show_in_bookmarks_bar (EggAction *action,
EphyBookmarksEditor *editor);
static void cmd_delete (EggAction *action,
EphyBookmarksEditor *editor);
@@ -158,9 +158,9 @@ static EggActionGroupEntry ephy_bookmark_popup_entries [] = {
{ "Delete", N_("_Delete"), GTK_STOCK_DELETE, NULL,
N_("Delete the selected bookmark or topic"),
G_CALLBACK (cmd_delete), NULL },
- { "ShowInToolbar", N_("_Show in the Toolbar"), NULL, NULL,
- N_("Show the selected bookmark or topic in the bookmarks toolbar"),
- G_CALLBACK (cmd_show_in_the_toolbar), NULL, TOGGLE_ACTION },
+ { "ShowInBookmarksBar", N_("_Show in Bookmarks Bar"), NULL, NULL,
+ N_("Show the selected bookmark or topic in the bookmarks bar"),
+ G_CALLBACK (cmd_show_in_bookmarks_bar), NULL, TOGGLE_ACTION },
{ "Properties", N_("_Properties"), GTK_STOCK_PROPERTIES, "<alt>Return",
N_("View or modify the properties of the selected bookmark"),
G_CALLBACK (cmd_bookmark_properties), NULL },
@@ -250,8 +250,8 @@ get_target_window (EphyBookmarksEditor *editor)
}
static void
-cmd_show_in_the_toolbar (EggAction *action,
- EphyBookmarksEditor *editor)
+cmd_show_in_bookmarks_bar (EggAction *action,
+ EphyBookmarksEditor *editor)
{
EphyNode *node;
GList *selection;
@@ -592,7 +592,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
gboolean key_normal = FALSE;
gboolean bmk_multiple_selection;
gboolean cut, copy, paste, select_all;
- gboolean can_show_in_toolbar, show_in_toolbar = FALSE;
+ gboolean can_show_in_bookmarks_bar, show_in_bookmarks_bar = FALSE;
EggActionGroup *action_group;
EggAction *action;
GList *selected;
@@ -642,7 +642,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
gulong id;
id = ephy_node_get_id (node);
- show_in_toolbar = ephy_toolbars_model_has_bookmark
+ show_in_bookmarks_bar = ephy_toolbars_model_has_bookmark
(editor->priv->tb_model, TRUE, id);
priority = ephy_node_get_property_int
@@ -660,7 +660,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
gulong id;
id = ephy_node_get_id (node);
- show_in_toolbar = ephy_toolbars_model_has_bookmark
+ show_in_bookmarks_bar = ephy_toolbars_model_has_bookmark
(editor->priv->tb_model, FALSE, id);
g_list_free (selected);
@@ -693,7 +693,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
delete = (bmk_focus && bmk_selection) ||
(key_selection && key_focus && key_normal);
properties = (bmk_focus && bmk_selection && !bmk_multiple_selection);
- can_show_in_toolbar = (bmk_focus && bmk_selection && !bmk_multiple_selection) ||
+ can_show_in_bookmarks_bar = (bmk_focus && bmk_selection && !bmk_multiple_selection) ||
(key_selection && key_focus);
action_group = editor->priv->action_group;
@@ -718,17 +718,17 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
g_object_set (action, "sensitive", paste, NULL);
action = egg_action_group_get_action (action_group, "SelectAll");
g_object_set (action, "sensitive", select_all, NULL);
- action = egg_action_group_get_action (action_group, "ShowInToolbar");
- g_object_set (action, "sensitive", can_show_in_toolbar, NULL);
+ action = egg_action_group_get_action (action_group, "ShowInBookmarksBar");
+ g_object_set (action, "sensitive", can_show_in_bookmarks_bar, NULL);
g_signal_handlers_block_by_func
(G_OBJECT (EGG_TOGGLE_ACTION (action)),
- G_CALLBACK (cmd_show_in_the_toolbar),
+ G_CALLBACK (cmd_show_in_bookmarks_bar),
editor);
- egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), show_in_toolbar);
+ egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), show_in_bookmarks_bar);
g_signal_handlers_unblock_by_func
(G_OBJECT (EGG_TOGGLE_ACTION (action)),
- G_CALLBACK (cmd_show_in_the_toolbar),
+ G_CALLBACK (cmd_show_in_bookmarks_bar),
editor);
}