X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fchildrentreestore.cpp;h=cf8798f609c33f3f2f005696c3ed07745a967a54;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=e6521ec31c079699b8d4fed7a8f29c5c27ba8bde;hpb=8b9c251aa2368b8bfcee60993a1ca1ca47464f6e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
index e6521ec..cf8798f 100644
--- a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/childrentreestore.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,11 +31,13 @@
 #endif
 
 #include "childrentreestore.h"
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 #include <gtkmm/button.h>
 #include <synfig/paramdesc.h>
 #include <ETL/clock>
 
+#include "general.h"
+
 class Profiler : private etl::clock
 {
 	const std::string name;
@@ -83,6 +86,7 @@ ChildrenTreeStore::ChildrenTreeStore(etl::loose_handle<synfigapp::CanvasInterfac
 
 	// Connect all the signals
 	canvas_interface()->signal_value_node_changed().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_changed));
+	canvas_interface()->signal_value_node_renamed().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_renamed));
 	canvas_interface()->signal_value_node_added().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_added));
 	canvas_interface()->signal_value_node_deleted().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_deleted));
 	canvas_interface()->signal_value_node_replaced().connect(sigc::mem_fun(*this,&studio::ChildrenTreeStore::on_value_node_replaced));
@@ -105,7 +109,7 @@ ChildrenTreeStore::create(etl::loose_handle<synfigapp::CanvasInterface> canvas_i
 void
 ChildrenTreeStore::rebuild()
 {
-	Profiler profiler("ChildrenTreeStore::rebuild()");
+	// Profiler profiler("ChildrenTreeStore::rebuild()");
 	rebuild_value_nodes();
 	rebuild_canvases();
 }
@@ -113,7 +117,7 @@ ChildrenTreeStore::rebuild()
 void
 ChildrenTreeStore::refresh()
 {
-	Profiler profiler("ChildrenTreeStore::refresh()");
+	// Profiler profiler("ChildrenTreeStore::refresh()");
 	refresh_value_nodes();
 	refresh_canvases();
 }
@@ -144,7 +148,6 @@ ChildrenTreeStore::refresh_value_nodes()
 		for(iter = children.begin(); iter != children.end(); ++iter)
 		{
 			Gtk::TreeRow row=*iter;
-			//DEBUGPOINT();
 			refresh_row(row);
 		}
 }
@@ -169,7 +172,7 @@ ChildrenTreeStore::refresh_canvases()
 }
 
 void
-ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool do_children)
+ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool /*do_children*/)
 {
 	CanvasTreeStore::refresh_row(row,false);
 
@@ -181,7 +184,7 @@ ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool do_children)
 }
 
 void
-ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas)
+ChildrenTreeStore::on_canvas_added(synfig::Canvas::Handle canvas)
 {
 	Gtk::TreeRow row = *(prepend(canvas_row.children()));
 
@@ -204,13 +207,13 @@ ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas)
 }
 
 void
-ChildrenTreeStore::on_canvas_removed(Canvas::Handle canvas)
+ChildrenTreeStore::on_canvas_removed(synfig::Canvas::Handle /*canvas*/)
 {
 	rebuild_canvases();
 }
 
 void
-ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node)
+ChildrenTreeStore::on_value_node_added(synfig::ValueNode::Handle value_node)
 {
 //	if(value_node->get_id().find("Unnamed")!=String::npos)
 //		return;
@@ -221,7 +224,7 @@ ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node)
 }
 
 void
-ChildrenTreeStore::on_value_node_deleted(etl::handle<ValueNode> value_node)
+ChildrenTreeStore::on_value_node_deleted(synfig::ValueNode::Handle value_node)
 {
 	Gtk::TreeIter iter;
 	//int i(0);
@@ -236,8 +239,7 @@ ChildrenTreeStore::on_value_node_deleted(etl::handle<ValueNode> value_node)
 bool
 ChildrenTreeStore::execute_changed_value_nodes()
 {
-	Profiler profiler("ChildrenTreeStore::execute_changed_value_nodes()");
-	DEBUGPOINT();
+	// Profiler profiler("ChildrenTreeStore::execute_changed_value_nodes()");
 	if(!replaced_set_.empty())
 		rebuild_value_nodes();
 
@@ -294,7 +296,7 @@ ChildrenTreeStore::execute_changed_value_nodes()
 }
 
 void
-ChildrenTreeStore::on_value_node_changed(etl::handle<ValueNode> value_node)
+ChildrenTreeStore::on_value_node_changed(synfig::ValueNode::Handle value_node)
 {
 
 	if(!value_node->is_exported())
@@ -329,7 +331,13 @@ ChildrenTreeStore::on_value_node_changed(etl::handle<ValueNode> value_node)
 }
 
 void
-ChildrenTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle new_value_node)
+ChildrenTreeStore::on_value_node_renamed(synfig::ValueNode::Handle value_node __attribute__ ((unused)))
+{
+	rebuild_value_nodes();
+}
+
+void
+ChildrenTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle /*new_value_node*/)
 {
 	changed_connection.disconnect();
 	//if(!execute_changed_queued())
@@ -376,6 +384,6 @@ ChildrenTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int colu
 	}
 	catch(std::exception x)
 	{
-		g_warning(x.what());
+		g_warning("%s", x.what());
 	}
 }