Rollback 15315

(bzr r15295.1.25)

57 files changed, 355 insertions, 330 deletions

diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp
index 56d33eb4b..9bfbf4ca8 100644
--- a/src/live_effects/lpe-angle_bisector.cpp
+++ b/src/live_effects/lpe-angle_bisector.cpp
@@ -8,13 +8,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-angle_bisector.h"
-#include "2geom/sbasis-to-bezier.h"
+
+#include <2geom/sbasis-to-bezier.h>
+
 #include "sp-lpe-item.h"
 #include "knot-holder-entity.h"
 #include "knotholder.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp
index 302165719..d2b44dd4e 100644
--- a/src/live_effects/lpe-attach-path.cpp
+++ b/src/live_effects/lpe-attach-path.cpp
@@ -4,14 +4,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm/i18n.h>
 #include <math.h>
+
 #include "live_effects/lpe-attach-path.h"
+
 #include "display/curve.h"
 #include "sp-shape.h"
 #include "sp-text.h"
 #include "2geom/path-sink.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index b1e133292..c24d38d7b 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -7,10 +7,9 @@
 
 #include "live_effects/lpe-bendpath.h"
 #include "sp-item-group.h"
+
 #include "knot-holder-entity.h"
 #include "knotholder.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 using std::vector;
 
diff --git a/src/live_effects/lpe-bounding-box.cpp b/src/live_effects/lpe-bounding-box.cpp
index 11fb34e04..2de768c3a 100644
--- a/src/live_effects/lpe-bounding-box.cpp
+++ b/src/live_effects/lpe-bounding-box.cpp
@@ -3,14 +3,14 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-bounding-box.h"
 
 #include "display/curve.h"
 #include "sp-shape.h"
 #include "sp-text.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-bspline.h b/src/live_effects/lpe-bspline.h
index 90cf82c19..7823f00f0 100644
--- a/src/live_effects/lpe-bspline.h
+++ b/src/live_effects/lpe-bspline.h
@@ -6,8 +6,8 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-
 #include "live_effects/effect.h"
+
 #include <vector>
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-circle_3pts.cpp b/src/live_effects/lpe-circle_3pts.cpp
index 3410b13f2..18252f6a0 100644
--- a/src/live_effects/lpe-circle_3pts.cpp
+++ b/src/live_effects/lpe-circle_3pts.cpp
@@ -17,8 +17,6 @@
 // You might need to include other 2geom files. You can add them here:
 #include <2geom/circle.h>
 #include <2geom/path-sink.h>
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-circle_with_radius.cpp b/src/live_effects/lpe-circle_with_radius.cpp
index fcefc4ec6..6e03cb1ce 100644
--- a/src/live_effects/lpe-circle_with_radius.cpp
+++ b/src/live_effects/lpe-circle_with_radius.cpp
@@ -17,8 +17,6 @@
 // You might need to include other 2geom files. You can add them here:
 #include <2geom/circle.h>
 #include <2geom/path-sink.h>
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 using namespace Geom;
 
diff --git a/src/live_effects/lpe-clone-original.cpp b/src/live_effects/lpe-clone-original.cpp
index 10418a02d..7541c0be2 100644
--- a/src/live_effects/lpe-clone-original.cpp
+++ b/src/live_effects/lpe-clone-original.cpp
@@ -4,10 +4,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-clone-original.h"
+
 #include "display/curve.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-constructgrid.cpp b/src/live_effects/lpe-constructgrid.cpp
index 8d24f9f47..4af8891e8 100644
--- a/src/live_effects/lpe-constructgrid.cpp
+++ b/src/live_effects/lpe-constructgrid.cpp
@@ -10,10 +10,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "live_effects/lpe-constructgrid.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
+#include "live_effects/lpe-constructgrid.h"
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 5b94e9083..1133e083a 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -11,17 +11,36 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
 #include <gdk/gdk.h>
 #include <2geom/path-intersection.h>
 #include <2geom/sbasis-to-bezier.h>
 #include "live_effects/lpe-copy_rotate.h"
+
+#include "knotholder.h"
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
 
+namespace CR {
+
+class KnotHolderEntityStartingAngle : public LPEKnotHolderEntity {
+public:
+    KnotHolderEntityStartingAngle(LPECopyRotate *effect) : LPEKnotHolderEntity(effect) {};
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual Geom::Point knot_get() const;
+};
+
+class KnotHolderEntityRotationAngle : public LPEKnotHolderEntity {
+public:
+    KnotHolderEntityRotationAngle(LPECopyRotate *effect) : LPEKnotHolderEntity(effect) {};
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual Geom::Point knot_get() const;
+};
+
+} // namespace CR
+
 bool 
 pointInTriangle(Geom::Point const &p, Geom::Point const &p1, Geom::Point const &p2, Geom::Point const &p3)
 {
@@ -40,7 +59,6 @@ pointInTriangle(Geom::Point const &p, Geom::Point const &p1, Geom::Point const &
 LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) :
     Effect(lpeobject),
     origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this),
-    starting_point("hidden", "hidden", "starting_point", &wr, this),
     starting_angle(_("Starting:"), _("Angle of the first copy"), "starting_angle", &wr, this, 0.0),
     rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 60.0),
     num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 6),
@@ -56,7 +74,6 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) :
     registerParameter(&copies_to_360);
     registerParameter(&fuse_paths);
     registerParameter(&starting_angle);
-    registerParameter(&starting_point);
     registerParameter(&rotation_angle);
     registerParameter(&num_copies);
     registerParameter(&origin);
@@ -70,41 +87,6 @@ LPECopyRotate::~LPECopyRotate()
 
 }
 
