Move LPE's into 3 groups normal, experimental y testing. Testing is only usable by setting up a flag. Must set off for release. I think also for LPETool

6 files changed, 74 insertions, 79 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95df3b674..592f14966 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} C
 option(WITH_DBUS "Compile with support for DBus interface" OFF)
 option(ENABLE_LCMS "Compile with LCMS support" ON)
 option(WITH_SVG2 "Compile with support for new SVG2 features" ON)
-option(WITH_LPETOOL "Compile with LPE Tool and experimental LPEs enabled" ON)
+option(WITH_LPETOOL "Compile with LPE Tool" ON)
+option(LPE_ENABLE_TEST_EFFECTS "Compile with test experimental LPEs enabled" ON)
 option(WITH_OPENMP "Compile with OpenMP support" ON)
 
 option(WITH_PROFILING "Turn on profiling" OFF) # Set to true if compiler/linker should enable profiling
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 91f93e760..322864869 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -228,12 +228,6 @@ else()
     add_definitions(-UWITH_MESH -UWITH_CSSBLEND -UWITH_CSSCOMPOSITE -UWITH_SVG2)
 endif()
 
-if(WITH_LPETOOL)
-    set(LPE_ENABLE_TEST_EFFECTS ON)
-else()
-    set(LPE_ENABLE_TEST_EFFECTS OFF)
-endif()
-
 if(APPLE)
     pkg_check_modules(MacIntegration REQUIRED gtk-mac-integration-gtk3)
     list(APPEND INKSCAPE_INCS_SYS ${MacIntegration_INCLUDE_DIRS})
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0fd1da583..e34183e7f 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -4,18 +4,11 @@
 ../src/3rdparty/autotrace/color.c
 ../src/3rdparty/autotrace/config.h
 ../src/3rdparty/autotrace/intl.h
-../src/live_effects/lpe-angle_bisector.cpp
-../src/live_effects/lpe-circle_with_radius.cpp
 ../src/live_effects/lpe-dynastroke.cpp
 ../src/live_effects/lpe-lattice.cpp
-../src/live_effects/lpe-line_segment.cpp
-../src/live_effects/lpe-offset.cpp
-../src/live_effects/lpe-parallel.cpp
 ../src/live_effects/lpe-path_length.cpp
-../src/live_effects/lpe-perp_bisector.cpp
 ../src/live_effects/lpe-recursiveskeleton.cpp
 ../src/live_effects/lpe-skeleton.cpp
-../src/live_effects/lpe-tangent_to_curve.cpp
 ../src/live_effects/lpe-test-doEffect-stack.cpp
 ../src/live_effects/lpe-text_label.cpp
 
diff --git a/po/POTFILES.src.in b/po/POTFILES.src.in
index dd7de6a08..ab7a9d630 100644
--- a/po/POTFILES.src.in
+++ b/po/POTFILES.src.in
@@ -108,11 +108,13 @@
 ../src/knotholder.cpp
 ../src/libnrtype/FontFactory.cpp
 ../src/live_effects/effect.cpp
+../src/live_effects/lpe-angle_bisector.cpp
 ../src/live_effects/lpe-attach-path.cpp
 ../src/live_effects/lpe-bendpath.cpp
 ../src/live_effects/lpe-bool.cpp
 ../src/live_effects/lpe-bounding-box.cpp
 ../src/live_effects/lpe-bspline.cpp
+../src/live_effects/lpe-circle_with_radius.cpp
 ../src/live_effects/lpe-clone-original.cpp
 ../src/live_effects/lpe-constructgrid.cpp
 ../src/live_effects/lpe-copy_rotate.cpp
@@ -131,9 +133,13 @@
 ../src/live_effects/lpe-jointype.cpp
 ../src/live_effects/lpe-knot.cpp
 ../src/live_effects/lpe-lattice2.cpp
+../src/live_effects/lpe-line_segment.cpp
 ../src/live_effects/lpe-measure-segments.cpp
 ../src/live_effects/lpe-mirror_symmetry.cpp
+../src/live_effects/lpe-offset.cpp
+../src/live_effects/lpe-parallel.cpp
 ../src/live_effects/lpe-patternalongpath.cpp
