X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_keyframe.cpp;h=3da655e4d856a2e8c280f8db67db6d4034dcc96b;hb=b6c331ec41a1788c39606b9c398a25f801bacb4a;hp=7886e7a65616f31f06e22434e960f138b2f7c1c8;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp
index 7886e7a..3da655e 100644
--- a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp
@@ -2,19 +2,20 @@
 /*!	\file dialog_keyframe.cpp
 **	\brief Template File
 **
-**	$Id: dialog_keyframe.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
 **
-**	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
 */
 /* ========================================================================= */
@@ -35,6 +36,8 @@
 #include <synfigapp/action.h>
 #include <synfigapp/instance.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -52,7 +55,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-Dialog_Keyframe::Dialog_Keyframe(Gtk::Window& parent,handle<synfigapp::CanvasInterface> canvas_interface):
+Dialog_Keyframe::Dialog_Keyframe(Gtk::Window& parent, etl::handle<synfigapp::CanvasInterface> canvas_interface):
 	Gtk::Dialog(_("Keyframe Dialog"),parent,false,true),
 	canvas_interface(canvas_interface)
 {
@@ -62,17 +65,17 @@ Dialog_Keyframe::Dialog_Keyframe(Gtk::Window& parent,handle<synfigapp::CanvasInt
 		ok_button->show();
 		add_action_widget(*ok_button,2);
 		ok_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Keyframe::on_ok_pressed));
-	
+
 /*		Gtk::Button *apply_button(manage(new class Gtk::Button(Gtk::StockID("gtk-apply"))));
 		apply_button->show();
 		add_action_widget(*apply_button,1);
 		apply_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Keyframe::on_apply_pressed));
-*/	
+*/
 		Gtk::Button *delete_button(manage(new class Gtk::Button(Gtk::StockID("gtk-delete"))));
 		delete_button->show();
 		add_action_widget(*delete_button,3);
 		delete_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Keyframe::on_delete_pressed));
-	
+
 		Gtk::Button *cancel_button(manage(new class Gtk::Button(Gtk::StockID("gtk-close"))));
 		cancel_button->show();
 		add_action_widget(*cancel_button,0);
@@ -83,13 +86,13 @@ Dialog_Keyframe::Dialog_Keyframe(Gtk::Window& parent,handle<synfigapp::CanvasInt
 
 	get_vbox()->pack_start(*table);
 
-	entry_description.set_text("Not yet implemented");
-	
-	//table->attach(*manage(new Gtk::Label(_("Description"))), 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);	
+	entry_description.set_text(_("Not yet implemented"));
+
+	//table->attach(*manage(new Gtk::Label(_("Description"))), 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
 	//table->attach(entry_description, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
 
 	table->show_all();
-	
+
 	widget_waypoint_model=Gtk::manage(new Widget_WaypointModel());
 	widget_waypoint_model->show();
 	table->attach(*widget_waypoint_model, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
@@ -117,16 +120,16 @@ Dialog_Keyframe::on_ok_pressed()
 {
 	if(widget_waypoint_model->get_waypoint_model().is_trivial())
 		return;
-	
+
 	synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_waypoint_set"));
-	
+
 	assert(action);
-	
-	action->set_param("canvas",canvas_interface->get_canvas());			
-	action->set_param("canvas_interface",canvas_interface);			
+
+	action->set_param("canvas",canvas_interface->get_canvas());
+	action->set_param("canvas_interface",canvas_interface);
 	action->set_param("keyframe",keyframe_);
 	action->set_param("model",widget_waypoint_model->get_waypoint_model());
-	
+
 	if(!canvas_interface->get_instance()->perform_action(action))
 	{
 	}