Made a start at implementing the ideas in http://synfig.org/Linking_to_Blines . ...

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
index 2c3d8ab..f479de5 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
@@ -33,6 +33,8 @@
 #include "valuenodedynamiclistremove.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -45,7 +47,7 @@ using namespace Action;
 
 ACTION_INIT(Action::ValueNodeDynamicListRemoveSmart);
 ACTION_SET_NAME(Action::ValueNodeDynamicListRemoveSmart,"value_node_dynamic_list_remove_smart");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRemoveSmart,"Remove Item (Smart)");
+ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRemoveSmart,N_("Remove Item (Smart)"));
 ACTION_SET_TASK(Action::ValueNodeDynamicListRemoveSmart,"remove");
 ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRemoveSmart,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::ValueNodeDynamicListRemoveSmart,-19);
@@ -89,15 +91,14 @@ Action::ValueNodeDynamicListRemoveSmart::get_param_vocab()
 bool
 Action::ValueNodeDynamicListRemoveSmart::is_candidate(const ParamList &x)
 {
-       if(candidate_check(get_param_vocab(),x))
-       {
-               ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
-               if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()))
-                       return false;
+       if (!candidate_check(get_param_vocab(),x))
+               return false;
 
-               return true;
-       }
-       return false;
+       ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+       return (value_desc.parent_is_value_node() &&
+                       // We need a dynamic list.
+                       ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()));
 }
 
 bool