-Gtk::Widget * LPECopyRotate::newWidget()
-{
-    // use manage here, because after deletion of Effect object, others might
-    // still be pointing to this widget.
-    Gtk::VBox *vbox = Gtk::manage(new Gtk::VBox(Effect::newWidget()));
-
-    vbox->set_border_width(5);
-    vbox->set_homogeneous(false);
-    vbox->set_spacing(2);
-
-    std::vector<Parameter *>::iterator it = param_vector.begin();
-    while (it != param_vector.end()) {
-        if ((*it)->widget_is_visible) {
-            Parameter *param = *it;
-            Gtk::Widget *widg = dynamic_cast<Gtk::Widget *>(param->param_newWidget());
-            Glib::ustring *tip = param->param_getTooltip();
-            if (widg) {
-                if (param->param_key != "starting_point") {
-                    vbox->pack_start(*widg, true, true, 2);
-                    if (tip) {
-                        widg->set_tooltip_text(*tip);
-                    } else {
-                        widg->set_tooltip_text("");
-                        widg->set_has_tooltip(false);
-                    }
-                }
-            }
-        }
-
-        ++it;
-    }
-    return dynamic_cast<Gtk::Widget *>(vbox);
-}
-
-
 void
 LPECopyRotate::doOnApply(SPLPEItem const* lpeitem)
 {
@@ -122,6 +104,11 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem)
 void
 LPECopyRotate::transform_multiply(Geom::Affine const& postmul, bool set)
 {
+    if(fuse_paths) {
+        Geom::Coord angle  = Geom::deg_from_rad(atan(-postmul[1]/postmul[0]));
+        angle += starting_angle;
+        starting_angle.param_set_value(angle);
+    }
     // cycle through all parameters. Most parameters will not need transformation, but path and point params do.
 
     for (std::vector<Parameter *>::iterator it = param_vector.begin(); it != param_vector.end(); ++it) {
@@ -159,25 +146,11 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem)
     dir = unit_vector(B - A);
     // I first suspected the minus sign to be a bug in 2geom but it is
     // likely due to SVG's choice of coordinate system orientation (max)
-    bool near = Geom::are_near(previous_start_point, (Geom::Point)starting_point, 0.01);
-    if (!near) { 
-        starting_angle.param_set_value(deg_from_rad(-angle_between(dir, starting_point - origin)));
-        if (GDK_SHIFT_MASK) {
-            dist_angle_handle = L2(B - A);
-        } else {
-            dist_angle_handle = L2(starting_point - origin);
-        }
-    }
     start_pos = origin + dir * Rotate(-rad_from_deg(starting_angle)) * dist_angle_handle;
     rot_pos = origin + dir * Rotate(-rad_from_deg(rotation_angle+starting_angle)) * dist_angle_handle;
-    if (near) { 
-        starting_point.param_setValue(start_pos);
-    }
-    previous_start_point = (Geom::Point)starting_point;
     if ( fuse_paths || copies_to_360 ) {
         rot_pos = origin;
     }
-
     SPLPEItem * item = const_cast<SPLPEItem*>(lpeitem);
     item->apply_to_clippath(item);
     item->apply_to_mask(item);
@@ -445,6 +418,85 @@ LPECopyRotate::resetDefaults(SPItem const* item)
     original_bbox(SP_LPE_ITEM(item));
 }
 
+void
+LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item)
+{
+    {
+        KnotHolderEntity *e = new CR::KnotHolderEntityStartingAngle(this);
+        e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN,
+                   _("Adjust the starting angle"));
+        knotholder->add(e);
+    }
+    {
+        KnotHolderEntity *e = new CR::KnotHolderEntityRotationAngle(this);
+        e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN,
+                   _("Adjust the rotation angle"));
+        knotholder->add(e);
+    }
+};
+
+namespace CR {
+
+using namespace Geom;
+
+void
+KnotHolderEntityStartingAngle::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+{
+    LPECopyRotate* lpe = dynamic_cast<LPECopyRotate *>(_effect);
+
+    Geom::Point const s = snap_knot_position(p, state);
+
+    // I first suspected the minus sign to be a bug in 2geom but it is
+    // likely due to SVG's choice of coordinate system orientation (max)
+    lpe->starting_angle.param_set_value(deg_from_rad(-angle_between(lpe->dir, s - lpe->origin)));
+    if (state & GDK_SHIFT_MASK) {
+        lpe->dist_angle_handle = L2(lpe->B - lpe->A);
+    } else {
+        lpe->dist_angle_handle = L2(p - lpe->origin);
+    }
+
+    // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating.
+    sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true);
+}
+
+void
+KnotHolderEntityRotationAngle::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+{
+    LPECopyRotate* lpe = dynamic_cast<LPECopyRotate *>(_effect);
+
+    Geom::Point const s = snap_knot_position(p, state);
+
+    // I first suspected the minus sign to be a bug in 2geom but it is
+    // likely due to SVG's choice of coordinate system orientation (max)
+    lpe->rotation_angle.param_set_value(deg_from_rad(-angle_between(lpe->dir, s - lpe->origin)) - lpe->starting_angle);
+    if (state & GDK_SHIFT_MASK) {
+        lpe->dist_angle_handle = L2(lpe->B - lpe->A);
+    } else {
+        lpe->dist_angle_handle = L2(p - lpe->origin);
+    }
+
+    // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating.
+    sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true);
+}
+
+Geom::Point
+KnotHolderEntityStartingAngle::knot_get() const
+{
+    LPECopyRotate const *lpe = dynamic_cast<LPECopyRotate const*>(_effect);
+    return lpe->start_pos;
+}
+
+Geom::Point
+KnotHolderEntityRotationAngle::knot_get() const
+{
+    LPECopyRotate const *lpe = dynamic_cast<LPECopyRotate const*>(_effect);
+    return lpe->rot_pos;
+}
+
+} // namespace CR
+
+/* ######################## */
+
 } //namespace LivePathEffect
 } /* namespace Inkscape */
 
diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h
index 8f9fc12ac..87af867df 100644
--- a/src/live_effects/lpe-copy_rotate.h
+++ b/src/live_effects/lpe-copy_rotate.h
@@ -21,6 +21,12 @@
 namespace Inkscape {
 namespace LivePathEffect {
 
+namespace CR {
+// we need a separate namespace to avoid clashes with LPEPerpBisector
+class KnotHolderEntityStartingAngle;
+class KnotHolderEntityRotationAngle;
+}
+
 class LPECopyRotate : public Effect, GroupBBoxEffect {
 public:
     LPECopyRotate(LivePathEffectObject *lpeobject);
@@ -32,13 +38,16 @@ public:
     virtual void split(Geom::PathVector &path_in, Geom::Path const &divider);
     virtual void resetDefaults(SPItem const* item);
     virtual void transform_multiply(Geom::Affine const& postmul, bool set);
-    virtual Gtk::Widget * newWidget();
+    /* the knotholder entity classes must be declared friends */
+    friend class CR::KnotHolderEntityStartingAngle;
+    friend class CR::KnotHolderEntityRotationAngle;
+    void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item);
+
 protected:
     virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec);
 
 private:
     PointParam origin;
-    PointParam starting_point;
     ScalarParam starting_angle;
     ScalarParam rotation_angle;
     ScalarParam num_copies;
@@ -49,7 +58,6 @@ private:
     Geom::Point dir;
     Geom::Point start_pos;
     Geom::Point rot_pos;
-    Geom::Point previous_start_point;
     double dist_angle_handle;
     LPECopyRotate(const LPECopyRotate&);
     LPECopyRotate& operator=(const LPECopyRotate&);
diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp
index 38cbeaac0..3beedaf57 100644
--- a/src/live_effects/lpe-curvestitch.cpp
+++ b/src/live_effects/lpe-curvestitch.cpp
@@ -13,6 +13,8 @@
  */
 
 #include "ui/widget/scalar.h"
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-curvestitch.h"
 
 #include "sp-path.h"
@@ -20,9 +22,6 @@
 #include "xml/repr.h"
 
 #include <2geom/bezier-to-sbasis.h>
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-dynastroke.cpp b/src/live_effects/lpe-dynastroke.cpp
index 50bbe6451..7e22f6e51 100644
--- a/src/live_effects/lpe-dynastroke.cpp
+++ b/src/live_effects/lpe-dynastroke.cpp
@@ -16,8 +16,6 @@
 
 #include <2geom/bezier-to-sbasis.h>
 #include <2geom/sbasis-math.h>
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-ellipse_5pts.cpp b/src/live_effects/lpe-ellipse_5pts.cpp
index 28e7058d7..0371fc313 100644
--- a/src/live_effects/lpe-ellipse_5pts.cpp
+++ b/src/live_effects/lpe-ellipse_5pts.cpp
@@ -12,14 +12,15 @@
  */
 
 #include "live_effects/lpe-ellipse_5pts.h"
+
+// You might need to include other 2geom files. You can add them here:
+#include <glibmm/i18n.h>
 #include <2geom/circle.h>
 #include <2geom/ellipse.h>
 #include <2geom/path-sink.h>
 #include "inkscape.h"
 #include "desktop.h"
 #include "message-stack.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp
index 61a696435..c3b0a7c10 100644
--- a/src/live_effects/lpe-envelope.cpp
+++ b/src/live_effects/lpe-envelope.cpp
@@ -6,8 +6,6 @@
 
 #include "live_effects/lpe-envelope.h"
 #include "display/curve.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 using std::vector;
 
diff --git a/src/live_effects/lpe-extrude.cpp b/src/live_effects/lpe-extrude.cpp
index daa30d45a..d22007f76 100644
--- a/src/live_effects/lpe-extrude.cpp
+++ b/src/live_effects/lpe-extrude.cpp
@@ -12,10 +12,10 @@
  */
 
 #include "live_effects/lpe-extrude.h"
-#include "sp-item.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
+
 #include <glibmm/i18n.h>
 
+#include "sp-item.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-fill-between-many.cpp b/src/live_effects/lpe-fill-between-many.cpp
index 1e2eadfdb..2087925fa 100644
--- a/src/live_effects/lpe-fill-between-many.cpp
+++ b/src/live_effects/lpe-fill-between-many.cpp
@@ -11,7 +11,7 @@
 #include "display/curve.h"
 #include "sp-shape.h"
 #include "sp-text.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
+
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-fill-between-strokes.cpp b/src/live_effects/lpe-fill-between-strokes.cpp
index 0dbebdf26..b1e328d18 100644
--- a/src/live_effects/lpe-fill-between-strokes.cpp
+++ b/src/live_effects/lpe-fill-between-strokes.cpp
@@ -3,13 +3,14 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-fill-between-strokes.h"
 
 #include "display/curve.h"
 #include "sp-shape.h"
 #include "sp-text.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 1e2df7dc8..24ee2ccc3 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -25,8 +25,8 @@
 
 // for programmatically updating knots
 #include "ui/tools-switch.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 using namespace Geom;
 namespace Inkscape {
diff --git a/src/live_effects/lpe-gears.cpp b/src/live_effects/lpe-gears.cpp
index 17579c64e..1d5398aa5 100644
--- a/src/live_effects/lpe-gears.cpp
+++ b/src/live_effects/lpe-gears.cpp
@@ -7,10 +7,11 @@
  */
 
 #include "live_effects/lpe-gears.h"
-#include <2geom/bezier-to-sbasis.h>
-// TODO due to internal breakage in glibmm headers, this must be last:
+
 #include <glibmm/i18n.h>
 
+#include <2geom/bezier-to-sbasis.h>
+
 using std::vector;
 using namespace Geom;
 
diff --git a/src/live_effects/lpe-interpolate.cpp b/src/live_effects/lpe-interpolate.cpp
index e95dc5f38..43da4d105 100644
--- a/src/live_effects/lpe-interpolate.cpp
+++ b/src/live_effects/lpe-interpolate.cpp
@@ -9,15 +9,15 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-interpolate.h"
 
 #include <2geom/sbasis-to-bezier.h>
 
 #include "sp-path.h"
 #include "display/curve.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-interpolate_points.cpp b/src/live_effects/lpe-interpolate_points.cpp
index 0a0bcea14..ab0576174 100644
--- a/src/live_effects/lpe-interpolate_points.cpp
+++ b/src/live_effects/lpe-interpolate_points.cpp
@@ -12,9 +12,8 @@
  */
 
 #include "live_effects/lpe-interpolate_points.h"
+
 #include "live_effects/lpe-powerstroke-interpolators.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp
index dacb87dd9..3bfbd6288 100644
--- a/src/live_effects/lpe-jointype.cpp
+++ b/src/live_effects/lpe-jointype.cpp
@@ -19,8 +19,6 @@
 #include <2geom/elliptical-arc.h>
 
 #include "lpe-jointype.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index c35da0601..474523aa3 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -33,9 +33,6 @@
 #include "document.h"
 #include "document-undo.h"
 
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp
index acffed000..091b6ddca 100644
--- a/src/live_effects/lpe-lattice.cpp
+++ b/src/live_effects/lpe-lattice.cpp
@@ -20,8 +20,7 @@
 
 #include <2geom/sbasis-2d.h>
 #include <2geom/bezier-to-sbasis.h>
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
+
 using namespace Geom;
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index e827491c0..9e9fc153a 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -16,15 +16,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
 #include "live_effects/lpe-lattice2.h"
 #include "display/curve.h"
 #include "helper/geom.h"
 #include <2geom/sbasis-2d.h>
 #include <2geom/bezier-to-sbasis.h>
-
 // TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 using namespace Geom;
 
diff --git a/src/live_effects/lpe-lattice2.h b/src/live_effects/lpe-lattice2.h
index 59a0350d3..4a025d182 100644
--- a/src/live_effects/lpe-lattice2.h
+++ b/src/live_effects/lpe-lattice2.h
@@ -18,7 +18,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-
+#include <gtkmm.h>
 #include "live_effects/effect.h"
 #include "live_effects/parameter/enum.h"
 #include "live_effects/parameter/point.h"
diff --git a/src/live_effects/lpe-line_segment.cpp b/src/live_effects/lpe-line_segment.cpp
index cc024fb92..4c9edabd4 100644
--- a/src/live_effects/lpe-line_segment.cpp
+++ b/src/live_effects/lpe-line_segment.cpp
@@ -13,8 +13,6 @@
 
 #include "live_effects/lpe-line_segment.h"
 #include "ui/tools/lpe-tool.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index f34421df2..11620b23f 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -13,10 +13,6 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-
-#include <gtkmm.h>
-#include "live_effects/lpeobject.h"
-#include "live_effects/lpeobject-reference.h"
 #include "live_effects/lpe-mirror_symmetry.h"
 #include "display/curve.h"
 #include "svg/path-string.h"
@@ -31,7 +27,6 @@
 #include "knotholder.h"
 #include "style.h"
 #include "xml/sp-css-attr.h"
-
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
@@ -48,6 +43,17 @@ static const Util::EnumData<ModeType> ModeTypeData[MT_END] = {
 static const Util::EnumDataConverter<ModeType>
 MTConverter(ModeTypeData, MT_END);
 
+namespace MS {
+
+class KnotHolderEntityCenterMirrorSymmetry : public LPEKnotHolderEntity {
+public:
+    KnotHolderEntityCenterMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect){};
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual Geom::Point knot_get() const;
+};
+
+} // namespace MS
+
 LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) :
     Effect(lpeobject),
     mode(_("Mode"), _("Symmetry move mode"), "mode", MTConverter, &wr, this, MT_FREE),
@@ -55,26 +61,27 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) :
     discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false),
     fuse_paths(_("Fuse paths"), _("Fuse original and the reflection into a single path"), "fuse_paths", &wr, this, false),
     oposite_fuse(_("Opposite fuse"), _("Picks the other side of the mirror as the original"), "oposite_fuse", &wr, this, false),
