X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenodedynamiclistrotateorder.cpp;h=4e1c40aace955b9458c5fd0af99e6c562df92a99;hb=fcf1f2a99d715f39ca71469145d286d74a8af159;hp=a7bfcf8c6412ea7623f8621c264533d8be7e708c;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp index a7bfcf8..4e1c40a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp @@ -32,6 +32,8 @@ #include "valuenodedynamiclistrotateorder.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeDynamicListRotateOrder); ACTION_SET_NAME(Action::ValueNodeDynamicListRotateOrder,"value_node_dynamic_list_rotate_order"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRotateOrder,"Rotate Order"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRotateOrder,N_("Rotate Order")); ACTION_SET_TASK(Action::ValueNodeDynamicListRotateOrder,"rotate"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRotateOrder,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListRotateOrder,0); @@ -78,15 +80,14 @@ Action::ValueNodeDynamicListRotateOrder::get_param_vocab() bool Action::ValueNodeDynamicListRotateOrder::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