d59a7af38c
Simplifies chooser widgets (e.g. GimpBrushSelect) by eliminating attributes (e.g. opacity) of chosen resource. See #8745, but this commit fixes that by first refactoring the code. Refactors GUI widgets (e.g. GimpBrushSelectButton and GimpBrushSelect etc.) Refactor by "Extract class" GimpResourceSelectButton from GimpBrushSelectButton etc. This moves common code into an inherited class (formerly called GimpSelectButton) but the subclasses still exist. The subclasses mainly just do drawing now. Refactor by "Extract module" GimpResourceSelect from GimpBrushSelect etc. Moves common code into one file, generic at runtime on type of GimpResource, that is, the new code dispatches on type i.e. switch statements. In the future, when core is changed some of that can be deleted. The files gimpbrushselect.[c,h] etc. are deleted. The module adapts the API from core to the API of callbacks to libgimp. Note that core is running the resource chooser (select) widgets remotely. Core is still calling back over the wire via PDB with more attributes than necessary. The new design gets the attributes from the resource themselves, instead of receiving them from core callback. The libgimp side adapts by discarding unneeded attributes. In the future, core (running choosers for plugins) can be simplified also. Fix gimp_prop_chooser_brush_new same as other resources. Finish changes, and clean style. Annotations
225 lines
9.6 KiB
C
225 lines
9.6 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995-2003 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 3 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, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
/* NOTE: This file is auto-generated by pdbgen.pl. */
|
|
|
|
#include "config.h"
|
|
|
|
#include "stamp-pdbgen.h"
|
|
|
|
#include <gegl.h>
|
|
|
|
#include <gdk-pixbuf/gdk-pixbuf.h>
|
|
|
|
#include "libgimpbase/gimpbase.h"
|
|
|
|
#include "pdb-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpdatafactory.h"
|
|
#include "core/gimpparamspecs.h"
|
|
|
|
#include "gimppdb.h"
|
|
#include "gimpprocedure.h"
|
|
#include "internal-procs.h"
|
|
|
|
|
|
static GimpValueArray *
|
|
brushes_popup_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GimpValueArray *args,
|
|
GError **error)
|
|
{
|
|
gboolean success = TRUE;
|
|
const gchar *brush_callback;
|
|
const gchar *popup_title;
|
|
const gchar *initial_brush_name;
|
|
|
|
brush_callback = g_value_get_string (gimp_value_array_index (args, 0));
|
|
popup_title = g_value_get_string (gimp_value_array_index (args, 1));
|
|
initial_brush_name = g_value_get_string (gimp_value_array_index (args, 2));
|
|
|
|
if (success)
|
|
{
|
|
if (gimp->no_interface ||
|
|
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
|
|
! gimp_pdb_dialog_new (gimp, context, progress,
|
|
gimp_data_factory_get_container (gimp->brush_factory),
|
|
popup_title, brush_callback, initial_brush_name,
|
|
NULL))
|
|
success = FALSE;
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success,
|
|
error ? *error : NULL);
|
|
}
|
|
|
|
static GimpValueArray *
|
|
brushes_close_popup_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GimpValueArray *args,
|
|
GError **error)
|
|
{
|
|
gboolean success = TRUE;
|
|
const gchar *brush_callback;
|
|
|
|
brush_callback = g_value_get_string (gimp_value_array_index (args, 0));
|
|
|
|
if (success)
|
|
{
|
|
if (gimp->no_interface ||
|
|
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
|
|
! gimp_pdb_dialog_close (gimp, gimp_data_factory_get_container (gimp->brush_factory),
|
|
brush_callback))
|
|
success = FALSE;
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success,
|
|
error ? *error : NULL);
|
|
}
|
|
|
|
static GimpValueArray *
|
|
brushes_set_popup_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GimpValueArray *args,
|
|
GError **error)
|
|
{
|
|
gboolean success = TRUE;
|
|
const gchar *brush_callback;
|
|
const gchar *brush_name;
|
|
|
|
brush_callback = g_value_get_string (gimp_value_array_index (args, 0));
|
|
brush_name = g_value_get_string (gimp_value_array_index (args, 1));
|
|
|
|
if (success)
|
|
{
|
|
if (gimp->no_interface ||
|
|
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
|
|
! gimp_pdb_dialog_set (gimp, gimp_data_factory_get_container (gimp->brush_factory),
|
|
brush_callback, brush_name,
|
|
NULL))
|
|
success = FALSE;
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success,
|
|
error ? *error : NULL);
|
|
}
|
|
|
|
void
|
|
register_brush_select_procs (GimpPDB *pdb)
|
|
{
|
|
GimpProcedure *procedure;
|
|
|
|
/*
|
|
* gimp-brushes-popup
|
|
*/
|
|
procedure = gimp_procedure_new (brushes_popup_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure),
|
|
"gimp-brushes-popup");
|
|
gimp_procedure_set_static_help (procedure,
|
|
"Invokes the GIMP brush selection dialog.",
|
|
"Opens a dialog letting a user choose a brush.",
|
|
NULL);
|
|
gimp_procedure_set_static_attribution (procedure,
|
|
"Andy Thomas",
|
|
"Andy Thomas",
|
|
"1998");
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("brush-callback",
|
|
"brush callback",
|
|
"The callback PDB proc to call when user chooses a brush",
|
|
FALSE, FALSE, TRUE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("popup-title",
|
|
"popup title",
|
|
"Title of the brush selection dialog",
|
|
FALSE, FALSE, FALSE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("initial-brush-name",
|
|
"initial brush name",
|
|
"The name of the brush to set as the initial choice",
|
|
FALSE, TRUE, FALSE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
|
|
/*
|
|
* gimp-brushes-close-popup
|
|
*/
|
|
procedure = gimp_procedure_new (brushes_close_popup_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure),
|
|
"gimp-brushes-close-popup");
|
|
gimp_procedure_set_static_help (procedure,
|
|
"Close the brush selection dialog.",
|
|
"Closes an open brush selection dialog.",
|
|
NULL);
|
|
gimp_procedure_set_static_attribution (procedure,
|
|
"Andy Thomas",
|
|
"Andy Thomas",
|
|
"1998");
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("brush-callback",
|
|
"brush callback",
|
|
"The name of the callback registered for this pop-up",
|
|
FALSE, FALSE, TRUE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
|
|
/*
|
|
* gimp-brushes-set-popup
|
|
*/
|
|
procedure = gimp_procedure_new (brushes_set_popup_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure),
|
|
"gimp-brushes-set-popup");
|
|
gimp_procedure_set_static_help (procedure,
|
|
"Sets the selected brush in a brush selection dialog.",
|
|
"Sets the selected brush in a brush selection dialog.",
|
|
NULL);
|
|
gimp_procedure_set_static_attribution (procedure,
|
|
"Andy Thomas",
|
|
"Andy Thomas",
|
|
"1998");
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("brush-callback",
|
|
"brush callback",
|
|
"The name of the callback registered for this pop-up",
|
|
FALSE, FALSE, TRUE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("brush-name",
|
|
"brush name",
|
|
"The name of the brush to set as selected",
|
|
FALSE, FALSE, FALSE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
}
|