From 1763b76918a3563dfc4f5839d27604d4de02bea7 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 17 Sep 2005 21:38:37 +0000 Subject: [PATCH] We don't need two labels for "Toggle QuickMask". Fixes bug #316569. 2005-09-17 Michael Natterer We don't need two labels for "Toggle QuickMask". Fixes bug #316569. * app/actions/qmask-actions.c: removed "qmask-active" action. * menus/qmask-menu.xml: use "qmask-toggle" instead. --- ChangeLog | 9 +++++++++ app/actions/qmask-actions.c | 18 +----------------- app/actions/quick-mask-actions.c | 18 +----------------- menus/qmask-menu.xml | 2 +- 4 files changed, 12 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb46cff660..855f95d68c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-09-17 Michael Natterer + + We don't need two labels for "Toggle QuickMask". + Fixes bug #316569. + + * app/actions/qmask-actions.c: removed "qmask-active" action. + + * menus/qmask-menu.xml: use "qmask-toggle" instead. + 2005-09-17 Michael Natterer * app/widgets/gimpactionview.c (gimp_action_view_new): skip diff --git a/app/actions/qmask-actions.c b/app/actions/qmask-actions.c index d2573398bf..7ad4dde4f8 100644 --- a/app/actions/qmask-actions.c +++ b/app/actions/qmask-actions.c @@ -50,18 +50,11 @@ static GimpActionEntry qmask_actions[] = static GimpToggleActionEntry qmask_toggle_actions[] = { - { "qmask-active", NULL, - N_("_Quick Mask Active"), NULL, NULL, - G_CALLBACK (qmask_toggle_cmd_callback), - FALSE, - GIMP_HELP_QMASK_TOGGLE }, - { "qmask-toggle", GIMP_STOCK_QMASK_ON, N_("Toggle _Quick Mask"), "Q", NULL, G_CALLBACK (qmask_toggle_cmd_callback), FALSE, GIMP_HELP_QMASK_TOGGLE } - }; static GimpRadioActionEntry qmask_invert_actions[] = @@ -81,8 +74,6 @@ static GimpRadioActionEntry qmask_invert_actions[] = void qmask_actions_setup (GimpActionGroup *group) { - GtkAction *action; - gimp_action_group_add_actions (group, qmask_actions, G_N_ELEMENTS (qmask_actions)); @@ -96,10 +87,6 @@ qmask_actions_setup (GimpActionGroup *group) G_N_ELEMENTS (qmask_invert_actions), FALSE, G_CALLBACK (qmask_invert_cmd_callback)); - - action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), - "qmask-active"); - gtk_action_set_accel_path (action, "/qmask/qmask-toggle"); } void @@ -115,11 +102,8 @@ qmask_actions_update (GimpActionGroup *group, #define SET_COLOR(action,color) \ gimp_action_group_set_action_color (group, action, (color), FALSE) - SET_SENSITIVE ("qmask-active", gimage); SET_SENSITIVE ("qmask-toggle", gimage); - - SET_ACTIVE ("qmask-active", gimage && gimage->qmask_state); - SET_ACTIVE ("qmask-toggle", gimage && gimage->qmask_state); + SET_ACTIVE ("qmask-toggle", gimage && gimage->qmask_state); SET_SENSITIVE ("qmask-invert-on", gimage); SET_SENSITIVE ("qmask-invert-off", gimage); diff --git a/app/actions/quick-mask-actions.c b/app/actions/quick-mask-actions.c index d2573398bf..7ad4dde4f8 100644 --- a/app/actions/quick-mask-actions.c +++ b/app/actions/quick-mask-actions.c @@ -50,18 +50,11 @@ static GimpActionEntry qmask_actions[] = static GimpToggleActionEntry qmask_toggle_actions[] = { - { "qmask-active", NULL, - N_("_Quick Mask Active"), NULL, NULL, - G_CALLBACK (qmask_toggle_cmd_callback), - FALSE, - GIMP_HELP_QMASK_TOGGLE }, - { "qmask-toggle", GIMP_STOCK_QMASK_ON, N_("Toggle _Quick Mask"), "Q", NULL, G_CALLBACK (qmask_toggle_cmd_callback), FALSE, GIMP_HELP_QMASK_TOGGLE } - }; static GimpRadioActionEntry qmask_invert_actions[] = @@ -81,8 +74,6 @@ static GimpRadioActionEntry qmask_invert_actions[] = void qmask_actions_setup (GimpActionGroup *group) { - GtkAction *action; - gimp_action_group_add_actions (group, qmask_actions, G_N_ELEMENTS (qmask_actions)); @@ -96,10 +87,6 @@ qmask_actions_setup (GimpActionGroup *group) G_N_ELEMENTS (qmask_invert_actions), FALSE, G_CALLBACK (qmask_invert_cmd_callback)); - - action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), - "qmask-active"); - gtk_action_set_accel_path (action, "/qmask/qmask-toggle"); } void @@ -115,11 +102,8 @@ qmask_actions_update (GimpActionGroup *group, #define SET_COLOR(action,color) \ gimp_action_group_set_action_color (group, action, (color), FALSE) - SET_SENSITIVE ("qmask-active", gimage); SET_SENSITIVE ("qmask-toggle", gimage); - - SET_ACTIVE ("qmask-active", gimage && gimage->qmask_state); - SET_ACTIVE ("qmask-toggle", gimage && gimage->qmask_state); + SET_ACTIVE ("qmask-toggle", gimage && gimage->qmask_state); SET_SENSITIVE ("qmask-invert-on", gimage); SET_SENSITIVE ("qmask-invert-off", gimage); diff --git a/menus/qmask-menu.xml b/menus/qmask-menu.xml index 1097eae821..de213e8973 100644 --- a/menus/qmask-menu.xml +++ b/menus/qmask-menu.xml @@ -3,7 +3,7 @@ - +