From c66ab87ed9b35bfafa1ad6aba79419d153e29de7 Mon Sep 17 00:00:00 2001 From: Peter Harvey Date: Tue, 21 Feb 2006 13:44:16 +0000 Subject: data/ui/epiphany-fs-toolbar.xml lib/egg/egg-toolbars-model.c 2006-02-21 Peter Harvey * data/ui/epiphany-fs-toolbar.xml * lib/egg/egg-toolbars-model.c * lib/egg/egg-toolbars-model.h Added "editable" attribute for toolbars. * data/ui/epiphany-ui.xml * lib/egg/egg-editable-toolbar.c * lib/egg/egg-editable-toolbar.h * src/ephy-toolbar.c * src/ephy-window.c Many improvements to toolbar menus. Includes changes to show visibility toggles in multiple locations. * lib/ephy-stock-icons.c * lib/ephy-stock-icons.h Additional stock icon for drag and drop. * src/bookmarks/ephy-bookmarks-ui.c Make 'customize toolbar' invisible when editing. * src/ephy-shell.c Mark the full-screen toolbar as non-removable. --- src/ephy-window.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/ephy-window.c') diff --git a/src/ephy-window.c b/src/ephy-window.c index 06e0767c3..0bddd0f2c 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -280,9 +280,9 @@ static const GtkToggleActionEntry ephy_menu_toggle_entries [] = /* View Menu */ - { "ViewToolbar", NULL, N_("_Show Toolbars"), "T", + { "ViewToolbar", NULL, N_("_Hide Toolbars"), "T", N_("Show or hide toolbar"), - G_CALLBACK (ephy_window_view_toolbar_cb), TRUE }, + G_CALLBACK (ephy_window_view_toolbar_cb), FALSE }, { "ViewStatusbar", NULL, N_("St_atusbar"), NULL, N_("Show or hide statusbar"), G_CALLBACK (ephy_window_view_statusbar_cb), TRUE }, @@ -674,7 +674,7 @@ ephy_window_fullscreen (EphyWindow *window) ephy_toolbar_set_show_leave_fullscreen (window->priv->toolbar, !lockdown_fs); - + sync_chromes_visibility (window); } @@ -1228,7 +1228,7 @@ update_chromes_actions (EphyWindow *window) g_signal_handlers_block_by_func (G_OBJECT (action), G_CALLBACK (ephy_window_view_toolbar_cb), window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), show_toolbar); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !show_toolbar); g_signal_handlers_unblock_by_func (G_OBJECT (action), G_CALLBACK (ephy_window_view_toolbar_cb), window); @@ -3652,8 +3652,8 @@ sync_chrome_with_view_toggle (GtkAction *action, EphyWindow *window, gboolean active; active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - window->priv->chrome = active ? window->priv->chrome | chrome_flag : - window->priv->chrome & (~chrome_flag); + window->priv->chrome = active ? window->priv->chrome & (~chrome_flag) : + window->priv->chrome | chrome_flag; sync_chromes_visibility (window); sync_prefs_with_chrome (window); -- cgit v1.2.3