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/levelChannel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/extension/internal/bitmap/levelChannel.cpp b/src/extension/internal/bitmap/levelChannel.cpp
index 714293d28..384408cf6 100644
--- a/src/extension/internal/bitmap/levelChannel.cpp
+++ b/src/extension/internal/bitmap/levelChannel.cpp
@@ -37,7 +37,7 @@ LevelChannel::applyEffect(Magick::Image* image) {
 
 void
 LevelChannel::refreshParameters(Inkscape::Extension::Effect* module) {
-	_channelName = module->get_param_enum("channel");
+	_channelName = module->get_param_optiongroup("channel");
 	_black_point = module->get_param_float("blackPoint");
 	_white_point = module->get_param_float("whitePoint");
 	_mid_point = module->get_param_float("midPoint");
-- 
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/levelChannel.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/src/extension/internal/bitmap/levelChannel.cpp b/src/extension/internal/bitmap/levelChannel.cpp
index 384408cf6..497d6ce8c 100644
--- a/src/extension/internal/bitmap/levelChannel.cpp
+++ b/src/extension/internal/bitmap/levelChannel.cpp
@@ -52,20 +52,20 @@ LevelChannel::init()
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Level (with Channel)") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.levelChannel</id>\n"
-			"<param name=\"channel\" _gui-text=\"" N_("Channel:") "\" 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=\"channel\" gui-text=\"" N_("Channel:") "\" 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"
-			"<param name=\"blackPoint\" _gui-text=\"" N_("Black Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">0.0</param>\n"			
-			"<param name=\"whitePoint\" _gui-text=\"" N_("White Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">100.0</param>\n"			
-			"<param name=\"midPoint\" _gui-text=\"" N_("Gamma Correction:") "\" type=\"float\" min=\"0.0\" max=\"10.0\">1.0</param>\n"
+			"<param name=\"blackPoint\" gui-text=\"" N_("Black Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">0.0</param>\n"			
+			"<param name=\"whitePoint\" gui-text=\"" N_("White Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">100.0</param>\n"			
+			"<param name=\"midPoint\" gui-text=\"" N_("Gamma Correction:") "\" type=\"float\" min=\"0.0\" max=\"10.0\">1.0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
-- 
cgit v1.2.3