X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fkeyframeactionmanager.cpp;h=79d8e5ebe018bc386a0a67fd2df34ce0d7a1e513;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=cb245dd0d66c32cff65a13a79f63f658d5073ea1;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
index cb245dd..79d8e5e 100644
--- a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
@@ -2,10 +2,11 @@
 /*!	\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-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
@@ -131,7 +132,7 @@ KeyframeActionManager::queue_refresh()
 {
 	if(queued)
 		return;
-	
+
 	//queue_refresh_connection.disconnect();
 	queue_refresh_connection=Glib::signal_idle().connect(
 		sigc::bind_return(
@@ -139,7 +140,7 @@ KeyframeActionManager::queue_refresh()
 			false
 		)
 	);
-	
+
 	queued=true;
 }
 
@@ -156,7 +157,7 @@ KeyframeActionManager::on_add_keyframe()
 
 	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()));
@@ -168,7 +169,7 @@ void
 KeyframeActionManager::refresh()
 {
 	KeyframeTreeStore::Model model;
-	
+
 	if(queued)
 	{
 		queued=false;
@@ -177,16 +178,16 @@ KeyframeActionManager::refresh()
 
 
 	clear();
-	
+
 	// Make sure we are ready
 	if(!ui_manager_ || !keyframe_tree_ || !canvas_interface_)
 	{
 		synfig::error("KeyframeActionManager::refresh(): Not ready!");
 		return;
 	}
-		
+
 	String ui_info;
-	
+
 	{
 		synfigapp::Action::ParamList param_list;
 		param_list.add("time",get_canvas_interface()->get_time());
@@ -211,7 +212,7 @@ KeyframeActionManager::refresh()
 	{
 		action_group_->remove(action_group_->get_action("action-keyframe_add"));
 	}
-	
+
 		action_group_->add(Gtk::Action::create(
 			"action-keyframe_add",
 			Gtk::StockID("gtk-add"),
@@ -219,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());
@@ -230,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));
@@ -238,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_);