-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
/*! \file layertreestore.cpp
** \brief Template File
**
-** $Id: layertreestore.cpp,v 1.2 2005/01/12 07:03:42 darco Exp $
+** $Id$
**
** \legal
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+** This package is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** General Public License for more details.
** \endlegal
*/
/* ========================================================================= */
#endif
#include "layertreestore.h"
-#include "iconcontroler.h"
+#include "iconcontroller.h"
#include <gtkmm/button.h>
-#include <sinfg/paramdesc.h>
-#include <sinfgapp/action.h>
-#include <sinfgapp/instance.h>
+#include <synfig/paramdesc.h>
+#include <synfigapp/action.h>
+#include <synfigapp/instance.h>
#include "app.h"
#include "instance.h"
-#include "iconcontroler.h"
-#include <sinfgapp/action_system.h>
+#include <synfigapp/action_system.h>
#include <gtk/gtkversion.h>
#include <ETL/clock>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
using namespace std;
using namespace etl;
-using namespace sinfg;
+using namespace synfig;
using namespace studio;
/* === M A C R O S ========================================================= */
return *model;
}
-LayerTreeStore::LayerTreeStore(etl::loose_handle<sinfgapp::CanvasInterface> canvas_interface_):
+LayerTreeStore::LayerTreeStore(etl::loose_handle<synfigapp::CanvasInterface> canvas_interface_):
Gtk::TreeStore (ModelHack()),
canvas_interface_ (canvas_interface_)
{
- layer_icon=Gtk::Button().render_icon(Gtk::StockID("sinfg-layer"),Gtk::ICON_SIZE_SMALL_TOOLBAR);
+ layer_icon=Gtk::Button().render_icon(Gtk::StockID("synfig-layer"),Gtk::ICON_SIZE_SMALL_TOOLBAR);
// Connect Signals to Terminals
canvas_interface()->signal_layer_status_changed().connect(sigc::mem_fun(*this,&studio::LayerTreeStore::on_layer_status_changed));
//canvas_interface()->signal_value_node_replaced().connect(sigc::mem_fun(*this,&studio::LayerTreeStore::on_value_node_replaced));
set_default_sort_func(sigc::ptr_fun(index_sorter));
-
+
// rebuild();
}
LayerTreeStore::~LayerTreeStore()
{
- sinfg::info("LayerTreeStore::~LayerTreeStore()q: Deleted");
-
+ synfig::info("LayerTreeStore::~LayerTreeStore(): Deleted");
}
int
LayerTreeStore::z_sorter(const Gtk::TreeModel::iterator &rhs,const Gtk::TreeModel::iterator &lhs)
{
const Model model;
-
+
float diff((float)(*rhs)[model.z_depth]-(float)(*lhs)[model.z_depth]);
if(diff<0)
LayerTreeStore::index_sorter(const Gtk::TreeModel::iterator &rhs,const Gtk::TreeModel::iterator &lhs)
{
const Model model;
-
+
return ((int)(*rhs)[model.index]-(int)(*lhs)[model.index]);
}
Glib::ustring substr(x.uppercase());
Glib::ustring label((*iter)[model.label]);
label=label.uppercase();
-
+
return label.find(substr)==Glib::ustring::npos;
}
Glib::RefPtr<LayerTreeStore>
-LayerTreeStore::create(etl::loose_handle<sinfgapp::CanvasInterface> canvas_interface_)
+LayerTreeStore::create(etl::loose_handle<synfigapp::CanvasInterface> canvas_interface_)
{
return Glib::RefPtr<LayerTreeStore>(new LayerTreeStore(canvas_interface_));
}
{
if(column==model.index.index())
{
- sinfg::Layer::Handle layer((*iter)[model.layer]);
+ synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)return;
Glib::Value<int> x;
g_value_init(x.gobj(),x.value_type());
-
+
x.set(layer->get_depth());
-
+
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())
{
- sinfg::Layer::Handle layer((*iter)[model.layer]);
+ synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)return;
Glib::Value<float> x;
g_value_init(x.gobj(),x.value_type());
-
+
x.set(layer->get_z_depth(canvas_interface()->get_time())*1.0001+layer->get_depth());
-
+
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())
{
- sinfg::Layer::Handle layer((*iter)[model.layer]);
+ synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)return;
Glib::Value<bool> x;
g_value_init(x.gobj(),x.value_type());
x.set(false);
-
+
ValueBase v(layer->get_param("children_lock"));
- if(v.same_as(bool()))
+ if(v.same_type_as(bool()))
x.set(v.get(bool()));
-
+
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())
{
- sinfg::Layer::Handle layer((*iter)[model.layer]);
+ synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)return;
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),x.value_type());
+ x.set(layer->get_non_empty_description());
- if(!layer->get_description().empty())
- x.set(layer->get_description());
- else
- x.set(layer->get_local_name());
-
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())
{
- sinfg::Layer::Handle layer((*iter)[model.layer]);
+ synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)return;
x.set(layer->get_local_name());
-
+
g_value_init(value.gobj(),x.value_type());
//g_value_copy(x.gobj(),value.gobj());
value=x;
}
- else
- if(column==model.canvas.index())
+ else if(column==model.canvas.index())
{
- sinfg::Layer::Handle layer((*iter)[model.layer]);
+ synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)return;
x.set(layer->get_canvas());
-
+
g_value_init(value.gobj(),x.value_type());
//g_value_copy(x.gobj(),value.gobj());
value=x;
}
- else
- if(column==model.active.index())
+ else if(column==model.active.index())
{
- sinfg::Layer::Handle layer((*iter)[model.layer]);
+ synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)return;
g_value_init(x.gobj(),x.value_type());
x.set(layer->active());
-
+
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())
{
- sinfg::Layer::Handle layer((*iter)[model.layer]);
+ synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)return;
Glib::Value<Glib::RefPtr<Gdk::Pixbuf> > x;
//x.set(layer_icon);
x.set(get_tree_pixbuf_layer(layer->get_name()));
-
+
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
}
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),model.label.type());
g_value_copy(value.gobj(),x.gobj());
-
- sinfg::Layer::Handle layer((*iter)[model.layer]);
+
+ synfig::Layer::Handle layer((*iter)[model.layer]);
if(!layer)
return;
- sinfg::String new_desc(x.get());
-
+ synfig::String new_desc(x.get());
+
if(new_desc==layer->get_local_name())
- new_desc=sinfg::String();
+ new_desc=synfig::String();
if(new_desc==layer->get_description())
return;
-
- sinfgapp::Action::Handle action(sinfgapp::Action::create("layer_set_desc"));
-
+
+ synfigapp::Action::Handle action(synfigapp::Action::create("layer_set_desc"));
+
if(!action)
return;
-
+
action->set_param("canvas",canvas_interface()->get_canvas());
action->set_param("canvas_interface",canvas_interface());
action->set_param("layer",layer);
- action->set_param("new_description",sinfg::String(x.get()));
-
+ action->set_param("new_description",synfig::String(x.get()));
+
canvas_interface()->get_instance()->perform_action(action);
return;
}
- else
- if(column==model.active.index())
+ else if(column==model.active.index())
{
- sinfg::Layer::Handle layer((*iter)[model.layer]);
-
+ synfig::Layer::Handle layer((*iter)[model.layer]);
+
if(!layer)return;
Glib::Value<bool> x;
g_value_init(x.gobj(),model.active.type());
g_value_copy(value.gobj(),x.gobj());
-
- sinfgapp::Action::Handle action(sinfgapp::Action::create("layer_activate"));
-
+
+ synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate"));
+
if(!action)
return;
-
+
action->set_param("canvas",canvas_interface()->get_canvas());
action->set_param("canvas_interface",canvas_interface());
action->set_param("layer",layer);
action->set_param("new_status",bool(x.get()));
-
+
canvas_interface()->get_instance()->perform_action(action);
return;
}
catch(std::exception x)
{
g_warning(x.what());
- }
+ }
}
bool
-LayerTreeStore::row_draggable_vfunc (const TreeModel::Path& path)const
+LayerTreeStore::row_draggable_vfunc (const TreeModel::Path& /*path*/)const
{
//if(!get_iter(path)) return false;
// Gtk::TreeModel::Row row(*get_iter(path));
-
+
return true;
// return (bool)true;
}
LayerTreeStore::drag_data_get_vfunc (const TreeModel::Path& path, Gtk::SelectionData& selection_data)const
{
if(!const_cast<LayerTreeStore*>(this)->get_iter(path)) return false;
- //sinfg::info("Dragged data of type \"%s\"",selection_data.get_data_type());
- //sinfg::info("Dragged data of target \"%s\"",gdk_atom_name(selection_data->target));
- //sinfg::info("Dragged selection=\"%s\"",gdk_atom_name(selection_data->selection));
+ //synfig::info("Dragged data of type \"%s\"",selection_data.get_data_type());
+ //synfig::info("Dragged data of target \"%s\"",gdk_atom_name(selection_data->target));
+ //synfig::info("Dragged selection=\"%s\"",gdk_atom_name(selection_data->selection));
Gtk::TreeModel::Row row(*const_cast<LayerTreeStore*>(this)->get_iter(path));
Layer* layer(((Layer::Handle)row[model.layer]).get());
assert(layer);
bool included(false);
-
+
//gtk_selection_data_set (selection_data, gdk_atom_intern("LAYER",false), 8, reinterpret_cast<const guchar*>(&layer), sizeof(layer));
std::vector<Layer*> layers;
// The following is a hack for multiple row DND
{
- sinfgapp::SelectionManager::LayerList bleh(get_canvas_interface()->get_selection_manager()->get_selected_layers());
+ synfigapp::SelectionManager::LayerList bleh(get_canvas_interface()->get_selection_manager()->get_selected_layers());
if(bleh.empty())
{
selection_data.set("LAYER", 8, reinterpret_cast<const guchar*>(&layer), sizeof(layer));
if(!included)
layers.push_back(layer);
selection_data.set("LAYER", 8, reinterpret_cast<const guchar*>(&layers.front()), sizeof(void*)*layers.size());
-
+
return true;
}
return false;
}
bool
-LayerTreeStore::drag_data_delete_vfunc (const TreeModel::Path& path)
+LayerTreeStore::drag_data_delete_vfunc (const TreeModel::Path& /*path*/)
{
return true;
}
{
//if(!const_cast<LayerTreeStore*>(this)->get_iter(dest)) return false;
- //sinfg::info("possible_drop -- data of type \"%s\"",selection_data.get_data_type());
- //sinfg::info("possible_drop -- data of target \"%s\"",gdk_atom_name(selection_data->target));
- //sinfg::info("possible_drop -- selection=\"%s\"",gdk_atom_name(selection_data->selection));
-
+ //synfig::info("possible_drop -- data of type \"%s\"",selection_data.get_data_type());
+ //synfig::info("possible_drop -- data of target \"%s\"",gdk_atom_name(selection_data->target));
+ //synfig::info("possible_drop -- selection=\"%s\"",gdk_atom_name(selection_data->selection));
+
//Gtk::TreeModel::Row row(*get_iter(dest));
- if(sinfg::String(selection_data.get_data_type())=="LAYER" && (bool)true)
+ if(synfig::String(selection_data.get_data_type())=="LAYER" && (bool)true)
{
//Layer::Handle src(reinterpret_cast<Layer**>(const_cast<guint8*>(selection_data.get_data()))[i]);
//assert(src);
//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;
}
bool
LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk::SelectionData& selection_data)
{
-
+
//if(!dest_parent.up() || !get_iter(dest)) return false;
-
+
bool ret=false;
int i(0);
-
- //sinfg::info("Dropped data of type \"%s\"",selection_data.get_data_type());
- //sinfg::info("Dropped data of target \"%s\"",gdk_atom_name(selection_data->target));
- //sinfg::info("Dropped selection=\"%s\"",gdk_atom_name(selection_data->selection));
- sinfgapp::Action::PassiveGrouper passive_grouper(canvas_interface()->get_instance().get(),_("Move Layers"));
-
+
+ //synfig::info("Dropped data of type \"%s\"",selection_data.get_data_type());
+ //synfig::info("Dropped data of target \"%s\"",gdk_atom_name(selection_data->target));
+ //synfig::info("Dropped selection=\"%s\"",gdk_atom_name(selection_data->selection));
+ synfigapp::Action::PassiveGrouper passive_grouper(canvas_interface()->get_instance().get(),_("Move Layers"));
+
// Save the selection data
- sinfgapp::SelectionManager::LayerList selected_layer_list=canvas_interface()->get_selection_manager()->get_selected_layers();
+ synfigapp::SelectionManager::LayerList selected_layer_list=canvas_interface()->get_selection_manager()->get_selected_layers();
if ((selection_data.get_length() >= 0) && (selection_data.get_format() == 8))
{
Gtk::TreeModel::Row row;
Canvas::Handle dest_canvas;
-
+
int dest_layer_depth=dest.back();
-
+
TreeModel::Path dest_parent(dest);
if(!dest_parent.up() || !get_iter(dest_parent))
{
- TreeModel::Path dest(dest);
- if(!get_iter(dest))
- dest.prev();
+ TreeModel::Path dest_(dest);
+ if(!get_iter(dest_))
+ dest_.prev();
- if(!get_iter(dest))
+ if(!get_iter(dest_))
return false;
{
- row=(*get_iter(dest));
+ row=(*get_iter(dest_));
dest_canvas=(Canvas::Handle)(row[model.canvas]);
}
}
row=(*get_iter(dest_parent));
dest_canvas=row[model.contained_canvas];
}
-
+
assert(dest_canvas);
-
+
Layer::Handle dest_layer(row[model.layer]);
- if(sinfg::String(selection_data.get_data_type())=="LAYER")for(unsigned int i=0;i<selection_data.get_length()/sizeof(void*);i++)
+ if(synfig::String(selection_data.get_data_type())=="LAYER")for(unsigned int i=0;i<selection_data.get_length()/sizeof(void*);i++)
{
- //sinfg::info("dest_layer_depth=%d",dest_layer_depth);
-
+ //synfig::info("dest_layer_depth=%d",dest_layer_depth);
+
Layer::Handle src(reinterpret_cast<Layer**>(const_cast<guint8*>(selection_data.get_data()))[i]);
assert(src);
if(dest_layer==src)
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())
{
// dest_layer_depth--;
if(dest_canvas==src->get_canvas() && dest_layer_depth==src->get_depth())
continue;
-
- sinfgapp::Action::Handle action(sinfgapp::Action::create("layer_move"));
+
+ synfigapp::Action::Handle action(synfigapp::Action::create("layer_move"));
action->set_param("canvas",dest_canvas);
action->set_param("canvas_interface",canvas_interface());
action->set_param("layer",src);
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;
}
continue;
}
/*else // In this case we need to remove and then add
- {
-
- sinfgapp::Action::Handle action;
- action=sinfgapp::Action::create("layer_remove");
+ {
+
+ synfigapp::Action::Handle action;
+ action=synfigapp::Action::create("layer_remove");
action->set_param("canvas",Canvas::Handle(src->get_canvas()));
if(!action->set_param("canvas_interface",App::get_instance(src->get_canvas())->find_canvas_interface(src->get_canvas())))
action->set_param("canvas_interface",canvas_interface());
return false;
}
- action=sinfgapp::Action::create("layer_add");
+ action=synfigapp::Action::create("layer_add");
action->set_param("canvas",dest_canvas);
action->set_param("canvas_interface",canvas_interface());
action->set_param("new",src);
if(dest_layer_depth!=0)
{
- action=sinfgapp::Action::create("layer_move");
+ action=synfigapp::Action::create("layer_move");
action->set_param("canvas",dest_canvas);
action->set_param("canvas_interface",canvas_interface());
action->set_param("layer",src);
ret=false;
return false;
}
- }
+ }
ret=true;
}
*/
}
}
- sinfg::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()
{
//etl::clock timer;timer.reset();
- //sinfg::warning("---------rebuilding layer table---------");
+ //synfig::warning("---------rebuilding layer table---------");
// Save the selection data
- sinfgapp::SelectionManager::LayerList layer_list=canvas_interface()->get_selection_manager()->get_selected_layers();
+ synfigapp::SelectionManager::LayerList layer_list=canvas_interface()->get_selection_manager()->get_selected_layers();
// Clear out the current list
clear();
-
+
// Go ahead and and add all the layers
std::for_each(
canvas_interface()->get_canvas()->rbegin(), canvas_interface()->get_canvas()->rend(),
if(!layer_list.empty())
canvas_interface()->get_selection_manager()->set_selected_layers(layer_list);
- //sinfg::info("LayerTreeStore::rebuild() took %f seconds",float(timer()));
+ //synfig::info("LayerTreeStore::rebuild() took %f seconds",float(timer()));
}
void
etl::clock timer;timer.reset();
Gtk::TreeModel::Children children_(children());
-
+
Gtk::TreeModel::Children::iterator iter;
-
+
if(!children_.empty())
for(iter = children_.begin(); iter && iter != children_.end(); ++iter)
{
Gtk::TreeRow row=*iter;
refresh_row(row);
}
- //sinfg::info("LayerTreeStore::refresh() took %f seconds",float(timer()));
+ //synfig::info("LayerTreeStore::refresh() took %f seconds",float(timer()));
}
void
Layer::Handle layer=row[model.layer];
/*
{
- row[model.name] = layer->get_local_name();
+ row[model.name] = layer->get_local_name();
if(layer->get_description().empty())
{
row[model.label] = layer->get_local_name();
}
else
{
- row[model.label] = layer->get_description();
+ row[model.label] = layer->get_description();
row[model.tooltip] = layer->get_local_name();
}
}
*/
-
+
if(layer->dynamic_param_list().count("z_depth"))
row[model.z_depth]=Time::begin();
- // row_changed(get_path(row),row);
-
+ // row_changed(get_path(row),row);
+
Gtk::TreeModel::Children children = row.children();
Gtk::TreeModel::Children::iterator iter;
void
-LayerTreeStore::set_row_layer(Gtk::TreeRow &row,sinfg::Layer::Handle &handle)
+LayerTreeStore::set_row_layer(Gtk::TreeRow &row,synfig::Layer::Handle &handle)
{
//row[model.id] = handle->get_name();
- //row[model.name] = handle->get_local_name();
+ //row[model.name] = handle->get_local_name();
/*if(handle->get_description().empty())
{
//row[model.label] = handle->get_local_name();
}
else
{
- //row[model.label] = handle->get_description();
+ //row[model.label] = handle->get_description();
row[model.tooltip] = handle->get_local_name();
}*/
-
+
//row[model.active] = handle->active();
row[model.layer] = handle;
//row[model.canvas] = handle->get_canvas();
- //row[model.icon] = layer_icon;
+ //row[model.icon] = layer_icon;
+
+ synfig::Layer::ParamList paramlist=handle->get_param_list();
- sinfg::Layer::ParamList paramlist=handle->get_param_list();
+ synfig::Layer::Vocab vocab=handle->get_param_vocab();
+ synfig::Layer::Vocab::iterator iter;
- sinfg::Layer::Vocab vocab=handle->get_param_vocab();
- sinfg::Layer::Vocab::iterator iter;
-
for(iter=vocab.begin();iter!=vocab.end();++iter)
{
if(iter->get_hidden())
continue;
if(handle->get_param(iter->get_name()).get_type()!=ValueBase::TYPE_CANVAS)
continue;
-
+
{
Canvas::Handle canvas;
canvas=handle->get_param(iter->get_name()).get(canvas);
if(!canvas)
continue;
-
+
Canvas::reverse_iterator iter;
row[model.contained_canvas]=canvas;
-
+
for(iter=canvas->rbegin();iter!=canvas->rend();++iter)
{
Gtk::TreeRow row_(*(prepend(row.children())));
set_row_layer(row_,*iter);
- }
+ }
continue;
}
-
-
+
/*
etl::handle<ValueNode> value_node;
if(handle.constant()->dynamic_param_list().count(iter->get_name()))
}
void
-LayerTreeStore::on_layer_added(sinfg::Layer::Handle layer)
+LayerTreeStore::on_layer_added(synfig::Layer::Handle layer)
{
assert(layer);
Gtk::TreeRow row;
}
void
-LayerTreeStore::on_layer_removed(sinfg::Layer::Handle handle)
+LayerTreeStore::on_layer_removed(synfig::Layer::Handle handle)
{
Gtk::TreeModel::Children::iterator iter;
if(find_layer_row(handle,iter))
erase(iter);
else
{
- sinfg::error("LayerTreeStore::on_layer_removed():Unable to find layer to be removed, forced to rebuild...");
+ synfig::error("LayerTreeStore::on_layer_removed():Unable to find layer to be removed, forced to rebuild...");
rebuild();
}
}
void
-LayerTreeStore::on_layer_inserted(sinfg::Layer::Handle handle,int depth)
-{
+LayerTreeStore::on_layer_inserted(synfig::Layer::Handle handle,int depth)
+{
if(depth==0)
{
on_layer_added(handle);
return;
}
-
Gtk::TreeModel::Children children_(children());
if(canvas_interface()->get_canvas()!=handle->get_canvas())
{
Gtk::TreeModel::Children::iterator iter;
if(!find_canvas_row(handle->get_canvas(),iter))
{
- sinfg::error("LayerTreeStore::on_layer_inserted():Unable to find canvas row, forced to rebuild...");
+ synfig::error("LayerTreeStore::on_layer_inserted():Unable to find canvas row, forced to rebuild...");
rebuild();
return;
}
children_=iter->children();
}
-
+
Gtk::TreeModel::Children::iterator iter(children_.begin());
while(depth-- && iter)
{
++iter;
if(!iter || iter==children_.end())
{
- sinfg::error("LayerTreeStore::on_layer_inserted():Unable to achieve desired depth, forced to rebuild...");
+ synfig::error("LayerTreeStore::on_layer_inserted():Unable to achieve desired depth, forced to rebuild...");
rebuild();
return;
}
}
-
+
Gtk::TreeModel::Row row(*insert(iter));
set_row_layer(row,handle);
-
}
void
-LayerTreeStore::on_layer_status_changed(sinfg::Layer::Handle handle,bool x)
+LayerTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool /*x*/)
{
Gtk::TreeModel::Children::iterator iter;
if(find_layer_row(handle,iter))
(*iter)[model.layer]=handle;
else
{
- sinfg::warning("Couldn't find layer to be activated in layer list. Rebuilding index...");
+ synfig::warning("Couldn't find layer to be activated in layer list. Rebuilding index...");
rebuild();
}
}
void
-LayerTreeStore::on_layer_lowered(sinfg::Layer::Handle layer)
-{
+LayerTreeStore::on_layer_lowered(synfig::Layer::Handle layer)
+{
Gtk::TreeModel::Children::iterator iter, iter2;
if(find_layer_row(layer,iter))
{
// Save the selection data
- //sinfgapp::SelectionManager::LayerList layer_list=canvas_interface()->get_selection_manager()->get_selected_layers();
+ //synfigapp::SelectionManager::LayerList layer_list=canvas_interface()->get_selection_manager()->get_selected_layers();
iter2=iter;
iter2++;
if(!iter2)
rebuild();
return;
}
-
+
//Gtk::TreeModel::Row row(*iter);
Gtk::TreeModel::Row row2 = *iter2;
- sinfg::Layer::Handle layer2=row2[model.layer];
-
+ synfig::Layer::Handle layer2=row2[model.layer];
+
erase(iter2);
row2=*insert(iter);
- set_row_layer(row2,layer2);
-
+ set_row_layer(row2,layer2);
+
}
else
rebuild();
}
void
-LayerTreeStore::on_layer_raised(sinfg::Layer::Handle layer)
+LayerTreeStore::on_layer_raised(synfig::Layer::Handle layer)
{
Gtk::TreeModel::Children::iterator iter, iter2;
if(find_layer_row_(layer, canvas_interface()->get_canvas(), children_, iter,iter2))
{
if(iter!=iter2)
- {
+ {
//Gtk::TreeModel::Row row = *iter;
Gtk::TreeModel::Row row2 = *iter2;
- sinfg::Layer::Handle layer2=row2[model.layer];
-
+ synfig::Layer::Handle layer2=row2[model.layer];
+
erase(iter2);
iter++;
row2=*insert(iter);
set_row_layer(row2,layer2);
-
+
return;
}
}
-
+
rebuild();
}
void
-LayerTreeStore::on_layer_moved(sinfg::Layer::Handle layer,int depth, sinfg::Canvas::Handle canvas)
+LayerTreeStore::on_layer_moved(synfig::Layer::Handle layer,int depth, synfig::Canvas::Handle /*canvas*/)
{
on_layer_removed(layer);
on_layer_inserted(layer,depth);
}
void
-LayerTreeStore::on_layer_param_changed(sinfg::Layer::Handle handle,sinfg::String param_name)
+LayerTreeStore::on_layer_param_changed(synfig::Layer::Handle handle,synfig::String param_name)
{
if(param_name=="z_depth")
{
}
/*
- //DEBUGPOINT();
Gtk::TreeModel::Children::iterator iter;
if(find_layer_row(handle,iter))
{
- //DEBUGPOINT();
Gtk::TreeModel::Children children(iter->children());
-
+
for(iter = children.begin(); iter && iter != children.end(); ++iter)
{
if((Glib::ustring)(*iter)[model.param_name]==param_name)
{
- //DEBUGPOINT();
Gtk::TreeRow row=*iter;
refresh_row(row);
- return;
+ return;
}
}
}
- //DEBUGPOINT();
rebuild();
*/
}
void
-LayerTreeStore::on_layer_new_description(sinfg::Layer::Handle handle,sinfg::String desc)
+LayerTreeStore::on_layer_new_description(synfig::Layer::Handle handle,synfig::String desc)
{
Gtk::TreeModel::Children::iterator iter;
if(find_layer_row(handle,iter))
{
Gtk::TreeRow row(*iter);
-
- Layer::Handle layer(row[model.layer]);
-
+
+ Layer::Handle layer(row[model.layer]);
+
if(desc.empty())
{
//row[model.label]=layer->get_local_name();
//row[model.label]=layer->get_description();
row[model.tooltip]=layer->get_local_name();
}
- else
+ else
{
rebuild();
}
}
bool
-LayerTreeStore::find_canvas_row_(sinfg::Canvas::Handle canvas, sinfg::Canvas::Handle parent, Gtk::TreeModel::Children layers, Gtk::TreeModel::Children::iterator &iter)
-{
+LayerTreeStore::find_canvas_row_(synfig::Canvas::Handle canvas, synfig::Canvas::Handle parent, Gtk::TreeModel::Children layers, Gtk::TreeModel::Children::iterator &iter)
+{
if(canvas==parent)
return false;
for(iter=layers.begin(); iter && iter != layers.end(); ++iter)
{
Gtk::TreeModel::Row row = *iter;
- if(canvas==(sinfg::Canvas::Handle)row[model.contained_canvas])
+ if(canvas==(synfig::Canvas::Handle)row[model.contained_canvas])
return true;
}
-
+
iter=children().end();
//return false;
}
Gtk::TreeModel::Children::iterator iter2;
//Gtk::TreeModel::Children::iterator iter3;
-
+
for(iter2 = layers.begin(); iter2 && iter2 != layers.end(); ++iter2)
{
Gtk::TreeModel::Row row = *iter2;
assert((bool)true);
-
+
if(row.children().empty())
continue;
-
+
Canvas::Handle sub_canvas((*row.children().begin())[model.canvas]);
if(!sub_canvas)
continue;
if(find_canvas_row_(canvas,sub_canvas,iter2->children(),iter))
return true;
}
-
+
iter=children().end();
return false;
}
bool
-LayerTreeStore::find_canvas_row(sinfg::Canvas::Handle canvas, Gtk::TreeModel::Children::iterator &iter)
+LayerTreeStore::find_canvas_row(synfig::Canvas::Handle canvas, Gtk::TreeModel::Children::iterator &iter)
{
return find_canvas_row_(canvas,canvas_interface()->get_canvas(),children(),iter);
}
bool
-LayerTreeStore::find_layer_row_(const sinfg::Layer::Handle &layer, sinfg::Canvas::Handle canvas, Gtk::TreeModel::Children layers, Gtk::TreeModel::Children::iterator &iter, Gtk::TreeModel::Children::iterator &prev)
+LayerTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig::Canvas::Handle /*canvas*/, Gtk::TreeModel::Children layers, Gtk::TreeModel::Children::iterator &iter, Gtk::TreeModel::Children::iterator &prev)
{
assert(layer);
-
+
//if(layer->get_canvas()==canvas)
{
for(iter=prev=layers.begin(); iter && iter != layers.end(); prev=iter++)
{
Gtk::TreeModel::Row row = *iter;
- if(layer==(sinfg::Layer::Handle)row[model.layer])
+ if(layer==(synfig::Layer::Handle)row[model.layer])
return true;
}
-
+
iter=children().end();
- //DEBUGPOINT();
//return false;
}
Gtk::TreeModel::Children::iterator iter2;
-
+
for(iter2 = layers.begin(); iter2 && iter2 != layers.end(); ++iter2)
{
Gtk::TreeModel::Row row = *iter2;
assert((bool)true);
-
+
if(row.children().empty())
continue;
-
+
Canvas::Handle canvas((*row.children().begin())[model.canvas]);
if(!canvas)
continue;
-
+
if(find_layer_row_(layer,canvas,iter2->children(),iter,prev))
return true;
}
-
+
iter=children().end();
return false;
}
bool
-LayerTreeStore::find_layer_row(const sinfg::Layer::Handle &layer, Gtk::TreeModel::Children::iterator &iter)
+LayerTreeStore::find_layer_row(const synfig::Layer::Handle &layer, Gtk::TreeModel::Children::iterator &iter)
{
Gtk::TreeModel::Children::iterator prev;
return find_layer_row_(layer,canvas_interface()->get_canvas(),children(),iter,prev);
}
bool
-LayerTreeStore::find_prev_layer_row(const sinfg::Layer::Handle &layer, Gtk::TreeModel::Children::iterator &prev)
+LayerTreeStore::find_prev_layer_row(const synfig::Layer::Handle &layer, Gtk::TreeModel::Children::iterator &prev)
{
Gtk::TreeModel::Children::iterator iter;
if(!find_layer_row_(layer,canvas_interface()->get_canvas(),children(),iter,prev))
projects / synfig.git / blobdiff