X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fchildrentreestore.cpp;h=e50f45dfe5c1adda8c35aa216fe1d354f082a18b;hb=7dd8043ef6511adc0eadcd9f011da4cdfdb7536b;hp=73378fe1ab5bf78b15955e0de1f4c7784625dfab;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
index 73378fe..e50f45d 100644
--- a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file childrentreestore.cpp
 **	\brief Template File
 **
 **	$Id: childrentreestore.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -31,7 +32,7 @@
 #include "childrentreestore.h"
 #include "iconcontroler.h"
 #include <gtkmm/button.h>
-#include <sinfg/paramdesc.h>
+#include <synfig/paramdesc.h>
 #include <ETL/clock>
 
 class Profiler : private etl::clock
@@ -39,7 +40,7 @@ class Profiler : private etl::clock
 	const std::string name;
 public:
 	Profiler(const std::string& name):name(name) { reset(); }
-	~Profiler() { float time(operator()()); sinfg::info("%s: took %f msec",name.c_str(),time*1000); }
+	~Profiler() { float time(operator()()); synfig::info("%s: took %f msec",name.c_str(),time*1000); }
 };
 
 #endif
@@ -48,7 +49,7 @@ public:
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -66,7 +67,7 @@ static ChildrenTreeStore::Model& ModelHack()
 	return *model;
 }
 
-ChildrenTreeStore::ChildrenTreeStore(etl::loose_handle<sinfgapp::CanvasInterface> canvas_interface_):
+ChildrenTreeStore::ChildrenTreeStore(etl::loose_handle<synfigapp::CanvasInterface> canvas_interface_):
 	Gtk::TreeStore			(ModelHack()),
 	CanvasTreeStore			(canvas_interface_)
 {
@@ -96,7 +97,7 @@ ChildrenTreeStore::~ChildrenTreeStore()
 }
 
 Glib::RefPtr<ChildrenTreeStore>
-ChildrenTreeStore::create(etl::loose_handle<sinfgapp::CanvasInterface> canvas_interface_)
+ChildrenTreeStore::create(etl::loose_handle<synfigapp::CanvasInterface> canvas_interface_)
 {
 	return Glib::RefPtr<ChildrenTreeStore>(new ChildrenTreeStore(canvas_interface_));
 }
@@ -184,7 +185,7 @@ ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas)
 {
 	Gtk::TreeRow row = *(prepend(canvas_row.children()));
 
-	row[model.icon] = Gtk::Button().render_icon(Gtk::StockID("sinfg-canvas"),Gtk::ICON_SIZE_SMALL_TOOLBAR);	
+	row[model.icon] = Gtk::Button().render_icon(Gtk::StockID("synfig-canvas"),Gtk::ICON_SIZE_SMALL_TOOLBAR);	
 	row[model.id] = canvas->get_id();
 	row[model.name] = canvas->get_name();
 	
@@ -216,7 +217,7 @@ ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node)
 
 	Gtk::TreeRow row = *prepend(value_node_row.children());
 	
-	set_row(row,sinfgapp::ValueDesc(canvas_interface()->get_canvas(),value_node->get_id()),false);
+	set_row(row,synfigapp::ValueDesc(canvas_interface()->get_canvas(),value_node->get_id()),false);
 }
 
 void
@@ -328,7 +329,7 @@ ChildrenTreeStore::on_value_node_changed(etl::handle<ValueNode> value_node)
 }
 
 void
-ChildrenTreeStore::on_value_node_replaced(sinfg::ValueNode::Handle replaced_value_node,sinfg::ValueNode::Handle new_value_node)
+ChildrenTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle new_value_node)
 {
 	changed_connection.disconnect();
 	//if(!execute_changed_queued())
@@ -357,11 +358,11 @@ ChildrenTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int colu
 	{
 		if(column==model.value.index())
 		{
-			Glib::Value<sinfg::ValueBase> x;
+			Glib::Value<synfig::ValueBase> x;
 			g_value_init(x.gobj(),model.value.type());
 			g_value_copy(value.gobj(),x.gobj());
 
-			sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]);
+			synfigapp::ValueDesc value_desc((*iter)[model.value_desc]);
 			if(value_desc)
 			{
 				canvas_interface()->change_value(value_desc,x.get());