[gimp] libgimp: add GimpProcedureConfig which implements the GimpConfig interface
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimp: add GimpProcedureConfig which implements the GimpConfig interface
- Date: Fri, 20 Sep 2019 10:35:19 +0000 (UTC)
commit b441d100ff679bf2f994c8395e6cd0241ce2f515
Author: Michael Natterer <mitch gimp org>
Date: Fri Sep 20 12:31:11 2019 +0200
libgimp: add GimpProcedureConfig which implements the GimpConfig interface
It's the base for bringing proper management of saved settings
(including the last used values) and generated GUI using prop_widgets
to plug-ins.
libgimp/Makefile.gi | 2 +
libgimp/gimp.def | 6 +
libgimp/gimp.h | 1 +
libgimp/gimpimageprocedure.c | 46 ++++-
libgimp/gimpprocedure.c | 51 +++++
libgimp/gimpprocedure.h | 15 +-
libgimp/gimpprocedureconfig.c | 420 ++++++++++++++++++++++++++++++++++++++++++
libgimp/gimpprocedureconfig.h | 84 +++++++++
libgimp/gimptypes.h | 25 +--
libgimp/meson.build | 2 +
10 files changed, 627 insertions(+), 25 deletions(-)
---
diff --git a/libgimp/Makefile.gi b/libgimp/Makefile.gi
index 70f4b3174b..3079facadc 100644
--- a/libgimp/Makefile.gi
+++ b/libgimp/Makefile.gi
@@ -130,6 +130,7 @@ libgimp_introspectable_headers = \
../libgimp/gimppdb.h \
../libgimp/gimpplugin.h \
../libgimp/gimpprocedure.h \
+ ../libgimp/gimpprocedureconfig.h \
../libgimp/gimpprogress.h \
../libgimp/gimpsaveprocedure.h \
../libgimp/gimpselection.h \
@@ -162,6 +163,7 @@ libgimp_introspectable = \
../libgimp/gimppdb.c \
../libgimp/gimpplugin.c \
../libgimp/gimpprocedure.c \
+ ../libgimp/gimpprocedureconfig.c \
../libgimp/gimpprogress.c \
../libgimp/gimpsaveprocedure.c \
../libgimp/gimpselection.c \
diff --git a/libgimp/gimp.def b/libgimp/gimp.def
index 4e606cba1a..14bdc36caa 100644
--- a/libgimp/gimp.def
+++ b/libgimp/gimp.def
@@ -680,6 +680,12 @@ EXPORTS
gimp_procedure_add_menu_path
gimp_procedure_add_return_value
gimp_procedure_add_return_value_from_property
+ gimp_procedure_config_begin_run
+ gimp_procedure_config_end_run
+ gimp_procedure_config_get_type
+ gimp_procedure_config_get_values
+ gimp_procedure_config_set_values
+ gimp_procedure_create_config
gimp_procedure_extension_ready
gimp_procedure_get_arguments
gimp_procedure_get_authors
diff --git a/libgimp/gimp.h b/libgimp/gimp.h
index 7d51623871..fae0cef24c 100644
--- a/libgimp/gimp.h
+++ b/libgimp/gimp.h
@@ -54,6 +54,7 @@
#include <libgimp/gimppatternselect.h>
#include <libgimp/gimppdb.h>
#include <libgimp/gimpplugin.h>
+#include <libgimp/gimpprocedureconfig.h>
#include <libgimp/gimpprocedure-params.h>
#include <libgimp/gimpprogress.h>
#include <libgimp/gimpsaveprocedure.h>
diff --git a/libgimp/gimpimageprocedure.c b/libgimp/gimpimageprocedure.c
index cd2e08caa5..68c3adfa7e 100644
--- a/libgimp/gimpimageprocedure.c
+++ b/libgimp/gimpimageprocedure.c
@@ -33,12 +33,16 @@ struct _GimpImageProcedurePrivate
};
-static void gimp_image_procedure_constructed (GObject *object);
-static void gimp_image_procedure_finalize (GObject *object);
+static void gimp_image_procedure_constructed (GObject *object);
+static void gimp_image_procedure_finalize (GObject *object);
static GimpValueArray *
- gimp_image_procedure_run (GimpProcedure *procedure,
- const GimpValueArray *args);
+ gimp_image_procedure_run (GimpProcedure *procedure,
+ const GimpValueArray *args);
+static GimpProcedureConfig *
+ gimp_image_procedure_create_config (GimpProcedure *procedure,
+ GParamSpec **args,
+ gint n_args);
G_DEFINE_TYPE_WITH_PRIVATE (GimpImageProcedure, gimp_image_procedure,
@@ -53,10 +57,11 @@ gimp_image_procedure_class_init (GimpImageProcedureClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpProcedureClass *procedure_class = GIMP_PROCEDURE_CLASS (klass);
- object_class->constructed = gimp_image_procedure_constructed;
- object_class->finalize = gimp_image_procedure_finalize;
+ object_class->constructed = gimp_image_procedure_constructed;
+ object_class->finalize = gimp_image_procedure_finalize;
- procedure_class->run = gimp_image_procedure_run;
+ procedure_class->run = gimp_image_procedure_run;
+ procedure_class->create_config = gimp_image_procedure_create_config;
}
static void
@@ -103,6 +108,8 @@ gimp_image_procedure_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
+#define ARG_OFFSET 3
+
static GimpValueArray *
gimp_image_procedure_run (GimpProcedure *procedure,
const GimpValueArray *args)
@@ -119,9 +126,9 @@ gimp_image_procedure_run (GimpProcedure *procedure,
image = GIMP_VALUES_GET_IMAGE (args, 1);
drawable = GIMP_VALUES_GET_DRAWABLE (args, 2);
- remaining = gimp_value_array_new (gimp_value_array_length (args) - 3);
+ remaining = gimp_value_array_new (gimp_value_array_length (args) - ARG_OFFSET);
- for (i = 3; i < gimp_value_array_length (args); i++)
+ for (i = ARG_OFFSET; i < gimp_value_array_length (args); i++)
{
GValue *value = gimp_value_array_index (args, i);
@@ -139,6 +146,27 @@ gimp_image_procedure_run (GimpProcedure *procedure,
return return_values;
}
+static GimpProcedureConfig *
+gimp_image_procedure_create_config (GimpProcedure *procedure,
+ GParamSpec **args,
+ gint n_args)
+{
+ if (n_args > ARG_OFFSET)
+ {
+ args += ARG_OFFSET;
+ n_args -= ARG_OFFSET;
+ }
+ else
+ {
+ args = NULL;
+ n_args = 0;
+ }
+
+ return GIMP_PROCEDURE_CLASS (parent_class)->create_config (procedure,
+ args,
+ n_args);
+}
+
/* public functions */
diff --git a/libgimp/gimpprocedure.c b/libgimp/gimpprocedure.c
index 4aab89edf6..749ae4b006 100644
--- a/libgimp/gimpprocedure.c
+++ b/libgimp/gimpprocedure.c
@@ -105,6 +105,11 @@ static void gimp_procedure_real_uninstall (GimpProcedure *procedure
static GimpValueArray *
gimp_procedure_real_run (GimpProcedure *procedure,
const GimpValueArray *args);
+static GimpProcedureConfig *
+ gimp_procedure_real_create_config
+ (GimpProcedure *procedure,
+ GParamSpec **args,
+ gint n_args);
static gboolean gimp_procedure_validate_args (GimpProcedure *procedure,
GParamSpec **param_specs,
@@ -138,6 +143,7 @@ gimp_procedure_class_init (GimpProcedureClass *klass)
klass->install = gimp_procedure_real_install;
klass->uninstall = gimp_procedure_real_uninstall;
klass->run = gimp_procedure_real_run;
+ klass->create_config = gimp_procedure_real_create_config;
props[PROP_PLUG_IN] =
g_param_spec_object ("plug-in",
@@ -464,6 +470,31 @@ gimp_procedure_real_run (GimpProcedure *procedure,
procedure->priv->run_data);
}
+static GimpProcedureConfig *
+gimp_procedure_real_create_config (GimpProcedure *procedure,
+ GParamSpec **args,
+ gint n_args)
+{
+ gchar *type_name;
+ GType type;
+
+ type_name = g_strdup_printf ("GimpProcedureConfig-%s",
+ gimp_procedure_get_name (procedure));
+
+ type = g_type_from_name (type_name);
+
+ if (! type)
+ type = gimp_config_type_register (GIMP_TYPE_PROCEDURE_CONFIG,
+ type_name,
+ args, n_args);
+
+ g_free (type_name);
+
+ return g_object_new (type,
+ "procedure", procedure,
+ NULL);
+}
+
/* public functions */
@@ -1490,6 +1521,26 @@ gimp_procedure_extension_ready (GimpProcedure *procedure)
gimp_quit ();
}
+/**
+ * gimp_procedure_create_config:
+ * @procedure: A #GimpProcedure
+ *
+ * Create a #GimpConfig with properties that match @procedure's arguments.
+ *
+ * Returns: (transfer full): The new #GimpConfig.
+ *
+ * Since: 3.0
+ **/
+GimpProcedureConfig *
+gimp_procedure_create_config (GimpProcedure *procedure)
+{
+ g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), NULL);
+
+ return GIMP_PROCEDURE_GET_CLASS (procedure)->create_config (procedure,
+ procedure->priv->args,
+ procedure->priv->n_args);
+}
+
/* private functions */
diff --git a/libgimp/gimpprocedure.h b/libgimp/gimpprocedure.h
index 6b4431c23d..5ae852f3f8 100644
--- a/libgimp/gimpprocedure.h
+++ b/libgimp/gimpprocedure.h
@@ -86,11 +86,15 @@ struct _GimpProcedureClass
{
GObjectClass parent_class;
- void (* install) (GimpProcedure *procedure);
- void (* uninstall) (GimpProcedure *procedure);
+ void (* install) (GimpProcedure *procedure);
+ void (* uninstall) (GimpProcedure *procedure);
- GimpValueArray * (* run) (GimpProcedure *procedure,
- const GimpValueArray *args);
+ GimpValueArray * (* run) (GimpProcedure *procedure,
+ const GimpValueArray *args);
+
+ GimpProcedureConfig * (* create_config) (GimpProcedure *procedure,
+ GParamSpec **args,
+ gint n_args);
/* Padding for future expansion */
void (*_gimp_reserved1) (void);
@@ -185,6 +189,9 @@ GimpValueArray * gimp_procedure_run (GimpProcedure *proced
void gimp_procedure_extension_ready (GimpProcedure *procedure);
+GimpProcedureConfig *
+ gimp_procedure_create_config (GimpProcedure *procedure);
+
G_END_DECLS
diff --git a/libgimp/gimpprocedureconfig.c b/libgimp/gimpprocedureconfig.c
new file mode 100644
index 0000000000..688868276d
--- /dev/null
+++ b/libgimp/gimpprocedureconfig.c
@@ -0,0 +1,420 @@
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-2003 Peter Mattis and Spencer Kimball
+ *
+ * gimpprocedureconfig.c
+ * Copyright (C) 2019 Michael Natterer <mitch gimp org>
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "gimp.h"
+
+
+/**
+ * SECTION: gimpprocedureconfig
+ * @title: GimpProcedureConfig
+ * @short_description: Config object for procedure arguments
+ *
+ * #GimpProcedureConfig base class for #GimpProcedure-specific config
+ * objects and the main interface to manage aspects of
+ * #GimpProcedure's arguments such as persistency of the last used
+ * argments across GIMP sessions.
+ *
+ * A #GimpProcedureConfig is created by a #GimpProcedure using
+ * gimp_procedure_create_config() and its properties match the
+ * procedure's arguments in number, order and type.
+ *
+ * It implements the #GimpConfig interface and therefore has all its
+ * serialization and deserialization features.
+ *
+ * Since: 3.0
+ **/
+
+
+enum
+{
+ PROP_0,
+ PROP_PROCEDURE,
+ N_PROPS
+};
+
+
+struct _GimpProcedureConfigPrivate
+{
+ GimpProcedure *procedure;
+};
+
+
+static void gimp_procedure_config_constructed (GObject *object);
+static void gimp_procedure_config_dispose (GObject *object);
+static void gimp_procedure_config_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gimp_procedure_config_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static GFile * gimp_procedure_config_get_file (GimpProcedureConfig *config,
+ const gchar *extension);
+static gboolean gimp_procedure_config_load_last (GimpProcedureConfig *config,
+ GError **error);
+static gboolean gimp_procedure_config_save_last (GimpProcedureConfig *config,
+ GError **error);
+
+
+
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GimpProcedureConfig, gimp_procedure_config,
+ G_TYPE_OBJECT)
+
+#define parent_class gimp_procedure_config_parent_class
+
+static GParamSpec *props[N_PROPS] = { NULL, };
+
+
+static void
+gimp_procedure_config_class_init (GimpProcedureConfigClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->constructed = gimp_procedure_config_constructed;
+ object_class->dispose = gimp_procedure_config_dispose;
+ object_class->set_property = gimp_procedure_config_set_property;
+ object_class->get_property = gimp_procedure_config_get_property;
+
+ props[PROP_PROCEDURE] =
+ g_param_spec_object ("procedure",
+ "Procedure",
+ "The procedure this config object is used for",
+ GIMP_TYPE_PROCEDURE,
+ GIMP_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY);
+
+ g_object_class_install_properties (object_class, N_PROPS, props);
+}
+
+static void
+gimp_procedure_config_init (GimpProcedureConfig *config)
+{
+ config->priv = gimp_procedure_config_get_instance_private (config);
+}
+
+static void
+gimp_procedure_config_constructed (GObject *object)
+{
+ GimpProcedureConfig *config = GIMP_PROCEDURE_CONFIG (object);
+
+ G_OBJECT_CLASS (parent_class)->constructed (object);
+
+ g_assert (GIMP_IS_PROCEDURE (config->priv->procedure));
+}
+
+static void
+gimp_procedure_config_dispose (GObject *object)
+{
+ GimpProcedureConfig *config = GIMP_PROCEDURE_CONFIG (object);
+
+ g_clear_object (&config->priv->procedure);
+
+ G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_procedure_config_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GimpProcedureConfig *config = GIMP_PROCEDURE_CONFIG (object);
+
+ switch (property_id)
+ {
+ case PROP_PROCEDURE:
+ config->priv->procedure = g_value_dup_object (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gimp_procedure_config_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GimpProcedureConfig *config = GIMP_PROCEDURE_CONFIG (object);
+
+ switch (property_id)
+ {
+ case PROP_PROCEDURE:
+ g_value_set_object (value, config->priv->procedure);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+
+/* public functions */
+
+/**
+ * gimp_procedure_config_set_values:
+ * @config: a #GimpProcedureConfig
+ * @values: a #GimpValueArray
+ *
+ * Sets the values from @values on @config's properties.
+ *
+ * The number, order and types of values in @values must match the
+ * number, order and types of @config's properties.
+ *
+ * This function is meant to be used on @values which are passed as
+ * arguments to the run() function of the #GimpProcedure which created
+ * this @config. See gimp_procedure_create_config().
+ *
+ * Since: 3.0
+ **/
+void
+gimp_procedure_config_set_values (GimpProcedureConfig *config,
+ const GimpValueArray *values)
+{
+ GParamSpec **pspecs;
+ guint n_pspecs;
+ gint i;
+
+ g_return_if_fail (GIMP_IS_PROCEDURE_CONFIG (config));
+ g_return_if_fail (values != NULL);
+
+ pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (config),
+ &n_pspecs);
+
+ g_return_if_fail (n_pspecs == gimp_value_array_length (values));
+
+ for (i = 0; i < n_pspecs; i++)
+ {
+ GParamSpec *pspec = pspecs[i];
+ GValue *value = gimp_value_array_index (values, i);
+
+ g_object_set_property (G_OBJECT (config), pspec->name, value);
+ }
+
+ g_free (pspecs);
+}
+
+/**
+ * gimp_procedure_config_get_values:
+ * @config: a #GimpProcedureConfig
+ * @values: a #GimpValueArray
+ *
+ * Gets the values from @config's properties and stores them in
+ * @values.
+ *
+ * See gimp_procedure_config_set_values().
+ *
+ * Since: 3.0
+ **/
+void
+gimp_procedure_config_get_values (GimpProcedureConfig *config,
+ GimpValueArray *values)
+{
+ GParamSpec **pspecs;
+ guint n_pspecs;
+ gint i;
+
+ g_return_if_fail (GIMP_IS_PROCEDURE_CONFIG (config));
+ g_return_if_fail (values != NULL);
+
+ pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (config),
+ &n_pspecs);
+
+ g_return_if_fail (n_pspecs == gimp_value_array_length (values));
+
+ for (i = 0; i < n_pspecs; i++)
+ {
+ GParamSpec *pspec = pspecs[i];
+ GValue *value = gimp_value_array_index (values, i);
+
+ g_object_get_property (G_OBJECT (config), pspec->name, value);
+ }
+
+ g_free (pspecs);
+}
+
+/**
+ * gimp_procedure_config_begin_run:
+ * @config: a #GimpProcedureConfig
+ * @run_mode: the #GimpRunMode passed to a #GimpProcedure's run()
+ * @args: the #GimpValueArray passed to a #GimpProcedure's run()
+ *
+ * Populates @config with values for a #GimpProcedure's run(),
+ * depending on @run_mode.
+ *
+ * If @run_mode is %GIMP_RUN_INTERACTIVE or %GIMP_RUN_WITH_LAST_VALS,
+ * the saved values from the procedure's last run() are loaded and set
+ * on @config. If no saved last values are found, the procedure's
+ * default argument values are used.
+ *
+ * If @run_mode is %GIMP_RUN_NONINTERACTIVE, the contents of @args are
+ * set on @config using gimp_procedure_config_set_values().
+ *
+ * After calling this function, the @args passed to run() should be
+ * left alone and @config be treated as the procedure's arguments.
+ *
+ * It is possible to get @config's resulting values back into @args by
+ * calling gimp_procedure_config_get_values(), as long as modified
+ * @args are written back to @config using
+ * gimp_procedure_config_set_values() before the call to
+ * gimp_procedure_config_end_run().
+ *
+ * This function should be used at the beginning of a procedure's
+ * run() and be paired with a call to gimp_procedure_config_end_run()
+ * at the end of run().
+ *
+ * Since: 3.0
+ **/
+void
+gimp_procedure_config_begin_run (GimpProcedureConfig *config,
+ GimpRunMode run_mode,
+ const GimpValueArray *args)
+{
+ GError *error = NULL;
+
+ g_return_if_fail (GIMP_IS_PROCEDURE_CONFIG (config));
+ g_return_if_fail (args != NULL);
+
+ switch (run_mode)
+ {
+ case GIMP_RUN_INTERACTIVE :
+ case GIMP_RUN_WITH_LAST_VALS:
+ if (! gimp_procedure_config_load_last (config, &error))
+ {
+ g_printerr ("Saving last values failed: %s\n",
+ error->message);
+ g_clear_error (&error);
+ }
+ break;
+
+ case GIMP_RUN_NONINTERACTIVE:
+ gimp_procedure_config_set_values (config, args);
+ break;
+ }
+}
+
+/**
+ * gimp_procedure_config_end_run:
+ * @config: a #GimpProcedureConfig
+ * @run_mode: the #GimpRunMode passed to a #GimpProcedure's run()
+ *
+ * This function is the counterpart of
+ * gimp_procedure_conig_begin_run() and should be used upon successful
+ * completion of a procedure's run(), before returning
+ * %GIMP_PDB_SUCCESS return values.
+ *
+ * If @run_mode is %GIMP_RUN_INTERACTIVE, @config is saved as last
+ * values to be used when the procedure runs again.
+ *
+ * If @run_mode is not %GIMP_RUN_NONINTERACTIVE, this function also
+ * conveniently calls gimp_display_flush(), which is what most
+ * procedures want and doesn't do any harm if called redundantly.
+ *
+ * See gimp_procedure_config_begin_run().
+ *
+ * Since: 3.0
+ **/
+void
+gimp_procedure_config_end_run (GimpProcedureConfig *config,
+ GimpRunMode run_mode)
+{
+ g_return_if_fail (GIMP_IS_PROCEDURE_CONFIG (config));
+
+ if (run_mode != GIMP_RUN_NONINTERACTIVE)
+ gimp_displays_flush ();
+
+ if (run_mode == GIMP_RUN_INTERACTIVE)
+ {
+ GError *error = NULL;
+
+ if (! gimp_procedure_config_save_last (config, &error))
+ {
+ g_printerr ("Saving last values failed: %s\n",
+ error->message);
+ g_clear_error (&error);
+ }
+ }
+}
+
+
+/* private functions */
+
+static GFile *
+gimp_procedure_config_get_file (GimpProcedureConfig *config,
+ const gchar *extension)
+{
+ GFile *file;
+ gchar *basename;
+
+ basename = g_strconcat (G_OBJECT_TYPE_NAME (config), extension, NULL);
+ file = gimp_directory_file ("plug-in-settings", basename, NULL);
+ g_free (basename);
+
+ return file;
+}
+
+static gboolean
+gimp_procedure_config_load_last (GimpProcedureConfig *config,
+ GError **error)
+{
+ GFile *file = gimp_procedure_config_get_file (config, ".last");
+ gboolean success;
+
+ success = gimp_config_deserialize_gfile (GIMP_CONFIG (config),
+ file,
+ NULL, error);
+
+ if (! success && (*error)->code == GIMP_CONFIG_ERROR_OPEN_ENOENT)
+ {
+ g_clear_error (error);
+ success = TRUE;
+ }
+
+ g_object_unref (file);
+
+ return TRUE;
+}
+
+static gboolean
+gimp_procedure_config_save_last (GimpProcedureConfig *config,
+ GError **error)
+{
+ GFile *file = gimp_procedure_config_get_file (config, ".last");
+ gboolean success;
+
+ success = gimp_config_serialize_to_gfile (GIMP_CONFIG (config),
+ file,
+ "settings",
+ "end of settings",
+ NULL, error);
+
+ g_object_unref (file);
+
+ return success;
+}
diff --git a/libgimp/gimpprocedureconfig.h b/libgimp/gimpprocedureconfig.h
new file mode 100644
index 0000000000..3e6fd58e08
--- /dev/null
+++ b/libgimp/gimpprocedureconfig.h
@@ -0,0 +1,84 @@
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-2003 Peter Mattis and Spencer Kimball
+ *
+ * gimpprocedureconfig.h
+ * Copyright (C) 2019 Michael Natterer <mitch gimp org>
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <https://www.gnu.org/licenses/>.
+ */
+
+#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
+#error "Only <libgimp/gimp.h> can be included directly."
+#endif
+
+#ifndef __GIMP_PROCEDURE_CONFIG_H__
+#define __GIMP_PROCEDURE_CONFIG_H__
+
+G_BEGIN_DECLS
+
+/* For information look into the C source or the html documentation */
+
+
+#define GIMP_TYPE_PROCEDURE_CONFIG (gimp_procedure_config_get_type ())
+#define GIMP_PROCEDURE_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GIMP_TYPE_PROCEDURE_CONFIG, GimpProcedureConfig))
+#define GIMP_PROCEDURE_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PROCEDURE_CONFIG,
GimpProcedureConfigClass))
+#define GIMP_IS_PROCEDURE_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GIMP_TYPE_PROCEDURE_CONFIG))
+#define GIMP_IS_PROCEDURE_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PROCEDURE_CONFIG))
+#define GIMP_PROCEDURE_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PROCEDURE_CONFIG,
GimpProcedureConfigClass))
+
+
+typedef struct _GimpProcedureConfigClass GimpProcedureConfigClass;
+typedef struct _GimpProcedureConfigPrivate GimpProcedureConfigPrivate;
+
+struct _GimpProcedureConfig
+{
+ GObject parent_instance;
+
+ GimpProcedureConfigPrivate *priv;
+};
+
+struct _GimpProcedureConfigClass
+{
+ GObjectClass parent_class;
+
+ /* Padding for future expansion */
+ void (* _gimp_reserved1) (void);
+ void (* _gimp_reserved2) (void);
+ void (* _gimp_reserved3) (void);
+ void (* _gimp_reserved4) (void);
+ void (* _gimp_reserved5) (void);
+ void (* _gimp_reserved6) (void);
+ void (* _gimp_reserved7) (void);
+ void (* _gimp_reserved8) (void);
+};
+
+
+GType gimp_procedure_config_get_type (void) G_GNUC_CONST;
+
+void gimp_procedure_config_set_values (GimpProcedureConfig *config,
+ const GimpValueArray *values);
+void gimp_procedure_config_get_values (GimpProcedureConfig *config,
+ GimpValueArray *values);
+
+void gimp_procedure_config_begin_run (GimpProcedureConfig *config,
+ GimpRunMode run_mode,
+ const GimpValueArray *args);
+void gimp_procedure_config_end_run (GimpProcedureConfig *config,
+ GimpRunMode run_mode);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_PROCEDURE_CONFIG_H__ */
diff --git a/libgimp/gimptypes.h b/libgimp/gimptypes.h
index cb9c34aa00..ad5b06523e 100644
--- a/libgimp/gimptypes.h
+++ b/libgimp/gimptypes.h
@@ -28,20 +28,21 @@ G_BEGIN_DECLS
/* For information look into the html documentation */
-typedef struct _GimpPDB GimpPDB;
-typedef struct _GimpPlugIn GimpPlugIn;
-typedef struct _GimpProcedure GimpProcedure;
+typedef struct _GimpPDB GimpPDB;
+typedef struct _GimpPlugIn GimpPlugIn;
+typedef struct _GimpProcedure GimpProcedure;
+typedef struct _GimpProcedureConfig GimpProcedureConfig;
-typedef struct _GimpImage GimpImage;
-typedef struct _GimpItem GimpItem;
-typedef struct _GimpDrawable GimpDrawable;
-typedef struct _GimpLayer GimpLayer;
-typedef struct _GimpChannel GimpChannel;
-typedef struct _GimpLayerMask GimpLayerMask;
-typedef struct _GimpSelection GimpSelection;
-typedef struct _GimpVectors GimpVectors;
+typedef struct _GimpImage GimpImage;
+typedef struct _GimpItem GimpItem;
+typedef struct _GimpDrawable GimpDrawable;
+typedef struct _GimpLayer GimpLayer;
+typedef struct _GimpChannel GimpChannel;
+typedef struct _GimpLayerMask GimpLayerMask;
+typedef struct _GimpSelection GimpSelection;
+typedef struct _GimpVectors GimpVectors;
-typedef struct _GimpDisplay GimpDisplay;
+typedef struct _GimpDisplay GimpDisplay;
/* FIXME move somewhere else */
diff --git a/libgimp/meson.build b/libgimp/meson.build
index 0d0cae4cc4..ab72c90f03 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -156,6 +156,7 @@ libgimp_sources_introspectable = [
'gimppdb.c',
'gimpplugin.c',
'gimpprocedure.c',
+ 'gimpprocedureconfig.c',
'gimpprogress.c',
'gimpsaveprocedure.c',
'gimpselection.c',
@@ -202,6 +203,7 @@ libgimp_headers_introspectable = [
'gimppdb.h',
'gimpplugin.h',
'gimpprocedure.h',
+ 'gimpprocedureconfig.h',
'gimpprogress.h',
'gimpsaveprocedure.h',
'gimpselection.h',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
