From 159da9c1d386d4be6e003a2b46cf489ebaf29a3d Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Thu, 12 Jul 2007 03:56:39 +0000
Subject: Filter effects dialog:

* Added controls for the composite filter primitive (operator and k1-k4).
* Simplified setting the filter attributes to remove duplicated code common for spinsliders and comboboxenums

(bzr r3228)
---
 src/ui/widget/filter-effect-chooser.cpp | 11 +++++++++++
 src/ui/widget/filter-effect-enums.h     |  5 +++++
 2 files changed, 16 insertions(+)

(limited to 'src/ui/widget')

diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index 1303d6393..005e2c2dc 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -245,6 +245,17 @@ const EnumData<NR::FilterBlendMode> BlendModeData[NR::BLEND_ENDMODE] = {
 };
 const Converter<NR::FilterBlendMode> BlendModeConverter(BlendModeData, NR::BLEND_ENDMODE);
 
+const EnumData<FeCompositeOperator> CompositeOperatorData[COMPOSITE_ENDOPERATOR] = {
+    {COMPOSITE_DEFAULT,    _("Default"),    ""},
+    {COMPOSITE_OVER,       _("Over"),       "over"},
+    {COMPOSITE_IN,         _("In"),         "in"},
+    {COMPOSITE_OUT,        _("Out"),        "out"},
+    {COMPOSITE_ATOP,       _("Atop"),       "atop"},
+    {COMPOSITE_XOR,        _("XOR"),        "xor"},
+    {COMPOSITE_ARITHMETIC, _("Arithmetic"), "arithmetic"}
+};
+const Converter<FeCompositeOperator> CompositeOperatorConverter(CompositeOperatorData, COMPOSITE_ENDOPERATOR);
+
 }
 }
 }
diff --git a/src/ui/widget/filter-effect-enums.h b/src/ui/widget/filter-effect-enums.h
index 3ac68a16f..ec9dcc851 100644
--- a/src/ui/widget/filter-effect-enums.h
+++ b/src/ui/widget/filter-effect-enums.h
@@ -12,6 +12,7 @@
 #ifndef INKSCAPE_UI_WIDGET_FILTER_EFFECT_ENUMS_H
 #define INKSCAPE_UI_WIDGET_FILTER_EFFECT_ENUMS_H
 
+#include "sp-fecomposite.h"
 #include "display/nr-filter-blend.h"
 #include "display/nr-filter-types.h"
 
@@ -138,6 +139,10 @@ extern const Converter<NR::FilterPrimitiveType> FPConverter;
 extern const EnumData<NR::FilterBlendMode> BlendModeData[NR::BLEND_ENDMODE];
 extern const Converter<NR::FilterBlendMode> BlendModeConverter;
 
+/*** feComposite Operator ***/
+extern const EnumData<FeCompositeOperator> CompositeOperatorData[COMPOSITE_ENDOPERATOR];
+extern const Converter<FeCompositeOperator> CompositeOperatorConverter;
+
 }
 }
 }
-- 
cgit v1.2.3