Merge branch 'jxl_effort' into 'master'

plug-ins: use a spinscale to change jpegxl's effort parameter

See merge request GNOME/gimp!2269
This commit is contained in:
Lucas Chollet 2025-07-02 05:20:55 +00:00
commit 1ca39cf573

View file

@ -207,20 +207,12 @@ jpegxl_create_procedure (GimpPlugIn *plug_in,
8, 16, 8, 8, 16, 8,
G_PARAM_READWRITE); G_PARAM_READWRITE);
gimp_procedure_add_choice_argument (procedure, "speed", gimp_procedure_add_int_argument (procedure, "speed",
_("Effort/S_peed"), _("Effort/S_peed"),
_("Encoder effort setting"), _("Encoder effort setting:\n"
gimp_choice_new_with_values ("lightning", 1, _("lightning (fastest)"), NULL, "- 1: faster encoding but bigger files\n"
"thunder", 2, _("thunder"), NULL, "- 10: slower encoding but smaller files"),
"falcon", 3, _("falcon (faster)"), NULL, 1, 10, 7,
"cheetah", 4, _("cheetah"), NULL,
"hare", 5, _("hare"), NULL,
"wombat", 6, _("wombat"), NULL,
"squirrel", 7, _("squirrel"), NULL,
"kitten", 8, _("kitten"), NULL,
"tortoise", 9, _("tortoise (slower)"), NULL,
NULL),
"squirrel",
G_PARAM_READWRITE); G_PARAM_READWRITE);
gimp_procedure_add_boolean_argument (procedure, "cmyk", gimp_procedure_add_boolean_argument (procedure, "cmyk",
@ -1392,13 +1384,12 @@ export_image (GFile *file,
g_object_get (config, g_object_get (config,
"lossless", &lossless, "lossless", &lossless,
"compression", &compression, "compression", &compression,
"speed", &speed,
"save-bit-depth", &bit_depth, "save-bit-depth", &bit_depth,
"cmyk", &cmyk, "cmyk", &cmyk,
"include-exif", &save_exif, "include-exif", &save_exif,
"include-xmp", &save_xmp, "include-xmp", &save_xmp,
NULL); NULL);
speed = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"speed");
if (cmyk) if (cmyk)
{ {
@ -2015,6 +2006,10 @@ save_dialog (GimpImage *image,
G_BINDING_SYNC_CREATE | G_BINDING_SYNC_CREATE |
G_BINDING_INVERT_BOOLEAN); G_BINDING_INVERT_BOOLEAN);
gimp_procedure_dialog_get_widget (GIMP_PROCEDURE_DIALOG (dialog),
"speed", GIMP_TYPE_SPIN_SCALE);
store = gimp_int_store_new (_("8 bit/channel"), 8, store = gimp_int_store_new (_("8 bit/channel"), 8,
_("16 bit/channel"), 16, _("16 bit/channel"), 16,
NULL); NULL);