From 775c7ef825bf36e10784efd6d70f2e5cc5f164c0 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 7 Jul 2025 14:33:12 +0200 Subject: [PATCH] app: vector -> path in GimpPathOptions --- app/tools/gimppathoptions.c | 70 ++++++++++++++++++------------------- app/tools/gimppathoptions.h | 28 +++++++-------- app/tools/gimppathtool.c | 24 ++++++------- app/tools/gimppathtool.h | 2 +- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/app/tools/gimppathoptions.c b/app/tools/gimppathoptions.c index ab1ef878d2..04f96621a2 100644 --- a/app/tools/gimppathoptions.c +++ b/app/tools/gimppathoptions.c @@ -1,7 +1,7 @@ /* GIMP - The GNU Image Manipulation Program * Copyright (C) 1995 Spencer Kimball and Peter Mattis * - * gimpvectoroptions.c + * gimppathoptions.c * Copyright (C) 1999 Sven Neumann * * This program is free software: you can redistribute it and/or modify @@ -41,42 +41,42 @@ enum { PROP_0, - PROP_VECTORS_EDIT_MODE, - PROP_VECTORS_POLYGONAL + PROP_PATH_EDIT_MODE, + PROP_PATH_POLYGONAL }; -static void gimp_vector_options_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); -static void gimp_vector_options_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec); +static void gimp_path_options_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gimp_path_options_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); -G_DEFINE_TYPE (GimpVectorOptions, gimp_vector_options, GIMP_TYPE_TOOL_OPTIONS) +G_DEFINE_TYPE (GimpPathOptions, gimp_path_options, GIMP_TYPE_TOOL_OPTIONS) static void -gimp_vector_options_class_init (GimpVectorOptionsClass *klass) +gimp_path_options_class_init (GimpPathOptionsClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->set_property = gimp_vector_options_set_property; - object_class->get_property = gimp_vector_options_get_property; + object_class->set_property = gimp_path_options_set_property; + object_class->get_property = gimp_path_options_get_property; - GIMP_CONFIG_PROP_ENUM (object_class, PROP_VECTORS_EDIT_MODE, - "vectors-edit-mode", + GIMP_CONFIG_PROP_ENUM (object_class, PROP_PATH_EDIT_MODE, + "path-edit-mode", _("Edit Mode"), NULL, GIMP_TYPE_PATH_MODE, GIMP_PATH_MODE_DESIGN, GIMP_PARAM_STATIC_STRINGS); - GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_VECTORS_POLYGONAL, - "vectors-polygonal", + GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_PATH_POLYGONAL, + "path-polygonal", _("Polygonal"), _("Restrict editing to polygons"), FALSE, @@ -84,24 +84,24 @@ gimp_vector_options_class_init (GimpVectorOptionsClass *klass) } static void -gimp_vector_options_init (GimpVectorOptions *options) +gimp_path_options_init (GimpPathOptions *options) { } static void -gimp_vector_options_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) +gimp_path_options_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) { - GimpVectorOptions *options = GIMP_VECTOR_OPTIONS (object); + GimpPathOptions *options = GIMP_PATH_OPTIONS (object); switch (property_id) { - case PROP_VECTORS_EDIT_MODE: + case PROP_PATH_EDIT_MODE: options->edit_mode = g_value_get_enum (value); break; - case PROP_VECTORS_POLYGONAL: + case PROP_PATH_POLYGONAL: options->polygonal = g_value_get_boolean (value); break; default: @@ -112,19 +112,19 @@ gimp_vector_options_set_property (GObject *object, static void -gimp_vector_options_get_property (GObject *object, +gimp_path_options_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - GimpVectorOptions *options = GIMP_VECTOR_OPTIONS (object); + GimpPathOptions *options = GIMP_PATH_OPTIONS (object); switch (property_id) { - case PROP_VECTORS_EDIT_MODE: + case PROP_PATH_EDIT_MODE: g_value_set_enum (value, options->edit_mode); break; - case PROP_VECTORS_POLYGONAL: + case PROP_PATH_POLYGONAL: g_value_set_boolean (value, options->polygonal); break; default: @@ -146,17 +146,17 @@ button_append_modifier (GtkWidget *button, } GtkWidget * -gimp_vector_options_gui (GimpToolOptions *tool_options) +gimp_path_options_gui (GimpToolOptions *tool_options) { GObject *config = G_OBJECT (tool_options); - GimpVectorOptions *options = GIMP_VECTOR_OPTIONS (tool_options); + GimpPathOptions *options = GIMP_PATH_OPTIONS (tool_options); GtkWidget *vbox = gimp_tool_options_gui (tool_options); GtkWidget *frame; GtkWidget *button; gchar *str; /* tool toggle */ - frame = gimp_prop_enum_radio_frame_new (config, "vectors-edit-mode", NULL, + frame = gimp_prop_enum_radio_frame_new (config, "path-edit-mode", NULL, 0, 0); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); @@ -174,7 +174,7 @@ gimp_vector_options_gui (GimpToolOptions *tool_options) gimp_get_toggle_behavior_mask ()); } - button = gimp_prop_check_button_new (config, "vectors-polygonal", NULL); + button = gimp_prop_check_button_new (config, "path-polygonal", NULL); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); str = g_strdup_printf (_("Path to Selection\n" diff --git a/app/tools/gimppathoptions.h b/app/tools/gimppathoptions.h index 783e4b5a91..e222a580bd 100644 --- a/app/tools/gimppathoptions.h +++ b/app/tools/gimppathoptions.h @@ -15,25 +15,25 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VECTOR_OPTIONS_H__ -#define __GIMP_VECTOR_OPTIONS_H__ +#ifndef __GIMP_PATH_OPTIONS_H__ +#define __GIMP_PATH_OPTIONS_H__ #include "core/gimptooloptions.h" -#define GIMP_TYPE_VECTOR_OPTIONS (gimp_vector_options_get_type ()) -#define GIMP_VECTOR_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTOR_OPTIONS, GimpVectorOptions)) -#define GIMP_VECTOR_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTOR_OPTIONS, GimpVectorOptionsClass)) -#define GIMP_IS_VECTOR_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VECTOR_OPTIONS)) -#define GIMP_IS_VECTOR_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTOR_OPTIONS)) -#define GIMP_VECTOR_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTOR_OPTIONS, GimpVectorOptionsClass)) +#define GIMP_TYPE_PATH_OPTIONS (gimp_path_options_get_type ()) +#define GIMP_PATH_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PATH_OPTIONS, GimpPathOptions)) +#define GIMP_PATH_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PATH_OPTIONS, GimpPathOptionsClass)) +#define GIMP_IS_PATH_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PATH_OPTIONS)) +#define GIMP_IS_PATH_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PATH_OPTIONS)) +#define GIMP_PATH_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PATH_OPTIONS, GimpPathOptionsClass)) -typedef struct _GimpVectorOptions GimpVectorOptions; -typedef struct _GimpToolOptionsClass GimpVectorOptionsClass; +typedef struct _GimpPathOptions GimpPathOptions; +typedef struct _GimpToolOptionsClass GimpPathOptionsClass; -struct _GimpVectorOptions +struct _GimpPathOptions { GimpToolOptions parent_instance; @@ -47,9 +47,9 @@ struct _GimpVectorOptions }; -GType gimp_vector_options_get_type (void) G_GNUC_CONST; +GType gimp_path_options_get_type (void) G_GNUC_CONST; -GtkWidget * gimp_vector_options_gui (GimpToolOptions *tool_options); +GtkWidget * gimp_path_options_gui (GimpToolOptions *tool_options); -#endif /* __GIMP_VECTOR_OPTIONS_H__ */ +#endif /* __GIMP_PATH_OPTIONS_H__ */ diff --git a/app/tools/gimppathtool.c b/app/tools/gimppathtool.c index 3223664697..04f74f123a 100644 --- a/app/tools/gimppathtool.c +++ b/app/tools/gimppathtool.c @@ -158,8 +158,8 @@ gimp_vector_tool_register (GimpToolRegisterCallback callback, gpointer data) { (* callback) (GIMP_TYPE_VECTOR_TOOL, - GIMP_TYPE_VECTOR_OPTIONS, - gimp_vector_options_gui, + GIMP_TYPE_PATH_OPTIONS, + gimp_path_options_gui, GIMP_PAINT_OPTIONS_CONTEXT_MASK | GIMP_CONTEXT_PROP_MASK_PATTERN | GIMP_CONTEXT_PROP_MASK_GRADIENT, /* for stroking */ @@ -308,8 +308,8 @@ gimp_vector_tool_modifier_key (GimpTool *tool, GdkModifierType state, GimpDisplay *display) { - GimpVectorTool *vector_tool = GIMP_VECTOR_TOOL (tool); - GimpVectorOptions *options = GIMP_VECTOR_TOOL_GET_OPTIONS (tool); + GimpVectorTool *vector_tool = GIMP_VECTOR_TOOL (tool); + GimpPathOptions *options = GIMP_VECTOR_TOOL_GET_OPTIONS (tool); if (key == TOGGLE_MASK) return; @@ -348,7 +348,7 @@ gimp_vector_tool_modifier_key (GimpTool *tool, if (button_mode != options->edit_mode) { - g_object_set (options, "vectors-edit-mode", button_mode, NULL); + g_object_set (options, "path-edit-mode", button_mode, NULL); } } } @@ -387,7 +387,7 @@ gimp_vector_tool_start (GimpVectorTool *vector_tool, GimpDisplay *display) { GimpTool *tool = GIMP_TOOL (vector_tool); - GimpVectorOptions *options = GIMP_VECTOR_TOOL_GET_OPTIONS (tool); + GimpPathOptions *options = GIMP_VECTOR_TOOL_GET_OPTIONS (tool); GimpDisplayShell *shell = gimp_display_get_shell (display); GimpToolWidget *widget; @@ -397,11 +397,11 @@ gimp_vector_tool_start (GimpVectorTool *vector_tool, gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), widget); - g_object_bind_property (G_OBJECT (options), "vectors-edit-mode", + g_object_bind_property (G_OBJECT (options), "path-edit-mode", G_OBJECT (widget), "edit-mode", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); - g_object_bind_property (G_OBJECT (options), "vectors-polygonal", + g_object_bind_property (G_OBJECT (options), "path-polygonal", G_OBJECT (widget), "polygonal", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); @@ -552,9 +552,9 @@ void gimp_vector_tool_set_path (GimpVectorTool *vector_tool, GimpPath *vectors) { - GimpTool *tool; - GimpItem *item = NULL; - GimpVectorOptions *options; + GimpTool *tool; + GimpItem *item = NULL; + GimpPathOptions *options; g_return_if_fail (GIMP_IS_VECTOR_TOOL (vector_tool)); g_return_if_fail (vectors == NULL || GIMP_IS_PATH (vectors)); @@ -694,7 +694,7 @@ gimp_vector_tool_set_path (GimpVectorTool *vector_tool, } if (options->edit_mode != GIMP_PATH_MODE_DESIGN) - g_object_set (options, "vectors-edit-mode", + g_object_set (options, "path-edit-mode", GIMP_PATH_MODE_DESIGN, NULL); } diff --git a/app/tools/gimppathtool.h b/app/tools/gimppathtool.h index 6dd9014afb..44d934ca10 100644 --- a/app/tools/gimppathtool.h +++ b/app/tools/gimppathtool.h @@ -32,7 +32,7 @@ #define GIMP_IS_VECTOR_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTOR_TOOL)) #define GIMP_VECTOR_TOOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTOR_TOOL, GimpVectorToolClass)) -#define GIMP_VECTOR_TOOL_GET_OPTIONS(t) (GIMP_VECTOR_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t)))) +#define GIMP_VECTOR_TOOL_GET_OPTIONS(t) (GIMP_PATH_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t)))) typedef struct _GimpVectorTool GimpVectorTool;