X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_waypoint.cpp;h=e009d8cbc1957821681291fc85af39e52ef7e42b;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=b1889aca162b48e9d07c420ff3b544840ccc93d9;hpb=c6af6e1c3816eb3b15c573089b32e6ae65cd2f49;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp index b1889ac..e009d8c 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp @@ -2,10 +2,11 @@ /*! \file widget_waypoint.cpp ** \brief Template Header ** -** $Id: widget_waypoint.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ +** $Id$ ** ** \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 @@ -43,6 +44,8 @@ #include #include "widget_time.h" #include "widget_waypoint.h" +#include "general.h" + #endif using namespace synfig; @@ -134,6 +137,7 @@ Widget_Waypoint::Widget_Waypoint(etl::handle 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); @@ -261,7 +265,8 @@ Widget_Waypoint::get_waypoint()const { #warning 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());