Remove all trace of the Tags dialog

Fixed Attach Path and Fill Between Many LPEs
Enabled Gradient Meshes

(bzr r13090.1.21)

5 files changed, 8 insertions, 8 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 2ffff153c..17b229352 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -47,7 +47,7 @@
 #include "live_effects/lpe-extrude.h"
 #include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-clone-original.h"
-//#include "live_effects/lpe-attach-path.h"
+#include "live_effects/lpe-attach-path.h"
 #include "live_effects/lpe-fill-between-strokes.h"
 #include "live_effects/lpe-fill-between-many.h"
 #include "live_effects/lpe-ellipse_5pts.h"
@@ -130,7 +130,7 @@ const Util::EnumData<EffectType> LPETypeData[] = {
     {POWERSTROKE,           N_("Power stroke"),            "powerstroke"},
     {CLONE_ORIGINAL,        N_("Clone original path"),     "clone_original"},
 /* Ponyscape */
-//    {ATTACH_PATH,           N_("Attach path"),             "attach_path"},
+    {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"},
     {ELLIPSE_5PTS,          N_("Ellipse by 5 points"),     "ellipse_5pts"},
@@ -258,9 +258,9 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)
         case CLONE_ORIGINAL:
             neweffect = static_cast<Effect*> ( new LPECloneOriginal(lpeobj) );
             break;
-        /*case ATTACH_PATH:
+        case ATTACH_PATH:
             neweffect = static_cast<Effect*> ( new LPEAttachPath(lpeobj) );
-            break;*/
+            break;
         case FILL_BETWEEN_STROKES:
             neweffect = static_cast<Effect*> ( new LPEFillBetweenStrokes(lpeobj) );
             break;
diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp
index b3d5ed9b7..0cceb1cb7 100644
--- a/src/live_effects/lpe-attach-path.cpp
+++ b/src/live_effects/lpe-attach-path.cpp
@@ -62,9 +62,9 @@ void LPEAttachPath::resetDefaults(SPItem const * item)
     curve_end_previous_origin = end_path_curve_end.getOrigin();
 }
 
-void LPEAttachPath::doBeforeEffect(const SPLPEItem *lpeitem)
+void LPEAttachPath::doBeforeEffect(SPLPEItem const *lpeitem)
 {
-    lpe_effect = lpeitem;
+    lpe_effect = const_cast<SPLPEItem*> (lpeitem);
 }
 
 void LPEAttachPath::doEffect (SPCurve * curve)
diff --git a/src/live_effects/lpe-attach-path.h b/src/live_effects/lpe-attach-path.h
index 3dda189d6..390282f90 100644
--- a/src/live_effects/lpe-attach-path.h
+++ b/src/live_effects/lpe-attach-path.h
@@ -45,7 +45,7 @@ private:
     ScalarParam end_path_position;
     TransformedPointParam end_path_curve_start;
     VectorParam end_path_curve_end;
-    const SPLPEItem * lpe_effect;
+    SPLPEItem * lpe_effect;
 };
 
 }; //namespace LivePathEffect
diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 422609390..f1a88cd2d 100644
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -180,7 +180,6 @@ static char const menus_skeleton[] =
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Object") "\">\n"
 "       <verb verb-id=\"DialogObjects\" />\n"
-"       <verb verb-id=\"DialogTags\"    />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"DialogFillStroke\" />\n"
 "       <verb verb-id=\"DialogObjectProperties\" />\n"
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 34885a971..2a8471b55 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -6,6 +6,7 @@
  *   Jon A. Cruz
  *   John Bintz
  *   Abhishek Sharma
+ *   Theodore Janezcko
  *
  * Copyright (C) 2005 Jon A. Cruz
  * Copyright (C) 2008 John Bintz