X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayerparamtreestore.cpp;h=ddd27b72c8ddbded72294cce35825512b1394196;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=6e098e5a9234448def8e9528435c45aee85b15fa;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
index 6e098e5..ddd27b7 100644
--- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -30,7 +31,7 @@
 #endif
 
 #include "layerparamtreestore.h"
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 #include <gtkmm/button.h>
 #include <synfig/paramdesc.h>
 #include "layertree.h"
@@ -39,6 +40,8 @@
 #include "app.h"
 #include <ETL/clock>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -79,6 +82,7 @@ LayerParamTreeStore::LayerParamTreeStore(etl::loose_handle<synfigapp::CanvasInte
 	queued=false;
 	// Connect all the signals
 	canvas_interface()->signal_value_node_changed().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_changed));
+	canvas_interface()->signal_value_node_renamed().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_renamed));
 	canvas_interface()->signal_value_node_added().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_added));
 	canvas_interface()->signal_value_node_deleted().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_deleted));
 	canvas_interface()->signal_value_node_replaced().connect(sigc::mem_fun(*this,&studio::LayerParamTreeStore::on_value_node_replaced));
@@ -101,7 +105,9 @@ LayerParamTreeStore::~LayerParamTreeStore()
 		changed_connection_list.back().disconnect();
 		changed_connection_list.pop_back();
 	}
-	synfig::info("LayerParamTreeStore::~LayerParamTreeStore(): Deleted");
+
+	if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+		synfig::info("LayerParamTreeStore::~LayerParamTreeStore(): Deleted");
 }
 
 Glib::RefPtr<LayerParamTreeStore>
@@ -130,11 +136,7 @@ LayerParamTreeStore::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());
@@ -300,7 +302,7 @@ LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co
 void
 LayerParamTreeStore::rebuild()
 {
-	Profiler profiler("LayerParamTreeStore::rebuild()");
+	// Profiler profiler("LayerParamTreeStore::rebuild()");
 	if(queued)queued=false;
 	clear();
 	layer_list=layer_tree->get_selected_layers();
@@ -424,7 +426,8 @@ LayerParamTreeStore::rebuild()
 			if(value!=((*iter2)->get_param(iter->get_name())))
 			{
 				row[model.is_inconsistent] = true;
-				while(!row.children().empty() && erase(row.children().begin()));
+				while(!row.children().empty() && erase(row.children().begin()))
+					;
 				break;
 			}
 		}
@@ -495,7 +498,8 @@ LayerParamTreeStore::refresh_row(Gtk::TreeModel::Row &row)
 			if(value!=((*iter2)->get_param(param_desc.get_name())))
 			{
 				row[model.is_inconsistent] = true;
-				while(!row.children().empty() && erase(row.children().begin()));
+				while(!row.children().empty() && erase(row.children().begin()))
+					;
 				return;
 			}
 		}
@@ -513,19 +517,20 @@ void
 LayerParamTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc)
 {
 	Gtk::TreeModel::Children children = row.children();
-	while(!children.empty() && erase(children.begin()));
+	while(!children.empty() && erase(children.begin()))
+		;
 
 	CanvasTreeStore::set_row(row,value_desc);
 }
 
 void
-LayerParamTreeStore::on_value_node_added(ValueNode::Handle /*value_node*/)
+LayerParamTreeStore::on_value_node_added(synfig::ValueNode::Handle /*value_node*/)
 {
 //	queue_refresh();
 }
 
 void
-LayerParamTreeStore::on_value_node_deleted(etl::handle<ValueNode> /*value_node*/)
+LayerParamTreeStore::on_value_node_deleted(synfig::ValueNode::Handle /*value_node*/)
 {
 //	queue_refresh();
 }
@@ -543,12 +548,18 @@ LayerParamTreeStore::on_value_node_child_removed(synfig::ValueNode::Handle /*val
 }
 
 void
-LayerParamTreeStore::on_value_node_changed(etl::handle<ValueNode> /*value_node*/)
+LayerParamTreeStore::on_value_node_changed(synfig::ValueNode::Handle /*value_node*/)
 {
 	queue_refresh();
 }
 
 void
+LayerParamTreeStore::on_value_node_renamed(synfig::ValueNode::Handle /*value_node*/)
+{
+	rebuild();
+}
+
+void
 LayerParamTreeStore::on_value_node_replaced(synfig::ValueNode::Handle /*replaced_value_node*/,synfig::ValueNode::Handle /*new_value_node*/)
 {
 	queue_rebuild();