X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fhistorytreestore.cpp;h=ae6016a932122aeb98bf33cb0c04bb9ca472fb3d;hb=e7e1794959f6b4af0d60d69b5501adcd305f2207;hp=a0e084466d93efdc5839546bf40d170f05da40ac;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/historytreestore.cpp b/synfig-studio/trunk/src/gtkmm/historytreestore.cpp
index a0e0844..ae6016a 100644
--- a/synfig-studio/trunk/src/gtkmm/historytreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/historytreestore.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file historytreestore.cpp
 **	\brief Template File
 **
 **	$Id: historytreestore.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
 */
 /* ========================================================================= */
@@ -29,11 +30,11 @@
 #endif
 
 #include "historytreestore.h"
-#include <sinfg/valuenode.h>
+#include <synfig/valuenode.h>
 #include "iconcontroler.h"
-#include <sinfg/valuenode_timedswap.h>
+#include <synfig/valuenode_timedswap.h>
 #include <gtkmm/button.h>
-#include <sinfgapp/action.h>
+#include <synfigapp/action.h>
 #include "instance.h"
 
 #endif
@@ -42,7 +43,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -74,7 +75,7 @@ HistoryTreeStore::HistoryTreeStore(etl::loose_handle<studio::Instance> instance_
 
 HistoryTreeStore::~HistoryTreeStore()
 {
-	sinfg::info("HistoryTreeStore::~HistoryTreeStore(): Deleted");
+	synfig::info("HistoryTreeStore::~HistoryTreeStore(): Deleted");
 }
 
 Glib::RefPtr<HistoryTreeStore>
@@ -86,7 +87,7 @@ HistoryTreeStore::create(etl::loose_handle<studio::Instance> instance_)
 void
 HistoryTreeStore::rebuild()
 {
-	sinfgapp::Action::Stack::const_iterator iter;
+	synfigapp::Action::Stack::const_iterator iter;
 	
 	clear();
 	
@@ -102,7 +103,7 @@ HistoryTreeStore::rebuild()
 }
 
 void
-HistoryTreeStore::insert_action(Gtk::TreeRow row,etl::handle<sinfgapp::Action::Undoable> action, bool is_active, bool is_undo, bool is_redo)
+HistoryTreeStore::insert_action(Gtk::TreeRow row,etl::handle<synfigapp::Action::Undoable> action, bool is_active, bool is_undo, bool is_redo)
 {
 	assert(action);
 
@@ -112,19 +113,19 @@ HistoryTreeStore::insert_action(Gtk::TreeRow row,etl::handle<sinfgapp::Action::U
 	row[model.is_undo] = is_undo;
 	row[model.is_redo] = is_redo;
 	
-	sinfgapp::Action::CanvasSpecific *specific_action;
-	specific_action=dynamic_cast<sinfgapp::Action::CanvasSpecific*>(action.get());
+	synfigapp::Action::CanvasSpecific *specific_action;
+	specific_action=dynamic_cast<synfigapp::Action::CanvasSpecific*>(action.get());
 	if(specific_action)
 	{
 		row[model.canvas] = specific_action->get_canvas();
 		row[model.canvas_id] = specific_action->get_canvas()->get_id();		
 	}
 
-	etl::handle<sinfgapp::Action::Group> group;
-	group=etl::handle<sinfgapp::Action::Group>::cast_dynamic(action);
+	etl::handle<synfigapp::Action::Group> group;
+	group=etl::handle<synfigapp::Action::Group>::cast_dynamic(action);
 	if(group)
 	{
-		sinfgapp::Action::ActionList::const_iterator iter;
+		synfigapp::Action::ActionList::const_iterator iter;
 		for(iter=group->action_list().begin();iter!=group->action_list().end();++iter)
 		{
 			Gtk::TreeRow child_row = *(append(row.children()));
@@ -132,7 +133,7 @@ HistoryTreeStore::insert_action(Gtk::TreeRow row,etl::handle<sinfgapp::Action::U
 		}
 	}
 	
-	//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);	
 }
 
 
@@ -177,7 +178,7 @@ HistoryTreeStore::on_redo_stack_cleared()
 }
 
 void
-HistoryTreeStore::on_new_action(etl::handle<sinfgapp::Action::Undoable> action)
+HistoryTreeStore::on_new_action(etl::handle<synfigapp::Action::Undoable> action)
 {
 //	Gtk::TreeRow row = *(append());
 	Gtk::TreeRow row;
@@ -197,7 +198,7 @@ HistoryTreeStore::on_new_action(etl::handle<sinfgapp::Action::Undoable> action)
 }
 
 void
-HistoryTreeStore::on_action_status_changed(etl::handle<sinfgapp::Action::Undoable> action)
+HistoryTreeStore::on_action_status_changed(etl::handle<synfigapp::Action::Undoable> action)
 {
 	Gtk::TreeModel::Children::iterator iter;
 	Gtk::TreeModel::Children children_(children());
@@ -205,7 +206,7 @@ HistoryTreeStore::on_action_status_changed(etl::handle<sinfgapp::Action::Undoabl
 	for(iter=children_.begin(); iter != children_.end(); ++iter)
 	{
 		Gtk::TreeModel::Row row = *iter;
-		if(action == (etl::handle<sinfgapp::Action::Undoable>)row[model.action])
+		if(action == (etl::handle<synfigapp::Action::Undoable>)row[model.action])
 		{
 			row[model.is_active]=action->is_active();
 			return;