From fb448d8004475c8e4d34bca28bb3f7b96fdaa9fa Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sun, 19 Oct 2003 16:04:01 +0000 Subject: [PATCH] app/tools/gimpcropoptions.c revert back to "Current". 2003-10-19 Sven Neumann * app/tools/gimpcropoptions.c * app/tools/gimpmoveoptions.c: revert back to "Current". * app/tools/tools-enums.[ch]: removed "Active" from the enum value descriptions; it was misleading. --- ChangeLog | 8 ++++++++ app/gui/image-menu.c | 4 ++-- app/menus/image-menu.c | 4 ++-- app/tools/gimpcropoptions.c | 2 +- app/tools/gimpmoveoptions.c | 4 ++-- app/tools/tools-enums.c | 4 ++-- app/tools/tools-enums.h | 6 +++--- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 835de360a4..d4dbad045c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-10-19 Sven Neumann + + * app/tools/gimpcropoptions.c + * app/tools/gimpmoveoptions.c: revert back to "Current". + + * app/tools/tools-enums.[ch]: removed "Active" from the enum value + descriptions; it was misleading. + 2003-10-19 Sven Neumann * app/widgets/gimppropwidgets.c (gimp_prop_enum_radio_frame_new) diff --git a/app/gui/image-menu.c b/app/gui/image-menu.c index 1d217ddf34..2db9ec224a 100644 --- a/app/gui/image-menu.c +++ b/app/gui/image-menu.c @@ -246,7 +246,7 @@ GimpItemFactoryEntry image_menu_entries[] = "", GIMP_STOCK_SELECTION_STROKE }, NULL, GIMP_HELP_SELECTION_STROKE, NULL }, - { { N_("/Edit/St_roke Active Path..."), NULL, + { { N_("/Edit/St_roke Path..."), NULL, vectors_stroke_cmd_callback, 0, "", GIMP_STOCK_PATH_STROKE }, NULL, @@ -1441,7 +1441,7 @@ image_menu_update (GtkItemFactory *item_factory, SET_SENSITIVE ("/Edit/Fill with BG Color", lp); SET_SENSITIVE ("/Edit/Fill with Pattern", lp); SET_SENSITIVE ("/Edit/Stroke Selection...", lp && sel); - SET_SENSITIVE ("/Edit/Stroke Active Path...", lp && vectors); + SET_SENSITIVE ("/Edit/Stroke Path...", lp && vectors); /* Select */ diff --git a/app/menus/image-menu.c b/app/menus/image-menu.c index 1d217ddf34..2db9ec224a 100644 --- a/app/menus/image-menu.c +++ b/app/menus/image-menu.c @@ -246,7 +246,7 @@ GimpItemFactoryEntry image_menu_entries[] = "", GIMP_STOCK_SELECTION_STROKE }, NULL, GIMP_HELP_SELECTION_STROKE, NULL }, - { { N_("/Edit/St_roke Active Path..."), NULL, + { { N_("/Edit/St_roke Path..."), NULL, vectors_stroke_cmd_callback, 0, "", GIMP_STOCK_PATH_STROKE }, NULL, @@ -1441,7 +1441,7 @@ image_menu_update (GtkItemFactory *item_factory, SET_SENSITIVE ("/Edit/Fill with BG Color", lp); SET_SENSITIVE ("/Edit/Fill with Pattern", lp); SET_SENSITIVE ("/Edit/Stroke Selection...", lp && sel); - SET_SENSITIVE ("/Edit/Stroke Active Path...", lp && vectors); + SET_SENSITIVE ("/Edit/Stroke Path...", lp && vectors); /* Select */ diff --git a/app/tools/gimpcropoptions.c b/app/tools/gimpcropoptions.c index fa28304223..4c13b7a1c6 100644 --- a/app/tools/gimpcropoptions.c +++ b/app/tools/gimpcropoptions.c @@ -195,7 +195,7 @@ gimp_crop_options_gui (GimpToolOptions *tool_options) /* layer toggle */ button = gimp_prop_check_button_new (config, "layer-only", - _("Active Layer only")); + _("Current Layer only")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_widget_show (button); diff --git a/app/tools/gimpmoveoptions.c b/app/tools/gimpmoveoptions.c index c02f2568dd..17bc118cc6 100644 --- a/app/tools/gimpmoveoptions.c +++ b/app/tools/gimpmoveoptions.c @@ -177,7 +177,7 @@ gimp_move_options_notify_type (GimpMoveOptions *move_options, { case GIMP_TRANSFORM_TYPE_LAYER: false_label = _("Pick a Layer or Guide to Move"); - true_label = _("Move the Active Layer"); + true_label = _("Move the Current Layer"); break; case GIMP_TRANSFORM_TYPE_SELECTION: @@ -187,7 +187,7 @@ gimp_move_options_notify_type (GimpMoveOptions *move_options, case GIMP_TRANSFORM_TYPE_PATH: false_label = _("Pick a Path to Move"); - true_label = _("Move the Active Path"); + true_label = _("Move the Current Path"); break; } diff --git a/app/tools/tools-enums.c b/app/tools/tools-enums.c index 49224632d3..5dfe6d688f 100644 --- a/app/tools/tools-enums.c +++ b/app/tools/tools-enums.c @@ -69,9 +69,9 @@ gimp_rect_select_mode_get_type (void) static const GEnumValue gimp_transform_type_enum_values[] = { - { GIMP_TRANSFORM_TYPE_LAYER, N_("Transform Active Layer"), "layer" }, + { GIMP_TRANSFORM_TYPE_LAYER, N_("Transform Layer"), "layer" }, { GIMP_TRANSFORM_TYPE_SELECTION, N_("Transform Selection"), "selection" }, - { GIMP_TRANSFORM_TYPE_PATH, N_("Transform Active Path"), "path" }, + { GIMP_TRANSFORM_TYPE_PATH, N_("Transform Path"), "path" }, { 0, NULL, NULL } }; diff --git a/app/tools/tools-enums.h b/app/tools/tools-enums.h index 3c0d7ef5c6..358d002ab5 100644 --- a/app/tools/tools-enums.h +++ b/app/tools/tools-enums.h @@ -63,9 +63,9 @@ GType gimp_transform_type_get_type (void) G_GNUC_CONST; typedef enum { - GIMP_TRANSFORM_TYPE_LAYER, /*< desc="Transform Active Layer" >*/ - GIMP_TRANSFORM_TYPE_SELECTION, /*< desc="Transform Selection" >*/ - GIMP_TRANSFORM_TYPE_PATH /*< desc="Transform Active Path" >*/ + GIMP_TRANSFORM_TYPE_LAYER, /*< desc="Transform Layer" >*/ + GIMP_TRANSFORM_TYPE_SELECTION, /*< desc="Transform Selection" >*/ + GIMP_TRANSFORM_TYPE_PATH /*< desc="Transform Path" >*/ } GimpTransformType;