Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-studio / tags / stable / src / gtkmm / widget_waypoint.cpp

diff --git a/synfig-studio/tags/stable/src/gtkmm/widget_waypoint.cpp b/synfig-studio/tags/stable/src/gtkmm/widget_waypoint.cpp
index c6ca087..d456130 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/widget_waypoint.cpp
+++ b/synfig-studio/tags/stable/src/gtkmm/widget_waypoint.cpp
@@ -6,6 +6,8 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
+**  Copyright (c) 2008 Paul Wise
 **
 **     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 +45,8 @@
 #include <gtkmm/optionmenu.h>
 #include "widget_time.h"
 #include "widget_waypoint.h"
+#include "general.h"
+
 #endif
 
 using namespace synfig;
@@ -80,18 +84,18 @@ Widget_Waypoint::Widget_Waypoint(etl::handle<synfig::Canvas> canvas):
        //spinbutton->show();
 
        before_options=manage(new class Gtk::Menu());
-       before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("TCB Smooth"));
-       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(_("TCB Smooth")));
+       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")));
 
        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(_("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")));
 
        before=manage(new class Gtk::OptionMenu());
        before->show();
@@ -134,6 +138,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);
@@ -232,7 +237,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());
@@ -259,9 +264,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());