-    split_elements(_("Split elements"), _("Split elements, this allow gradients and other paints. Group result to apply nested"), "split_elements", &wr, this, false),
-    start_point(_("Start mirror line"), _("Start mirror line"), "start_point", &wr, this, _("Adjust the start of mirroring")),
-    end_point(_("End mirror line"), _("End mirror line"), "end_point", &wr, this, _("Adjust end of mirroring")),
-    center_point(_("Center mirror line"), _("Center mirror line"), "center_point", &wr, this, _("Adjust center of mirroring"))
+    split_elements(_("Split elements"), _("Split elements, this allow gradients and other paints"), "split_elements", &wr, this, false),
+    start_point(_("Start mirror line"), _("Start mirror line"), "start_point", &wr, this, "Adjust the start of mirroring"),
+    end_point(_("End mirror line"), _("End mirror line"), "end_point", &wr, this, "Adjust end of mirroring"),
+    id_origin("id_origin", "id_origin", "id_origin", &wr, this,"")
 {
     show_orig_path = true;
     registerParameter(&mode);
-    registerParameter(&split_gap);
-    registerParameter(&discard_orig_path);
-    registerParameter(&fuse_paths);
-    registerParameter(&oposite_fuse);
-    registerParameter(&split_elements);
-    registerParameter(&start_point);
-    registerParameter(&end_point);
-    registerParameter(&center_point);
+    registerParameter( &split_gap);
+    registerParameter( &discard_orig_path);
+    registerParameter( &fuse_paths);
+    registerParameter( &oposite_fuse);
+    registerParameter( &split_elements);
+    registerParameter( &start_point);
+    registerParameter( &end_point);
+    registerParameter( &id_origin);
+    id_origin.param_hide_canvas_text();
     split_gap.param_set_range(-999999.0, 999999.0);
     split_gap.param_set_increments(0.1, 0.1);
     split_gap.param_set_digits(2);
     apply_to_clippath_and_mask = true;
-    previous_center = Geom::Point(0,0);
+    actual = true;
 }
 
 LPEMirrorSymmetry::~LPEMirrorSymmetry()
@@ -87,10 +94,11 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem)
     SPLPEItem * splpeitem = const_cast<SPLPEItem *>(lpeitem);
     if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
         Inkscape::Selection *sel = desktop->getSelection();
-        if ( sel && !sel->isEmpty()) {
+        if ( sel && !sel->isEmpty() && actual) {
             SPItem *item = sel->singleItem();
             if (item) {
                 if(std::strcmp(splpeitem->getId(),item->getId()) != 0) {
+                    actual = false;
                     return;
                 }
             }
@@ -109,14 +117,11 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem)
         point_a = Geom::Point(center_point[X],boundingbox_Y.min());
         point_b = Geom::Point(center_point[X],boundingbox_Y.max());
     }
-    if (Geom::are_near((Geom::Point)start_point, (Geom::Point)end_point, 0.01)) {
-        start_point.param_setValue(point_a);
-        end_point.param_setValue(point_b);
-    }
     line_separation.setPoints(point_a, point_b);
     if ( mode == MT_X || mode == MT_Y ) {
         start_point.param_setValue(point_a);
         end_point.param_setValue(point_b);
+        center_point = Geom::middle_point(point_a, point_b);
     } else if ( mode == MT_FREE) {
         if(!are_near(previous_center,center_point, 0.01)) {
             Geom::Point trans = center_point - previous_center;
@@ -124,6 +129,7 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem)
             end_point.param_setValue(end_point * trans);
             line_separation.setPoints(start_point, end_point);
         } else {
+            center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point);
             line_separation.setPoints(start_point, end_point);
         }
     } else if ( mode == MT_V){
@@ -136,6 +142,7 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem)
             Geom::Point ep = Geom::Point(view_box_rect.width()/2.0, view_box_rect.height());
             ep *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse();
             end_point.param_setValue(ep);
+            center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point);
             line_separation.setPoints(start_point, end_point);
         }
     } else { //horizontal page
@@ -148,56 +155,53 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem)
             Geom::Point ep = Geom::Point(view_box_rect.width(), view_box_rect.height()/2.0);
             ep *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse();
             end_point.param_setValue(ep);
+            center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point);
             line_separation.setPoints(start_point, end_point);
         }
     }
