Improve the description of a ValueNode to include its exported name if requested...

[synfig.git] / synfig-core / trunk / src / synfig / valuenode.cpp

diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp
index 03a8757..af1fb0d 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode.cpp
@@ -314,10 +314,18 @@ ValueNode::set_id(const String &x)
 String
 ValueNode::get_description(bool show_exported_name)const
 {
+       String ret(_("ValueNode"));
+
        if (dynamic_cast<const LinkableValueNode*>(this))
                return (dynamic_cast<const LinkableValueNode*>(this))->get_description(-1, show_exported_name);
 
-       return "ValueNode";
+       if (show_exported_name && !is_exported())
+               show_exported_name = false;
+
+       if (show_exported_name)
+               ret += strprintf(" (%s)", get_id().c_str());
+
+       return ret;
 }
 
 ValueNodeList::ValueNodeList():
@@ -333,7 +341,8 @@ ValueNodeList::count(const String &id)const
        if(id.empty())
                return false;
 
-       for(iter=begin();iter!=end() && id!=(*iter)->get_id();++iter);
+       for(iter=begin();iter!=end() && id!=(*iter)->get_id();++iter)
+               ;
 
        if(iter==end())
                return false;
@@ -349,7 +358,8 @@ ValueNodeList::find(const String &id)
        if(id.empty())
                throw Exception::IDNotFound("Empty ID");
 
-       for(iter=begin();iter!=end() && id!=(*iter)->get_id();++iter);
+       for(iter=begin();iter!=end() && id!=(*iter)->get_id();++iter)
+               ;
 
        if(iter==end())
                throw Exception::IDNotFound("ValueNode in ValueNodeList: "+id);
@@ -365,7 +375,8 @@ ValueNodeList::find(const String &id)const
        if(id.empty())
                throw Exception::IDNotFound("Empty ID");
 
-       for(iter=begin();iter!=end() && id!=(*iter)->get_id();++iter);
+       for(iter=begin();iter!=end() && id!=(*iter)->get_id();++iter)
+               ;
 
        if(iter==end())
                throw Exception::IDNotFound("ValueNode in ValueNodeList: "+id);