diff options
| author | Michael Soegtrop <MSoegtrop@yahoo.de> | 2017-06-05 18:59:36 +0000 |
|---|---|---|
| committer | Michael Soegtrop <MSoegtrop@yahoo.de> | 2017-06-05 18:59:36 +0000 |
| commit | cfb1e23e906e35f0d4e7bbd9fcbb047c3a3788bf (patch) | |
| tree | 9c57c1bb09bc22960ad1dfc1e8196950249725a5 /src/live_effects | |
| parent | merged with latest version of lpe-bool and trunk (diff) | |
| download | inkscape-cfb1e23e906e35f0d4e7bbd9fcbb047c3a3788bf.tar.gz inkscape-cfb1e23e906e35f0d4e7bbd9fcbb047c3a3788bf.zip | |
fixed enum order + added cpp files to POFILES.in
(bzr r14862.2.4)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/effect-enum.h | 4 | ||||
| -rw-r--r-- | src/live_effects/effect.cpp | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h index 0ad9c5230..5cc4d58e5 100644 --- a/src/live_effects/effect-enum.h +++ b/src/live_effects/effect-enum.h @@ -42,8 +42,6 @@ enum EffectType { TAPER_STROKE, MIRROR_SYMMETRY, COPY_ROTATE, - EMBRODERY_STITCH, - BOOL_OP, ATTACH_PATH, FILL_BETWEEN_STROKES, FILL_BETWEEN_MANY, @@ -51,6 +49,8 @@ enum EffectType { BOUNDING_BOX, MEASURE_LINE, FILLET_CHAMFER, + BOOL_OP, + EMBRODERY_STITCH, DOEFFECTSTACK_TEST, ANGLE_BISECTOR, CIRCLE_WITH_RADIUS, diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 44580b9b2..e5a879241 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -118,8 +118,6 @@ const Util::EnumData<EffectType> LPETypeData[] = { {MIRROR_SYMMETRY, N_("Mirror symmetry"), "mirror_symmetry"}, {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, /* Ponyscape -> Inkscape 0.92*/ - {EMBRODERY_STITCH, N_("Embrodery stitch"), "embrodery_stitch"}, - {BOOL_OP, N_("Boolean operation"), "bool_op"}, {ATTACH_PATH, N_("Attach path"), "attach_path"}, {FILL_BETWEEN_STROKES, N_("Fill between strokes"), "fill_between_strokes"}, {FILL_BETWEEN_MANY, N_("Fill between many"), "fill_between_many"}, @@ -128,6 +126,8 @@ const Util::EnumData<EffectType> LPETypeData[] = { /* 9.93 */ {MEASURE_LINE, N_("Measure Line"), "measure_line"}, {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet_chamfer"}, + {BOOL_OP, N_("Boolean operation"), "bool_op"}, + {EMBRODERY_STITCH, N_("Embrodery stitch"), "embrodery_stitch"}, #ifdef LPE_ENABLE_TEST_EFFECTS {DOEFFECTSTACK_TEST, N_("doEffect stack test"), "doeffectstacktest"}, {ANGLE_BISECTOR, N_("Angle bisector"), "angle_bisector"}, @@ -171,11 +171,9 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case EMBRODERY_STITCH: neweffect = static_cast<Effect*> ( new LPEEmbroderyStitch(lpeobj) ); break; - case BOOL_OP: neweffect = static_cast<Effect*> ( new LPEBool(lpeobj) ); break; - case PATTERN_ALONG_PATH: neweffect = static_cast<Effect*> ( new LPEPatternAlongPath(lpeobj) ); break; |