#endif
#include "layertreestore.h"
-#include "iconcontroler.h"
+#include "iconcontroller.h"
#include <gtkmm/button.h>
#include <synfig/paramdesc.h>
#include <synfigapp/action.h>
#include <synfigapp/instance.h>
#include "app.h"
#include "instance.h"
-#include "iconcontroler.h"
#include <synfigapp/action_system.h>
#include <gtk/gtkversion.h>
#include <ETL/clock>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
LayerTreeStore::~LayerTreeStore()
{
synfig::info("LayerTreeStore::~LayerTreeStore(): Deleted");
-
}
int
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
}
- else
- if(column==model.z_depth.index())
+ else if(column==model.z_depth.index())
{
synfig::Layer::Handle layer((*iter)[model.layer]);
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
}
- else
- if(column==model.children_lock.index())
+ else if(column==model.children_lock.index())
{
synfig::Layer::Handle layer((*iter)[model.layer]);
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
}
- else
- if(column==model.label.index())
+ else if(column==model.label.index())
{
synfig::Layer::Handle layer((*iter)[model.layer]);
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),x.value_type());
-
- if(!layer->get_description().empty())
- x.set(layer->get_description());
- else
- x.set(layer->get_local_name());
+ x.set(layer->get_non_empty_description());
g_value_init(value.gobj(),x.value_type());
//g_value_copy(x.gobj(),value.gobj());
value=x;
}
- else
- if(column==model.tooltip.index())
+ else if(column==model.tooltip.index())
{
synfig::Layer::Handle layer((*iter)[model.layer]);
//g_value_copy(x.gobj(),value.gobj());
value=x;
}
- else
- if(column==model.canvas.index())
+ else if(column==model.canvas.index())
{
synfig::Layer::Handle layer((*iter)[model.layer]);
//g_value_copy(x.gobj(),value.gobj());
value=x;
}
- else
- if(column==model.active.index())
+ else if(column==model.active.index())
{
synfig::Layer::Handle layer((*iter)[model.layer]);
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
}
- else
- if(column==model.icon.index())
+ else if(column==model.icon.index())
{
synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)return;
canvas_interface()->get_instance()->perform_action(action);
return;
}
- else
- if(column==model.active.index())
+ else if(column==model.active.index())
{
synfig::Layer::Handle layer((*iter)[model.layer]);
//dest_canvas=(Canvas::Handle)(row[model.canvas]);
return true;
}
- else
- {
- if((bool)const_cast<LayerTreeStore*>(this)->get_iter(dest_parent))
- return (bool)(Canvas::Handle)(*const_cast<LayerTreeStore*>(this)->get_iter(dest_parent))[model.contained_canvas];
- else
- return false;
- }
+ else if((bool)const_cast<LayerTreeStore*>(this)->get_iter(dest_parent))
+ return (bool)(Canvas::Handle)(*const_cast<LayerTreeStore*>(this)->get_iter(dest_parent))[model.contained_canvas];
}
return false;
}
continue;
if(dest_canvas==src->get_canvas() && src->get_depth()<dest_layer_depth)
- {
dest_layer_depth--;
- }
// In this case, we are just moving.
// if(dest_canvas==src->get_canvas())
action->set_param("new_index",dest_layer_depth);
action->set_param("dest_canvas",dest_canvas);
if(canvas_interface()->get_instance()->perform_action(action))
- {
- //DEBUGPOINT();
ret=true;
- }
else
{
- //DEBUGPOINT();
passive_grouper.cancel();
return false;
}
*/
}
}
- synfig::info("I suposidly moved %d layers",i);
+ synfig::info("I supposedly moved %d layers",i);
// Reselect the previously selected layers
canvas_interface()->get_selection_manager()->set_selected_layers(selected_layer_list);
return ret;
}
-
-
-
-
-
-
void
LayerTreeStore::rebuild()
{
continue;
}
-
/*
etl::handle<ValueNode> value_node;
if(handle.constant()->dynamic_param_list().count(iter->get_name()))
return;
}
-
Gtk::TreeModel::Children children_(children());
if(canvas_interface()->get_canvas()!=handle->get_canvas())
{
Gtk::TreeModel::Row row(*insert(iter));
set_row_layer(row,handle);
-
}
void