X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescset.cpp;h=7f6f686ae8133a47e107f2e27c46cd2b0fe4e498;hb=2e7fd51065ba36fc990b825f2842da8baa2fed39;hp=85e1fce021401b4f412931c2b05e50370b68623e;hpb=9c016812c5af9aa44cf424c768b8ff604d9c8a24;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp index 85e1fce..7f6f686 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp @@ -77,38 +77,10 @@ Action::ValueDescSet::ValueDescSet(): synfig::String Action::ValueDescSet::get_local_name()const { - String name("ValueDesc"); - - if(!value_desc) - { - } - else if(value_desc.parent_is_layer_param()) - { - name = strprintf("'%s' -> %s", // layer -> parameter - value_desc.get_layer()->get_non_empty_description().c_str(), - value_desc.get_param_name().c_str()); - if (value_desc.is_exported()) - name += strprintf(" (%s)", value_desc.get_value_node()->get_id().c_str()); - } - else if(value_desc.parent_is_value_node()) - { - synfig::LinkableValueNode::Handle value_node(synfig::LinkableValueNode::Handle::cast_reinterpret(value_desc.get_parent_value_node())); - synfig::Node* node; - for(node=value_node.get();!node->parent_set.empty() && !dynamic_cast(node);node=*node->parent_set.begin()); - Layer::Handle parent_layer(dynamic_cast(node)); - if(parent_layer) - name = strprintf("'%s' => %s", // layer -> sub-parameter - parent_layer->get_non_empty_description().c_str(), - value_node->link_local_name(value_desc.get_index()).c_str()); - else - name = value_node->link_local_name(value_desc.get_index()); // sub-parameter - if (value_desc.is_exported()) - name += strprintf(" (%s)", value_desc.get_value_node()->get_id().c_str()); - } - else if (value_desc.is_exported()) - name = strprintf(_("ValueNode (%s)"), value_desc.get_value_node()->get_id().c_str()); - - return strprintf(_("Set %s"), name.c_str()); + return strprintf(_("Set %s"), + value_desc + ? value_desc.get_description().c_str() + : _("ValueDesc")); } Action::ParamVocab