Commit 891f85e8 authored by Michael Natterer's avatar Michael Natterer 😴
Browse files

app: move gimp-gegl-config.[ch] to operations/

and rename it to gimp-operation-config.[ch].
parent 80244ad4
......@@ -30,6 +30,8 @@
#include "actions-types.h"
#include "operations/gimp-operation-config.h"
#include "core/gimp.h"
#include "core/gimp-memsize.h"
#include "core/gimpcontainer.h"
......@@ -41,8 +43,6 @@
#include "core/gimpsettings.h"
#include "core/gimptoolinfo.h"
#include "gegl/gimp-gegl-config.h"
#include "display/gimpdisplay.h"
#include "tools/gimpoperationtool.h"
......@@ -251,11 +251,11 @@ gimp_gegl_procedure_execute_async (GimpProcedure *procedure,
GimpContainer *container;
GimpTool *active_tool;
settings = gimp_gegl_config_new (procedure->original_name,
gimp_viewable_get_icon_name (GIMP_VIEWABLE (procedure)),
GIMP_TYPE_SETTINGS);
settings = gimp_operation_config_new (procedure->original_name,
gimp_viewable_get_icon_name (GIMP_VIEWABLE (procedure)),
GIMP_TYPE_SETTINGS);
container = gimp_gegl_config_get_container (G_TYPE_FROM_INSTANCE (settings));
container = gimp_operation_config_get_container (G_TYPE_FROM_INSTANCE (settings));
g_object_unref (settings);
......@@ -279,7 +279,7 @@ gimp_gegl_procedure_execute_async (GimpProcedure *procedure,
node = gegl_node_new_child (NULL,
"operation", procedure->original_name,
NULL);
gimp_gegl_config_sync_node (settings, node);
gimp_operation_config_sync_node (settings, node);
image = gimp_value_get_image (gimp_value_array_index (args, 1),
gimp);
......
......@@ -24,8 +24,6 @@ libappgegl_a_sources = \
gimp-gegl.h \
gimp-gegl-apply-operation.c \
gimp-gegl-apply-operation.h \
gimp-gegl-config.c \
gimp-gegl-config.h \
gimp-gegl-loops.c \
gimp-gegl-loops.h \
gimp-gegl-mask.c \
......
......@@ -25,6 +25,8 @@ libappoperations_a_sources = \
gimp-operations.c \
gimp-operations.h \
\
gimp-operation-config.c \
gimp-operation-config.h \
gimpbrightnesscontrastconfig.c \
gimpbrightnesscontrastconfig.h \
gimpcageconfig.c \
......
......@@ -26,33 +26,34 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpconfig/gimpconfig.h"
#include "gimp-gegl-types.h"
#include "operations-types.h"
#include "core/gimplist.h"
#include "core/gimpparamspecs-duplicate.h"
#include "core/gimpviewable.h"
#include "gimp-gegl-config.h"
#include "gimp-gegl-utils.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp-operation-config.h"
/* local function prototypes */
static void gimp_gegl_config_config_sync (GObject *config,
const GParamSpec *gimp_pspec,
GeglNode *node);
static void gimp_gegl_config_config_notify (GObject *config,
const GParamSpec *gimp_pspec,
GeglNode *node);
static void gimp_gegl_config_node_notify (GeglNode *node,
const GParamSpec *gegl_pspec,
GObject *config);
static void gimp_operation_config_config_sync (GObject *config,
const GParamSpec *gimp_pspec,
GeglNode *node);
static void gimp_operation_config_config_notify (GObject *config,
const GParamSpec *gimp_pspec,
GeglNode *node);
static void gimp_operation_config_node_notify (GeglNode *node,
const GParamSpec *gegl_pspec,
GObject *config);
/* public functions */
static GHashTable *
gimp_gegl_config_get_type_table (void)
gimp_operation_config_get_type_table (void)
{
static GHashTable *config_types = NULL;
......@@ -66,7 +67,7 @@ gimp_gegl_config_get_type_table (void)
}
static GHashTable *
gimp_gegl_config_get_container_table (void)
gimp_operation_config_get_container_table (void)
{
static GHashTable *config_containers = NULL;
......@@ -80,7 +81,7 @@ gimp_gegl_config_get_container_table (void)
}
static GValue *
gimp_gegl_config_value_new (GParamSpec *pspec)
gimp_operation_config_value_new (GParamSpec *pspec)
{
GValue *value = g_slice_new0 (GValue);
......@@ -90,14 +91,14 @@ gimp_gegl_config_value_new (GParamSpec *pspec)
}
static void
gimp_gegl_config_value_free (GValue *value)
gimp_operation_config_value_free (GValue *value)
{
g_value_unset (value);
g_slice_free (GValue, value);
}
static GHashTable *
gimp_gegl_config_get_properties (GObject *object)
gimp_operation_config_get_properties (GObject *object)
{
GHashTable *properties = g_object_get_data (object, "properties");
......@@ -106,7 +107,7 @@ gimp_gegl_config_get_properties (GObject *object)
properties = g_hash_table_new_full (g_str_hash,
g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) gimp_gegl_config_value_free);
(GDestroyNotify) gimp_operation_config_value_free);
g_object_set_data_full (object, "properties", properties,
(GDestroyNotify) g_hash_table_unref);
......@@ -116,17 +117,17 @@ gimp_gegl_config_get_properties (GObject *object)
}
static GValue *
gimp_gegl_config_value_get (GObject *object,
GParamSpec *pspec)
gimp_operation_config_value_get (GObject *object,
GParamSpec *pspec)
{
GHashTable *properties = gimp_gegl_config_get_properties (object);
GHashTable *properties = gimp_operation_config_get_properties (object);
GValue *value;
value = g_hash_table_lookup (properties, pspec->name);
if (! value)
{
value = gimp_gegl_config_value_new (pspec);
value = gimp_operation_config_value_new (pspec);
g_hash_table_insert (properties, g_strdup (pspec->name), value);
}
......@@ -134,37 +135,37 @@ gimp_gegl_config_value_get (GObject *object,
}
static void
gimp_gegl_config_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
gimp_operation_config_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
GValue *val = gimp_gegl_config_value_get (object, pspec);
GValue *val = gimp_operation_config_value_get (object, pspec);
g_value_copy (value, val);
}
static void
gimp_gegl_config_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
gimp_operation_config_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
GValue *val = gimp_gegl_config_value_get (object, pspec);
GValue *val = gimp_operation_config_value_get (object, pspec);
g_value_copy (val, value);
}
static void
gimp_gegl_config_class_init (GObjectClass *klass,
const gchar *operation)
gimp_operation_config_class_init (GObjectClass *klass,
const gchar *operation)
{
GParamSpec **pspecs;
guint n_pspecs;
gint i;
klass->set_property = gimp_gegl_config_set_property;
klass->get_property = gimp_gegl_config_get_property;
klass->set_property = gimp_operation_config_set_property;
klass->get_property = gimp_operation_config_get_property;
pspecs = gegl_operation_list_properties (operation, &n_pspecs);
......@@ -190,8 +191,8 @@ gimp_gegl_config_class_init (GObjectClass *klass,
}
static gboolean
gimp_gegl_config_equal (GimpConfig *a,
GimpConfig *b)
gimp_operation_config_equal (GimpConfig *a,
GimpConfig *b)
{
GList *diff;
gboolean equal = TRUE;
......@@ -225,24 +226,24 @@ gimp_gegl_config_equal (GimpConfig *a,
}
static void
gimp_gegl_config_config_iface_init (GimpConfigInterface *iface)
gimp_operation_config_config_iface_init (GimpConfigInterface *iface)
{
iface->equal = gimp_gegl_config_equal;
iface->equal = gimp_operation_config_equal;
}
/* public functions */
void
gimp_gegl_config_register (const gchar *operation,
GType config_type)
gimp_operation_config_register (const gchar *operation,
GType config_type)
{
GHashTable *config_types;
g_return_if_fail (operation != NULL);
g_return_if_fail (g_type_is_a (config_type, GIMP_TYPE_OBJECT));
config_types = gimp_gegl_config_get_type_table ();
config_types = gimp_operation_config_get_type_table ();
g_hash_table_insert (config_types,
g_strdup (operation),
......@@ -250,9 +251,9 @@ gimp_gegl_config_register (const gchar *operation,
}
GimpObject *
gimp_gegl_config_new (const gchar *operation,
const gchar *icon_name,
GType parent_type)
gimp_operation_config_new (const gchar *operation,
const gchar *icon_name,
GType parent_type)
{
GHashTable *config_types;
GType config_type;
......@@ -260,7 +261,7 @@ gimp_gegl_config_new (const gchar *operation,
g_return_val_if_fail (operation != NULL, NULL);
g_return_val_if_fail (g_type_is_a (parent_type, GIMP_TYPE_OBJECT), NULL);
config_types = gimp_gegl_config_get_type_table ();
config_types = gimp_operation_config_get_type_table ();
config_type = (GType) g_hash_table_lookup (config_types, operation);
......@@ -272,24 +273,24 @@ gimp_gegl_config_new (const gchar *operation,
{
GTypeInfo info =
{
query.class_size,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_gegl_config_class_init,
NULL, /* class_finalize */
operation,
query.instance_size,
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
{
query.class_size,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_operation_config_class_init,
NULL, /* class_finalize */
operation,
query.instance_size,
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
const GInterfaceInfo config_info =
{
(GInterfaceInitFunc) gimp_gegl_config_config_iface_init,
NULL, /* interface_finalize */
NULL /* interface_data */
};
{
(GInterfaceInitFunc) gimp_operation_config_config_iface_init,
NULL, /* interface_finalize */
NULL /* interface_data */
};
gchar *type_name = g_strdup_printf ("GimpGegl-%s-config",
operation);
......@@ -314,7 +315,7 @@ gimp_gegl_config_new (const gchar *operation,
g_type_class_unref (viewable_class);
}
gimp_gegl_config_register (operation, config_type);
gimp_operation_config_register (operation, config_type);
}
}
......@@ -322,14 +323,14 @@ gimp_gegl_config_new (const gchar *operation,
}
GimpContainer *
gimp_gegl_config_get_container (GType config_type)
gimp_operation_config_get_container (GType config_type)
{
GHashTable *config_containers;
GimpContainer *container;
g_return_val_if_fail (g_type_is_a (config_type, GIMP_TYPE_OBJECT), NULL);
config_containers = gimp_gegl_config_get_container_table ();
config_containers = gimp_operation_config_get_container_table ();
container = g_hash_table_lookup (config_containers, (gpointer) config_type);
......@@ -345,8 +346,8 @@ gimp_gegl_config_get_container (GType config_type)
}
void
gimp_gegl_config_sync_node (GimpObject *config,
GeglNode *node)
gimp_operation_config_sync_node (GimpObject *config,
GeglNode *node)
{
GParamSpec **pspecs;
gchar *operation;
......@@ -423,8 +424,8 @@ gimp_gegl_config_sync_node (GimpObject *config,
}
void
gimp_gegl_config_connect_node (GimpObject *config,
GeglNode *node)
gimp_operation_config_connect_node (GimpObject *config,
GeglNode *node)
{
GParamSpec **pspecs;
gchar *operation;
......@@ -454,7 +455,7 @@ gimp_gegl_config_connect_node (GimpObject *config,
pspec->value_type == G_TYPE_FROM_INSTANCE (config))
{
g_signal_connect_object (config, "notify",
G_CALLBACK (gimp_gegl_config_config_sync),
G_CALLBACK (gimp_operation_config_config_sync),
node, 0);
g_free (pspecs);
return;
......@@ -472,11 +473,11 @@ gimp_gegl_config_connect_node (GimpObject *config,
gchar *notify_name = g_strconcat ("notify::", gimp_pspec->name, NULL);
g_signal_connect_object (config, notify_name,
G_CALLBACK (gimp_gegl_config_config_notify),
G_CALLBACK (gimp_operation_config_config_notify),
node, 0);
g_signal_connect_object (node, notify_name,
G_CALLBACK (gimp_gegl_config_node_notify),
G_CALLBACK (gimp_operation_config_node_notify),
config, 0);
g_free (notify_name);
......@@ -490,17 +491,17 @@ gimp_gegl_config_connect_node (GimpObject *config,
/* private functions */
static void
gimp_gegl_config_config_sync (GObject *config,
const GParamSpec *gimp_pspec,
GeglNode *node)
gimp_operation_config_config_sync (GObject *config,
const GParamSpec *gimp_pspec,
GeglNode *node)
{
gimp_gegl_config_sync_node (GIMP_OBJECT (config), node);
gimp_operation_config_sync_node (GIMP_OBJECT (config), node);
}
static void
gimp_gegl_config_config_notify (GObject *config,
const GParamSpec *gimp_pspec,
GeglNode *node)
gimp_operation_config_config_notify (GObject *config,
const GParamSpec *gimp_pspec,
GeglNode *node)
{
GParamSpec *gegl_pspec = gegl_node_find_property (node, gimp_pspec->name);
......@@ -533,7 +534,7 @@ gimp_gegl_config_config_notify (GObject *config,
0,
g_quark_from_string (gegl_pspec->name),
NULL,
gimp_gegl_config_node_notify,
gimp_operation_config_node_notify,
config);
if (handler)
......@@ -549,9 +550,9 @@ gimp_gegl_config_config_notify (GObject *config,
}
static void
gimp_gegl_config_node_notify (GeglNode *node,
const GParamSpec *gegl_pspec,
GObject *config)
gimp_operation_config_node_notify (GeglNode *node,
const GParamSpec *gegl_pspec,
GObject *config)
{
GParamSpec *gimp_pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
gegl_pspec->name);
......@@ -597,7 +598,7 @@ gimp_gegl_config_node_notify (GeglNode *node,
0,
g_quark_from_string (gimp_pspec->name),
NULL,
gimp_gegl_config_config_notify,
gimp_operation_config_config_notify,
node);
if (handler)
......
......@@ -15,22 +15,22 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_GEGL_CONFIG_ARGH_H__
#define __GIMP_GEGL_CONFIG_ARGH_H__
#ifndef __GIMP_OPERATION_CONFIG_H__
#define __GIMP_OPERATION_CONFIG_H__
void gimp_gegl_config_register (const gchar *operation,
GType config_type);
void gimp_operation_config_register (const gchar *operation,
GType config_type);
GimpObject * gimp_gegl_config_new (const gchar *operation,
const gchar *icon_name,
GType parent_type);
GimpContainer * gimp_gegl_config_get_container (GType config_type);
GimpObject * gimp_operation_config_new (const gchar *operation,
const gchar *icon_name,
GType parent_type);
GimpContainer * gimp_operation_config_get_container (GType config_type);
void gimp_gegl_config_sync_node (GimpObject *config,
GeglNode *node);
void gimp_gegl_config_connect_node (GimpObject *config,
GeglNode *node);
void gimp_operation_config_sync_node (GimpObject *config,
GeglNode *node);
void gimp_operation_config_connect_node (GimpObject *config,
GeglNode *node);
#endif /* __GIMP_GEGL_CONFIG_ARGH_H__ */
#endif /* __GIMP_OPERATION_CONFIG_H__ */
......@@ -26,8 +26,6 @@
#include "core/gimp.h"
#include "gegl/gimp-gegl-config.h"
#include "gimp-operations.h"
#include "gimpoperationblend.h"
......@@ -58,6 +56,7 @@
#include "gimpoperationposterize.h"
#include "gimpoperationthreshold.h"
#include "gimp-operation-config.h"
#include "gimpbrightnesscontrastconfig.h"
#include "gimpcolorbalanceconfig.h"
#include "gimpcolorizeconfig.h"
......@@ -153,16 +152,16 @@ gimp_operations_init (void)
g_type_class_ref (GIMP_TYPE_OPERATION_REPLACE);
g_type_class_ref (GIMP_TYPE_OPERATION_ANTI_ERASE);
gimp_gegl_config_register ("gimp:brightness-contrast",
GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG);
gimp_gegl_config_register ("gimp:color-balance",
GIMP_TYPE_COLOR_BALANCE_CONFIG);
gimp_gegl_config_register ("gimp:colorize",
GIMP_TYPE_COLORIZE_CONFIG);
gimp_gegl_config_register ("gimp:curves",
GIMP_TYPE_CURVES_CONFIG);
gimp_gegl_config_register ("gimp:hue-saturation",
GIMP_TYPE_HUE_SATURATION_CONFIG);
gimp_gegl_config_register ("gimp:levels",
GIMP_TYPE_LEVELS_CONFIG);
gimp_operation_config_register ("gimp:brightness-contrast",
GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG);
gimp_operation_config_register ("gimp:color-balance",
GIMP_TYPE_COLOR_BALANCE_CONFIG);
gimp_operation_config_register ("gimp:colorize",
GIMP_TYPE_COLORIZE_CONFIG);
gimp_operation_config_register ("gimp:curves",
GIMP_TYPE_CURVES_CONFIG);
gimp_operation_config_register ("gimp:hue-saturation",
GIMP_TYPE_HUE_SATURATION_CONFIG);
gimp_operation_config_register ("gimp:levels",
GIMP_TYPE_LEVELS_CONFIG);
}
......@@ -31,7 +31,7 @@
#include "tools-types.h"
#include "gegl/gimp-gegl-config.h"
#include "operations/gimp-operation-config.h"
#include "core/gimp-utils.h"
#include "core/gimpdrawable.h"
......@@ -880,7 +880,8 @@ gimp_blend_tool_start (GimpBlendTool *blend_tool,
gimp_blend_tool_create_filter (blend_tool, drawable);
/* Initially sync all of the properties */
gimp_gegl_config_sync_node (GIMP_OBJECT (options), blend_tool->render_node);
gimp_operation_config_sync_node (GIMP_OBJECT (options),
blend_tool->render_node);
/* Connect signal handlers for the gradient */
gimp_blend_tool_set_gradient (blend_tool, context->gradient);
......
......@@ -39,7 +39,8 @@
#include "config/gimpguiconfig.h"
#include "gegl/gimp-gegl-config.h"
#include "operations/gimp-operation-config.h"
#include "gegl/gimp-gegl-utils.h"
#include "core/gimp.h"
......@@ -379,7 +380,7 @@ gimp_filter_tool_initialize (GimpTool *tool,
GFile *default_folder;
GtkWidget *settings_ui;
settings = gimp_gegl_config_get_container (type);
settings = gimp_operation_config_get_container (type);
if (! gimp_list_get_sort_func (GIMP_LIST (settings)))
gimp_list_set_sort_func (GIMP_LIST (settings),
(GCompareFunc) gimp_settings_compare);
......@@ -1306,14 +1307,15 @@ gimp_filter_tool_get_operation (GimpFilterTool *filter_tool)
filter_tool->operation = gegl_node_new_child (NULL,
"operation", operation_name,
NULL);
filter_tool->config = G_OBJECT (gimp_gegl_config_new (operation_name,
filter_tool->icon_name,
GIMP_TYPE_SETTINGS));
gimp_gegl_config_sync_node (GIMP_OBJECT (filter_tool->config),
filter_tool->operation);
gimp_gegl_config_connect_node (GIMP_OBJECT (filter_tool->config),
filter_tool->operation);
filter_tool->config =
G_OBJECT (gimp_operation_config_new (operation_name,
filter_tool->icon_name,
GIMP_TYPE_SETTINGS));
gimp_operation_config_sync_node (GIMP_OBJECT (filter_tool->config),
filter_tool->operation);
gimp_operation_config_connect_node (GIMP_OBJECT (filter_tool->config),
filter_tool->operation);
if (filter_tool->gui)
{
......
......@@ -29,7 +29,6 @@
#include "tools-types.h"
#include "gegl/gimp-gegl-config.h"
#include "gegl/gimp-gegl-utils.h"
#include "core/gimpchannel.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment