X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenodedynamiclistinsert.cpp;h=0613603439492790910de34c8bb7e80927cbb4f1;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=9d2e4cfd3c1c92aeefe2bb7c1167c7b5ba3e6515;hpb=9b5810cef039c7f25e924ce2cf2fc80e76e59972;p=synfig.git diff --git a/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistinsert.cpp b/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistinsert.cpp index 9d2e4cf..0613603 100644 --- a/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistinsert.cpp +++ b/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistinsert.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -32,6 +33,8 @@ #include "valuenodedynamiclistinsert.h" #include +#include + #endif using namespace std; @@ -44,7 +47,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeDynamicListInsert); ACTION_SET_NAME(Action::ValueNodeDynamicListInsert,"value_node_dynamic_list_insert"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsert,"Insert Item"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsert,N_("Insert Item")); ACTION_SET_TASK(Action::ValueNodeDynamicListInsert,"insert"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListInsert,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE|Action::CATEGORY_HIDDEN); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListInsert,-20); @@ -92,15 +95,14 @@ Action::ValueNodeDynamicListInsert::get_param_vocab() bool Action::ValueNodeDynamicListInsert::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