X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_waypoint.cpp;h=bd653ded6a849981b8d15eadbd8b6edd05b29cc5;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=5f6113083d163b63f8136ab744759b4952d6408d;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp index 5f61130..bd653de 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp @@ -1,8 +1,8 @@ /* === S Y N F I G ========================================================= */ -/*! \file dialog_waypoint.cpp +/*! \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 @@ -43,6 +43,8 @@ #include #include "widget_time.h" #include "widget_waypoint.h" +#include "general.h" + #endif using namespace synfig; @@ -134,6 +136,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 +264,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());