-    
-    previous_center = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point);
-    if (!are_near(previous_center, center_point,0.01)) {
-        center_point.param_setValue(previous_center);
-    }
-    if (split_elements && allow_split()) {
-        container = dynamic_cast<SPObject *>(splpeitem->parent);
+    previous_center = center_point;
+    if (split_elements) {
+        ms_container = dynamic_cast<SPObject *>(splpeitem->parent);
         SPDocument * doc = SP_ACTIVE_DOCUMENT;
         Inkscape::XML::Node *root = splpeitem->document->getReprRoot();
         Inkscape::XML::Node *root_origin = doc->getReprRoot();
         if (root_origin != root) {
             return;
         }
-        const char * mirror = g_strdup(Glib::ustring("mirror-b-").append(this->getRepr()->attribute("id")).c_str());
-//        if (std::strcmp(splpeitem->getId(), mirror_b) == 0) {
-//            syncMirror(splpeitem, mirror_a);
-//        } else {
-            Geom::Point point_a(line_separation.initialPoint());
-            Geom::Point point_b(line_separation.finalPoint());
-            Geom::Point gap(split_gap,0);
-            Geom::Translate m1(point_a[0], point_a[1]);
-            double hyp = Geom::distance(point_a, point_b);
-            double cos = 0;
-            double sin = 0;
-            if (hyp > 0) {
-                cos = (point_b[0] - point_a[0]) / hyp;
-                sin = (point_b[1] - point_a[1]) / hyp;
-            }
-            Geom::Affine m2(cos, -sin, sin, cos, 0.0, 0.0);
-            Geom::Point dir = unit_vector(point_b - point_a);
-            Geom::Point offset = (point_a + point_b)/2 + dir.ccw() * split_gap;
-            line_separation *= Geom::Translate(offset);
-            Geom::Scale sca(1.0, -1.0);
-            m = m1.inverse() * m2;
-            m = m * sca;
-            m = m * m2.inverse();
-            m = m * m1;
-            m = m * splpeitem->transform;
-            createMirror(splpeitem, m);
-        //}
-    } else {
-        if (!allow_split()) {
-            std::cout << "Only one operation of split allowed. Group results to nested effects.\n";
-            split_elements.param_setValue(false);
+        Geom::Point point_a(line_separation.initialPoint());
+        Geom::Point point_b(line_separation.finalPoint());
+        Geom::Point gap(split_gap,0);
+        Geom::Translate m1(point_a[0], point_a[1]);
+        double hyp = Geom::distance(point_a, point_b);
+        double cos = 0;
+        double sin = 0;
+        if (hyp > 0) {
+            cos = (point_b[0] - point_a[0]) / hyp;
+            sin = (point_b[1] - point_a[1]) / hyp;
         }
-        processObjects(LPE_ERASE);
+        Geom::Affine m2(cos, -sin, sin, cos, 0.0, 0.0);
+        Geom::Point dir = unit_vector(point_b - point_a);
+        Geom::Point offset = (point_a + point_b)/2 + dir.ccw() * split_gap;
+        line_separation *= Geom::Translate(offset);
+        Geom::Scale sca(1.0, -1.0);
+        const char * id_original = id_origin.param_getSVGValue();
+        const char * id = g_strdup(Glib::ustring("mirror-").append(id_original).append("-").append(this->getRepr()->attribute("id")).c_str());
+        m = m1.inverse() * m2;
+        m = m * sca;
+        m = m * m2.inverse();
+        m = m * m1;
+        m = m * lpeitem->transform;
+        if (std::strcmp(splpeitem->getId(), id) == 0) {
+            createMirror(splpeitem, m, id_original);
+        } else {
+            createMirror(splpeitem, m, id);
+        }
+        elements.clear();
+        elements.push_back(id);
+        elements.push_back(id_original);
+    } else {
         elements.clear();
+        processObjects(LPE_ERASE);
     }
 }
 
@@ -251,7 +255,7 @@ LPEMirrorSymmetry::cloneAttrbutes(SPObject *origin, SPObject *dest, bool live, c
                 if (c) {
                     dest->getRepr()->setAttribute(att,sp_svg_write_path(c->get_pathvector()));
                     c->reset();
-                    g_free(c);
+                    g_free(c);                    
                 } else {
                     dest->getRepr()->setAttribute(att,NULL);
                 }
@@ -264,19 +268,9 @@ LPEMirrorSymmetry::cloneAttrbutes(SPObject *origin, SPObject *dest, bool live, c
 }
 
 void
-LPEMirrorSymmetry::createMirror(SPLPEItem *origin, Geom::Affine transform)
+LPEMirrorSymmetry::createMirror(SPLPEItem *origin, Geom::Affine transform, const char * id)
 {
     if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
-        const char * id;
-        Glib::ustring idbase = Glib::ustring(sp_lpe_item->getId());
-        size_t pos = idbase.find("-mirror");
-        if (pos <= idbase.size()) {
-            id = g_strdup(idbase.substr(pos).c_str());
-        } else {
-            id = g_strdup(idbase.append("-mirror").c_str());
-            elements.clear();
-            elements.push_back(id);
-        }
         Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
         Inkscape::URI SVGElem_uri(Glib::ustring("#").append(id).c_str());
         Inkscape::URIReference* SVGElemRef = new Inkscape::URIReference(desktop->doc());
@@ -288,95 +282,24 @@ LPEMirrorSymmetry::createMirror(SPLPEItem *origin, Geom::Affine transform)
         } else {
             phantom = origin->getRepr()->duplicate(xml_doc);
         }
+
         phantom->setAttribute("id", id);
         if (!elemref) {
-            elemref = container->appendChildRepr(phantom);
+            elemref = ms_container->appendChildRepr(phantom);
             Inkscape::GC::release(phantom);
         }
-        cloneAttrbutes(SP_OBJECT(origin), elemref, true, "inkscape:original-d", "inkscape:path-effect", NULL); //NULL required
+        cloneAttrbutes(SP_OBJECT(origin), elemref, true, "inkscape:original-d", NULL); //NULL required
         elemref->getRepr()->setAttribute("transform" , sp_svg_transform_write(transform));
-        if (elemref->parent != container) {
+        if (elemref->parent != ms_container) {
             Inkscape::XML::Node *copy = phantom->duplicate(xml_doc);
             copy->setAttribute("id", id);
-            container->appendChildRepr(copy);
+            ms_container->appendChildRepr(copy);
             Inkscape::GC::release(copy);
             elemref->deleteObject();
         }
     }
 }
 
-//void
-//LPEMirrorSymmetry::syncMirror(SPLPEItem *origin, const char * id)
-//{
-//    if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
-//        Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
-//        Inkscape::URI SVGElem_uri(Glib::ustring("#").append(id).c_str());
-//        Inkscape::URIReference* SVGElemRef = new Inkscape::URIReference(desktop->doc());
-//        SVGElemRef->attach(SVGElem_uri);
-//        SPObject *elemref= NULL;
-//        Inkscape::XML::Node *phantom = NULL;
-//        if (elemref = SVGElemRef->getObject()) {
-//            cloneAttrbutes(SP_OBJECT(origin), elemref, true, "inkscape:original-d", "inkscape:path-effect", NULL); //NULL required
-//        }
-//    }
-//}
-
-bool 
-LPEMirrorSymmetry::allow_split(){
-    if (sp_lpe_item->path_effect_list->empty()) {
-        return false;
-    }
-    size_t count = 0;
-    for (PathEffectList::const_iterator it = sp_lpe_item->path_effect_list->begin(); it != sp_lpe_item->path_effect_list->end(); ++it)
-    {
-        LivePathEffectObject *lpeobj = (*it)->lpeobject;
-        if (lpeobj) {
-            Inkscape::LivePathEffect::LPEMirrorSymmetry * ms = dynamic_cast<Inkscape::LivePathEffect::LPEMirrorSymmetry *>(lpeobj->get_lpe());
-            if (ms && ms->split_elements) {
-                count++;
-            }
-        }
-    }
-    return count <= 1;
-}
-
-//Gtk::Widget *
-//LPEMirrorSymmetry::newWidget()
-//{
-//    // use manage here, because after deletion of Effect object, others might
-//    // still be pointing to this widget.
-//    Gtk::VBox *vbox = Gtk::manage(new Gtk::VBox(Effect::newWidget()));
-
-//    vbox->set_border_width(5);
-//    std::vector<Parameter *>::iterator it = param_vector.begin();
-//    while (it != param_vector.end()) {
-//        if ((*it)->widget_is_visible) {
-//            Parameter *param = *it;
-//            Gtk::Widget *widg = dynamic_cast<Gtk::Widget *>(param->param_newWidget());
-//            if (widg) {
-//                if (param->param_key == "split_elements") {
-//                    Gtk::CheckButton *widg_registered = Gtk::manage(dynamic_cast<Gtk::CheckButton *>(widg));
-//                    if (!allow_split()) {
-//                        widg_registered->set_sensitive("false");
-//                    }
-//                    widg = dynamic_cast<Gtk::Widget *>(widg_registered);
-//                }
-//                Glib::ustring *tip = param->param_getTooltip();
-//                vbox->pack_start(*widg, true, true, 2);
-//                if (tip) {
-//                    widg->set_tooltip_text(*tip);
-//                } else {
-//                    widg->set_tooltip_text("");
-//                    widg->set_has_tooltip(false);
-//                }
-//            }
-//        }
-
-//        ++it;
-//    }
-//    return dynamic_cast<Gtk::Widget *>(vbox);
-//}
-
 //TODO: Migrate the tree next function to effect.cpp/h to avoid duplication
 void
 LPEMirrorSymmetry::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
@@ -426,15 +349,15 @@ LPEMirrorSymmetry::processObjects(LpeAction lpe_action)
                     break;
 
                 case LPE_ERASE:
-                    //if (std::strcmp(elemref->getId(),sp_lpe_item->getId()) != 0) {
+                    if (std::strcmp(elemref->getId(),id_origin.param_getSVGValue()) != 0) {
                         elemref->deleteObject();
-                    //}
+                    }
                     break;
 
                 case LPE_VISIBILITY:
                     css = sp_repr_css_attr_new();
                     sp_repr_css_attr_add_from_string(css, elemref->getRepr()->attribute("style"));
-                    if (!this->isVisible()/* && std::strcmp(elemref->getId(),sp_lpe_item->getId()) != 0*/) {
+                    if (!this->isVisible() && std::strcmp(elemref->getId(),id_origin.param_getSVGValue()) != 0) {
                         css->setAttribute("display", "none");
                     } else {
                         css->setAttribute("display", NULL);
@@ -459,6 +382,8 @@ void
 LPEMirrorSymmetry::transform_multiply(Geom::Affine const& postmul, bool set)
 {
     if( !split_elements) {
+        center_point *= postmul;
+        previous_center = center_point;
         // cycle through all parameters. Most parameters will not need transformation, but path and point params do.
         for (std::vector<Parameter *>::iterator it = param_vector.begin(); it != param_vector.end(); ++it) {
             Parameter * param = *it;
@@ -481,15 +406,10 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem)
     start_point.param_update_default(point_a);
     end_point.param_setValue(point_b);
     end_point.param_update_default(point_b);
-    center_point.param_setValue(point_c);
+    center_point = point_c;
     previous_center = center_point;
-//    SPLPEItem * splpeitem = const_cast<SPLPEItem *>(lpeitem);
-//    if (!lpeitem->hasPathEffectOfType(this->effectType(), false) ){ //first applied not ready yet
-//        const char * mirror_a = g_strdup(Glib::ustring("mirror-a-").append(this->getRepr()->attribute("id")).c_str());
-//        splpeitem->setAttribute("id", mirror_a);
-//        first_lpe.param_setValue(this->getRepr()->attribute("id"));
-//        first_lpe.write_to_SVG();
-//    }
+    id_origin.param_setValue(Glib::ustring(lpeitem->getId()));
+    id_origin.write_to_SVG();
 }
 
 
@@ -640,6 +560,41 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in)
     return path_out;
 }
 
+
+Gtk::Widget *LPEMirrorSymmetry::newWidget()
+{
+    // use manage here, because after deletion of Effect object, others might
+    // still be pointing to this widget.
+    Gtk::VBox *vbox = Gtk::manage(new Gtk::VBox(Effect::newWidget()));
+
+    vbox->set_border_width(5);
+    vbox->set_homogeneous(false);
+    vbox->set_spacing(2);
+
+    std::vector<Parameter *>::iterator it = param_vector.begin();
+    while (it != param_vector.end()) {
+        if ((*it)->widget_is_visible) {
+            Parameter *param = *it;
+            Gtk::Widget *widg = dynamic_cast<Gtk::Widget *>(param->param_newWidget());
+            Glib::ustring *tip = param->param_getTooltip();
+            if (widg) {
+                if (param->param_key != "id_origin") {
+                    vbox->pack_start(*widg, true, true, 2);
+                    if (tip) {
+                        widg->set_tooltip_text(*tip);
+                    } else {
+                        widg->set_tooltip_text("");
+                        widg->set_has_tooltip(false);
+                    }
+                }
+            }
+        }
+
+        ++it;
+    }
+    return dynamic_cast<Gtk::Widget *>(vbox);
+}
+
 void
 LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec)
 {
@@ -655,6 +610,43 @@ LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector
     hp_vec.push_back(helper);
 }
 
+void
+LPEMirrorSymmetry::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item)
+{
+    SPKnotShapeType knot_shape =  SP_KNOT_SHAPE_CIRCLE;
+    SPKnotModeType knot_mode = SP_KNOT_MODE_XOR;
+    guint32 knot_color = 0x0000ff00;
+    {
+        KnotHolderEntity *c = new MS::KnotHolderEntityCenterMirrorSymmetry(this);
+        c->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN,
+                   _("Adjust the center"), knot_shape, knot_mode, knot_color );
+        knotholder->add(c);
+    }
+};
+
+namespace MS {
+
+using namespace Geom;
+
+void
+KnotHolderEntityCenterMirrorSymmetry::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state)
+{
+    LPEMirrorSymmetry* lpe = dynamic_cast<LPEMirrorSymmetry *>(_effect);
+    Geom::Point const s = snap_knot_position(p, state);
+    lpe->center_point = s;
+    // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating.
+    sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true);
+}
+
+Geom::Point
+KnotHolderEntityCenterMirrorSymmetry::knot_get() const
+{
+    LPEMirrorSymmetry const *lpe = dynamic_cast<LPEMirrorSymmetry const*>(_effect);
+    return lpe->center_point;
+}
+
+} // namespace CR
+
 } //namespace LivePathEffect
 } /* namespace Inkscape */
 
diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h
index 12ceebaf8..7b090ed82 100644
--- a/src/live_effects/lpe-mirror_symmetry.h
+++ b/src/live_effects/lpe-mirror_symmetry.h
@@ -15,10 +15,10 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-
+#include <gtkmm.h>
 #include "live_effects/effect.h"
-#include "live_effects/parameter/parameter.h"
 #include "live_effects/parameter/text.h"
+#include "live_effects/parameter/parameter.h"
 #include "live_effects/parameter/point.h"
 #include "live_effects/parameter/path.h"
 #include "live_effects/parameter/enum.h"
@@ -27,6 +27,11 @@
 namespace Inkscape {
 namespace LivePathEffect {
 
+namespace MS {
+// we need a separate namespace to avoid clashes with LPEPerpBisector
+class KnotHolderEntityCenterMirrorSymmetry;
+}
+
 enum ModeType {
     MT_V,
     MT_H,
@@ -46,13 +51,14 @@ public:
     virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in);
     virtual void doOnRemove (SPLPEItem const* /*lpeitem*/);
     virtual void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/);
-//    virtual Gtk::Widget * newWidget();
+    virtual Gtk::Widget *newWidget();
     void processObjects(LpeAction lpe_action);
-    void createMirror(SPLPEItem *origin, Geom::Affine transform);
+    /* the knotholder entity classes must be declared friends */
+    friend class MS::KnotHolderEntityCenterMirrorSymmetry;
+    void createMirror(SPLPEItem *origin, Geom::Affine transform, const char * id);
 //    void cloneAttrbutes(Inkscape::XML::Node * origin, Inkscape::XML::Node * dest, const char * first_attribute, ...);
-//    void syncMirror(SPLPEItem *origin, const char * id);
     void cloneAttrbutes(SPObject *origin, SPObject *dest, bool live, const char * first_attribute, ...);
-    bool allow_split();
+    void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item);
 
 protected:
     virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec);
