diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | lib/egg/egg-editable-toolbar.c | 7 |
2 files changed, 14 insertions, 0 deletions
@@ -1,5 +1,12 @@ 2006-02-24 Peter Harvey <peter.a.harvey@gmail.com> + * lib/egg/egg-editable-toolbar.c + + Made the "Show" menu items insensitive when the entire toolbar + is hidden. + +2006-02-24 Peter Harvey <peter.a.harvey@gmail.com> + * src/bookmarks/ephy-topics-palette.c Changed selection mode to 'none'. Makes it more diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index 69b3ef03e..d56a9047a 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -817,6 +817,7 @@ toolbar_visibility_refresh (EggEditableToolbar *etoolbar) GtkToggleAction *action; GList *list; GString *string; + gboolean showing; char action_name[40]; char *action_label; char *tmp; @@ -839,6 +840,8 @@ toolbar_visibility_refresh (EggEditableToolbar *etoolbar) priv->visibility_id = gtk_ui_manager_new_merge_id (priv->manager); + showing = GTK_WIDGET_VISIBLE (etoolbar); + n_toolbars = egg_toolbars_model_n_toolbars (priv->model); for (i = 0; i < n_toolbars; i++) { @@ -918,6 +921,7 @@ toolbar_visibility_refresh (EggEditableToolbar *etoolbar) gtk_action_set_visible (GTK_ACTION (action), (egg_toolbars_model_get_flags (priv->model, i) & EGG_TB_MODEL_NOT_REMOVABLE) == 0); + gtk_action_set_sensitive (GTK_ACTION (action), showing); gtk_toggle_action_set_active (action, GTK_WIDGET_VISIBLE (get_dock_nth (etoolbar, i))); @@ -1306,6 +1310,9 @@ egg_editable_toolbar_init (EggEditableToolbar *etoolbar) priv = etoolbar->priv = EGG_EDITABLE_TOOLBAR_GET_PRIVATE (etoolbar); priv->save_hidden = TRUE; + + g_signal_connect (etoolbar, "notify::visible", + G_CALLBACK (toolbar_visibility_refresh), NULL); } static void |