Uncomment and fix segment duck code. Now the walk.sifz example can be edited.

[synfig.git] / synfig-studio / trunk / src / gtkmm / duckmatic.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index ccedcae..cfdb9cd 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
@@ -1064,9 +1064,11 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                        duck->signal_user_click(2).connect(
                                sigc::bind(
                                        sigc::bind(
-                                               sigc::mem_fun(
-                                                       *canvas_view,
-                                                       &studio::CanvasView::popup_param_menu),
+                                               sigc::bind(
+                                                       sigc::mem_fun(
+                                                               *canvas_view,
+                                                               &studio::CanvasView::popup_param_menu),
+                                                       false),
                                                0.0f),
                                        value_desc));
 
@@ -1134,9 +1136,11 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                        duck->signal_user_click(2).connect(
                                sigc::bind(
                                        sigc::bind(
-                                               sigc::mem_fun(
-                                                       *canvas_view,
-                                                       &studio::CanvasView::popup_param_menu),
+                                               sigc::bind(
+                                                       sigc::mem_fun(
+                                                               *canvas_view,
+                                                               &studio::CanvasView::popup_param_menu),
+                                                       false),
                                                0.0f),
                                        value_desc));
                        duck->set_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(multiple));
@@ -1225,9 +1229,11 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                        duck->signal_user_click(2).connect(
                                sigc::bind(
                                        sigc::bind(
-                                               sigc::mem_fun(
-                                                       *canvas_view,
-                                                       &studio::CanvasView::popup_param_menu),
+                                               sigc::bind(
+                                                       sigc::mem_fun(
+                                                               *canvas_view,
+                                                               &studio::CanvasView::popup_param_menu),
+                                                       false),
                                                1.0f),
                                        value_desc));
                        duck->set_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(multiple));
@@ -1236,7 +1242,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                        return true;
                }
                break;
-/*     case ValueBase::TYPE_SEGMENT:
+       case ValueBase::TYPE_SEGMENT:
                {
                        etl::handle<Bezier> bezier(new Bezier());
                        ValueNode_Composite::Handle value_node;
@@ -1291,12 +1297,12 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                        name=guid_string(value_desc);
                                }
 
-                               duck_p=new class Duck(segment.p1);
+                               duck_p=new Duck(segment.p1);
                                duck_p->set_name(name+".P1");
                                duck_p->set_type(Duck::TYPE_VERTEX);
                                add_duck(duck_p);
 
-                               duck_c=new class Duck(segment.t1);
+                               duck_c=new Duck(segment.t1);
                                duck_c->set_name(name+".T1");
                                duck_c->set_type(Duck::TYPE_TANGENT);
                                add_duck(duck_c);
@@ -1307,12 +1313,12 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                bezier->p1=duck_p;
                                bezier->c1=duck_c;
 
-                               duck_p=new class Duck(segment.p2);
+                               duck_p=new Duck(segment.p2);
                                duck_p->set_name(name+".P2");
                                duck_p->set_type(Duck::TYPE_VERTEX);
                                add_duck(duck_p);
 
-                               duck_c=new class Duck(segment.t2);
+                               duck_c=new Duck(segment.t2);
                                duck_c->set_type(Duck::TYPE_TANGENT);
                                duck_c->set_name(name+".T2");
                                add_duck(duck_c);
@@ -1328,7 +1334,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                        return true;
                }
                break;
-*/
        case ValueBase::TYPE_BLINEPOINT:
        {
 
@@ -1423,9 +1428,11 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                                duck->signal_user_click(2).connect(
                                                        sigc::bind(
                                                                sigc::bind(
-                                                                       sigc::mem_fun(
-                                                                               *canvas_view,
-                                                                               &studio::CanvasView::popup_param_menu),
+                                                                       sigc::bind(
+                                                                               sigc::mem_fun(
+                                                                                       *canvas_view,
+                                                                                       &studio::CanvasView::popup_param_menu),
+                                                                               false),
                                                                        1.0f),
                                                                synfigapp::ValueDesc(value_node,i)));
                                                duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
@@ -1551,9 +1558,11 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                        duck->signal_user_click(2).connect(
                                                sigc::bind(
                                                        sigc::bind(
-                                                               sigc::mem_fun(
-                                                                       *canvas_view,
-                                                                       &studio::CanvasView::popup_param_menu),
+                                                               sigc::bind(
+                                                                       sigc::mem_fun(
+                                                                               *canvas_view,
+                                                                               &studio::CanvasView::popup_param_menu),
+                                                                       false),
                                                                1.0f),
                                                        synfigapp::ValueDesc(value_node,i)));
                                        duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
@@ -1606,9 +1615,11 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                        duck->signal_user_click(2).connect(
                                                sigc::bind(
                                                        sigc::bind(
-                                                               sigc::mem_fun(
-                                                                       *canvas_view,
-                                                                       &studio::CanvasView::popup_param_menu),
+                                                               sigc::bind(
+                                                                       sigc::mem_fun(
+                                                                               *canvas_view,
+                                                                               &studio::CanvasView::popup_param_menu),
+                                                                       false),
                                                                1.0f),
                                                        synfigapp::ValueDesc(value_node,i)));
                                        duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
@@ -1672,9 +1683,11 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                duck->signal_user_click(2).connect(
                                        sigc::bind(
                                                sigc::bind(
-                                                       sigc::mem_fun(
-                                                               *canvas_view,
-                                                               &studio::CanvasView::popup_param_menu),
+                                                       sigc::bind(
+                                                               sigc::mem_fun(
+                                                                       *canvas_view,
+                                                                       &studio::CanvasView::popup_param_menu),
+                                                               false),
                                                        1.0f),
                                                synfigapp::ValueDesc(value_node,first)));
                                duck->set_value_desc(synfigapp::ValueDesc(value_node,first));
@@ -1767,7 +1780,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                                        synfigapp::ValueDesc(value_node,first)));
                                }
                        }
-                       /*else if(value_node->get_contained_type()==ValueBase::TYPE_SEGMENT)
+                       else if(value_node->get_contained_type()==ValueBase::TYPE_SEGMENT)
                        {
                                for(i=0;i<value_node->link_count();i++)
                                {
@@ -1777,7 +1790,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                                return false;
                                }
                        }
-                       */
                        else
                                return false;
                }