From 6cd51e1962dde760e92109a87993d0d4bc30d846 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 1 Jan 2003 14:37:14 +0000 Subject: [PATCH] changed some menu entries as suggested in bug #101974. 2003-01-01 Sven Neumann * app/gui/menus.c (image_entries): changed some menu entries as suggested in bug #101974. * app/display/gimpdisplayshell.c: changed accordingly. --- ChangeLog | 7 +++++++ app/display/gimpdisplayshell-draw.c | 27 ++++++++++++++------------- app/display/gimpdisplayshell.c | 27 ++++++++++++++------------- app/gui/menus.c | 12 ++++++------ app/menus/menus.c | 12 ++++++------ 5 files changed, 47 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16af718a91..bd5506a796 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-01-01 Sven Neumann + + * app/gui/menus.c (image_entries): changed some menu entries as + suggested in bug #101974. + + * app/display/gimpdisplayshell.c: changed accordingly. + 2003-01-01 Hans Breuer * libgimpbase/gimpdatafiles.c : when checking for diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index 30a3e5c582..cececa9e35 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -1232,26 +1232,27 @@ gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, SET_SENSITIVE ("/View/Navigation Window...", gdisp); SET_SENSITIVE ("/View/Display Filters...", gdisp); - SET_SENSITIVE ("/View/Toggle Selection", gdisp); - SET_ACTIVE ("/View/Toggle Selection", gdisp && ! shell->select->hidden); - SET_SENSITIVE ("/View/Toggle Layer Boundary", gdisp); - SET_ACTIVE ("/View/Toggle Layer Boundary", gdisp && ! shell->select->layer_hidden); + SET_SENSITIVE ("/View/Show Selection", gdisp); + SET_ACTIVE ("/View/Show Selection", gdisp && ! shell->select->hidden); + SET_SENSITIVE ("/View/Show Layer Boundary", gdisp); + SET_ACTIVE ("/View/Show Layer Boundary", gdisp && ! shell->select->layer_hidden); - SET_SENSITIVE ("/View/Toggle Guides", gdisp); - SET_ACTIVE ("/View/Toggle Guides", gdisp && gdisp->draw_guides); + SET_SENSITIVE ("/View/Show Guides", gdisp); + SET_ACTIVE ("/View/Show Guides", gdisp && gdisp->draw_guides); SET_SENSITIVE ("/View/Snap to Guides", gdisp); SET_ACTIVE ("/View/Snap to Guides", gdisp && gdisp->snap_to_guides); - SET_SENSITIVE ("/View/Toggle Menubar", gdisp); - SET_ACTIVE ("/View/Toggle Menubar", - gdisp && GTK_WIDGET_VISIBLE (GTK_ITEM_FACTORY (shell->menubar_factory)->widget)); + SET_SENSITIVE ("/View/Show Menubar", gdisp); + SET_ACTIVE ("/View/Show Menubar", + gdisp && + GTK_WIDGET_VISIBLE (GTK_ITEM_FACTORY (shell->menubar_factory)->widget)); - SET_SENSITIVE ("/View/Toggle Rulers", gdisp); - SET_ACTIVE ("/View/Toggle Rulers", + SET_SENSITIVE ("/View/Show Rulers", gdisp); + SET_ACTIVE ("/View/Show Rulers", gdisp && GTK_WIDGET_VISIBLE (shell->hrule)); - SET_SENSITIVE ("/View/Toggle Statusbar", gdisp); - SET_ACTIVE ("/View/Toggle Statusbar", + SET_SENSITIVE ("/View/Show Statusbar", gdisp); + SET_ACTIVE ("/View/Show Statusbar", gdisp && GTK_WIDGET_VISIBLE (shell->statusbar)); SET_SENSITIVE ("/View/New View", gdisp); diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 30a3e5c582..cececa9e35 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -1232,26 +1232,27 @@ gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, SET_SENSITIVE ("/View/Navigation Window...", gdisp); SET_SENSITIVE ("/View/Display Filters...", gdisp); - SET_SENSITIVE ("/View/Toggle Selection", gdisp); - SET_ACTIVE ("/View/Toggle Selection", gdisp && ! shell->select->hidden); - SET_SENSITIVE ("/View/Toggle Layer Boundary", gdisp); - SET_ACTIVE ("/View/Toggle Layer Boundary", gdisp && ! shell->select->layer_hidden); + SET_SENSITIVE ("/View/Show Selection", gdisp); + SET_ACTIVE ("/View/Show Selection", gdisp && ! shell->select->hidden); + SET_SENSITIVE ("/View/Show Layer Boundary", gdisp); + SET_ACTIVE ("/View/Show Layer Boundary", gdisp && ! shell->select->layer_hidden); - SET_SENSITIVE ("/View/Toggle Guides", gdisp); - SET_ACTIVE ("/View/Toggle Guides", gdisp && gdisp->draw_guides); + SET_SENSITIVE ("/View/Show Guides", gdisp); + SET_ACTIVE ("/View/Show Guides", gdisp && gdisp->draw_guides); SET_SENSITIVE ("/View/Snap to Guides", gdisp); SET_ACTIVE ("/View/Snap to Guides", gdisp && gdisp->snap_to_guides); - SET_SENSITIVE ("/View/Toggle Menubar", gdisp); - SET_ACTIVE ("/View/Toggle Menubar", - gdisp && GTK_WIDGET_VISIBLE (GTK_ITEM_FACTORY (shell->menubar_factory)->widget)); + SET_SENSITIVE ("/View/Show Menubar", gdisp); + SET_ACTIVE ("/View/Show Menubar", + gdisp && + GTK_WIDGET_VISIBLE (GTK_ITEM_FACTORY (shell->menubar_factory)->widget)); - SET_SENSITIVE ("/View/Toggle Rulers", gdisp); - SET_ACTIVE ("/View/Toggle Rulers", + SET_SENSITIVE ("/View/Show Rulers", gdisp); + SET_ACTIVE ("/View/Show Rulers", gdisp && GTK_WIDGET_VISIBLE (shell->hrule)); - SET_SENSITIVE ("/View/Toggle Statusbar", gdisp); - SET_ACTIVE ("/View/Toggle Statusbar", + SET_SENSITIVE ("/View/Show Statusbar", gdisp); + SET_ACTIVE ("/View/Show Statusbar", gdisp && GTK_WIDGET_VISIBLE (shell->statusbar)); SET_SENSITIVE ("/View/New View", gdisp); diff --git a/app/gui/menus.c b/app/gui/menus.c index 9d06c6a3f2..a8881b0c15 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -619,15 +619,15 @@ static GimpItemFactoryEntry image_entries[] = SEPARATOR ("/View/---"), - { { N_("/View/Toggle Selection"), "T", + { { N_("/View/Show Selection"), "T", view_toggle_selection_cmd_callback, 0, "" }, NULL, "view/toggle_selection.html", NULL }, - { { N_("/View/Toggle Layer Boundary"), NULL, + { { N_("/View/Show Layer Boundary"), NULL, view_toggle_layer_boundary_cmd_callback, 0, "" }, NULL, "view/toggle_selection.html", NULL }, - { { N_("/View/Toggle Guides"), "T", + { { N_("/View/Show Guides"), "T", view_toggle_guides_cmd_callback, 0, "" }, NULL, "view/toggle_guides.html", NULL }, @@ -638,15 +638,15 @@ static GimpItemFactoryEntry image_entries[] = SEPARATOR ("/View/---"), - { { N_("/View/Toggle Menubar"), NULL, + { { N_("/View/Show Menubar"), NULL, view_toggle_menubar_cmd_callback, 0, "" }, NULL, "view/toggle_menubar.html", NULL }, - { { N_("/View/Toggle Rulers"), "R", + { { N_("/View/Show Rulers"), "R", view_toggle_rulers_cmd_callback, 0, "" }, NULL, "view/toggle_rulers.html", NULL }, - { { N_("/View/Toggle Statusbar"), NULL, + { { N_("/View/Show Statusbar"), NULL, view_toggle_statusbar_cmd_callback, 0, "" }, NULL, "view/toggle_statusbar.html", NULL }, diff --git a/app/menus/menus.c b/app/menus/menus.c index 9d06c6a3f2..a8881b0c15 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -619,15 +619,15 @@ static GimpItemFactoryEntry image_entries[] = SEPARATOR ("/View/---"), - { { N_("/View/Toggle Selection"), "T", + { { N_("/View/Show Selection"), "T", view_toggle_selection_cmd_callback, 0, "" }, NULL, "view/toggle_selection.html", NULL }, - { { N_("/View/Toggle Layer Boundary"), NULL, + { { N_("/View/Show Layer Boundary"), NULL, view_toggle_layer_boundary_cmd_callback, 0, "" }, NULL, "view/toggle_selection.html", NULL }, - { { N_("/View/Toggle Guides"), "T", + { { N_("/View/Show Guides"), "T", view_toggle_guides_cmd_callback, 0, "" }, NULL, "view/toggle_guides.html", NULL }, @@ -638,15 +638,15 @@ static GimpItemFactoryEntry image_entries[] = SEPARATOR ("/View/---"), - { { N_("/View/Toggle Menubar"), NULL, + { { N_("/View/Show Menubar"), NULL, view_toggle_menubar_cmd_callback, 0, "" }, NULL, "view/toggle_menubar.html", NULL }, - { { N_("/View/Toggle Rulers"), "R", + { { N_("/View/Show Rulers"), "R", view_toggle_rulers_cmd_callback, 0, "" }, NULL, "view/toggle_rulers.html", NULL }, - { { N_("/View/Toggle Statusbar"), NULL, + { { N_("/View/Show Statusbar"), NULL, view_toggle_statusbar_cmd_callback, 0, "" }, NULL, "view/toggle_statusbar.html", NULL },