Reorder LPE enum to match definition in effect.cpp. also fix a bug pointed by Ede_123 in IRC, LPE dialog show bad default selected LPE

(bzr r15670)

2 files changed, 54 insertions, 55 deletions

diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h
index 3682aa1bd..a6920c1fb 100644
--- a/src/live_effects/effect-enum.h
+++ b/src/live_effects/effect-enum.h
@@ -16,57 +16,55 @@ namespace LivePathEffect {
 
 enum EffectType {
     BEND_PATH = 0,
+    GEARS,
     PATTERN_ALONG_PATH,
-    FREEHAND_SHAPE,
-    SKETCH,
-    ROUGH_HATCHES,
+    CURVE_STITCH,
     VONKOCH,
     KNOT,
-    GEARS,
-    CURVE_STITCH,
-    CIRCLE_WITH_RADIUS,
-    PERSPECTIVE_PATH,
+    CONSTRUCT_GRID,
     SPIRO,
-    LATTICE,
-    LATTICE2,
-    ROUGHEN,
-    SHOW_HANDLES,
-    SIMPLIFY,
     ENVELOPE,
-    CONSTRUCT_GRID,
-    PERP_BISECTOR,
-    TANGENT_TO_CURVE,
-    MEASURE_LINE,
-    MIRROR_SYMMETRY,
-    CIRCLE_3PTS,
-    TRANSFORM_2PTS,
-    ANGLE_BISECTOR,
-    PARALLEL,
-    COPY_ROTATE,
-    OFFSET,
-    RULER,
-    BOOLOPS,
     INTERPOLATE,
-    INTERPOLATE_POINTS,
-    TEXT_LABEL,
-    PATH_LENGTH,
-    LINE_SEGMENT,
-    DOEFFECTSTACK_TEST,
-    BSPLINE,
-    DYNASTROKE,
-    RECURSIVE_SKELETON,
-    EXTRUDE,
+    ROUGH_HATCHES,
+    SKETCH,
+    RULER,
     POWERSTROKE,
     CLONE_ORIGINAL,
+    SIMPLIFY,
+    LATTICE2,
+    PERSPECTIVE_ENVELOPE,
+    INTERPOLATE_POINTS,
+    TRANSFORM_2PTS,
+    SHOW_HANDLES,
+    ROUGHEN,
+    BSPLINE,
+    JOIN_TYPE,
+    TAPER_STROKE,
+    MIRROR_SYMMETRY,
+    COPY_ROTATE,
     ATTACH_PATH,
     FILL_BETWEEN_STROKES,
     FILL_BETWEEN_MANY,
     ELLIPSE_5PTS,
     BOUNDING_BOX,
-    JOIN_TYPE,
-    TAPER_STROKE,
-    PERSPECTIVE_ENVELOPE,
+    MEASURE_LINE,
     FILLET_CHAMFER,
+    DOEFFECTSTACK_TEST,
+    ANGLE_BISECTOR,
+    CIRCLE_WITH_RADIUS,
+    CIRCLE_3PTS,
+    DYNASTROKE,
+    EXTRUDE,
+    LATTICE,
+    LINE_SEGMENT,
+    OFFSET,
+    PARALLEL,
+    PATH_LENGTH,
+    PERP_BISECTOR,
+    PERSPECTIVE_PATH,
+    RECURSIVE_SKELETON,
+    TANGENT_TO_CURVE,
+    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 467a65c7c..6ab50b1c0 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -84,24 +84,6 @@ namespace LivePathEffect {
 
 const Util::EnumData<EffectType> LPETypeData[] = {
     // {constant defined in effect-enum.h, N_("name of your effect"), "name of your effect in SVG"}
-#ifdef LPE_ENABLE_TEST_EFFECTS
-    {DOEFFECTSTACK_TEST,    N_("doEffect stack test"),             "doeffectstacktest"},
-    {ANGLE_BISECTOR,        N_("Angle bisector"),                  "angle_bisector"},
-    {CIRCLE_WITH_RADIUS,    N_("Circle (by center and radius)"),   "circle_with_radius"},
-    {CIRCLE_3PTS,           N_("Circle by 3 points"),              "circle_3pts"},
-    {DYNASTROKE,            N_("Dynamic stroke"),                  "dynastroke"},
-    {EXTRUDE,               N_("Extrude"),                         "extrude"},
-    {LATTICE,               N_("Lattice Deformation"),             "lattice"},
-    {LINE_SEGMENT,          N_("Line Segment"),                    "line_segment"},
-    {OFFSET,                N_("Offset"),                          "offset"},
-    {PARALLEL,              N_("Parallel"),                        "parallel"},
-    {PATH_LENGTH,           N_("Path length"),                     "path_length"},
-    {PERP_BISECTOR,         N_("Perpendicular bisector"),          "perp_bisector"},
-    {PERSPECTIVE_PATH,      N_("Perspective path"),                "perspective_path"},
-    {RECURSIVE_SKELETON,    N_("Recursive skeleton"),              "recursive_skeleton"},
-    {TANGENT_TO_CURVE,      N_("Tangent to curve"),                "tangent_to_curve"},
-    {TEXT_LABEL,            N_("Text label"),                      "text_label"},
-#endif
 /* 0.46 */
     {BEND_PATH,             N_("Bend"),                            "bend_path"},
     {GEARS,                 N_("Gears"),                           "gears"},
@@ -142,6 +124,25 @@ const Util::EnumData<EffectType> LPETypeData[] = {
 /* 9.93 */
     {MEASURE_LINE,          N_("Measure Line"),                    "measure_line"},
     {FILLET_CHAMFER,        N_("Fillet/Chamfer"),                  "fillet_chamfer"},
+#ifdef LPE_ENABLE_TEST_EFFECTS
+    {DOEFFECTSTACK_TEST,    N_("doEffect stack test"),             "doeffectstacktest"},
+    {ANGLE_BISECTOR,        N_("Angle bisector"),                  "angle_bisector"},
+    {CIRCLE_WITH_RADIUS,    N_("Circle (by center and radius)"),   "circle_with_radius"},
+    {CIRCLE_3PTS,           N_("Circle by 3 points"),              "circle_3pts"},
+    {DYNASTROKE,            N_("Dynamic stroke"),                  "dynastroke"},
+    {EXTRUDE,               N_("Extrude"),                         "extrude"},
+    {LATTICE,               N_("Lattice Deformation"),             "lattice"},
+    {LINE_SEGMENT,          N_("Line Segment"),                    "line_segment"},
+    {OFFSET,                N_("Offset"),                          "offset"},
+    {PARALLEL,              N_("Parallel"),                        "parallel"},
+    {PATH_LENGTH,           N_("Path length"),                     "path_length"},
+    {PERP_BISECTOR,         N_("Perpendicular bisector"),          "perp_bisector"},
+    {PERSPECTIVE_PATH,      N_("Perspective path"),                "perspective_path"},
+    {RECURSIVE_SKELETON,    N_("Recursive skeleton"),              "recursive_skeleton"},
+    {TANGENT_TO_CURVE,      N_("Tangent to curve"),                "tangent_to_curve"},
+    {TEXT_LABEL,            N_("Text label"),                      "text_label"},
+#endif
+
 };
 const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData));