340c4a2309
While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
548 lines
19 KiB
C
548 lines
19 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gegl.h>
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpconfig/gimpconfig.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "tools-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimptoolinfo.h"
|
|
|
|
#include "widgets/gimppropwidgets.h"
|
|
#include "widgets/gimpspinscale.h"
|
|
#include "widgets/gimpwidgets-utils.h"
|
|
|
|
#include "gimprotatetool.h"
|
|
#include "gimpscaletool.h"
|
|
#include "gimpunifiedtransformtool.h"
|
|
#include "gimptooloptions-gui.h"
|
|
#include "gimptransformgridoptions.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
enum
|
|
{
|
|
PROP_0,
|
|
PROP_DIRECTION,
|
|
PROP_SHOW_PREVIEW,
|
|
PROP_PREVIEW_OPACITY,
|
|
PROP_GRID_TYPE,
|
|
PROP_GRID_SIZE,
|
|
PROP_CONSTRAIN_MOVE,
|
|
PROP_CONSTRAIN_SCALE,
|
|
PROP_CONSTRAIN_ROTATE,
|
|
PROP_CONSTRAIN_SHEAR,
|
|
PROP_CONSTRAIN_PERSPECTIVE,
|
|
PROP_FROMPIVOT_SCALE,
|
|
PROP_FROMPIVOT_SHEAR,
|
|
PROP_FROMPIVOT_PERSPECTIVE,
|
|
PROP_CORNERSNAP,
|
|
PROP_FIXEDPIVOT,
|
|
};
|
|
|
|
|
|
static void gimp_transform_grid_options_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec);
|
|
static void gimp_transform_grid_options_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec);
|
|
|
|
static gboolean gimp_transform_grid_options_sync_grid (GBinding *binding,
|
|
const GValue *source_value,
|
|
GValue *target_value,
|
|
gpointer user_data);
|
|
|
|
|
|
G_DEFINE_TYPE (GimpTransformGridOptions, gimp_transform_grid_options,
|
|
GIMP_TYPE_TRANSFORM_OPTIONS)
|
|
|
|
#define parent_class gimp_transform_grid_options_parent_class
|
|
|
|
|
|
static void
|
|
gimp_transform_grid_options_class_init (GimpTransformGridOptionsClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
object_class->set_property = gimp_transform_grid_options_set_property;
|
|
object_class->get_property = gimp_transform_grid_options_get_property;
|
|
|
|
g_object_class_override_property (object_class, PROP_DIRECTION,
|
|
"direction");
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_PREVIEW,
|
|
"show-preview",
|
|
_("Show image preview"),
|
|
_("Show a preview of the transform_grided image"),
|
|
TRUE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_PREVIEW_OPACITY,
|
|
"preview-opacity",
|
|
_("Image opacity"),
|
|
_("Opacity of the preview image"),
|
|
0.0, 1.0, 1.0,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_ENUM (object_class, PROP_GRID_TYPE,
|
|
"grid-type",
|
|
_("Guides"),
|
|
_("Composition guides such as rule of thirds"),
|
|
GIMP_TYPE_GUIDES_TYPE,
|
|
GIMP_GUIDES_NONE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_INT (object_class, PROP_GRID_SIZE,
|
|
"grid-size",
|
|
NULL,
|
|
_("Size of a grid cell for variable number "
|
|
"of composition guides"),
|
|
1, 128, 15,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_MOVE,
|
|
"constrain-move",
|
|
NULL, NULL,
|
|
FALSE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_SCALE,
|
|
"constrain-scale",
|
|
NULL, NULL,
|
|
FALSE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_ROTATE,
|
|
"constrain-rotate",
|
|
NULL, NULL,
|
|
FALSE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_SHEAR,
|
|
"constrain-shear",
|
|
NULL, NULL,
|
|
TRUE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_PERSPECTIVE,
|
|
"constrain-perspective",
|
|
NULL, NULL,
|
|
FALSE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FROMPIVOT_SCALE,
|
|
"frompivot-scale",
|
|
NULL, NULL,
|
|
FALSE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FROMPIVOT_SHEAR,
|
|
"frompivot-shear",
|
|
NULL, NULL,
|
|
FALSE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FROMPIVOT_PERSPECTIVE,
|
|
"frompivot-perspective",
|
|
NULL, NULL,
|
|
FALSE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CORNERSNAP,
|
|
"cornersnap",
|
|
NULL, NULL,
|
|
FALSE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
|
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FIXEDPIVOT,
|
|
"fixedpivot",
|
|
NULL, NULL,
|
|
FALSE,
|
|
GIMP_PARAM_STATIC_STRINGS);
|
|
}
|
|
|
|
static void
|
|
gimp_transform_grid_options_init (GimpTransformGridOptions *options)
|
|
{
|
|
}
|
|
|
|
static void
|
|
gimp_transform_grid_options_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpTransformGridOptions *options = GIMP_TRANSFORM_GRID_OPTIONS (object);
|
|
GimpTransformOptions *transform_options = GIMP_TRANSFORM_OPTIONS (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_DIRECTION:
|
|
transform_options->direction = g_value_get_enum (value);
|
|
|
|
/* Expected default for corrective transform_grid is to see the
|
|
* original image only.
|
|
*/
|
|
g_object_set (options,
|
|
"show-preview",
|
|
transform_options->direction != GIMP_TRANSFORM_BACKWARD,
|
|
NULL);
|
|
break;
|
|
case PROP_SHOW_PREVIEW:
|
|
options->show_preview = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_PREVIEW_OPACITY:
|
|
options->preview_opacity = g_value_get_double (value);
|
|
break;
|
|
case PROP_GRID_TYPE:
|
|
options->grid_type = g_value_get_enum (value);
|
|
break;
|
|
case PROP_GRID_SIZE:
|
|
options->grid_size = g_value_get_int (value);
|
|
break;
|
|
case PROP_CONSTRAIN_MOVE:
|
|
options->constrain_move = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_CONSTRAIN_SCALE:
|
|
options->constrain_scale = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_CONSTRAIN_ROTATE:
|
|
options->constrain_rotate = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_CONSTRAIN_SHEAR:
|
|
options->constrain_shear = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_CONSTRAIN_PERSPECTIVE:
|
|
options->constrain_perspective = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_FROMPIVOT_SCALE:
|
|
options->frompivot_scale = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_FROMPIVOT_SHEAR:
|
|
options->frompivot_shear = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_FROMPIVOT_PERSPECTIVE:
|
|
options->frompivot_perspective = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_CORNERSNAP:
|
|
options->cornersnap = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_FIXEDPIVOT:
|
|
options->fixedpivot = g_value_get_boolean (value);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_transform_grid_options_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpTransformGridOptions *options = GIMP_TRANSFORM_GRID_OPTIONS (object);
|
|
GimpTransformOptions *transform_options = GIMP_TRANSFORM_OPTIONS (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_DIRECTION:
|
|
g_value_set_enum (value, transform_options->direction);
|
|
break;
|
|
case PROP_SHOW_PREVIEW:
|
|
g_value_set_boolean (value, options->show_preview);
|
|
break;
|
|
case PROP_PREVIEW_OPACITY:
|
|
g_value_set_double (value, options->preview_opacity);
|
|
break;
|
|
case PROP_GRID_TYPE:
|
|
g_value_set_enum (value, options->grid_type);
|
|
break;
|
|
case PROP_GRID_SIZE:
|
|
g_value_set_int (value, options->grid_size);
|
|
break;
|
|
case PROP_CONSTRAIN_MOVE:
|
|
g_value_set_boolean (value, options->constrain_move);
|
|
break;
|
|
case PROP_CONSTRAIN_SCALE:
|
|
g_value_set_boolean (value, options->constrain_scale);
|
|
break;
|
|
case PROP_CONSTRAIN_ROTATE:
|
|
g_value_set_boolean (value, options->constrain_rotate);
|
|
break;
|
|
case PROP_CONSTRAIN_SHEAR:
|
|
g_value_set_boolean (value, options->constrain_shear);
|
|
break;
|
|
case PROP_CONSTRAIN_PERSPECTIVE:
|
|
g_value_set_boolean (value, options->constrain_perspective);
|
|
break;
|
|
case PROP_FROMPIVOT_SCALE:
|
|
g_value_set_boolean (value, options->frompivot_scale);
|
|
break;
|
|
case PROP_FROMPIVOT_SHEAR:
|
|
g_value_set_boolean (value, options->frompivot_shear);
|
|
break;
|
|
case PROP_FROMPIVOT_PERSPECTIVE:
|
|
g_value_set_boolean (value, options->frompivot_perspective);
|
|
break;
|
|
case PROP_CORNERSNAP:
|
|
g_value_set_boolean (value, options->cornersnap);
|
|
break;
|
|
case PROP_FIXEDPIVOT:
|
|
g_value_set_boolean (value, options->fixedpivot);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* gimp_transform_grid_options_gui:
|
|
* @tool_options: a #GimpToolOptions
|
|
*
|
|
* Build the TransformGrid Tool Options.
|
|
*
|
|
* Return value: a container holding the transform_grid tool options
|
|
**/
|
|
GtkWidget *
|
|
gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
|
|
{
|
|
GObject *config = G_OBJECT (tool_options);
|
|
GtkWidget *vbox;
|
|
GtkWidget *frame;
|
|
GtkWidget *combo;
|
|
GtkWidget *scale;
|
|
GtkWidget *grid_box;
|
|
GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
|
|
GdkModifierType constrain_mask = gimp_get_constrain_behavior_mask ();
|
|
|
|
vbox = gimp_transform_options_gui (tool_options, TRUE, TRUE, TRUE);
|
|
|
|
/* the preview frame */
|
|
scale = gimp_prop_spin_scale_new (config, "preview-opacity", NULL,
|
|
0.01, 0.1, 0);
|
|
gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
|
|
frame = gimp_prop_expanding_frame_new (config, "show-preview", NULL,
|
|
scale, NULL);
|
|
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
|
gtk_widget_show (frame);
|
|
|
|
/* the guides frame */
|
|
frame = gimp_frame_new (NULL);
|
|
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
|
gtk_widget_show (frame);
|
|
|
|
/* the guides type menu */
|
|
combo = gimp_prop_enum_combo_box_new (config, "grid-type", 0, 0);
|
|
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Guides"));
|
|
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
|
|
gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
|
|
gtk_widget_show (combo);
|
|
|
|
/* the grid density scale */
|
|
scale = gimp_prop_spin_scale_new (config, "grid-size", NULL,
|
|
1.8, 8.0, 0);
|
|
gimp_spin_scale_set_label (GIMP_SPIN_SCALE (scale), NULL);
|
|
gtk_container_add (GTK_CONTAINER (frame), scale);
|
|
|
|
g_object_bind_property_full (config, "grid-type",
|
|
scale, "visible",
|
|
G_BINDING_SYNC_CREATE,
|
|
gimp_transform_grid_options_sync_grid,
|
|
NULL,
|
|
NULL, NULL);
|
|
|
|
if (tool_options->tool_info->tool_type == GIMP_TYPE_ROTATE_TOOL)
|
|
{
|
|
GtkWidget *button;
|
|
gchar *label;
|
|
|
|
label = g_strdup_printf (_("15 degrees (%s)"),
|
|
gimp_get_mod_string (extend_mask));
|
|
|
|
button = gimp_prop_check_button_new (config, "constrain-rotate", label);
|
|
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
|
gtk_widget_show (button);
|
|
|
|
gimp_help_set_help_data (button, _("Limit rotation steps to 15 degrees"),
|
|
NULL);
|
|
|
|
g_free (label);
|
|
}
|
|
else if (tool_options->tool_info->tool_type == GIMP_TYPE_SCALE_TOOL)
|
|
{
|
|
GtkWidget *button;
|
|
gchar *label;
|
|
|
|
label = g_strdup_printf (_("Keep aspect (%s)"),
|
|
gimp_get_mod_string (extend_mask));
|
|
|
|
button = gimp_prop_check_button_new (config, "constrain-scale", label);
|
|
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
|
gtk_widget_show (button);
|
|
|
|
gimp_help_set_help_data (button, _("Keep the original aspect ratio"),
|
|
NULL);
|
|
|
|
g_free (label);
|
|
|
|
label = g_strdup_printf (_("Around center (%s)"),
|
|
gimp_get_mod_string (constrain_mask));
|
|
|
|
button = gimp_prop_check_button_new (config, "frompivot-scale", label);
|
|
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
|
gtk_widget_show (button);
|
|
|
|
gimp_help_set_help_data (button, _("Scale around the center point"),
|
|
NULL);
|
|
|
|
g_free (label);
|
|
}
|
|
else if (tool_options->tool_info->tool_type == GIMP_TYPE_UNIFIED_TRANSFORM_TOOL)
|
|
{
|
|
struct
|
|
{
|
|
GdkModifierType mod;
|
|
gchar *name;
|
|
gchar *desc;
|
|
gchar *tip;
|
|
}
|
|
opt_list[] =
|
|
{
|
|
{ extend_mask, NULL, N_("Constrain (%s)") },
|
|
{ extend_mask, "constrain-move", N_("Move"),
|
|
N_("Constrain movement to 45 degree angles from center (%s)") },
|
|
{ extend_mask, "constrain-scale", N_("Scale"),
|
|
N_("Maintain aspect ratio when scaling (%s)") },
|
|
{ extend_mask, "constrain-rotate", N_("Rotate"),
|
|
N_("Constrain rotation to 15 degree increments (%s)") },
|
|
{ extend_mask, "constrain-shear", N_("Shear"),
|
|
N_("Shear along edge direction only (%s)") },
|
|
{ extend_mask, "constrain-perspective", N_("Perspective"),
|
|
N_("Constrain perspective handles to move along edges and diagonal (%s)") },
|
|
|
|
{ constrain_mask, NULL,
|
|
N_("From pivot (%s)") },
|
|
{ constrain_mask, "frompivot-scale", N_("Scale"),
|
|
N_("Scale from pivot point (%s)") },
|
|
{ constrain_mask, "frompivot-shear", N_("Shear"),
|
|
N_("Shear opposite edge by same amount (%s)") },
|
|
{ constrain_mask, "frompivot-perspective", N_("Perspective"),
|
|
N_("Maintain position of pivot while changing perspective (%s)") },
|
|
|
|
{ 0, NULL,
|
|
N_("Pivot") },
|
|
{ extend_mask, "cornersnap", N_("Snap (%s)"),
|
|
N_("Snap pivot to corners and center (%s)") },
|
|
{ 0, "fixedpivot", N_("Lock"),
|
|
N_("Lock pivot position to canvas") },
|
|
};
|
|
|
|
GtkWidget *button;
|
|
gchar *label;
|
|
gint i;
|
|
|
|
frame = NULL;
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (opt_list); i++)
|
|
{
|
|
if (! opt_list[i].name && ! opt_list[i].desc)
|
|
{
|
|
frame = NULL;
|
|
continue;
|
|
}
|
|
|
|
label = g_strdup_printf (gettext (opt_list[i].desc),
|
|
gimp_get_mod_string (opt_list[i].mod));
|
|
|
|
if (opt_list[i].name)
|
|
{
|
|
button = gimp_prop_check_button_new (config, opt_list[i].name,
|
|
label);
|
|
|
|
gtk_box_pack_start (GTK_BOX (frame ? grid_box : vbox),
|
|
button, FALSE, FALSE, 0);
|
|
|
|
gtk_widget_show (button);
|
|
|
|
g_free (label);
|
|
label = g_strdup_printf (gettext (opt_list[i].tip),
|
|
gimp_get_mod_string (opt_list[i].mod));
|
|
|
|
gimp_help_set_help_data (button, label, NULL);
|
|
}
|
|
else
|
|
{
|
|
frame = gimp_frame_new (label);
|
|
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
|
gtk_widget_show (frame);
|
|
|
|
grid_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
|
|
gtk_container_add (GTK_CONTAINER (frame), grid_box);
|
|
gtk_widget_show (grid_box);
|
|
}
|
|
|
|
g_free (label);
|
|
}
|
|
}
|
|
|
|
return vbox;
|
|
}
|
|
|
|
gboolean
|
|
gimp_transform_grid_options_show_preview (GimpTransformGridOptions *options)
|
|
{
|
|
GimpTransformOptions *transform_options;
|
|
|
|
g_return_val_if_fail (GIMP_IS_TRANSFORM_GRID_OPTIONS (options), FALSE);
|
|
|
|
transform_options = GIMP_TRANSFORM_OPTIONS (options);
|
|
|
|
return (options->show_preview &&
|
|
transform_options->type == GIMP_TRANSFORM_TYPE_LAYER);
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static gboolean
|
|
gimp_transform_grid_options_sync_grid (GBinding *binding,
|
|
const GValue *source_value,
|
|
GValue *target_value,
|
|
gpointer user_data)
|
|
{
|
|
GimpGuidesType type = g_value_get_enum (source_value);
|
|
|
|
g_value_set_boolean (target_value,
|
|
type == GIMP_GUIDES_N_LINES ||
|
|
type == GIMP_GUIDES_SPACING);
|
|
|
|
return TRUE;
|
|
}
|
|
|