2003-02-07 Michael Natterer <mitch@gimp.org> Added object properties for almost all tool_options values and registered lots of enums with the type system: Part I (enum and type cleanup): * app/core/core-enums.[ch] * app/core/core-types.h: removed InternalOrientaionType and register GimpOrientationType. Register GimpChannelOps. Removed GimpToolOptionsGUIFunc. * app/xcf/xcf-private.h: added XcfOrientationType with the same values as the old InternalOrientationType * app/xcf/xcf-load.c * app/xcf/xcf-save.c: translate between GimpOrientationType and XcfOrientationType. * app/core/gimpdrawable-transform-utils.[ch] * app/core/gimpdrawable-transform.[ch] * app/core/gimpimage-crop.c * app/core/gimpimage-duplicate.c * app/core/gimpimage-guides.c * app/core/gimpimage-resize.c * app/core/gimpimage-scale.c * app/core/gimpimage.h * app/display/gimpdisplayshell.c * tools/pdbgen/stddefs.pdb * tools/pdbgen/pdb/transform_tools.pdb: changed accordingly. * app/pdb/guides_cmds.c * app/pdb/transform_tools_cmds.c * libgimp/gimpenums.h * libgimpproxy/gimpproxytypes.h * plug-ins/script-fu/script-fu-constants.c * tools/pdbgen/enums.pl: regenerated. * libgimptool/gimptoolenums.[ch]: added GimpTransformGridType. * libgimptool/gimptooltypes.h: removed GimpToolOptionsResetFunc, added GimpToolOptionsGUIFunc. Part II (tool options changes): * app/config/gimpconfig-utils.c (gimp_config_reset_properties): don't reset object properties because they have NULL as default value. * app/widgets/gimppropwidgets.[ch]: added gimp_prop_[enum|boolean]_radio_frame_new(), gimp_prop_paint_mode_menu_new() and gimp_prop_scale_entry_new(), which are all needed by the new tool options GUI code. * app/tools/tool_options.[ch]: removed the "reset_func" since the virtual reset() method is used now. * app/paint/gimpairbrushoptions.[ch] * app/paint/gimpcloneoptions.[ch] * app/paint/gimpconvolveoptions.[ch] * app/paint/gimpdodgeburnoptions.[ch] * app/paint/gimperaseroptions.[ch] * app/paint/gimppaintoptions.[ch] * app/paint/gimpsmudgeoptions.[ch]: added properties all over the place and removed the widget and default_value members from the structs. Renamed some values (e.g. s/type/clone_type/). Don't #include <gtk/gtk.h>. * app/paint/gimpairbrush.c * app/paint/gimpclone.c * app/paint/gimpconvolve.c * app/paint/gimpdodgeburn.c * app/paint/gimperaser.c * app/paint/gimppaintbrush.c * app/paint/gimppaintcore-stroke.c * app/paint/gimppaintcore.c * app/paint/gimppencil.c * app/paint/gimpsmudge.c * app/paint/paint-types.h * app/paint/paint.c: changed accordingly. Don't #include <gtk/gtk.h>. * tools/pdbgen/pdb/paint_tools.pdb: changed accordingly. * app/pdb/paint_tools_cmds.c: regenerated. * app/tools/gimpblendoptions.[ch] * app/tools/gimpbucketfilloptions.[ch] * app/tools/gimpcolorpickeroptions.[ch] * app/tools/gimpcropoptions.[ch] * app/tools/gimpflipoptions.[ch] * app/tools/gimpinkoptions.c * app/tools/gimpmagnifyoptions.[ch] * app/tools/gimpmeasureoptions.[ch] * app/tools/gimpmoveoptions.[ch] * app/tools/gimptextoptions.c * app/tools/paint_options.[ch] * app/tools/selection_options.[ch] * app/tools/transform_options.[ch]: ditto: added properties and removed widget and default_value stuff. Removed most reset functions. Use gimp_prop widgets all over the place, renamed some values as above. * app/tools/Makefile.am * app/tools/gimpairbrushtool.c * app/tools/gimpblendtool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpclonetool.c * app/tools/gimpconvolvetool.c * app/tools/gimpcroptool.c * app/tools/gimpdodgeburntool.c * app/tools/gimperasertool.c * app/tools/gimpfliptool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmovetool.c * app/tools/gimpselectiontool.c * app/tools/gimpsheartool.c * app/tools/gimpsmudgetool.c * app/tools/gimptransformtool.c * app/tools/gimpvectoroptions.c: changed accordingly. Ported the paint_options GUI constructors to gimp_prop widgets. * app/widgets/gimpselectioneditor.c * app/gui/tool-options-dialog.c: changed accordingly.
460 lines
15 KiB
C
460 lines
15 KiB
C
/* The GIMP -- an 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 2 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, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpmath/gimpmath.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "tools-types.h"
|
|
|
|
#include "config/gimpconfig-params.h"
|
|
#include "config/gimpcoreconfig.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimptoolinfo.h"
|
|
|
|
#include "widgets/gimppropwidgets.h"
|
|
#include "widgets/gimpwidgets-utils.h"
|
|
|
|
#include "gimprotatetool.h"
|
|
#include "gimpscaletool.h"
|
|
#include "gimptransformtool.h"
|
|
#include "transform_options.h"
|
|
#include "tool_manager.h"
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
|
enum
|
|
{
|
|
PROP_0,
|
|
PROP_DIRECTION,
|
|
PROP_INTERPOLATION,
|
|
PROP_CLIP,
|
|
PROP_GRID_TYPE,
|
|
PROP_GRID_SIZE,
|
|
PROP_SHOW_PATH,
|
|
PROP_CONSTRAIN_1,
|
|
PROP_CONSTRAIN_2
|
|
};
|
|
|
|
|
|
static void gimp_transform_options_init (GimpTransformOptions *options);
|
|
static void gimp_transform_options_class_init (GimpTransformOptionsClass *options_class);
|
|
|
|
static void gimp_transform_options_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec);
|
|
static void gimp_transform_options_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec);
|
|
|
|
static void gimp_transform_options_reset (GimpToolOptions *tool_options);
|
|
|
|
static void gimp_transform_options_notify (GimpTransformOptions *options,
|
|
GParamSpec *pspec,
|
|
GtkWidget *density_box);
|
|
|
|
|
|
static GimpToolOptionsClass *parent_class = NULL;
|
|
|
|
|
|
GType
|
|
gimp_transform_options_get_type (void)
|
|
{
|
|
static GType type = 0;
|
|
|
|
if (! type)
|
|
{
|
|
static const GTypeInfo info =
|
|
{
|
|
sizeof (GimpTransformOptionsClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gimp_transform_options_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpTransformOptions),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gimp_transform_options_init,
|
|
};
|
|
|
|
type = g_type_register_static (GIMP_TYPE_TOOL_OPTIONS,
|
|
"GimpTransformOptions",
|
|
&info, 0);
|
|
}
|
|
|
|
return type;
|
|
}
|
|
|
|
static void
|
|
gimp_transform_options_class_init (GimpTransformOptionsClass *klass)
|
|
{
|
|
GObjectClass *object_class;
|
|
GimpToolOptionsClass *options_class;
|
|
|
|
object_class = G_OBJECT_CLASS (klass);
|
|
options_class = GIMP_TOOL_OPTIONS_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
object_class->set_property = gimp_transform_options_set_property;
|
|
object_class->get_property = gimp_transform_options_get_property;
|
|
|
|
options_class->reset = gimp_transform_options_reset;
|
|
|
|
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_DIRECTION,
|
|
"direction", NULL,
|
|
GIMP_TYPE_TRANSFORM_DIRECTION,
|
|
GIMP_TRANSFORM_FORWARD,
|
|
0);
|
|
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_INTERPOLATION,
|
|
"interpolation", NULL,
|
|
GIMP_TYPE_INTERPOLATION_TYPE,
|
|
GIMP_LINEAR,
|
|
0);
|
|
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_CLIP,
|
|
"clip", NULL,
|
|
TRUE,
|
|
0);
|
|
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_GRID_TYPE,
|
|
"grid-type", NULL,
|
|
GIMP_TYPE_TRANSFORM_GRID_TYPE,
|
|
GIMP_TRANSFORM_GRID_TYPE_N_LINES,
|
|
0);
|
|
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_GRID_SIZE,
|
|
"grid-size", NULL,
|
|
1, 128, 15,
|
|
0);
|
|
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_PATH,
|
|
"show-path", NULL,
|
|
FALSE,
|
|
0);
|
|
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_1,
|
|
"constrain-1", NULL,
|
|
FALSE,
|
|
0);
|
|
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_2,
|
|
"constrain-2", NULL,
|
|
FALSE,
|
|
0);
|
|
}
|
|
|
|
static void
|
|
gimp_transform_options_init (GimpTransformOptions *options)
|
|
{
|
|
}
|
|
|
|
static void
|
|
gimp_transform_options_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpTransformOptions *options;
|
|
|
|
options = GIMP_TRANSFORM_OPTIONS (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_DIRECTION:
|
|
options->direction = g_value_get_enum (value);
|
|
break;
|
|
case PROP_INTERPOLATION:
|
|
options->interpolation = g_value_get_enum (value);
|
|
break;
|
|
case PROP_CLIP:
|
|
options->clip = g_value_get_boolean (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_SHOW_PATH:
|
|
options->show_path = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_CONSTRAIN_1:
|
|
options->constrain_1 = g_value_get_boolean (value);
|
|
break;
|
|
case PROP_CONSTRAIN_2:
|
|
options->constrain_2 = g_value_get_boolean (value);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_transform_options_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpTransformOptions *options;
|
|
|
|
options = GIMP_TRANSFORM_OPTIONS (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_DIRECTION:
|
|
g_value_set_enum (value, options->direction);
|
|
break;
|
|
case PROP_INTERPOLATION:
|
|
g_value_set_enum (value, options->interpolation);
|
|
break;
|
|
case PROP_CLIP:
|
|
g_value_set_boolean (value, options->clip);
|
|
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_SHOW_PATH:
|
|
g_value_set_boolean (value, options->show_path);
|
|
break;
|
|
case PROP_CONSTRAIN_1:
|
|
g_value_set_boolean (value, options->constrain_1);
|
|
break;
|
|
case PROP_CONSTRAIN_2:
|
|
g_value_set_boolean (value, options->constrain_2);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_transform_options_reset (GimpToolOptions *tool_options)
|
|
{
|
|
GimpTransformOptions *options;
|
|
GParamSpec *pspec;
|
|
|
|
options = GIMP_TRANSFORM_OPTIONS (tool_options);
|
|
|
|
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (tool_options),
|
|
"interpolation");
|
|
|
|
if (pspec)
|
|
{
|
|
G_PARAM_SPEC_ENUM (pspec)->default_value =
|
|
tool_options->tool_info->gimp->config->interpolation_type;
|
|
}
|
|
|
|
GIMP_TOOL_OPTIONS_CLASS (parent_class)->reset (tool_options);
|
|
}
|
|
|
|
void
|
|
gimp_transform_options_gui (GimpToolOptions *tool_options)
|
|
{
|
|
GObject *config;
|
|
GimpTransformOptions *options;
|
|
GtkWidget *vbox;
|
|
GtkWidget *hbox;
|
|
GtkWidget *label;
|
|
GtkWidget *frame;
|
|
GtkWidget *table;
|
|
GtkWidget *optionmenu;
|
|
GtkWidget *button;
|
|
|
|
config = G_OBJECT (tool_options);
|
|
options = GIMP_TRANSFORM_OPTIONS (tool_options);
|
|
|
|
vbox = tool_options->main_vbox;
|
|
|
|
frame = gimp_prop_enum_radio_frame_new (config, "direction",
|
|
_("Transform Direction"), 0, 0);
|
|
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
|
gtk_widget_show (frame);
|
|
|
|
/* the interpolation menu */
|
|
hbox = gtk_hbox_new (FALSE, 4);
|
|
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
|
gtk_widget_show (hbox);
|
|
|
|
label = gtk_label_new (_("Interpolation:"));
|
|
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
|
|
gtk_widget_show (label);
|
|
|
|
optionmenu = gimp_prop_enum_option_menu_new (config, "interpolation", 0, 0);
|
|
gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0);
|
|
gtk_widget_show (optionmenu);
|
|
|
|
/* the clip resulting image toggle button */
|
|
button = gimp_prop_check_button_new (config, "clip", _("Clip Result"));
|
|
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
|
gtk_widget_show (button);
|
|
|
|
/* the grid frame */
|
|
frame = gtk_frame_new (NULL);
|
|
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
|
gtk_widget_show (frame);
|
|
|
|
/* the grid type menu */
|
|
optionmenu = gimp_prop_enum_option_menu_new (config, "grid-type", 0, 0);
|
|
gtk_frame_set_label_widget (GTK_FRAME (frame), optionmenu);
|
|
gtk_widget_show (optionmenu);
|
|
|
|
/* the grid density scale */
|
|
table = gtk_table_new (1, 3, FALSE);
|
|
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
|
|
gtk_table_set_col_spacings (GTK_TABLE (table), 2);
|
|
gtk_container_add (GTK_CONTAINER (frame), table);
|
|
gtk_widget_show (table);
|
|
|
|
g_signal_connect (config, "notify",
|
|
G_CALLBACK (gimp_transform_options_notify),
|
|
table);
|
|
|
|
gimp_prop_scale_entry_new (config, "grid-size",
|
|
GTK_TABLE (table), 0, 0,
|
|
_("Density:"),
|
|
1.0, 8.0, 0,
|
|
FALSE, 0.0, 0.0);
|
|
|
|
/* the show_path toggle button */
|
|
button = gimp_prop_check_button_new (config, "show-path", _("Show Path"));
|
|
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
|
gtk_widget_show (button);
|
|
|
|
if (tool_options->tool_info->tool_type == GIMP_TYPE_ROTATE_TOOL ||
|
|
tool_options->tool_info->tool_type == GIMP_TYPE_SCALE_TOOL)
|
|
{
|
|
GtkWidget *vbox2;
|
|
gchar *str;
|
|
|
|
/* the constraints frame */
|
|
frame = gtk_frame_new (_("Constraints"));
|
|
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
|
gtk_widget_show (frame);
|
|
|
|
vbox2 = gtk_vbox_new (FALSE, 2);
|
|
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2);
|
|
gtk_container_add (GTK_CONTAINER (frame), vbox2);
|
|
gtk_widget_show (vbox2);
|
|
|
|
if (tool_options->tool_info->tool_type == GIMP_TYPE_ROTATE_TOOL)
|
|
{
|
|
str = g_strdup_printf (_("15 Degrees %s"),
|
|
gimp_get_mod_name_control ());
|
|
|
|
button = gimp_prop_check_button_new (config, "constrain-1", str);
|
|
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
|
|
gtk_widget_show (button);
|
|
|
|
g_free (str);
|
|
}
|
|
else if (tool_options->tool_info->tool_type == GIMP_TYPE_SCALE_TOOL)
|
|
{
|
|
str = g_strdup_printf (_("Keep Height %s"),
|
|
gimp_get_mod_name_control ());
|
|
|
|
button = gimp_prop_check_button_new (config, "constrain-1", str);
|
|
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
|
|
gtk_widget_show (button);
|
|
|
|
g_free (str);
|
|
|
|
gimp_help_set_help_data (button,
|
|
_("Activate both the \"Keep Height\" and\n"
|
|
"\"Keep Width\" toggles to constrain\n"
|
|
"the aspect ratio"), NULL);
|
|
|
|
str = g_strdup_printf (_("Keep Width %s"),
|
|
gimp_get_mod_name_alt ());
|
|
|
|
button = gimp_prop_check_button_new (config, "constrain-2", str);
|
|
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
|
|
gtk_widget_show (button);
|
|
|
|
g_free (str);
|
|
|
|
gimp_help_set_help_data (button,
|
|
_("Activate both the \"Keep Height\" and\n"
|
|
"\"Keep Width\" toggles to constrain\n"
|
|
"the aspect ratio"), NULL);
|
|
}
|
|
}
|
|
|
|
gimp_transform_options_reset (tool_options);
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
gimp_transform_options_notify (GimpTransformOptions *options,
|
|
GParamSpec *pspec,
|
|
GtkWidget *density_box)
|
|
{
|
|
GimpToolOptions *tool_options;
|
|
GimpTool *active_tool;
|
|
GimpTransformTool *transform_tool;
|
|
|
|
tool_options = GIMP_TOOL_OPTIONS (options);
|
|
|
|
active_tool = tool_manager_get_active (tool_options->tool_info->gimp);
|
|
|
|
if (GIMP_IS_TRANSFORM_TOOL (active_tool))
|
|
transform_tool = GIMP_TRANSFORM_TOOL (active_tool);
|
|
else
|
|
transform_tool = NULL;
|
|
|
|
switch (pspec->param_id)
|
|
{
|
|
case PROP_GRID_TYPE:
|
|
if (transform_tool)
|
|
gimp_transform_tool_grid_density_changed (transform_tool);
|
|
|
|
gtk_widget_set_sensitive (density_box,
|
|
options->grid_type !=
|
|
GIMP_TRANSFORM_GRID_TYPE_NONE);
|
|
break;
|
|
|
|
case PROP_GRID_SIZE:
|
|
if (transform_tool)
|
|
gimp_transform_tool_grid_density_changed (transform_tool);
|
|
break;
|
|
|
|
case PROP_SHOW_PATH:
|
|
if (transform_tool)
|
|
{
|
|
#if 0
|
|
gimp_transform_tool_show_path_changed (transform_tool, 1); /* pause */
|
|
|
|
gimp_toggle_button_update (widget, &options->show_path);
|
|
|
|
gimp_transform_tool_show_path_changed (transform_tool, 0); /* resume */
|
|
#endif
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|