Removed trailing whitespace.

[synfig.git] / synfig-studio / trunk / src / synfigapp / actions / valuenodedynamiclistunloop.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
index 7fbbf24..a1ee55d 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
@@ -5,16 +5,17 @@
 **     $Id: valuenodedynamiclistunloop.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -64,7 +65,7 @@ Action::ParamVocab
 Action::ValueNodeDynamicListUnLoop::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("value_node",Param::TYPE_VALUENODE)
                .set_local_name(_("ValueNode"))
        );
@@ -73,11 +74,16 @@ Action::ValueNodeDynamicListUnLoop::get_param_vocab()
 }
 
 bool
-Action::ValueNodeDynamicListUnLoop::is_canidate(const ParamList &x)
+Action::ValueNodeDynamicListUnLoop::is_candidate(const ParamList &x)
 {
-       if(canidate_check(get_param_vocab(),x))
+       if(candidate_check(get_param_vocab(),x))
        {
-               ValueNode::Handle value_node(x.find("value_node")->second.get_value_node());
+               ValueNode::Handle value_node;
+               ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+               if(value_desc.parent_is_value_node())
+                       value_node = value_desc.get_parent_value_node();
+               else
+                       value_node = x.find("value_node")->second.get_value_node();
                if(!ValueNode_DynamicList::Handle::cast_dynamic(value_node))
                        return false;
                if(ValueNode_DynamicList::Handle::cast_dynamic(value_node)->get_loop()==false)
@@ -90,10 +96,25 @@ Action::ValueNodeDynamicListUnLoop::is_canidate(const ParamList &x)
 bool
 Action::ValueNodeDynamicListUnLoop::set_param(const synfig::String& name, const Action::Param &param)
 {
-       if(name=="value_node" && param.get_type()==Param::TYPE_VALUENODE)
-       {               
+       if(!value_node && name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC)
+       {
+               ValueDesc value_desc(param.get_value_desc());
+
+               if(!value_desc.parent_is_value_node())
+                       return false;
+
+               value_node=ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node());
+
+               if (!value_node)
+                       return false;
+
+               return true;
+       }
+
+       if(!value_node && name=="value_node" && param.get_type()==Param::TYPE_VALUENODE)
+       {
                value_node=ValueNode_DynamicList::Handle::cast_dynamic(param.get_value_node());
-               
+
                if(!value_node)
                        return false;
 
@@ -113,9 +134,9 @@ Action::ValueNodeDynamicListUnLoop::is_ready()const
 
 void
 Action::ValueNodeDynamicListUnLoop::perform()
-{      
+{
        old_loop_value=value_node->get_loop();
-       
+
        if(old_loop_value==false)
        {
                set_dirty(false);
@@ -124,7 +145,7 @@ Action::ValueNodeDynamicListUnLoop::perform()
 
        set_dirty(true);
        value_node->set_loop(false);
-               
+
        value_node->changed();
 /*_if(get_canvas_interface())
        {
@@ -144,7 +165,7 @@ Action::ValueNodeDynamicListUnLoop::undo()
 
        set_dirty(true);
        value_node->set_loop(old_loop_value);
-               
+
        value_node->changed();
 /*_if(get_canvas_interface())
        {