if(column==model.type.index())
{
synfigapp::ValueDesc value_desc((*iter)[model.value_desc]);
+ String stype, lname;
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),x.value_type());
}
else
{
- if(!value_desc.is_value_node() || value_desc.get_value_node()->get_name()=="constant")
+ stype=ValueBase::type_local_name(value_desc.get_value_type());
+ if(value_desc.get_value_node())
{
- x.set(ValueBase::type_local_name(value_desc.get_value_type()));
+ lname=value_desc.get_value_node()->get_name();
+ if (lname=="animated" || lname=="static" ||
+ synfig::LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())
+ )
+ stype+=" (" + value_desc.get_value_node()->get_local_name() + ")";
}
- else
+ else if(value_desc.parent_is_layer_param())
{
- x.set(value_desc.get_value_node()->get_local_name());
+ if(value_desc.get_value().get_static())
+ stype+=_(" (Static)");
}
}
-
+ x.set(stype.c_str());
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
}
if(linkable && do_children)
{
row[model.link_count] = linkable->link_count();
- for(int i=0;i<linkable->link_count();i++)
+ LinkableValueNode::Vocab vocab(linkable->get_children_vocab());
+ LinkableValueNode::Vocab::iterator iter(vocab.begin());
+ for(int i=0;i<linkable->link_count();i++, iter++)
{
Gtk::TreeRow child_row=*(append(row.children()));
child_row[model.link_id] = i;
child_row[model.canvas] = static_cast<Canvas::Handle>(row[model.canvas]);
child_row[model.name] = linkable->link_local_name(i);
+ child_row[model.tooltip] = iter->get_description();
+ child_row[model.child_param_desc] = *iter;
set_row(child_row,synfigapp::ValueDesc(linkable,i));
}
}