X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffilter-enums.cpp;h=2f6d2f64b15b5e0e8749e816699d97acda811c18;hb=42382dfb4164b919ffcdf03766da9f8be4e43b42;hp=111cd62f9ea860a25563d5dfec920a781cfad5e9;hpb=000dfc9dd0bc3d8cd37fabe93f6f9d1ede190adf;p=inkscape.git

diff --git a/src/filter-enums.cpp b/src/filter-enums.cpp
index 111cd62f9..2f6d2f64b 100644
--- a/src/filter-enums.cpp
+++ b/src/filter-enums.cpp
@@ -16,25 +16,25 @@
 using Inkscape::Util::EnumData;
 using Inkscape::Util::EnumDataConverter;
 
-const EnumData<NR::FilterPrimitiveType> FPData[NR::NR_FILTER_ENDPRIMITIVETYPE] = {
-    {NR::NR_FILTER_BLEND,             _("Blend"),              "svg:feBlend"},
-    {NR::NR_FILTER_COLORMATRIX,       _("Color Matrix"),       "svg:feColorMatrix"},
-    {NR::NR_FILTER_COMPONENTTRANSFER, _("Component Transfer"), "svg:feComponentTransfer"},
-    {NR::NR_FILTER_COMPOSITE,         _("Composite"),          "svg:feComposite"},
-    {NR::NR_FILTER_CONVOLVEMATRIX,    _("Convolve Matrix"),    "svg:feConvolveMatrix"},
-    {NR::NR_FILTER_DIFFUSELIGHTING,   _("Diffuse Lighting"),   "svg:feDiffuseLighting"},
-    {NR::NR_FILTER_DISPLACEMENTMAP,   _("Displacement Map"),   "svg:feDisplacementMap"},
-    {NR::NR_FILTER_FLOOD,             _("Flood"),              "svg:feFlood"},
-    {NR::NR_FILTER_GAUSSIANBLUR,      _("Gaussian Blur"),      "svg:feGaussianBlur"},
-    {NR::NR_FILTER_IMAGE,             _("Image"),              "svg:feImage"},
-    {NR::NR_FILTER_MERGE,             _("Merge"),              "svg:feMerge"},
-    {NR::NR_FILTER_MORPHOLOGY,        _("Morphology"),         "svg:feMorphology"},
-    {NR::NR_FILTER_OFFSET,            _("Offset"),             "svg:feOffset"},
-    {NR::NR_FILTER_SPECULARLIGHTING,  _("Specular Lighting"),  "svg:feSpecularLighting"},
-    {NR::NR_FILTER_TILE,              _("Tile"),               "svg:feTile"},
-    {NR::NR_FILTER_TURBULENCE,        _("Turbulence"),         "svg:feTurbulence"}
+const EnumData<Inkscape::Filters::FilterPrimitiveType> FPData[Inkscape::Filters::NR_FILTER_ENDPRIMITIVETYPE] = {
+    {Inkscape::Filters::NR_FILTER_BLEND,             _("Blend"),              "svg:feBlend"},
+    {Inkscape::Filters::NR_FILTER_COLORMATRIX,       _("Color Matrix"),       "svg:feColorMatrix"},
+    {Inkscape::Filters::NR_FILTER_COMPONENTTRANSFER, _("Component Transfer"), "svg:feComponentTransfer"},
+    {Inkscape::Filters::NR_FILTER_COMPOSITE,         _("Composite"),          "svg:feComposite"},
+    {Inkscape::Filters::NR_FILTER_CONVOLVEMATRIX,    _("Convolve Matrix"),    "svg:feConvolveMatrix"},
+    {Inkscape::Filters::NR_FILTER_DIFFUSELIGHTING,   _("Diffuse Lighting"),   "svg:feDiffuseLighting"},
+    {Inkscape::Filters::NR_FILTER_DISPLACEMENTMAP,   _("Displacement Map"),   "svg:feDisplacementMap"},
+    {Inkscape::Filters::NR_FILTER_FLOOD,             _("Flood"),              "svg:feFlood"},
+    {Inkscape::Filters::NR_FILTER_GAUSSIANBLUR,      _("Gaussian Blur"),      "svg:feGaussianBlur"},
+    {Inkscape::Filters::NR_FILTER_IMAGE,             _("Image"),              "svg:feImage"},
+    {Inkscape::Filters::NR_FILTER_MERGE,             _("Merge"),              "svg:feMerge"},
+    {Inkscape::Filters::NR_FILTER_MORPHOLOGY,        _("Morphology"),         "svg:feMorphology"},
+    {Inkscape::Filters::NR_FILTER_OFFSET,            _("Offset"),             "svg:feOffset"},
+    {Inkscape::Filters::NR_FILTER_SPECULARLIGHTING,  _("Specular Lighting"),  "svg:feSpecularLighting"},
+    {Inkscape::Filters::NR_FILTER_TILE,              _("Tile"),               "svg:feTile"},
+    {Inkscape::Filters::NR_FILTER_TURBULENCE,        _("Turbulence"),         "svg:feTurbulence"}
 };
-const EnumDataConverter<NR::FilterPrimitiveType> FPConverter(FPData, NR::NR_FILTER_ENDPRIMITIVETYPE);
+const EnumDataConverter<Inkscape::Filters::FilterPrimitiveType> FPConverter(FPData, Inkscape::Filters::NR_FILTER_ENDPRIMITIVETYPE);
 
 const EnumData<FilterPrimitiveInput> FPInputData[FPINPUT_END] = {
     {FPINPUT_SOURCEGRAPHIC,     _("Source Graphic"),     "SourceGraphic"},
@@ -47,23 +47,23 @@ const EnumData<FilterPrimitiveInput> FPInputData[FPINPUT_END] = {
 const EnumDataConverter<FilterPrimitiveInput> FPInputConverter(FPInputData, FPINPUT_END);
 
 // feBlend
-const EnumData<NR::FilterBlendMode> BlendModeData[NR::BLEND_ENDMODE] = {
-    {NR::BLEND_NORMAL,   _("Normal"),   "normal"},
-    {NR::BLEND_MULTIPLY, _("Multiply"), "multiply"},
-    {NR::BLEND_SCREEN,   _("Screen"),   "screen"},
-    {NR::BLEND_DARKEN,   _("Darken"),   "darken"},
-    {NR::BLEND_LIGHTEN,  _("Lighten"),  "lighten"}
+const EnumData<Inkscape::Filters::FilterBlendMode> BlendModeData[Inkscape::Filters::BLEND_ENDMODE] = {
+    {Inkscape::Filters::BLEND_NORMAL,   C_("Filter blend mode", "Normal"),   "normal"},
+    {Inkscape::Filters::BLEND_MULTIPLY, C_("Filter blend mode", "Multiply"), "multiply"},
+    {Inkscape::Filters::BLEND_SCREEN,   C_("Filter blend mode", "Screen"),   "screen"},
+    {Inkscape::Filters::BLEND_DARKEN,   C_("Filter blend mode", "Darken"),   "darken"},
+    {Inkscape::Filters::BLEND_LIGHTEN,  C_("Filter blend mode", "Lighten"),  "lighten"}
 };
-const EnumDataConverter<NR::FilterBlendMode> BlendModeConverter(BlendModeData, NR::BLEND_ENDMODE);
+const EnumDataConverter<Inkscape::Filters::FilterBlendMode> BlendModeConverter(BlendModeData, Inkscape::Filters::BLEND_ENDMODE);
 
 
-const EnumData<NR::FilterColorMatrixType> ColorMatrixTypeData[NR::COLORMATRIX_ENDTYPE] = {
-    {NR::COLORMATRIX_MATRIX,           _("Matrix"),             "matrix"},
-    {NR::COLORMATRIX_SATURATE,         _("Saturate"),           "saturate"},
-    {NR::COLORMATRIX_HUEROTATE,        _("Hue Rotate"),         "hueRotate"},
-    {NR::COLORMATRIX_LUMINANCETOALPHA, _("Luminance to Alpha"), "luminanceToAlpha"}
+const EnumData<Inkscape::Filters::FilterColorMatrixType> ColorMatrixTypeData[Inkscape::Filters::COLORMATRIX_ENDTYPE] = {
+    {Inkscape::Filters::COLORMATRIX_MATRIX,           _("Matrix"),             "matrix"},
+    {Inkscape::Filters::COLORMATRIX_SATURATE,         _("Saturate"),           "saturate"},
+    {Inkscape::Filters::COLORMATRIX_HUEROTATE,        _("Hue Rotate"),         "hueRotate"},
+    {Inkscape::Filters::COLORMATRIX_LUMINANCETOALPHA, _("Luminance to Alpha"), "luminanceToAlpha"}
 };
-const EnumDataConverter<NR::FilterColorMatrixType> ColorMatrixTypeConverter(ColorMatrixTypeData, NR::COLORMATRIX_ENDTYPE);
+const EnumDataConverter<Inkscape::Filters::FilterColorMatrixType> ColorMatrixTypeConverter(ColorMatrixTypeData, Inkscape::Filters::COLORMATRIX_ENDTYPE);
 
 // feComposite
 const EnumData<FeCompositeOperator> CompositeOperatorData[COMPOSITE_ENDOPERATOR] = {
@@ -77,42 +77,52 @@ const EnumData<FeCompositeOperator> CompositeOperatorData[COMPOSITE_ENDOPERATOR]
 };
 const EnumDataConverter<FeCompositeOperator> CompositeOperatorConverter(CompositeOperatorData, COMPOSITE_ENDOPERATOR);
 
+// feComponentTransfer
+const EnumData<Inkscape::Filters::FilterComponentTransferType> ComponentTransferTypeData[Inkscape::Filters::COMPONENTTRANSFER_TYPE_ERROR] = {
+    {Inkscape::Filters::COMPONENTTRANSFER_TYPE_IDENTITY, _("Identity"), "identity"},
+    {Inkscape::Filters::COMPONENTTRANSFER_TYPE_TABLE,    _("Table"),    "table"},
+    {Inkscape::Filters::COMPONENTTRANSFER_TYPE_DISCRETE, _("Discrete"), "discrete"},
+    {Inkscape::Filters::COMPONENTTRANSFER_TYPE_LINEAR,   _("Linear"),   "linear"},
+    {Inkscape::Filters::COMPONENTTRANSFER_TYPE_GAMMA,    _("Gamma"),    "gamma"},
+};
+const EnumDataConverter<Inkscape::Filters::FilterComponentTransferType> ComponentTransferTypeConverter(ComponentTransferTypeData, Inkscape::Filters::COMPONENTTRANSFER_TYPE_ERROR);
+
 // feConvolveMatrix
-const EnumData<NR::FilterConvolveMatrixEdgeMode> ConvolveMatrixEdgeModeData[NR::CONVOLVEMATRIX_EDGEMODE_ENDTYPE] = {
-    {NR::CONVOLVEMATRIX_EDGEMODE_DUPLICATE, _("Duplicate"), "duplicate"},
-    {NR::CONVOLVEMATRIX_EDGEMODE_WRAP,      _("Wrap"),      "wrap"},
-    {NR::CONVOLVEMATRIX_EDGEMODE_NONE,      _("None"),      "none"}
+const EnumData<Inkscape::Filters::FilterConvolveMatrixEdgeMode> ConvolveMatrixEdgeModeData[Inkscape::Filters::CONVOLVEMATRIX_EDGEMODE_ENDTYPE] = {
+    {Inkscape::Filters::CONVOLVEMATRIX_EDGEMODE_DUPLICATE, _("Duplicate"), "duplicate"},
+    {Inkscape::Filters::CONVOLVEMATRIX_EDGEMODE_WRAP,      _("Wrap"),      "wrap"},
+    {Inkscape::Filters::CONVOLVEMATRIX_EDGEMODE_NONE,      _("None"),      "none"}
 };
-const EnumDataConverter<NR::FilterConvolveMatrixEdgeMode> ConvolveMatrixEdgeModeConverter(ConvolveMatrixEdgeModeData, NR::CONVOLVEMATRIX_EDGEMODE_ENDTYPE);
+const EnumDataConverter<Inkscape::Filters::FilterConvolveMatrixEdgeMode> ConvolveMatrixEdgeModeConverter(ConvolveMatrixEdgeModeData, Inkscape::Filters::CONVOLVEMATRIX_EDGEMODE_ENDTYPE);
 
 // feDisplacementMap
-const EnumData<int> DisplacementMapChannelData[4] = {
-    {0, _("Red"),   "R"},
-    {1, _("Green"), "G"},
-    {2, _("Blue"),  "B"},
-    {3, _("Alpha"), "A"}
+const EnumData<FilterDisplacementMapChannelSelector> DisplacementMapChannelData[DISPLACEMENTMAP_CHANNEL_ENDTYPE] = {
+    {DISPLACEMENTMAP_CHANNEL_RED, _("Red"),   "R"},
+    {DISPLACEMENTMAP_CHANNEL_GREEN, _("Green"), "G"},
+    {DISPLACEMENTMAP_CHANNEL_BLUE, _("Blue"),  "B"},
+    {DISPLACEMENTMAP_CHANNEL_ALPHA, _("Alpha"), "A"}
 };
-const EnumDataConverter<int> DisplacementMapChannelConverter(DisplacementMapChannelData, 4);
+const EnumDataConverter<FilterDisplacementMapChannelSelector> DisplacementMapChannelConverter(DisplacementMapChannelData, DISPLACEMENTMAP_CHANNEL_ENDTYPE);
 
 // feMorphology
-const EnumData<NR::FilterMorphologyOperator> MorphologyOperatorData[NR::MORPHOLOGY_OPERATOR_END] = {
-    {NR::MORPHOLOGY_OPERATOR_ERODE,  _("Erode"),   "erode"},
-    {NR::MORPHOLOGY_OPERATOR_DILATE, _("Dilate"),  "dilate"}
+const EnumData<Inkscape::Filters::FilterMorphologyOperator> MorphologyOperatorData[Inkscape::Filters::MORPHOLOGY_OPERATOR_END] = {
+    {Inkscape::Filters::MORPHOLOGY_OPERATOR_ERODE,  _("Erode"),   "erode"},
+    {Inkscape::Filters::MORPHOLOGY_OPERATOR_DILATE, _("Dilate"),  "dilate"}
 };
-const EnumDataConverter<NR::FilterMorphologyOperator> MorphologyOperatorConverter(MorphologyOperatorData, NR::MORPHOLOGY_OPERATOR_END);
+const EnumDataConverter<Inkscape::Filters::FilterMorphologyOperator> MorphologyOperatorConverter(MorphologyOperatorData, Inkscape::Filters::MORPHOLOGY_OPERATOR_END);
 
 // feTurbulence
-const EnumData<NR::FilterTurbulenceType> TurbulenceTypeData[NR::TURBULENCE_ENDTYPE] = {
-    {NR::TURBULENCE_FRACTALNOISE, _("Fractal Noise"), "fractalNoise"},
-    {NR::TURBULENCE_TURBULENCE,   _("Turbulence"),    "turbulence"}
+const EnumData<Inkscape::Filters::FilterTurbulenceType> TurbulenceTypeData[Inkscape::Filters::TURBULENCE_ENDTYPE] = {
+    {Inkscape::Filters::TURBULENCE_FRACTALNOISE, _("Fractal Noise"), "fractalNoise"},
+    {Inkscape::Filters::TURBULENCE_TURBULENCE,   _("Turbulence"),    "turbulence"}
 };
-const EnumDataConverter<NR::FilterTurbulenceType> TurbulenceTypeConverter(TurbulenceTypeData, NR::TURBULENCE_ENDTYPE);
+const EnumDataConverter<Inkscape::Filters::FilterTurbulenceType> TurbulenceTypeConverter(TurbulenceTypeData, Inkscape::Filters::TURBULENCE_ENDTYPE);
 
 // Light source
 const EnumData<LightSource> LightSourceData[LIGHT_ENDSOURCE] = {
-    {LIGHT_DISTANT, _("Distance Light"), "svg:feDistanceLight"},
-    {LIGHT_POINT,   _("Point Light"),    "svg:fePointLight"},
-    {LIGHT_SPOT,    _("Spot Light"),     "svg:feSpotLight"}
+    {LIGHT_DISTANT, _("Distant Light"), "svg:feDistantLight"},
+    {LIGHT_POINT,   _("Point Light"),   "svg:fePointLight"},
+    {LIGHT_SPOT,    _("Spot Light"),    "svg:feSpotLight"}
 };
 const EnumDataConverter<LightSource> LightSourceConverter(LightSourceData, LIGHT_ENDSOURCE);
 
@@ -125,4 +135,4 @@ const EnumDataConverter<LightSource> LightSourceConverter(LightSourceData, LIGHT
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :