X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_waypoint.cpp;h=13c739c1ccd128cd8b0ae4f74e1cccc618497482;hb=ab162dd6939c16bf505a745132117777b47032ca;hp=1644ac4b2571028106bffff8734170754dd1872a;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp
index 1644ac4..13c739c 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 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
@@ -86,14 +87,14 @@ Widget_Waypoint::Widget_Waypoint(etl::handle<synfig::Canvas> canvas):
 	before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Constant"));
 	before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Linear"));
 	before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Ease In"));
-	before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual"));
+	// before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual"));
 
 	after_options=manage(new class Gtk::Menu());
 	after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("TCB Smooth"));
 	after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Constant"));
 	after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Linear"));
 	after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Ease Out"));
-	after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual"));
+	// after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual"));
 
 	before=manage(new class Gtk::OptionMenu());
 	before->show();
@@ -136,6 +137,7 @@ Widget_Waypoint::Widget_Waypoint(etl::handle<synfig::Canvas> canvas):
 	waypointValueLabel->set_mnemonic_widget(*value_widget);
 	waypointTable->attach(*waypointValueLabel, 0, 1, 0, 1, Gtk::SHRINK | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
 	waypointTable->attach(*value_widget, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+	waypointTable->attach(*value_node_label, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
 
 	Gtk::Label *waypointTimeLabel = manage(new Gtk::Label(_("_Time"), true));
 	waypointTimeLabel->set_alignment(0, 0.5);
@@ -234,7 +236,7 @@ Widget_Waypoint::set_waypoint(synfig::Waypoint &x)
 
 	waypoint=x;
 
-#warning This really needs to be fixed to support value node waypoints!
+	//! \todo This really needs to be fixed to support value node waypoints!
 	if(waypoint.is_static())
 	{
 		value_widget->set_value(waypoint.get_value());
@@ -261,9 +263,10 @@ Widget_Waypoint::set_waypoint(synfig::Waypoint &x)
 const synfig::Waypoint &
 Widget_Waypoint::get_waypoint()const
 {
-#warning This too!
+	//! \todo This too!
 	waypoint.set_time(time_widget->get_value());
-	waypoint.set_value(value_widget->get_value());
+	if(waypoint.is_static())
+		waypoint.set_value(value_widget->get_value());
 	//int i;
 
 	waypoint.set_before((synfig::Waypoint::Interpolation)before->get_history());