X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayergrouptreestore.cpp;h=22629a109dd78de0281d4526f2b4b1c5fdb1cbe6;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=d6d32939c17ae460e591c09db4c39eb5d5a42711;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
index d6d3293..22629a1 100644
--- 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
+**	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
@@ -95,7 +96,9 @@ LayerGroupTreeStore::LayerGroupTreeStore(etl::loose_handle<synfigapp::CanvasInte
 LayerGroupTreeStore::~LayerGroupTreeStore()
 {
 	//clear();
-	synfig::info("LayerGroupTreeStore::~LayerGroupTreeStore(): Deleted");
+
+	if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+		synfig::info("LayerGroupTreeStore::~LayerGroupTreeStore(): Deleted");
 }
 
 bool
@@ -212,11 +215,7 @@ LayerGroupTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int
 			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());
@@ -671,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))
 				{
-					DEBUGPOINT();
 					ret=true;
 				}
 				else
 				{
-					DEBUGPOINT();
 					passive_grouper.cancel();
 					return false;
 				}
@@ -704,7 +701,7 @@ void
 LayerGroupTreeStore::rebuild()
 {
 	rebuilding=true;
-		etl::clock timer;timer.reset();
+	// etl::clock timer;timer.reset();
 	try {
 
 		// Clear out the current list
@@ -737,7 +734,7 @@ LayerGroupTreeStore::rebuild()
 		throw;
 	}
 	rebuilding=false;
-	synfig::info("LayerGroupTreeStore::rebuild() took %f seconds",float(timer()));
+	// synfig::info("LayerGroupTreeStore::rebuild() took %f seconds",float(timer()));
 }
 
 void
@@ -831,8 +828,6 @@ LayerGroupTreeStore::on_group_added(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);
@@ -845,16 +840,14 @@ LayerGroupTreeStore::on_group_removed(synfig::String group)
 bool
 LayerGroupTreeStore::on_group_changed(synfig::String /*group*/)
 {
-	//DEBUGPOINT();
 	return true;
 }
 
 void
-LayerGroupTreeStore::on_group_pair_added(String group, etl::handle<Layer> layer)
+LayerGroupTreeStore::on_group_pair_added(synfig::String group, etl::handle<synfig::Layer> layer)
 {
 	if(!layer->get_canvas())
 		return;
-	//DEBUGPOINT();
 	Gtk::TreeModel::Children::iterator iter;
 	if(!find_group_row(group, iter))
 		iter=on_group_added(group);
@@ -865,11 +858,10 @@ LayerGroupTreeStore::on_group_pair_added(String group, etl::handle<Layer> layer)
 }
 
 void
-LayerGroupTreeStore::on_group_pair_removed(String group, etl::handle<Layer> layer)
+LayerGroupTreeStore::on_group_pair_removed(synfig::String group, etl::handle<synfig::Layer> layer)
 {
 	if(!layer->get_canvas())
 		return;
-	//DEBUGPOINT();
 	Gtk::TreeModel::Children::iterator iter;
 	if(!find_group_row(group, iter))
 		return;
@@ -952,7 +944,6 @@ LayerGroupTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig:
 		}
 
 		iter=children().end();
-		//DEBUGPOINT();
 		//return false;
 	}
 
@@ -987,7 +978,7 @@ LayerGroupTreeStore::find_layer_row(const synfig::Layer::Handle &layer, Gtk::Tre
 }
 
 bool
-LayerGroupTreeStore::find_group_row(const String &group, Gtk::TreeModel::Children::iterator &iter)
+LayerGroupTreeStore::find_group_row(const synfig::String &group, Gtk::TreeModel::Children::iterator &iter)
 {
 	Gtk::TreeModel::Children::iterator prev;
 	return find_group_row_(group,children(),iter,prev);
@@ -1006,7 +997,6 @@ LayerGroupTreeStore::find_group_row_(const synfig::String &group, Gtk::TreeModel
 		}
 
 		iter=children().end();
-		//DEBUGPOINT();
 		//return false;
 	}