X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayergrouptreestore.cpp;h=f9750a5bba6ce4b56883cf8fd3f4ce9a8202ed62;hb=1b138b535876987c79453888f370d71910d975ed;hp=de98228763c560650f0c54281f40d39eb946f78c;hpb=54d76cf22cb55862d5ebf52dfa098fcfe8d246f8;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
index de98228..f9750a5 100644
--- a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
@@ -43,6 +43,8 @@
 
 #include <gtk/gtkversion.h>
 #include <ETL/clock>
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -210,11 +212,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());
@@ -669,12 +667,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;
 				}
@@ -702,7 +698,7 @@ void
 LayerGroupTreeStore::rebuild()
 {
 	rebuilding=true;
-		etl::clock timer;timer.reset();
+	// etl::clock timer;timer.reset();
 	try {
 
 		// Clear out the current list
@@ -735,7 +731,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
@@ -829,8 +825,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);
@@ -843,16 +837,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);
@@ -863,11 +855,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;
@@ -950,7 +941,6 @@ LayerGroupTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig:
 		}
 
 		iter=children().end();
-		//DEBUGPOINT();
 		//return false;
 	}
 
@@ -985,7 +975,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);
@@ -1004,7 +994,6 @@ LayerGroupTreeStore::find_group_row_(const synfig::String &group, Gtk::TreeModel
 		}
 
 		iter=children().end();
-		//DEBUGPOINT();
 		//return false;
 	}