procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

plug-ins: use generated widget for GimpPalette arg.

Browse source 
Also make the start checks a bit more robust to broken core code by
double-checking that the palette is valid from the start, even though getting an
invalid palette should normally not happen anymore (at least I fixed one such
case with a palette with a NULL id in my previous commit; but it looks like our
core code is not perfectly robust and we should push the code to extensive
testing).

Note that the generated widget is currently ugly (no label and terrible UX), but
this is meant to improve soon.
This commit is contained in:
Jehan 2023-01-14 19:21:44 +01:00
parent e8365e81e2
commit f99bdcd008
1 changed files with 7 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

45
plug-ins/python/palette-sort.py
View file

@ -197,23 +197,6 @@ def quantization_grain(channel, g):
g = max(0.00001, GRAIN_SCALE[channel] / g)
return g
# Convenience feature to add options that are not yet in
# GimpProcedureDialog
def create_ui_row(dialog, label_text, offset, widget):
grid = Gtk.Grid()
grid.set_column_homogeneous(False)
grid.set_border_width(0)
grid.set_column_spacing(offset)
grid.set_row_spacing(10)
dialog.get_content_area().add(grid)
grid.show()
label = Gtk.Label.new_with_mnemonic(_(label_text))
grid.attach(label, 0, 0, 1, 1)
label.show()
grid.attach(widget, 1, 0, 1, 1)
widget.show()
def palette_sort(palette, selection, slice_expr, channel1, ascending1,
channel2, ascending2, quantize, pchannel, pquantize):
@ -363,7 +346,6 @@ class PaletteSort (Gimp.PlugIn):
"The run mode",
Gimp.RunMode.INTERACTIVE,
GObject.ParamFlags.READWRITE),
# Originally: (PF_PALETTE, "palette", _("Palette"), ""),
"palette": (Gimp.Palette,
_("_Palette"),
_("Palette"),
@ -478,7 +460,11 @@ class PaletteSort (Gimp.PlugIn):
pchannel = args.index(9)
pquantize = args.index(10)
if palette is None:
if palette is None or not palette.is_valid():
if palette is not None:
sys.stderr.write(f'Invalid palette id: {palette.get_id()}\n')
sys.stderr.write('This should not happen. Please report to GIMP project.\n')
sys.stderr.write('Falling back to context palette instead.\n')
palette = Gimp.context_get_palette()
if not palette.is_valid():
@ -491,21 +477,7 @@ class PaletteSort (Gimp.PlugIn):
GimpUi.init('python-fu-palette-sort')
dialog = GimpUi.ProcedureDialog(procedure=procedure, config=config)
# Add palette button
prior_palette = None
if config.get_property ("palette") != None:
prior_palette = config.get_property ("palette")
button = GimpUi.PaletteSelectButton.new ("palette", prior_palette)
create_ui_row(dialog, "_Palette", 86, button)
#Connect config so reset works on custom widgets
def palette_reset (*args):
if len(args) >= 2:
if args[1].name == "palette":
button.set_palette(config.get_property("palette"))
config.connect("notify::palette", palette_reset)
dialog.fill (["palette"])
dialog.get_int_combo("selections", GimpUi.IntStore.new (selections_option))
dialog.fill (["selections","slice-expr"])
dialog.get_int_combo("channel1", GimpUi.IntStore.new (AVAILABLE_CHANNELS))
@ -520,7 +492,7 @@ class PaletteSort (Gimp.PlugIn):
config.end_run(Gimp.PDBStatusType.CANCEL)
return procedure.new_return_values(Gimp.PDBStatusType.CANCEL, GLib.Error())
else:
palette = button.get_palette()
palette = config.get_property("palette")
selection = config.get_property("selections")
slice_expr = config.get_property ("slice_expr")
channel1 = config.get_property("channel1")
@ -531,9 +503,6 @@ class PaletteSort (Gimp.PlugIn):
pchannel = config.get_property("pchannel")
pquantize = config.get_property ("pquantize")
#Save configs for non-connected UI element
config.set_property ("palette", palette)
dialog.destroy()
try: