Updated with upstream update

This commit is contained in:
2023-10-30 15:55:30 -07:00
parent 098531073c
commit 3bbdd873ef
584 changed files with 91827 additions and 70362 deletions

View File

@ -507,8 +507,8 @@ gfig_dialog (PikaGfig *gfig)
/* brush selector in Stroke frame */
gfig_context->brush_select
= pika_brush_select_button_new ("Brush",
PIKA_RESOURCE (gfig_context->default_style.brush));
= pika_brush_chooser_new ("Brush", "Brush",
PIKA_RESOURCE (gfig_context->default_style.brush));
g_signal_connect (gfig_context->brush_select, "resource-set",
G_CALLBACK (gfig_brush_changed_callback), NULL);
gtk_box_pack_start (GTK_BOX (vbox), gfig_context->brush_select,
@ -573,8 +573,8 @@ gfig_dialog (PikaGfig *gfig)
/* A page for the pattern selector */
gfig_context->pattern_select
= pika_pattern_select_button_new ("Pattern",
PIKA_RESOURCE (gfig_context->default_style.pattern));
= pika_pattern_chooser_new ("Pattern", "Pattern",
PIKA_RESOURCE (gfig_context->default_style.pattern));
g_signal_connect (gfig_context->pattern_select, "resource-set",
G_CALLBACK (gfig_pattern_changed_callback), NULL);
gtk_widget_show (gfig_context->pattern_select);
@ -583,8 +583,8 @@ gfig_dialog (PikaGfig *gfig)
/* A page for the gradient selector */
gfig_context->gradient_select
= pika_gradient_select_button_new ("Gradient",
PIKA_RESOURCE (gfig_context->default_style.gradient));
= pika_gradient_chooser_new ("Gradient", "Gradient",
PIKA_RESOURCE (gfig_context->default_style.gradient));
g_signal_connect (gfig_context->gradient_select, "resource-set",
G_CALLBACK (gfig_gradient_changed_callback), NULL);
gtk_widget_show (gfig_context->gradient_select);

View File

@ -697,14 +697,14 @@ gfig_style_set_context_from_style (Style *style)
pika_context_set_brush_default_size ();
pika_resource_select_button_set_resource (PIKA_RESOURCE_SELECT_BUTTON (gfig_context->brush_select),
PIKA_RESOURCE (style->brush));
pika_resource_chooser_set_resource (PIKA_RESOURCE_CHOOSER (gfig_context->brush_select),
PIKA_RESOURCE (style->brush));
pika_resource_select_button_set_resource (PIKA_RESOURCE_SELECT_BUTTON (gfig_context->pattern_select),
PIKA_RESOURCE (style->pattern));
pika_resource_chooser_set_resource (PIKA_RESOURCE_CHOOSER (gfig_context->pattern_select),
PIKA_RESOURCE (style->pattern));
pika_resource_select_button_set_resource (PIKA_RESOURCE_SELECT_BUTTON (gfig_context->gradient_select),
PIKA_RESOURCE (style->gradient));
pika_resource_chooser_set_resource (PIKA_RESOURCE_CHOOSER (gfig_context->gradient_select),
PIKA_RESOURCE (style->gradient));
set_context_bdesc (style->brush);

View File

@ -70,7 +70,7 @@ static PikaValueArray * gfig_run (PikaProcedure *procedure,
PikaImage *image,
gint n_drawables,
PikaDrawable **drawables,
const PikaValueArray *args,
PikaProcedureConfig *config,
gpointer run_data);
static void on_app_activate (GApplication *gapp,
@ -199,7 +199,7 @@ gfig_run (PikaProcedure *procedure,
PikaImage *image,
gint n_drawables,
PikaDrawable **drawables,
const PikaValueArray *args,
PikaProcedureConfig *config,
gpointer run_data)
{
PikaDrawable *drawable;