projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The recent changes to allow dragging of BLineCalcVertex ducks along the BLines they...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
layergrouptreestore.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
index
aa84808
..
22629a1
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-95,7
+96,9
@@
LayerGroupTreeStore::LayerGroupTreeStore(etl::loose_handle<synfigapp::CanvasInte
LayerGroupTreeStore::~LayerGroupTreeStore()
{
//clear();
LayerGroupTreeStore::~LayerGroupTreeStore()
{
//clear();
- synfig::info("LayerGroupTreeStore::~LayerGroupTreeStore(): Deleted");
+
+ if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+ synfig::info("LayerGroupTreeStore::~LayerGroupTreeStore(): Deleted");
}
bool
}
bool
@@
-667,12
+670,10
@@
LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons
action->set_param("dest_canvas",dest_canvas);
if(canvas_interface()->get_instance()->perform_action(action))
{
action->set_param("dest_canvas",dest_canvas);
if(canvas_interface()->get_instance()->perform_action(action))
{
- DEBUGPOINT();
ret=true;
}
else
{
ret=true;
}
else
{
- DEBUGPOINT();
passive_grouper.cancel();
return false;
}
passive_grouper.cancel();
return false;
}
@@
-700,7
+701,7
@@
void
LayerGroupTreeStore::rebuild()
{
rebuilding=true;
LayerGroupTreeStore::rebuild()
{
rebuilding=true;
-
etl::clock timer;timer.reset();
+
//
etl::clock timer;timer.reset();
try {
// Clear out the current list
try {
// Clear out the current list
@@
-733,7
+734,7
@@
LayerGroupTreeStore::rebuild()
throw;
}
rebuilding=false;
throw;
}
rebuilding=false;
- synfig::info("LayerGroupTreeStore::rebuild() took %f seconds",float(timer()));
+
//
synfig::info("LayerGroupTreeStore::rebuild() took %f seconds",float(timer()));
}
void
}
void
@@
-827,8
+828,6
@@
LayerGroupTreeStore::on_group_added(synfig::String group)
bool
LayerGroupTreeStore::on_group_removed(synfig::String group)
{
bool
LayerGroupTreeStore::on_group_removed(synfig::String group)
{
- //DEBUGPOINT();
-
Gtk::TreeModel::Children::iterator iter;
if(find_group_row(group,iter) && iter->children().size()==0)
erase(iter);
Gtk::TreeModel::Children::iterator iter;
if(find_group_row(group,iter) && iter->children().size()==0)
erase(iter);
@@
-841,7
+840,6
@@
LayerGroupTreeStore::on_group_removed(synfig::String group)
bool
LayerGroupTreeStore::on_group_changed(synfig::String /*group*/)
{
bool
LayerGroupTreeStore::on_group_changed(synfig::String /*group*/)
{
- //DEBUGPOINT();
return true;
}
return true;
}
@@
-850,7
+848,6
@@
LayerGroupTreeStore::on_group_pair_added(synfig::String group, etl::handle<synfi
{
if(!layer->get_canvas())
return;
{
if(!layer->get_canvas())
return;
- //DEBUGPOINT();
Gtk::TreeModel::Children::iterator iter;
if(!find_group_row(group, iter))
iter=on_group_added(group);
Gtk::TreeModel::Children::iterator iter;
if(!find_group_row(group, iter))
iter=on_group_added(group);
@@
-865,7
+862,6
@@
LayerGroupTreeStore::on_group_pair_removed(synfig::String group, etl::handle<syn
{
if(!layer->get_canvas())
return;
{
if(!layer->get_canvas())
return;
- //DEBUGPOINT();
Gtk::TreeModel::Children::iterator iter;
if(!find_group_row(group, iter))
return;
Gtk::TreeModel::Children::iterator iter;
if(!find_group_row(group, iter))
return;
@@
-948,7
+944,6
@@
LayerGroupTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig:
}
iter=children().end();
}
iter=children().end();
- //DEBUGPOINT();
//return false;
}
//return false;
}
@@
-1002,7
+997,6
@@
LayerGroupTreeStore::find_group_row_(const synfig::String &group, Gtk::TreeModel
}
iter=children().end();
}
iter=children().end();
- //DEBUGPOINT();
//return false;
}
//return false;
}