@@ -66,11 +72,13 @@ private:
     BoolParam split_elements;
     PointParam start_point;
     PointParam end_point;
-    PointParam center_point;
+    TextParam id_origin;
     Geom::Line line_separation;
     Geom::Point previous_center;
+    Geom::Point center_point;
+    bool actual;
     std::vector<const char *> elements;
-    SPObject * container;
+    SPObject * ms_container;
     LPEMirrorSymmetry(const LPEMirrorSymmetry&);
     LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&);
 };
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp
index 057f404e0..a0fa46c3f 100644
--- a/src/live_effects/lpe-offset.cpp
+++ b/src/live_effects/lpe-offset.cpp
@@ -11,12 +11,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-offset.h"
 #include "sp-shape.h"
 #include "display/curve.h"
+
 #include <2geom/elliptical-arc.h>
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp
index 276749c43..9cd8ecf46 100644
--- a/src/live_effects/lpe-parallel.cpp
+++ b/src/live_effects/lpe-parallel.cpp
@@ -11,15 +11,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-parallel.h"
 #include "sp-shape.h"
 #include "display/curve.h"
 
 #include "knotholder.h"
 
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-path_length.cpp b/src/live_effects/lpe-path_length.cpp
index a06dbde98..6ec1e0ede 100644
--- a/src/live_effects/lpe-path_length.cpp
+++ b/src/live_effects/lpe-path_length.cpp
@@ -11,10 +11,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-path_length.h"
 #include "util/units.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index 9cfeffee7..15c2817c4 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -12,8 +12,6 @@
 
 #include "knotholder.h"
 #include <algorithm>
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 using std::vector;
 
diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp
index bce22250a..f69dae6a1 100644
--- a/src/live_effects/lpe-perp_bisector.cpp
+++ b/src/live_effects/lpe-perp_bisector.cpp
@@ -11,6 +11,9 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-perp_bisector.h"
 #include "display/curve.h"
 #include "sp-path.h"
