From 93b1e80cf5516333d7a5068a2ba6bcc95f5577dc Mon Sep 17 00:00:00 2001 From: Patrick Storz Date: Sun, 21 Jul 2019 23:56:32 +0200 Subject: Use proper boolean values --- src/extension/internal/bitmap/raise.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/extension/internal/bitmap') diff --git a/src/extension/internal/bitmap/raise.cpp b/src/extension/internal/bitmap/raise.cpp index b97455d4e..1f3c48502 100644 --- a/src/extension/internal/bitmap/raise.cpp +++ b/src/extension/internal/bitmap/raise.cpp @@ -42,7 +42,7 @@ Raise::init() "org.inkscape.effect.bitmap.raise\n" "6\n" "6\n" - "0\n" + "false\n" "\n" "all\n" "\n" -- cgit v1.2.3 From 8f7a3a637f6a465e78e88490a03f539f0d8fdc1a Mon Sep 17 00:00:00 2001 From: Patrick Storz 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/addNoise.cpp | 2 +- src/extension/internal/bitmap/channel.cpp | 2 +- src/extension/internal/bitmap/levelChannel.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/extension/internal/bitmap') diff --git a/src/extension/internal/bitmap/addNoise.cpp b/src/extension/internal/bitmap/addNoise.cpp index 5981eed24..b9e80a915 100644 --- a/src/extension/internal/bitmap/addNoise.cpp +++ b/src/extension/internal/bitmap/addNoise.cpp @@ -33,7 +33,7 @@ AddNoise::applyEffect(Magick::Image *image) { void AddNoise::refreshParameters(Inkscape::Extension::Effect *module) { - _noiseTypeName = module->get_param_enum("noiseType"); + _noiseTypeName = module->get_param_optiongroup("noiseType"); } #include "../clear-n_.h" 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" 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 Date: Sun, 1 Sep 2019 20:28:08 +0200 Subject: Update internal extensions for latest .inx format changes --- .../internal/bitmap/adaptiveThreshold.cpp | 6 ++--- src/extension/internal/bitmap/addNoise.cpp | 14 ++++++------ src/extension/internal/bitmap/blur.cpp | 4 ++-- src/extension/internal/bitmap/channel.cpp | 20 ++++++++--------- src/extension/internal/bitmap/charcoal.cpp | 4 ++-- src/extension/internal/bitmap/colorize.cpp | 2 +- src/extension/internal/bitmap/contrast.cpp | 2 +- src/extension/internal/bitmap/crop.cpp | 8 +++---- src/extension/internal/bitmap/cycleColormap.cpp | 2 +- src/extension/internal/bitmap/edge.cpp | 2 +- src/extension/internal/bitmap/emboss.cpp | 4 ++-- src/extension/internal/bitmap/gaussianBlur.cpp | 4 ++-- src/extension/internal/bitmap/implode.cpp | 2 +- src/extension/internal/bitmap/level.cpp | 6 ++--- src/extension/internal/bitmap/levelChannel.cpp | 26 +++++++++++----------- src/extension/internal/bitmap/medianFilter.cpp | 2 +- src/extension/internal/bitmap/modulate.cpp | 6 ++--- src/extension/internal/bitmap/oilPaint.cpp | 2 +- src/extension/internal/bitmap/opacity.cpp | 2 +- src/extension/internal/bitmap/raise.cpp | 6 ++--- src/extension/internal/bitmap/reduceNoise.cpp | 2 +- src/extension/internal/bitmap/sample.cpp | 4 ++-- src/extension/internal/bitmap/shade.cpp | 6 ++--- src/extension/internal/bitmap/sharpen.cpp | 4 ++-- src/extension/internal/bitmap/solarize.cpp | 2 +- src/extension/internal/bitmap/spread.cpp | 2 +- src/extension/internal/bitmap/swirl.cpp | 2 +- src/extension/internal/bitmap/threshold.cpp | 2 +- src/extension/internal/bitmap/unsharpmask.cpp | 8 +++---- src/extension/internal/bitmap/wave.cpp | 4 ++-- 30 files changed, 80 insertions(+), 80 deletions(-) (limited to 'src/extension/internal/bitmap') diff --git a/src/extension/internal/bitmap/adaptiveThreshold.cpp b/src/extension/internal/bitmap/adaptiveThreshold.cpp index 473bada4e..ce4d78a89 100644 --- a/src/extension/internal/bitmap/adaptiveThreshold.cpp +++ b/src/extension/internal/bitmap/adaptiveThreshold.cpp @@ -39,9 +39,9 @@ AdaptiveThreshold::init() "\n" "" N_("Adaptive Threshold") "\n" "org.inkscape.effect.bitmap.adaptiveThreshold\n" - "5\n" - "5\n" - "0\n" + "5\n" + "5\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/addNoise.cpp b/src/extension/internal/bitmap/addNoise.cpp index b9e80a915..26b050fa8 100644 --- a/src/extension/internal/bitmap/addNoise.cpp +++ b/src/extension/internal/bitmap/addNoise.cpp @@ -45,13 +45,13 @@ AddNoise::init() "\n" "" N_("Add Noise") "\n" "org.inkscape.effect.bitmap.addNoise\n" - "\n" - "<_item value='Uniform Noise'>" N_("Uniform Noise") "\n" - "<_item value='Gaussian Noise'>" N_("Gaussian Noise") "\n" - "<_item value='Multiplicative Gaussian Noise'>" N_("Multiplicative Gaussian Noise") "\n" - "<_item value='Impulse Noise'>" N_("Impulse Noise") "\n" - "<_item value='Laplacian Noise'>" N_("Laplacian Noise") "\n" - "<_item value='Poisson Noise'>" N_("Poisson Noise") "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n" "\n" "all\n" diff --git a/src/extension/internal/bitmap/blur.cpp b/src/extension/internal/bitmap/blur.cpp index 57c3342a8..b50511c32 100644 --- a/src/extension/internal/bitmap/blur.cpp +++ b/src/extension/internal/bitmap/blur.cpp @@ -38,8 +38,8 @@ Blur::init() "\n" "" N_("Blur") "\n" "org.inkscape.effect.bitmap.blur\n" - "1\n" - "0.5\n" + "1\n" + "0.5\n" "\n" "all\n" "\n" 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() "\n" "" N_("Channel") "\n" "org.inkscape.effect.bitmap.channel\n" - "\n" - "<_item value='Red Channel'>" N_("Red Channel") "\n" - "<_item value='Green Channel'>" N_("Green Channel") "\n" - "<_item value='Blue Channel'>" N_("Blue Channel") "\n" - "<_item value='Cyan Channel'>" N_("Cyan Channel") "\n" - "<_item value='Magenta Channel'>" N_("Magenta Channel") "\n" - "<_item value='Yellow Channel'>" N_("Yellow Channel") "\n" - "<_item value='Black Channel'>" N_("Black Channel") "\n" - "<_item value='Opacity Channel'>" N_("Opacity Channel") "\n" - "<_item value='Matte Channel'>" N_("Matte Channel") "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n" "\n" "all\n" diff --git a/src/extension/internal/bitmap/charcoal.cpp b/src/extension/internal/bitmap/charcoal.cpp index 2c4894732..4da2cbac0 100644 --- a/src/extension/internal/bitmap/charcoal.cpp +++ b/src/extension/internal/bitmap/charcoal.cpp @@ -38,8 +38,8 @@ Charcoal::init() "\n" "" N_("Charcoal") "\n" "org.inkscape.effect.bitmap.charcoal\n" - "1\n" - "0.5\n" + "1\n" + "0.5\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/colorize.cpp b/src/extension/internal/bitmap/colorize.cpp index 01dfd1d7e..265090915 100644 --- a/src/extension/internal/bitmap/colorize.cpp +++ b/src/extension/internal/bitmap/colorize.cpp @@ -50,7 +50,7 @@ Colorize::init() "\n" "" N_("Colorize") "\n" "org.inkscape.effect.bitmap.colorize\n" - "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/contrast.cpp b/src/extension/internal/bitmap/contrast.cpp index bb01d8e85..64d21674e 100644 --- a/src/extension/internal/bitmap/contrast.cpp +++ b/src/extension/internal/bitmap/contrast.cpp @@ -40,7 +40,7 @@ Contrast::init() "\n" "" N_("Contrast") "\n" "org.inkscape.effect.bitmap.contrast\n" - "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp index 69e23c770..c69b4029b 100644 --- a/src/extension/internal/bitmap/crop.cpp +++ b/src/extension/internal/bitmap/crop.cpp @@ -67,10 +67,10 @@ Crop::init() "\n" "" N_("Crop") "\n" "org.inkscape.effect.bitmap.crop\n" - "0\n" - "0\n" - "0\n" - "0\n" + "0\n" + "0\n" + "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/cycleColormap.cpp b/src/extension/internal/bitmap/cycleColormap.cpp index d245294bc..04741f9f4 100644 --- a/src/extension/internal/bitmap/cycleColormap.cpp +++ b/src/extension/internal/bitmap/cycleColormap.cpp @@ -37,7 +37,7 @@ CycleColormap::init() "\n" "" N_("Cycle Colormap") "\n" "org.inkscape.effect.bitmap.cycleColormap\n" - "180\n" + "180\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/edge.cpp b/src/extension/internal/bitmap/edge.cpp index d147001d6..58bceec46 100644 --- a/src/extension/internal/bitmap/edge.cpp +++ b/src/extension/internal/bitmap/edge.cpp @@ -37,7 +37,7 @@ Edge::init() "\n" "" N_("Edge") "\n" "org.inkscape.effect.bitmap.edge\n" - "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/emboss.cpp b/src/extension/internal/bitmap/emboss.cpp index 8cb363ebd..b7f2235a2 100644 --- a/src/extension/internal/bitmap/emboss.cpp +++ b/src/extension/internal/bitmap/emboss.cpp @@ -38,8 +38,8 @@ Emboss::init() "\n" "" N_("Emboss") "\n" "org.inkscape.effect.bitmap.emboss\n" - "1.0\n" - "0.5\n" + "1.0\n" + "0.5\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/gaussianBlur.cpp b/src/extension/internal/bitmap/gaussianBlur.cpp index 78b77e23c..405ee66d5 100644 --- a/src/extension/internal/bitmap/gaussianBlur.cpp +++ b/src/extension/internal/bitmap/gaussianBlur.cpp @@ -38,8 +38,8 @@ GaussianBlur::init() "\n" "" N_("Gaussian Blur") "\n" "org.inkscape.effect.bitmap.gaussianBlur\n" - "5.0\n" - "5.0\n" + "5.0\n" + "5.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/implode.cpp b/src/extension/internal/bitmap/implode.cpp index 7bad3489f..c6c7a5f48 100644 --- a/src/extension/internal/bitmap/implode.cpp +++ b/src/extension/internal/bitmap/implode.cpp @@ -37,7 +37,7 @@ Implode::init() "\n" "" N_("Implode") "\n" "org.inkscape.effect.bitmap.implode\n" - "10\n" + "10\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/level.cpp b/src/extension/internal/bitmap/level.cpp index 0b58ec8b9..aaf31682f 100644 --- a/src/extension/internal/bitmap/level.cpp +++ b/src/extension/internal/bitmap/level.cpp @@ -41,9 +41,9 @@ Level::init() "\n" "" N_("Level") "\n" "org.inkscape.effect.bitmap.level\n" - "0\n" - "100\n" - "1\n" + "0\n" + "100\n" + "1\n" "\n" "all\n" "\n" 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() "\n" "" N_("Level (with Channel)") "\n" "org.inkscape.effect.bitmap.levelChannel\n" - "\n" - "<_item value='Red Channel'>" N_("Red Channel") "\n" - "<_item value='Green Channel'>" N_("Green Channel") "\n" - "<_item value='Blue Channel'>" N_("Blue Channel") "\n" - "<_item value='Cyan Channel'>" N_("Cyan Channel") "\n" - "<_item value='Magenta Channel'>" N_("Magenta Channel") "\n" - "<_item value='Yellow Channel'>" N_("Yellow Channel") "\n" - "<_item value='Black Channel'>" N_("Black Channel") "\n" - "<_item value='Opacity Channel'>" N_("Opacity Channel") "\n" - "<_item value='Matte Channel'>" N_("Matte Channel") "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n" - "0.0\n" - "100.0\n" - "1.0\n" + "0.0\n" + "100.0\n" + "1.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/medianFilter.cpp b/src/extension/internal/bitmap/medianFilter.cpp index 5a5e0311b..cc3dabd9f 100644 --- a/src/extension/internal/bitmap/medianFilter.cpp +++ b/src/extension/internal/bitmap/medianFilter.cpp @@ -37,7 +37,7 @@ MedianFilter::init() "\n" "" N_("Median") "\n" "org.inkscape.effect.bitmap.medianFilter\n" - "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/modulate.cpp b/src/extension/internal/bitmap/modulate.cpp index 1a82707f2..5071a6031 100644 --- a/src/extension/internal/bitmap/modulate.cpp +++ b/src/extension/internal/bitmap/modulate.cpp @@ -40,9 +40,9 @@ Modulate::init() "\n" "" N_("HSB Adjust") "\n" "org.inkscape.effect.bitmap.modulate\n" - "0\n" - "0\n" - "0\n" + "0\n" + "0\n" + "0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/oilPaint.cpp b/src/extension/internal/bitmap/oilPaint.cpp index a2ffce712..a5373eb22 100644 --- a/src/extension/internal/bitmap/oilPaint.cpp +++ b/src/extension/internal/bitmap/oilPaint.cpp @@ -37,7 +37,7 @@ OilPaint::init() "\n" "" N_("Oil Paint") "\n" "org.inkscape.effect.bitmap.oilPaint\n" - "3\n" + "3\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/opacity.cpp b/src/extension/internal/bitmap/opacity.cpp index 3206d246d..cac8b65f7 100644 --- a/src/extension/internal/bitmap/opacity.cpp +++ b/src/extension/internal/bitmap/opacity.cpp @@ -38,7 +38,7 @@ Opacity::init() "\n" "" N_("Opacity") "\n" "org.inkscape.effect.bitmap.opacity\n" - "80.0\n" + "80.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/raise.cpp b/src/extension/internal/bitmap/raise.cpp index 1f3c48502..8b3598ae8 100644 --- a/src/extension/internal/bitmap/raise.cpp +++ b/src/extension/internal/bitmap/raise.cpp @@ -40,9 +40,9 @@ Raise::init() "\n" "" N_("Raise") "\n" "org.inkscape.effect.bitmap.raise\n" - "6\n" - "6\n" - "false\n" + "6\n" + "6\n" + "false\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/reduceNoise.cpp b/src/extension/internal/bitmap/reduceNoise.cpp index 1a4e124ac..809c69315 100644 --- a/src/extension/internal/bitmap/reduceNoise.cpp +++ b/src/extension/internal/bitmap/reduceNoise.cpp @@ -40,7 +40,7 @@ ReduceNoise::init() "\n" "" N_("Reduce Noise") "\n" "org.inkscape.effect.bitmap.reduceNoise\n" - "-1\n" + "-1\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/sample.cpp b/src/extension/internal/bitmap/sample.cpp index e8bf32500..e59e1aff9 100644 --- a/src/extension/internal/bitmap/sample.cpp +++ b/src/extension/internal/bitmap/sample.cpp @@ -39,8 +39,8 @@ Sample::init() "\n" "" N_("Resample") "\n" "org.inkscape.effect.bitmap.sample\n" - "100\n" - "100\n" + "100\n" + "100\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/shade.cpp b/src/extension/internal/bitmap/shade.cpp index 5896072c4..f6b2f255b 100644 --- a/src/extension/internal/bitmap/shade.cpp +++ b/src/extension/internal/bitmap/shade.cpp @@ -40,9 +40,9 @@ Shade::init() "\n" "" N_("Shade") "\n" "org.inkscape.effect.bitmap.shade\n" - "30\n" - "30\n" - "false\n" + "30\n" + "30\n" + "false\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/sharpen.cpp b/src/extension/internal/bitmap/sharpen.cpp index 6ee05a900..aa24ac3ff 100644 --- a/src/extension/internal/bitmap/sharpen.cpp +++ b/src/extension/internal/bitmap/sharpen.cpp @@ -38,8 +38,8 @@ Sharpen::init() "\n" "" N_("Sharpen") "\n" "org.inkscape.effect.bitmap.sharpen\n" - "1.0\n" - "0.5\n" + "1.0\n" + "0.5\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/solarize.cpp b/src/extension/internal/bitmap/solarize.cpp index 489141d39..69a1e186b 100644 --- a/src/extension/internal/bitmap/solarize.cpp +++ b/src/extension/internal/bitmap/solarize.cpp @@ -39,7 +39,7 @@ Solarize::init() "\n" "" N_("Solarize") "\n" "org.inkscape.effect.bitmap.solarize\n" - "50\n" + "50\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/spread.cpp b/src/extension/internal/bitmap/spread.cpp index e6f426591..86b4432bb 100644 --- a/src/extension/internal/bitmap/spread.cpp +++ b/src/extension/internal/bitmap/spread.cpp @@ -37,7 +37,7 @@ Spread::init() "\n" "" N_("Dither") "\n" "org.inkscape.effect.bitmap.spread\n" - "3\n" + "3\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/swirl.cpp b/src/extension/internal/bitmap/swirl.cpp index 21df59502..a7681a34d 100644 --- a/src/extension/internal/bitmap/swirl.cpp +++ b/src/extension/internal/bitmap/swirl.cpp @@ -37,7 +37,7 @@ Swirl::init() "\n" "" N_("Swirl") "\n" "org.inkscape.effect.bitmap.swirl\n" - "30\n" + "30\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/threshold.cpp b/src/extension/internal/bitmap/threshold.cpp index ddcc7ab1b..4f9dec57c 100644 --- a/src/extension/internal/bitmap/threshold.cpp +++ b/src/extension/internal/bitmap/threshold.cpp @@ -38,7 +38,7 @@ Threshold::init() // TRANSLATORS: see http://docs.gimp.org/en/gimp-tool-threshold.html "" N_("Threshold") "\n" "org.inkscape.effect.bitmap.threshold\n" - "\n" + "\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/unsharpmask.cpp b/src/extension/internal/bitmap/unsharpmask.cpp index 2e807a39a..9240803e2 100644 --- a/src/extension/internal/bitmap/unsharpmask.cpp +++ b/src/extension/internal/bitmap/unsharpmask.cpp @@ -41,10 +41,10 @@ Unsharpmask::init() "\n" "" N_("Unsharp Mask") "\n" "org.inkscape.effect.bitmap.unsharpmask\n" - "5.0\n" - "5.0\n" - "50.0\n" - "5.0\n" + "5.0\n" + "5.0\n" + "50.0\n" + "5.0\n" "\n" "all\n" "\n" diff --git a/src/extension/internal/bitmap/wave.cpp b/src/extension/internal/bitmap/wave.cpp index 6a86ca3f7..5a67574a0 100644 --- a/src/extension/internal/bitmap/wave.cpp +++ b/src/extension/internal/bitmap/wave.cpp @@ -38,8 +38,8 @@ Wave::init() "\n" "" N_("Wave") "\n" "org.inkscape.effect.bitmap.wave\n" - "25\n" - "150\n" + "25\n" + "150\n" "\n" "all\n" "\n" -- cgit v1.2.3