X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fvalue_desc.cpp;h=b27e81b9685a35565b891c969c00bfae8e0d46e4;hb=14584123d5a0026ecc586d9aa4b34084651a626b;hp=96f04f6e850168872ded147b4928213b23fb4e8d;hpb=238847fac924cf756235b9c63cbf1a48341f648f;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/value_desc.cpp b/synfig-studio/trunk/src/synfigapp/value_desc.cpp index 96f04f6..b27e81b 100644 --- a/synfig-studio/trunk/src/synfigapp/value_desc.cpp +++ b/synfig-studio/trunk/src/synfigapp/value_desc.cpp @@ -48,34 +48,27 @@ using namespace synfigapp; /* === M E T H O D S ======================================================= */ String -ValueDesc::get_description()const +ValueDesc::get_description(bool show_exported_name)const { String description(_("ValueDesc")); + if (show_exported_name && !is_exported()) + show_exported_name = false; + if (parent_is_layer_param()) { - description = strprintf("'%s' -> %s", // layer -> parameter - get_layer()->get_non_empty_description().c_str(), - get_param_name().c_str()); - if (is_exported()) + description = strprintf("(%s):%s", // (layer):parameter + get_layer()->get_non_empty_description().c_str(), + get_layer()->get_param_local_name(get_param_name()).c_str()); + if (show_exported_name) description += strprintf(" (%s)", get_value_node()->get_id().c_str()); } else if (parent_is_value_node()) { synfig::LinkableValueNode::Handle value_node(synfig::LinkableValueNode::Handle::cast_reinterpret(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) - description = strprintf("'%s' => %s", // layer -> sub-parameter - parent_layer->get_non_empty_description().c_str(), - value_node->link_local_name(get_index()).c_str()); - else - description = value_node->link_local_name(get_index()); // sub-parameter - if (is_exported()) - description += strprintf(" (%s)", get_value_node()->get_id().c_str()); + return value_node->get_description(get_index(), show_exported_name); } - else if (is_exported()) + else if (show_exported_name) description = strprintf(_("ValueNode (%s)"), get_value_node()->get_id().c_str()); return description;