X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fkeyframeactionmanager.cpp;h=ec238ad1676ac946d0a81c1da8b2977d95511765;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=b25290dde5302098c2672532979dee9b397ccebc;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
index b25290d..ec238ad 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
@@ -34,6 +35,8 @@
 #include <synfigapp/action_param.h>
 #include "instance.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -152,7 +155,7 @@ KeyframeActionManager::on_keyframe_properties()
 void
 KeyframeActionManager::on_add_keyframe()
 {
-	synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_add"));
+	synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeAdd"));
 
 	if(!action)
 		return;
@@ -207,15 +210,15 @@ KeyframeActionManager::refresh()
 			synfigapp::Action::CATEGORY_KEYFRAME
 		);
 	}
-	if(action_group_->get_action("action-keyframe_add"))
+	if(action_group_->get_action("action-KeyframeAdd"))
 	{
-		action_group_->remove(action_group_->get_action("action-keyframe_add"));
+		action_group_->remove(action_group_->get_action("action-KeyframeAdd"));
 	}
 
 		action_group_->add(Gtk::Action::create(
-			"action-keyframe_add",
+			"action-KeyframeAdd",
 			Gtk::StockID("gtk-add"),
-			_("Add new Keyframe"),_("Add new Keyframe")
+			_("Add New Keyframe"),_("Add New Keyframe")
 		),
 			sigc::mem_fun(*this,&KeyframeActionManager::on_add_keyframe)
 		);
@@ -223,22 +226,23 @@ KeyframeActionManager::refresh()
 	try
 	{
 		canvas_interface_->get_canvas()->keyframe_list().find(canvas_interface_->get_time());
-		action_group_->get_action("action-keyframe_add")->set_sensitive(false);
-		if(action_group_->get_action("action-keyframe_duplicate"))
-			action_group_->get_action("action-keyframe_duplicate")->set_sensitive(false);
+		action_group_->get_action("action-KeyframeAdd")->set_sensitive(false);
+		if(action_group_->get_action("action-KeyframeDuplicate"))
+			action_group_->get_action("action-KeyframeDuplicate")->set_sensitive(false);
 	}
 	catch(...)
 	{
 	}
 
 	{
-		Glib::RefPtr<Gtk::Action> action(Gtk::Action::create("keyframe-properties", Gtk::StockID("gtk-properties"), _("Keyframe Properties")));
+		Glib::RefPtr<Gtk::Action> action(Gtk::Action::create("keyframe-properties", Gtk::StockID("gtk-properties"),
+															 _("Keyframe Properties"), _("Keyframe Properties")));
 		action_group_->add(action,sigc::mem_fun(*this,&KeyframeActionManager::on_keyframe_properties));
 		if(keyframe_tree_->get_selection()->count_selected_rows()==0)
 			action->set_sensitive(false);
 	}
 
-	ui_info="<ui><menubar action='menu-main'><menu action='menu-keyframe'>"+ui_info+"</menu></menubar></ui>";
+	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