aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPeter Harvey <peter.a.harvey@gmail.com>2006-01-31 06:13:07 +0800
committerPeter Anthony Harvey <paharvey@src.gnome.org>2006-01-31 06:13:07 +0800
commitcbccb0edeaa90948433f559a16d8490c8ad3f97e (patch)
tree940edc8ce0f51e5b53ddadab77e246f93cc459a7 /src
parent4f2f3783b5772129829049efa0ce263665fb1800 (diff)
downloadgsoc2013-epiphany-cbccb0edeaa90948433f559a16d8490c8ad3f97e.tar
gsoc2013-epiphany-cbccb0edeaa90948433f559a16d8490c8ad3f97e.tar.gz
gsoc2013-epiphany-cbccb0edeaa90948433f559a16d8490c8ad3f97e.tar.bz2
gsoc2013-epiphany-cbccb0edeaa90948433f559a16d8490c8ad3f97e.tar.lz
gsoc2013-epiphany-cbccb0edeaa90948433f559a16d8490c8ad3f97e.tar.xz
gsoc2013-epiphany-cbccb0edeaa90948433f559a16d8490c8ad3f97e.tar.zst
gsoc2013-epiphany-cbccb0edeaa90948433f559a16d8490c8ad3f97e.zip
data/ui/epiphany-ui.xml src/ephy-lockdown.c src/ephy-toolbar.c
2006-01-30 Peter Harvey <peter.a.harvey@gmail.com> * data/ui/epiphany-ui.xml * src/ephy-lockdown.c * src/ephy-toolbar.c * src/ephy-window.c * lib/egg/egg-editable-toolbar.c * lib/egg/egg-editable-toolbar.h Add a Toolbars submenu with per-toolbar hide/show items.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-lockdown.c2
-rwxr-xr-xsrc/ephy-toolbar.c1
-rw-r--r--src/ephy-window.c9
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 723042320..1141d0b83 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -193,7 +193,7 @@ update_window (EphyWindow *window,
ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled || !writable);
disabled = eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_TOOLBAR_EDITING);
- action = gtk_action_group_get_action (action_group, "EditToolbar");
+ action = gtk_action_group_get_action (action_group, "ViewToolbarEditor");
ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled);
fullscreen = eel_gconf_get_boolean (CONF_LOCKDOWN_FULLSCREEN);
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index 5cf152168..f69d25a3c 100755
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -739,5 +739,6 @@ ephy_toolbar_new (EphyWindow *window)
return EPHY_TOOLBAR (g_object_new (EPHY_TYPE_TOOLBAR,
"window", window,
"ui-manager", ephy_window_get_ui_manager (window),
+ "visibility-path", "/menubar/ViewMenu/ViewTogglesGroup/ToolbarMenu",
NULL));
}
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 782033f42..0402496f2 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -120,6 +120,7 @@ static const GtkActionEntry ephy_menu_entries [] = {
{ "Tools", NULL, N_("T_ools") },
{ "Tabs", NULL, N_("_Tabs") },
{ "Help", NULL, N_("_Help") },
+ { "Toolbar", NULL, N_("_Toolbars") },
{ "PopupAction", NULL, "" },
{ "NotebookPopupAction", NULL, "" },
@@ -190,15 +191,15 @@ static const GtkActionEntry ephy_menu_entries [] = {
N_("Manage Certificates"),
G_CALLBACK (window_cmd_edit_certificates) },
#endif
- { "EditToolbar", NULL, N_("T_oolbars"), NULL,
- N_("Customize toolbars"),
- G_CALLBACK (window_cmd_edit_toolbar) },
{ "EditPrefs", GTK_STOCK_PREFERENCES, N_("P_references"), NULL,
N_("Configure the web browser"),
G_CALLBACK (window_cmd_edit_prefs) },
/* View menu */
+ { "ViewToolbarEditor", NULL, N_("_Customize Toolbars..."), NULL,
+ N_("Customize toolbars"),
+ G_CALLBACK (window_cmd_edit_toolbar) },
{ "ViewStop", GTK_STOCK_STOP, N_("_Stop"), "Escape",
N_("Stop current data transfer"),
G_CALLBACK (window_cmd_view_stop) },
@@ -279,7 +280,7 @@ static const GtkToggleActionEntry ephy_menu_toggle_entries [] =
/* View Menu */
- { "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T",
+ { "ViewToolbar", NULL, N_("_Show Toolbars"), "<shift><control>T",
N_("Show or hide toolbar"),
G_CALLBACK (ephy_window_view_toolbar_cb), TRUE },
{ "ViewStatusbar", NULL, N_("St_atusbar"), NULL,