dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a patch from Tino Schwarze <tino.schwarze@informatik.tu-chemnitz.de> 

2000-10-18  Daniel Egger  <egger@suse.de>

        * app/resize.c: Add a patch from
	Tino Schwarze <tino.schwarze@informatik.tu-chemnitz.de>
	to add a reset button to the image resize dialog.
This commit is contained in:
Daniel Egger 2000-10-18 23:31:38 +00:00 committed by Daniel Egger
parent 22616e80f4
commit 8780254389
4 changed files with 144 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-10-18 Daniel Egger <egger@suse.de>
* app/resize.c: Add a patch from
Tino Schwarze <tino.schwarze@informatik.tu-chemnitz.de>
to add a reset button to the image resize dialog.
2000-10-18 Sven Neumann <sven@gimp.org>
* app/cursorutil.c (gtkutil_compress_motion): as Mitch pointed out we

49
app/dialogs/resize-dialog.c
View File

@ -71,13 +71,15 @@ static void unit_update (GtkWidget *, gpointer);
static gint resize_bound_off_x (Resize *, gint);
static gint resize_bound_off_y (Resize *, gint);
static void orig_labels_update (GtkWidget *, gpointer);
static void reset_callback (GtkWidget *, gpointer);
static void size_callback (GtkWidget *, gpointer);
static void ratio_callback (GtkWidget *, gpointer);
static void size_update (Resize *, gdouble, gdouble, gdouble, gdouble);
static void offset_update (GtkWidget *, gpointer);
static gint resize_events (GtkWidget *, GdkEvent *);
static void printsize_update (GtkWidget *, gpointer);
static void resolution_update (GtkWidget *, gpointer);
static void resolution_callback (GtkWidget *, gpointer);
static void resolution_update (Resize *, gdouble, gdouble);
static void resize_scale_warn_callback (GtkWidget *, gboolean, gpointer);
Resize *
@ -191,6 +193,10 @@ resize_widget_new (ResizeType type,
_("OK"), ok_cb,
user_data, NULL, NULL, TRUE, FALSE,
_("Reset"), reset_callback,
resize, NULL, NULL, FALSE, TRUE,
_("Cancel"), cancel_cb ? cancel_cb : gtk_widget_destroy,
cancel_cb ? user_data : NULL,
cancel_cb ? NULL : (gpointer) 1,
@ -611,7 +617,7 @@ resize_widget_new (ResizeType type,
1, resize->resolution_y);
gtk_signal_connect (GTK_OBJECT (private->resolution_se), "value_changed",
(GtkSignalFunc) resolution_update,
(GtkSignalFunc) resolution_callback,
resize);
/* the resolution chainbutton */
@ -839,6 +845,31 @@ offset_update (GtkWidget *widget,
}
}
/*
* Callback function for "Reset" button.
* Data must be a pointer pointer to a Resize structure.
*/
static void
reset_callback (GtkWidget *widget,
gpointer data)
{
Resize *resize;
ResizePrivate *private;
resize = (Resize *)data;
private = (ResizePrivate *)resize->private_part;
/* restore size and ratio settings */
size_update (resize, private->old_width, private->old_height, 1.0, 1.0);
if ((resize->type == ScaleWidget) && (resize->target == ResizeImage))
{
/* restore resolution settings */
resolution_update (resize, private->old_res_x, private->old_res_y);
}
}
static void
size_callback (GtkWidget *widget,
gpointer data)
@ -1064,8 +1095,9 @@ printsize_update (GtkWidget *widget,
resize);
}
/* Callback for resolution change. */
static void
resolution_update (GtkWidget *widget,
resolution_callback (GtkWidget *widget,
gpointer data)
{
Resize *resize;
@ -1093,6 +1125,17 @@ resolution_update (GtkWidget *widget,
}
}
resolution_update (resize, res_x, res_y);
}
/* Update widgets with resolution settings found in given Resize struct. */
static void
resolution_update (Resize *resize, gdouble res_x, gdouble res_y)
{
ResizePrivate *private;
private = (ResizePrivate *) resize->private_part;
resize->resolution_x = res_x;
resize->resolution_y = res_y;

49
app/gui/resize-dialog.c
View File

@ -71,13 +71,15 @@ static void unit_update (GtkWidget *, gpointer);
static gint resize_bound_off_x (Resize *, gint);
static gint resize_bound_off_y (Resize *, gint);
static void orig_labels_update (GtkWidget *, gpointer);
static void reset_callback (GtkWidget *, gpointer);
static void size_callback (GtkWidget *, gpointer);
static void ratio_callback (GtkWidget *, gpointer);
static void size_update (Resize *, gdouble, gdouble, gdouble, gdouble);
static void offset_update (GtkWidget *, gpointer);
static gint resize_events (GtkWidget *, GdkEvent *);
static void printsize_update (GtkWidget *, gpointer);
static void resolution_update (GtkWidget *, gpointer);
static void resolution_callback (GtkWidget *, gpointer);
static void resolution_update (Resize *, gdouble, gdouble);
static void resize_scale_warn_callback (GtkWidget *, gboolean, gpointer);
Resize *
@ -191,6 +193,10 @@ resize_widget_new (ResizeType type,
_("OK"), ok_cb,
user_data, NULL, NULL, TRUE, FALSE,
_("Reset"), reset_callback,
resize, NULL, NULL, FALSE, TRUE,
_("Cancel"), cancel_cb ? cancel_cb : gtk_widget_destroy,
cancel_cb ? user_data : NULL,
cancel_cb ? NULL : (gpointer) 1,
@ -611,7 +617,7 @@ resize_widget_new (ResizeType type,
1, resize->resolution_y);
gtk_signal_connect (GTK_OBJECT (private->resolution_se), "value_changed",
(GtkSignalFunc) resolution_update,
(GtkSignalFunc) resolution_callback,
resize);
/* the resolution chainbutton */
@ -839,6 +845,31 @@ offset_update (GtkWidget *widget,
}
}
/*
* Callback function for "Reset" button.
* Data must be a pointer pointer to a Resize structure.
*/
static void
reset_callback (GtkWidget *widget,
gpointer data)
{
Resize *resize;
ResizePrivate *private;
resize = (Resize *)data;
private = (ResizePrivate *)resize->private_part;
/* restore size and ratio settings */
size_update (resize, private->old_width, private->old_height, 1.0, 1.0);
if ((resize->type == ScaleWidget) && (resize->target == ResizeImage))
{
/* restore resolution settings */
resolution_update (resize, private->old_res_x, private->old_res_y);
}
}
static void
size_callback (GtkWidget *widget,
gpointer data)
@ -1064,8 +1095,9 @@ printsize_update (GtkWidget *widget,
resize);
}
/* Callback for resolution change. */
static void
resolution_update (GtkWidget *widget,
resolution_callback (GtkWidget *widget,
gpointer data)
{
Resize *resize;
@ -1093,6 +1125,17 @@ resolution_update (GtkWidget *widget,
}
}
resolution_update (resize, res_x, res_y);
}
/* Update widgets with resolution settings found in given Resize struct. */
static void
resolution_update (Resize *resize, gdouble res_x, gdouble res_y)
{
ResizePrivate *private;
private = (ResizePrivate *) resize->private_part;
resize->resolution_x = res_x;
resize->resolution_y = res_y;

49
app/resize.c
View File

@ -71,13 +71,15 @@ static void unit_update (GtkWidget *, gpointer);
static gint resize_bound_off_x (Resize *, gint);
static gint resize_bound_off_y (Resize *, gint);
static void orig_labels_update (GtkWidget *, gpointer);
static void reset_callback (GtkWidget *, gpointer);
static void size_callback (GtkWidget *, gpointer);
static void ratio_callback (GtkWidget *, gpointer);
static void size_update (Resize *, gdouble, gdouble, gdouble, gdouble);
static void offset_update (GtkWidget *, gpointer);
static gint resize_events (GtkWidget *, GdkEvent *);
static void printsize_update (GtkWidget *, gpointer);
static void resolution_update (GtkWidget *, gpointer);
static void resolution_callback (GtkWidget *, gpointer);
static void resolution_update (Resize *, gdouble, gdouble);
static void resize_scale_warn_callback (GtkWidget *, gboolean, gpointer);
Resize *
@ -191,6 +193,10 @@ resize_widget_new (ResizeType type,
_("OK"), ok_cb,
user_data, NULL, NULL, TRUE, FALSE,
_("Reset"), reset_callback,
resize, NULL, NULL, FALSE, TRUE,
_("Cancel"), cancel_cb ? cancel_cb : gtk_widget_destroy,
cancel_cb ? user_data : NULL,
cancel_cb ? NULL : (gpointer) 1,
@ -611,7 +617,7 @@ resize_widget_new (ResizeType type,
1, resize->resolution_y);
gtk_signal_connect (GTK_OBJECT (private->resolution_se), "value_changed",
(GtkSignalFunc) resolution_update,
(GtkSignalFunc) resolution_callback,
resize);
/* the resolution chainbutton */
@ -839,6 +845,31 @@ offset_update (GtkWidget *widget,
}
}
/*
* Callback function for "Reset" button.
* Data must be a pointer pointer to a Resize structure.
*/
static void
reset_callback (GtkWidget *widget,
gpointer data)
{
Resize *resize;
ResizePrivate *private;
resize = (Resize *)data;
private = (ResizePrivate *)resize->private_part;
/* restore size and ratio settings */
size_update (resize, private->old_width, private->old_height, 1.0, 1.0);
if ((resize->type == ScaleWidget) && (resize->target == ResizeImage))
{
/* restore resolution settings */
resolution_update (resize, private->old_res_x, private->old_res_y);
}
}
static void
size_callback (GtkWidget *widget,
gpointer data)
@ -1064,8 +1095,9 @@ printsize_update (GtkWidget *widget,
resize);
}
/* Callback for resolution change. */
static void
resolution_update (GtkWidget *widget,
resolution_callback (GtkWidget *widget,
gpointer data)
{
Resize *resize;
@ -1093,6 +1125,17 @@ resolution_update (GtkWidget *widget,
}
}
resolution_update (resize, res_x, res_y);
}
/* Update widgets with resolution settings found in given Resize struct. */
static void
resolution_update (Resize *resize, gdouble res_x, gdouble res_y)
{
ResizePrivate *private;
private = (ResizePrivate *) resize->private_part;
resize->resolution_x = res_x;
resize->resolution_y = res_y;