From 8f7a3a637f6a465e78e88490a03f539f0d8fdc1a Mon Sep 17 00:00:00 2001
From: Patrick Storz <eduard.braun2@gmx.de>
Date: Tue, 23 Jul 2019 01:06:21 +0200
Subject: Refactor a lot of the parameter handling code

Many fixes, improvements and simplifications to existing code.

Implements the first part of the changes discussed in
  https://gitlab.com/inkscape/inkscape/issues/333
---
 src/extension/internal/bitmap/channel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/extension/internal/bitmap/channel.cpp')

diff --git a/src/extension/internal/bitmap/channel.cpp b/src/extension/internal/bitmap/channel.cpp
index fb0dad635..be0cce2e1 100644
--- a/src/extension/internal/bitmap/channel.cpp
+++ b/src/extension/internal/bitmap/channel.cpp
@@ -36,7 +36,7 @@ Channel::applyEffect(Magick::Image *image) {
 
 void
 Channel::refreshParameters(Inkscape::Extension::Effect *module) {	
-	_layerName = module->get_param_enum("layer");
+	_layerName = module->get_param_optiongroup("layer");
 }
 
 #include "../clear-n_.h"
-- 
cgit v1.2.3


From 22c4b9e1b4964bf244d2c563217cc431194dc20a Mon Sep 17 00:00:00 2001
From: Patrick Storz <eduard.braun2@gmx.de>
Date: Sun, 1 Sep 2019 20:28:08 +0200
Subject: Update internal extensions for latest .inx format changes

---
 src/extension/internal/bitmap/channel.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/extension/internal/bitmap/channel.cpp')

diff --git a/src/extension/internal/bitmap/channel.cpp b/src/extension/internal/bitmap/channel.cpp
index be0cce2e1..f26a9f985 100644
--- a/src/extension/internal/bitmap/channel.cpp
+++ b/src/extension/internal/bitmap/channel.cpp
@@ -48,16 +48,16 @@ Channel::init()
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Channel") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.channel</id>\n"
-			"<param name=\"layer\" _gui-text=\"" N_("Layer:") "\" type=\"enum\" >\n"
-				"<_item value='Red Channel'>" N_("Red Channel") "</_item>\n"
-				"<_item value='Green Channel'>" N_("Green Channel") "</_item>\n"
-				"<_item value='Blue Channel'>" N_("Blue Channel") "</_item>\n"
-				"<_item value='Cyan Channel'>" N_("Cyan Channel") "</_item>\n"
-				"<_item value='Magenta Channel'>" N_("Magenta Channel") "</_item>\n"
-				"<_item value='Yellow Channel'>" N_("Yellow Channel") "</_item>\n"
-				"<_item value='Black Channel'>" N_("Black Channel") "</_item>\n"
-				"<_item value='Opacity Channel'>" N_("Opacity Channel") "</_item>\n"
-				"<_item value='Matte Channel'>" N_("Matte Channel") "</_item>\n"
+			"<param name=\"layer\" gui-text=\"" N_("Layer:") "\" type=\"optiongroup\" appearance=\"combo\" >\n"
+				"<option value='Red Channel'>" N_("Red Channel") "</option>\n"
+				"<option value='Green Channel'>" N_("Green Channel") "</option>\n"
+				"<option value='Blue Channel'>" N_("Blue Channel") "</option>\n"
+				"<option value='Cyan Channel'>" N_("Cyan Channel") "</option>\n"
+				"<option value='Magenta Channel'>" N_("Magenta Channel") "</option>\n"
+				"<option value='Yellow Channel'>" N_("Yellow Channel") "</option>\n"
+				"<option value='Black Channel'>" N_("Black Channel") "</option>\n"
+				"<option value='Opacity Channel'>" N_("Opacity Channel") "</option>\n"
+				"<option value='Matte Channel'>" N_("Matte Channel") "</option>\n"
 			"</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
-- 
cgit v1.2.3