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

diff --git a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
index 2d44451..cb245dd 100644
--- a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file keyframeactionmanager.cpp
 **	\brief Template File
 **
 **	$Id: keyframeactionmanager.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
 */
 /* ========================================================================= */
@@ -30,7 +31,7 @@
 
 #include "keyframeactionmanager.h"
 #include "keyframetree.h"
-#include <sinfgapp/action_param.h>
+#include <synfigapp/action_param.h>
 #include "instance.h"
 
 #endif
@@ -39,7 +40,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 static const guint no_prev_popup((guint)-1);
@@ -93,7 +94,7 @@ KeyframeActionManager::set_keyframe_tree(KeyframeTree* x)
 }
 
 void
-KeyframeActionManager::set_canvas_interface(const etl::handle<sinfgapp::CanvasInterface> &x)
+KeyframeActionManager::set_canvas_interface(const etl::handle<synfigapp::CanvasInterface> &x)
 {
 	time_changed_connection.disconnect();
 	canvas_interface_=x;
@@ -151,7 +152,7 @@ KeyframeActionManager::on_keyframe_properties()
 void
 KeyframeActionManager::on_add_keyframe()
 {
-	sinfgapp::Action::Handle action(sinfgapp::Action::create("keyframe_add"));
+	synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_add"));
 
 	if(!action)
 		return;
@@ -180,14 +181,14 @@ KeyframeActionManager::refresh()
 	// Make sure we are ready
 	if(!ui_manager_ || !keyframe_tree_ || !canvas_interface_)
 	{
-		sinfg::error("KeyframeActionManager::refresh(): Not ready!");
+		synfig::error("KeyframeActionManager::refresh(): Not ready!");
 		return;
 	}
 		
 	String ui_info;
 	
 	{
-		sinfgapp::Action::ParamList param_list;
+		synfigapp::Action::ParamList param_list;
 		param_list.add("time",get_canvas_interface()->get_time());
 		param_list.add("canvas",get_canvas_interface()->get_canvas());
 		param_list.add("canvas_interface",get_canvas_interface());
@@ -203,7 +204,7 @@ KeyframeActionManager::refresh()
 			action_group_,
 			ui_info,
 			param_list,
-			sinfgapp::Action::CATEGORY_KEYFRAME
+			synfigapp::Action::CATEGORY_KEYFRAME
 		);
 	}
 	if(action_group_->get_action("action-keyframe_add"))