**
** \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
#include "canvastreestore.h"
#include <synfig/valuenode.h>
-#include "iconcontroler.h"
+#include "iconcontroller.h"
#include <synfig/valuenode_timedswap.h>
#include <synfig/valuenode_animated.h>
#include <gtkmm/button.h>
#include "cellrenderer_timetrack.h"
#include <ETL/clock>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
}
void
-CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int column, Glib::ValueBase& value)const
+CanvasTreeStore::get_value_vfunc(const Gtk::TreeModel::iterator& iter, int column, Glib::ValueBase& value)const
{
if(column==model.value.index())
{
{
if(!value_desc.is_value_node() || value_desc.get_value_node()->get_name()=="constant")
{
- x.set(ValueBase::type_name(value_desc.get_value_type()));
+ x.set(ValueBase::type_local_name(value_desc.get_value_type()));
}
else
{
if(!iter->children().empty())
{
Gtk::TreeIter iter2(iter->children().begin());
- if(iter2 && value_desc==(*iter2)[model.value_desc] || find_next_value_desc(value_desc, iter2))
+ //! \todo confirm that the && should be done before the ||
+ if((iter2 && value_desc==(*iter2)[model.value_desc]) || find_next_value_desc(value_desc, iter2))
{
iter=iter2;
return true;
if(!iter->children().empty())
{
Gtk::TreeIter iter2(iter->children().begin());
- if(iter2 && value_desc==(*iter2)[model.value_desc] || find_next_value_desc(value_desc, iter2))
+ //! \todo confirm that the && should be done before the ||
+ if((iter2 && value_desc==(*iter2)[model.value_desc]) || find_next_value_desc(value_desc, iter2))
{
iter=iter2;
return true;
return (bool)iter && value_desc==(*iter)[model.value_desc];
}
-
-
-
-
-
bool
-CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter)
+CanvasTreeStore::find_first_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter)
{
iter=children().begin();
while(iter && value_node!=(ValueNode::Handle)(*iter)[model.value_node])
if(!iter->children().empty())
{
Gtk::TreeIter iter2(iter->children().begin());
- if(iter2 && value_node==(ValueNode::Handle)(*iter2)[model.value_node] || find_next_value_node(value_node, iter2))
+ //! \todo confirm that the && should be done before the ||
+ if((iter2 && value_node==(ValueNode::Handle)(*iter2)[model.value_node]) || find_next_value_node(value_node, iter2))
{
iter=iter2;
return true;
}
bool
-CanvasTreeStore::find_next_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter)
+CanvasTreeStore::find_next_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter)
{
if(!iter) return find_first_value_node(value_node,iter);
if(!iter->children().empty())
{
Gtk::TreeIter iter2(iter->children().begin());
- if(iter2 && value_node==(ValueNode::Handle)(*iter2)[model.value_node] || find_next_value_node(value_node, iter2))
+ //! \todo confirm that the && should be done before the ||
+ if((iter2 && value_node==(ValueNode::Handle)(*iter2)[model.value_node]) || find_next_value_node(value_node, iter2))
{
iter=iter2;
return true;
CanvasTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc, bool do_children)
{
Gtk::TreeModel::Children children = row.children();
- while(!children.empty() && erase(children.begin()));
+ while(!children.empty() && erase(children.begin()))
+ ;
row[model.value_desc]=value_desc;
try
row[model.is_value_node] = false;
row[model.is_editable] = true;
Gtk::TreeModel::Children children = row.children();
- while(!children.empty() && erase(children.begin()));
+ while(!children.empty() && erase(children.begin()))
+ ;
}
if(!do_children)
return;