+../src/live_effects/lpe-perp_bisector.cpp
 ../src/live_effects/lpe-perspective-envelope.cpp
 ../src/live_effects/lpe-powerclip.cpp
 ../src/live_effects/lpe-powermask.cpp
@@ -146,6 +152,7 @@
 ../src/live_effects/lpe-show_handles.cpp
 ../src/live_effects/lpe-simplify.cpp
 ../src/live_effects/lpe-sketch.cpp
+../src/live_effects/lpe-tangent_to_curve.cpp
 ../src/live_effects/lpe-taperstroke.cpp
 ../src/live_effects/lpe-transform_2pts.cpp
 ../src/live_effects/lpe-vonkoch.cpp
diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h
index 887f02343..df7314cbd 100644
--- a/src/live_effects/effect-enum.h
+++ b/src/live_effects/effect-enum.h
@@ -58,19 +58,19 @@ enum EffectType {
     PTS2ELLIPSE,
     OFFSET,
     DASHED_STROKE,
-    DOEFFECTSTACK_TEST,
     ANGLE_BISECTOR,
     CIRCLE_WITH_RADIUS,
     CIRCLE_3PTS,
-    DYNASTROKE,
     EXTRUDE,
-    LATTICE,
     LINE_SEGMENT,
     PARALLEL,
-    PATH_LENGTH,
     PERP_BISECTOR,
-    RECURSIVE_SKELETON,
     TANGENT_TO_CURVE,
+    DOEFFECTSTACK_TEST,
+    DYNASTROKE,
+    LATTICE,
+    PATH_LENGTH,
+    RECURSIVE_SKELETON,
     TEXT_LABEL,
     INVALID_LPE // This must be last (I made it such that it is not needed anymore I think..., Don't trust on it being
                 // last. - johan)
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 3cc6f247a..fe1cebedb 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -676,21 +676,6 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , false //on_text
         , false //experimental
     },
-#ifdef LPE_ENABLE_TEST_EFFECTS
-    {
-        DOEFFECTSTACK_TEST
-        , N_("doEffect stack test") //label
-        , "doeffectstacktest" //key
-        , "experimental" //icon
-        , "doEffect stack test" //untranslated name
-        , N_("Test LPE") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , false //on_image
-        , false //on_text
-        , true //experimental
-    },
     {
         ANGLE_BISECTOR
         , N_("Angle bisector") //label
@@ -734,12 +719,12 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , true //experimental
     },
     {
-        DYNASTROKE
-        , N_("Dynamic stroke") //label
-        , "dynastroke" //key
+        EXTRUDE
+        , N_("Extrude") //label
+        , "extrude" //key
         , "experimental" //icon
-        , "Dynamic stroke" //untranslated name
-        , N_("Create calligraphic strokes with variably shaped ends, making use of a parameter for the brush angle") //description
+        , "Extrude" //untranslated name
+        , N_("Extrude the path, creating a face for each path segment") //description
         , true  //on_path
         , true  //on_shape
         , true  //on_group
@@ -748,12 +733,12 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , true //experimental
     },
     {
-        EXTRUDE
-        , N_("Extrude") //label
-        , "extrude" //key
+        LINE_SEGMENT
+        , N_("Line Segment") //label
+        , "line_segment" //key
         , "experimental" //icon
-        , "Extrude" //untranslated name
-        , N_("Extrude the path, creating a face for each path segment") //description
+        , "Line Segment" //untranslated name
+        , N_("Draw a straight line that connects the first and last node of a path") //description
         , true  //on_path
         , true  //on_shape
         , true  //on_group
@@ -762,12 +747,12 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , true //experimental
     },
     {
-        LATTICE
-        , N_("Lattice Deformation") //label
-        , "lattice" //key
+        PARALLEL
+        , N_("Parallel") //label
+        , "parallel" //key
         , "experimental" //icon
-        , "Lattice Deformation" //untranslated name
-        , N_("Deform an object using a 4x4 grid") //description
+        , "Parallel" //untranslated name
+        , N_("Create a draggable line that will always be parallel to a two-node path") //description
         , true  //on_path
         , true  //on_shape
         , true  //on_group
@@ -776,12 +761,12 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , true //experimental
     },
     {
-        LINE_SEGMENT
-        , N_("Line Segment") //label
-        , "line_segment" //key
+        PERP_BISECTOR
+        , N_("Perpendicular bisector") //label
+        , "perp_bisector" //key
         , "experimental" //icon
-        , "Line Segment" //untranslated name
-        , N_("Draw a straight line that connects the first and last node of a path") //description
+        , "Perpendicular bisector" //untranslated name
+        , N_("Draw a perpendicular line in the middle of the (imaginary) line that connects the start and end nodes") //description
         , true  //on_path
         , true  //on_shape
         , true  //on_group
@@ -790,12 +775,12 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , true //experimental
     },
     {
-        PARALLEL
-        , N_("Parallel") //label
-        , "parallel" //key
+        TANGENT_TO_CURVE
+        , N_("Tangent to curve") //label
+        , "tangent_to_curve" //key
         , "experimental" //icon
-        , "Parallel" //untranslated name
-        , N_("Create a draggable line that will always be parallel to a two-node path") //description
+        , "Tangent to curve" //untranslated name
+        , N_("Draw a tangent with variable length and additional angle that can be moved along the path") //description
         , true  //on_path
         , true  //on_shape
         , true  //on_group
@@ -803,13 +788,14 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , false //on_text
         , true //experimental
     },
