graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-22 04:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bill Skaggs <weskaggs@primate.ucdavis.edu>

Browse source 
* app/tools/gimpcroptool.c
	* app/tools/gimpcropoptions.[ch]: remove "crop vs resize"
	option, as recommended in bug #353936.
This commit is contained in:
William Skaggs 2006-09-06 15:38:28 +00:00
parent 557a217e05
commit 05f8df22d7
4 changed files with 10 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-09-06 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/tools/gimpcroptool.c
* app/tools/gimpcropoptions.[ch]: remove "crop vs resize"
option, as recommended in bug #353936.
2006-09-06 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/paint-funcs/scale-funcs.[ch]: apply patch from Geert

27
app/tools/gimpcropoptions.c
View file

@ -37,8 +37,7 @@
enum
{
PROP_LAYER_ONLY = GIMP_RECTANGLE_OPTIONS_PROP_LAST + 1,
PROP_CROP_MODE
PROP_LAYER_ONLY = GIMP_RECTANGLE_OPTIONS_PROP_LAST + 1
};
@ -72,11 +71,6 @@ gimp_crop_options_class_init (GimpCropOptionsClass *klass)
"layer-only", NULL,
FALSE,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CROP_MODE,
"crop-mode", NULL,
GIMP_TYPE_CROP_MODE,
GIMP_CROP_MODE_CROP,
GIMP_PARAM_STATIC_STRINGS);
gimp_rectangle_options_install_properties (object_class);
}
@ -106,9 +100,6 @@ gimp_crop_options_set_property (GObject *object,
case PROP_LAYER_ONLY:
options->layer_only = g_value_get_boolean (value);
break;
case PROP_CROP_MODE:
options->crop_mode = g_value_get_enum (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@ -130,9 +121,6 @@ gimp_crop_options_get_property (GObject *object,
case PROP_LAYER_ONLY:
g_value_set_boolean (value, options->layer_only);
break;
case PROP_CROP_MODE:
g_value_set_enum (value, options->crop_mode);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@ -145,20 +133,7 @@ gimp_crop_options_gui (GimpToolOptions *tool_options)
GObject *config = G_OBJECT (tool_options);
GtkWidget *vbox = gimp_tool_options_gui (tool_options);
GtkWidget *vbox_rectangle;
GtkWidget *frame;
GtkWidget *button;
gchar *str;
/* tool toggle */
str = g_strdup_printf (_("Tool Toggle (%s)"),
gimp_get_mod_string (GDK_CONTROL_MASK));
frame = gimp_prop_enum_radio_frame_new (config, "crop-mode",
str, 0, 0);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
g_free (str);
/* layer toggle */
button = gimp_prop_check_button_new (config, "layer-only",

1
app/tools/gimpcropoptions.h
View file

@ -39,7 +39,6 @@ struct _GimpCropOptions
GimpToolOptions parent_instence;
gboolean layer_only;
GimpCropMode crop_mode;
};

12
app/tools/gimpcroptool.c
View file

@ -198,14 +198,8 @@ gimp_crop_tool_button_release (GimpTool *tool,
GdkModifierType state,
GimpDisplay *display)
{
GimpCropOptions *options = GIMP_CROP_TOOL_GET_OPTIONS (tool);
if (options->crop_mode == GIMP_CROP_MODE_CROP)
gimp_tool_push_status (tool, display,
_("Click or press enter to crop."));
else
gimp_tool_push_status (tool, display,
_("Click or press enter to resize."));
gimp_tool_push_status (tool, display,
_("Click or press enter to crop."));
gimp_rectangle_tool_button_release (tool, coords, time, state, display);
}
@ -282,7 +276,7 @@ gimp_crop_tool_execute (GimpRectangleTool *rectangle,
gimp_image_crop (image, GIMP_CONTEXT (options),
x, y, w + x, h + y,
options->layer_only,
options->crop_mode == GIMP_CROP_MODE_CROP);
TRUE);
gimp_image_flush (image);