X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fkeyframeactionmanager.cpp;h=79d8e5ebe018bc386a0a67fd2df34ce0d7a1e513;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;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..79d8e5e 100644
--- a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
@@ -1,20 +1,22 @@
-/* === 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 $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
-**	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 +32,7 @@
 
 #include "keyframeactionmanager.h"
 #include "keyframetree.h"
-#include <sinfgapp/action_param.h>
+#include <synfigapp/action_param.h>
 #include "instance.h"
 
 #endif
@@ -39,7 +41,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 +95,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;
@@ -130,7 +132,7 @@ KeyframeActionManager::queue_refresh()
 {
 	if(queued)
 		return;
-	
+
 	//queue_refresh_connection.disconnect();
 	queue_refresh_connection=Glib::signal_idle().connect(
 		sigc::bind_return(
@@ -138,7 +140,7 @@ KeyframeActionManager::queue_refresh()
 			false
 		)
 	);
-	
+
 	queued=true;
 }
 
@@ -151,11 +153,11 @@ 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;
-	
+
 	action->set_param("canvas",canvas_interface_->get_canvas());
 	action->set_param("canvas_interface",canvas_interface_);
 	action->set_param("keyframe",Keyframe(canvas_interface_->get_time()));
@@ -167,7 +169,7 @@ void
 KeyframeActionManager::refresh()
 {
 	KeyframeTreeStore::Model model;
-	
+
 	if(queued)
 	{
 		queued=false;
@@ -176,18 +178,18 @@ KeyframeActionManager::refresh()
 
 
 	clear();
-	
+
 	// 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,14 +205,14 @@ KeyframeActionManager::refresh()
 			action_group_,
 			ui_info,
 			param_list,
-			sinfgapp::Action::CATEGORY_KEYFRAME
+			synfigapp::Action::CATEGORY_KEYFRAME
 		);
 	}
 	if(action_group_->get_action("action-keyframe_add"))
 	{
 		action_group_->remove(action_group_->get_action("action-keyframe_add"));
 	}
-	
+
 		action_group_->add(Gtk::Action::create(
 			"action-keyframe_add",
 			Gtk::StockID("gtk-add"),
@@ -218,7 +220,7 @@ KeyframeActionManager::refresh()
 		),
 			sigc::mem_fun(*this,&KeyframeActionManager::on_add_keyframe)
 		);
-	
+
 	try
 	{
 		canvas_interface_->get_canvas()->keyframe_list().find(canvas_interface_->get_time());
@@ -229,7 +231,7 @@ KeyframeActionManager::refresh()
 	catch(...)
 	{
 	}
-	
+
 	{
 		Glib::RefPtr<Gtk::Action> action(Gtk::Action::create("keyframe-properties", Gtk::StockID("gtk-properties"), _("Keyframe Properties")));
 		action_group_->add(action,sigc::mem_fun(*this,&KeyframeActionManager::on_keyframe_properties));
@@ -237,8 +239,8 @@ KeyframeActionManager::refresh()
 			action->set_sensitive(false);
 	}
 
-	ui_info="<ui><menubar action='menu-main'><menu action='menu-keyframe'>"+ui_info+"</menu></menubar></ui>";
-	popup_id_=get_ui_manager()->add_ui_from_string(ui_info);	
+	ui_info="<ui><popup action='menu-main'><menu action='menu-keyframe'>"+ui_info+"</menu></popup></ui>";
+	popup_id_=get_ui_manager()->add_ui_from_string(ui_info);
 #ifdef ONE_ACTION_GROUP
 #else
 	get_ui_manager()->insert_action_group(action_group_);