+#ifdef LPE_ENABLE_TEST_EFFECTS
     {
-        PATH_LENGTH
-        , N_("Path length") //label
-        , "path_length" //key
+        DOEFFECTSTACK_TEST
+        , N_("doEffect stack test") //label
+        , "doeffectstacktest" //key
         , "experimental" //icon
-        , "Path length" //untranslated name
-        , N_("Display the total length of a (curved) path") //description
+        , "doEffect stack test" //untranslated name
+        , N_("Test LPE") //description
         , true  //on_path
         , true  //on_shape
         , true  //on_group
@@ -818,12 +804,12 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , true //experimental
     },
     {
-        PERP_BISECTOR
-        , N_("Perpendicular bisector") //label
-        , "perp_bisector" //key
+        DYNASTROKE
+        , N_("Dynamic stroke") //label
+        , "dynastroke" //key
         , "experimental" //icon
-        , "Perpendicular bisector" //untranslated name
-        , N_("Draw a perpendicular line in the middle of the (imaginary) line that connects the start and end nodes") //description
+        , "Dynamic stroke" //untranslated name
+        , N_("Create calligraphic strokes with variably shaped ends, making use of a parameter for the brush angle") //description
         , true  //on_path
         , true  //on_shape
         , true  //on_group
@@ -832,12 +818,12 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , true //experimental
     },
     {
-        RECURSIVE_SKELETON
-        , N_("Recursive skeleton") //label
-        , "recursive_skeleton" //key
+        LATTICE
+        , N_("Lattice Deformation") //label
+        , "lattice" //key
         , "experimental" //icon
-        , "Recursive skeleton" //untranslated name
-        , N_("Draw a path recursively") //description
+        , "Lattice Deformation" //untranslated name
+        , N_("Deform an object using a 4x4 grid") //description
         , true  //on_path
         , true  //on_shape
         , true  //on_group
@@ -846,12 +832,26 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         , true //experimental
     },
     {
-        TANGENT_TO_CURVE
-        , N_("Tangent to curve") //label
-        , "tangent_to_curve" //key
+        PATH_LENGTH
+        , N_("Path length") //label
+        , "path_length" //key
         , "experimental" //icon
-        , "Tangent to curve" //untranslated name
-        , N_("Draw a tangent with variable length and additional angle that can be moved along the path") //description
+        , "Path length" //untranslated name
+        , N_("Display the total length of a (curved) path") //description
+        , true  //on_path
+        , true  //on_shape
+        , true  //on_group
+        , false //on_image
+        , false //on_text
+        , true //experimental
+    },
+    {
+        RECURSIVE_SKELETON
+        , N_("Recursive skeleton") //label
+        , "recursive_skeleton" //key
+        , "experimental" //icon
+        , "Recursive skeleton" //untranslated name
+        , N_("Draw a path recursively") //description
         , true  //on_path
         , true  //on_shape
         , true  //on_group