dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app, libgimp: support GParamParam as a GParamSpec 

also add forgotten support for GimpParamEnum.
This commit is contained in:
Michael Natterer 2019-08-05 14:14:32 +02:00
parent 7764f8b34b
commit 6c18492668
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/plug-in/gimpgpparams.c
View File

@ -134,6 +134,12 @@ _gimp_gp_param_def_to_param_spec (gpointer gimp,
g_type_from_name (param_def->meta.m_enum.type_name),
param_def->meta.m_enum.default_val,
flags);
if (! strcmp (param_def->type_name, "GimpParamEnum"))
return gimp_param_spec_enum (name, nick, blurb,
g_type_from_name (param_def->meta.m_enum.type_name),
param_def->meta.m_enum.default_val,
flags);
break;
case GP_PARAM_DEF_TYPE_BOOLEAN:
@ -225,6 +231,13 @@ _gimp_gp_param_def_to_param_spec (gpointer gimp,
param_def->meta.m_id.none_ok,
flags);
break;
case GP_PARAM_DEF_TYPE_PARAM_DEF:
if (! strcmp (param_def->type_name, "GParamParam"))
return g_param_spec_param (name, nick, blurb,
g_type_from_name (param_def->meta.m_param_def.type_name),
flags);
break;
}
g_printerr ("%s: GParamSpec type '%s' is not handled\n",

10
libgimp/gimpgpparams-body.c
View File

@ -73,7 +73,7 @@ _gimp_param_spec_to_gp_param_def (GParamSpec *pspec,
param_def->meta.m_unit.allow_percent = uspec->allow_percent;
param_def->meta.m_unit.default_val = ispec->default_value;
}
else if (pspec_type == G_TYPE_PARAM_ENUM)
else if (G_IS_PARAM_SPEC_ENUM (pspec))
{
GParamSpecEnum *espec = G_PARAM_SPEC_ENUM (pspec);
GType enum_type = pspec->value_type;
@ -110,6 +110,7 @@ _gimp_param_spec_to_gp_param_def (GParamSpec *pspec,
param_def->meta.m_string.null_ok = ! gsspec->ensure_non_null;
param_def->meta.m_string.default_val = gsspec->default_value;
if (pspec_type == GIMP_TYPE_PARAM_STRING)
{
GimpParamSpecString *sspec = GIMP_PARAM_SPEC_STRING (pspec);
@ -157,6 +158,13 @@ _gimp_param_spec_to_gp_param_def (GParamSpec *pspec,
param_def->meta.m_id.none_ok = ispec->none_ok;
}
else if (G_IS_PARAM_SPEC_PARAM (pspec))
{
param_def->param_def_type = GP_PARAM_DEF_TYPE_PARAM_DEF;
param_def->meta.m_param_def.type_name =
(gchar *) g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec));
}
}
void

14
libgimp/gimpgpparams.c
View File

@ -125,6 +125,13 @@ _gimp_gp_param_def_to_param_spec (gpointer gimp,
g_type_from_name (param_def->meta.m_enum.type_name),
param_def->meta.m_enum.default_val,
flags);
if (! strcmp (param_def->type_name, "GimpParamEnum"))
/* FIXME GimpParamEnum */
return g_param_spec_enum (name, nick, blurb,
g_type_from_name (param_def->meta.m_enum.type_name),
param_def->meta.m_enum.default_val,
flags);
break;
case GP_PARAM_DEF_TYPE_BOOLEAN:
@ -207,6 +214,13 @@ _gimp_gp_param_def_to_param_spec (gpointer gimp,
param_def->meta.m_id.none_ok,
flags);
break;
case GP_PARAM_DEF_TYPE_PARAM_DEF:
if (! strcmp (param_def->type_name, "GParamParam"))
return g_param_spec_param (name, nick, blurb,
g_type_from_name (param_def->meta.m_param_def.type_name),
flags);
break;
}
g_printerr ("%s: GParamSpec type '%s' is not handled\n",