@@ -18,9 +21,6 @@
 
 #include "knotholder.h"
 
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 namespace Inkscape {
 namespace LivePathEffect {
 namespace PB {
diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp
index e834c0e86..6a6b59519 100644
--- a/src/live_effects/lpe-perspective-envelope.cpp
+++ b/src/live_effects/lpe-perspective-envelope.cpp
@@ -20,9 +20,6 @@
 #include "display/curve.h"
 #include <gsl/gsl_linalg.h>
 
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 using namespace Geom;
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp
index 2c6d66cee..cb4e43d87 100644
--- a/src/live_effects/lpe-perspective_path.cpp
+++ b/src/live_effects/lpe-perspective_path.cpp
@@ -11,6 +11,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include <gtkmm.h>
+#include <glibmm/i18n.h>
+
 #include "persp3d.h"
 //#include "transf_mat_3x4.h"
 #include "document-private.h"
@@ -21,9 +23,6 @@
 #include "desktop.h"
 #include <util/units.h>
 
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp
index e9f3975c7..329a00756 100644
--- a/src/live_effects/lpe-powerstroke.cpp
+++ b/src/live_effects/lpe-powerstroke.cpp
@@ -25,9 +25,6 @@
 #include <2geom/circle.h>
 #include "helper/geom.h"
 
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 namespace Geom {
 // should all be moved to 2geom at some point
 
diff --git a/src/live_effects/lpe-recursiveskeleton.cpp b/src/live_effects/lpe-recursiveskeleton.cpp
index aa0db920b..ed0c915ce 100644
--- a/src/live_effects/lpe-recursiveskeleton.cpp
+++ b/src/live_effects/lpe-recursiveskeleton.cpp
@@ -10,13 +10,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-recursiveskeleton.h"
 
 #include <2geom/bezier-to-sbasis.h>
 
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 3cc8658ea..2fb65b349 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -13,6 +13,7 @@
  */
 
 #include "ui/widget/scalar.h"
+#include <glibmm/i18n.h>
 #include "live_effects/lpe-rough-hatches.h"
 
 #include "sp-item.h"
@@ -22,8 +23,6 @@
 #include <2geom/sbasis-math.h>
 #include <2geom/bezier-to-sbasis.h>
 
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp
index c6edffd9b..3a486ff10 100644
--- a/src/live_effects/lpe-roughen.cpp
+++ b/src/live_effects/lpe-roughen.cpp
@@ -13,14 +13,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
 #include "live_effects/lpe-roughen.h"
 #include "display/curve.h"
 #include <boost/functional/hash.hpp>
 #include "helper/geom.h"
-
 // TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-roughen.h b/src/live_effects/lpe-roughen.h
index bab06022f..dbdb91e62 100644
--- a/src/live_effects/lpe-roughen.h
+++ b/src/live_effects/lpe-roughen.h
@@ -12,6 +12,7 @@
 #ifndef INKSCAPE_LPE_ROUGHEN_H
 #define INKSCAPE_LPE_ROUGHEN_H
 
+#include <gtkmm.h>
 #include "live_effects/effect.h"
 #include "live_effects/parameter/enum.h"
 #include "live_effects/parameter/parameter.h"
diff --git a/src/live_effects/lpe-ruler.cpp b/src/live_effects/lpe-ruler.cpp
index 60c2a3e1c..3a2d78b2c 100644
--- a/src/live_effects/lpe-ruler.cpp
+++ b/src/live_effects/lpe-ruler.cpp
@@ -12,8 +12,7 @@
  */
 
 #include "live_effects/lpe-ruler.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
+
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-show_handles.cpp b/src/live_effects/lpe-show_handles.cpp
index 7c298d0e7..170b6dccb 100644
--- a/src/live_effects/lpe-show_handles.cpp
+++ b/src/live_effects/lpe-show_handles.cpp
@@ -6,7 +6,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
 #include "live_effects/lpe-show_handles.h"
 #include <2geom/sbasis-to-bezier.h>
 #include <2geom/svg-path-parser.h>
@@ -14,7 +13,6 @@
 #include "desktop-style.h"
 #include "style.h"
 #include "svg/svg.h"
-
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-show_handles.h b/src/live_effects/lpe-show_handles.h
index c46abd2c2..3eda04649 100644
--- a/src/live_effects/lpe-show_handles.h
+++ b/src/live_effects/lpe-show_handles.h
@@ -8,6 +8,7 @@
 * Copyright (C) Jabier Arraiza Cenoz 2014 <jabier.arraiza@marker.es>
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+#include <gtkmm.h>
 #include "helper/geom-nodetype.h"
 #include "live_effects/effect.h"
 #include "live_effects/lpegroupbbox.h"
diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp
index 8bdb19b4f..ec21e10d2 100644
--- a/src/live_effects/lpe-simplify.cpp
+++ b/src/live_effects/lpe-simplify.cpp
@@ -2,7 +2,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
 #include "live_effects/lpe-simplify.h"
 #include "display/curve.h"
 #include "helper/geom.h"
@@ -10,7 +9,6 @@
 #include "svg/svg.h"
 #include "ui/tools/node-tool.h"
 #include "ui/icon-names.h"
-
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-simplify.h b/src/live_effects/lpe-simplify.h
index 6c407f572..8135561af 100644
--- a/src/live_effects/lpe-simplify.h
+++ b/src/live_effects/lpe-simplify.h
@@ -6,6 +6,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+#include <gtkmm.h>
 #include "live_effects/effect.h"
 #include "live_effects/parameter/togglebutton.h"
 #include "live_effects/lpegroupbbox.h"
diff --git a/src/live_effects/lpe-skeleton.cpp b/src/live_effects/lpe-skeleton.cpp
index adc4a3493..7d34db699 100644
--- a/src/live_effects/lpe-skeleton.cpp
+++ b/src/live_effects/lpe-skeleton.cpp
@@ -20,7 +20,8 @@
 
 #include "live_effects/lpe-skeleton.h"
 
-// TODO due to internal breakage in glibmm headers, this must be last:
+// You might need to include other 2geom files. You can add them here:
+
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp
index e01516f2e..95e2f6f0d 100644
--- a/src/live_effects/lpe-sketch.cpp
+++ b/src/live_effects/lpe-sketch.cpp
@@ -13,14 +13,13 @@
 
 #include "live_effects/lpe-sketch.h"
 
+#include <glibmm/i18n.h>
+
 // You might need to include other 2geom files. You can add them here:
 #include <2geom/sbasis-math.h>
 #include <2geom/bezier-to-sbasis.h>
 #include <2geom/path-intersection.h>
 
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
-
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp
index 76d4ea71b..b308ef8d7 100644
--- a/src/live_effects/lpe-tangent_to_curve.cpp
+++ b/src/live_effects/lpe-tangent_to_curve.cpp
@@ -13,13 +13,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm/i18n.h>
+
 #include "live_effects/lpe-tangent_to_curve.h"
 #include "sp-path.h"
 #include "display/curve.h"
 
 #include "knotholder.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp
index 4ffc41691..f6f6b33dc 100644
--- a/src/live_effects/lpe-taperstroke.cpp
+++ b/src/live_effects/lpe-taperstroke.cpp
@@ -26,8 +26,6 @@
 #include "svg/svg.h"
 
 #include "knotholder.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
-#include <glibmm/i18n.h>
 
 template<typename T>
 inline bool withinRange(T value, T low, T high) {
diff --git a/src/live_effects/lpe-test-doEffect-stack.cpp b/src/live_effects/lpe-test-doEffect-stack.cpp
index 324893706..c7ecf6481 100644
--- a/src/live_effects/lpe-test-doEffect-stack.cpp
+++ b/src/live_effects/lpe-test-doEffect-stack.cpp
@@ -4,11 +4,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "live_effects/lpe-test-doEffect-stack.h"
-
-// TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
+#include "live_effects/lpe-test-doEffect-stack.h"
+
 using std::memcpy;
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-text_label.cpp b/src/live_effects/lpe-text_label.cpp
index 709d05e18..602a6897c 100644
--- a/src/live_effects/lpe-text_label.cpp
+++ b/src/live_effects/lpe-text_label.cpp
@@ -11,11 +11,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "live_effects/lpe-text_label.h"
-
-// TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
+#include "live_effects/lpe-text_label.h"
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp
index e1f36eee7..78db622f2 100644
--- a/src/live_effects/lpe-transform_2pts.cpp
+++ b/src/live_effects/lpe-transform_2pts.cpp
@@ -20,7 +20,6 @@
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
-
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp
index 47e2a1cec..2486f3366 100644
--- a/src/live_effects/lpe-vonkoch.cpp
+++ b/src/live_effects/lpe-vonkoch.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "live_effects/lpe-vonkoch.h"
-// TODO due to internal breakage in glibmm headers, this must be last:
+
 #include <glibmm/i18n.h>
 
 //using std::vector;
diff --git a/src/live_effects/parameter/fontbutton.cpp b/src/live_effects/parameter/fontbutton.cpp
index 64c203093..ff8ab76a0 100644
--- a/src/live_effects/parameter/fontbutton.cpp
+++ b/src/live_effects/parameter/fontbutton.cpp
@@ -4,7 +4,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
+
 #include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/fontbutton.h"
 #include "live_effects/effect.h"
diff --git a/src/live_effects/parameter/fontbutton.h b/src/live_effects/parameter/fontbutton.h
index df47251a2..387ad130b 100644
--- a/src/live_effects/parameter/fontbutton.h
+++ b/src/live_effects/parameter/fontbutton.h
@@ -8,6 +8,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include <glib.h>
+#include <gtkmm.h>
 #include "live_effects/parameter/parameter.h"
 
 namespace Inkscape {