From 8bdee5f4dded2cea80e62b9402e138e7dc0f37c2 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Tue, 19 Apr 2011 15:22:10 -0700 Subject: Tweak the "Hide Menubar" UI options slightly. Remove the menubar visibility options from the content context menu and adds them to the chrome context menu. Invert the meaning of the option and update the option text. --- src/ephy-window.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/ephy-window.c b/src/ephy-window.c index 7da0ba4e4..006915126 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -286,9 +286,8 @@ static const GtkToggleActionEntry ephy_menu_toggle_entries [] = N_("Show the active downloads for this window"), NULL, FALSE }, - { "HideMenubar", NULL, N_("Hide Men_ubar"), NULL, - NULL, - G_CALLBACK (ephy_window_view_menubar_cb), FALSE }, + { "ViewMenuBar", NULL, N_("Men_ubar"), NULL, + NULL, G_CALLBACK (ephy_window_view_menubar_cb), TRUE }, { "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11", N_("Browse at full screen"), G_CALLBACK (window_cmd_view_fullscreen), FALSE }, @@ -1537,12 +1536,11 @@ update_chromes_actions (EphyWindow *window) g_signal_handlers_unblock_by_func (G_OBJECT (action), G_CALLBACK (ephy_window_view_toolbar_cb), window); - - action = gtk_action_group_get_action (action_group, "HideMenubar"); + action = gtk_action_group_get_action (action_group, "ViewMenuBar"); g_signal_handlers_block_by_func (G_OBJECT (action), G_CALLBACK (ephy_window_view_menubar_cb), window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !show_menubar); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), show_menubar); g_signal_handlers_unblock_by_func (G_OBJECT (action), G_CALLBACK (ephy_window_view_menubar_cb), window); @@ -4139,7 +4137,7 @@ ephy_window_view_menubar_cb (GtkAction *action, EphyWindow *window) { sync_chrome_with_view_toggle (action, window, - EPHY_WEB_VIEW_CHROME_MENUBAR, TRUE); + EPHY_WEB_VIEW_CHROME_MENUBAR, FALSE); } static void -- cgit v1.2.3