Applied the following dooglus patches from the sourceforge tracker:

[synfig.git] / synfig-studio / trunk / src / gtkmm / dock_timetrack.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index c81a6cd..0d696f2 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dock_timetrack.cpp
 **     \brief Template File
 **
 **     $Id: dock_timetrack.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
 **
 **     \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
 */
 /* ========================================================================= */
@@ -48,7 +49,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -64,7 +65,7 @@ class TimeTrackView : public Gtk::TreeView
        Gtk::TreeView *mimic_tree_view; 
 public:
 
-       sigc::signal<void,sinfgapp::ValueDesc,sinfg::Waypoint,int> signal_waypoint_clicked;
+       sigc::signal<void,synfigapp::ValueDesc,synfig::Waypoint,int> signal_waypoint_clicked;
 
        LayerParamTreeStore::Model model;
 
@@ -173,17 +174,17 @@ public:
                                                LayerList layer_list(get_selected_layers());
                                                if(layer_list.size()<=1)
                                                {
-                                                       sinfgapp::ValueDesc value_desc(row[model.value_desc]);
+                                                       synfigapp::ValueDesc value_desc(row[model.value_desc]);
                                                        Gtk::Menu* menu(manage(new Gtk::Menu()));                                       
                                                        App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc,0.5f);
                                                        menu->popup(event->button.button,gtk_get_current_event_time());
                                                        return true;
                                                }
                                                Gtk::Menu* menu(manage(new Gtk::Menu()));                                       
-                                               std::list<sinfgapp::ValueDesc> value_desc_list;
+                                               std::list<synfigapp::ValueDesc> value_desc_list;
                                                ParamDesc param_desc(row[model.param_desc]);
                                                for(;!layer_list.empty();layer_list.pop_back())
-                                                       value_desc_list.push_back(sinfgapp::ValueDesc(layer_list.back(),param_desc.get_name()));
+                                                       value_desc_list.push_back(synfigapp::ValueDesc(layer_list.back(),param_desc.get_name()));
                                                App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc_list);
                                                menu->popup(event->button.button,gtk_get_current_event_time());
                                                return true;
@@ -286,7 +287,7 @@ public:
        void
        queue_draw_msg()
        {
-               sinfg::info("*************QUEUE_DRAW***************** (time track view)");
+               synfig::info("*************QUEUE_DRAW***************** (time track view)");
                Widget::queue_draw();
        }
        void set_model(Glib::RefPtr<LayerParamTreeStore> store)
@@ -298,9 +299,9 @@ public:
        }
        
        void
-       on_waypoint_changed( sinfg::Waypoint waypoint , sinfg::ValueNode::Handle value_node)
+       on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node)
        {
-               sinfgapp::Action::ParamList param_list;
+               synfigapp::Action::ParamList param_list;
                param_list.add("canvas",param_tree_store_->canvas_interface()->get_canvas());
                param_list.add("canvas_interface",param_tree_store_->canvas_interface());
                param_list.add("value_node",value_node);
@@ -353,7 +354,7 @@ public:
        }
        
        void
-       on_waypoint_clicked(const Glib::ustring &path_string, sinfg::Waypoint waypoint,int button)
+       on_waypoint_clicked(const Glib::ustring &path_string, synfig::Waypoint waypoint,int button)
        {
 /*
                Gtk::TreePath path(path_string);
@@ -369,14 +370,14 @@ public:
                Gtk::TreeRow row;
                if(!param_tree_store_->find_first_value_node(value_node, row))
                {
-                       sinfg::error(__FILE__":%d: Unable to find the valuenode",__LINE__);
+                       synfig::error(__FILE__":%d: Unable to find the valuenode",__LINE__);
                        return;
                }
                
                if(!row)
                        return;
                
-               sinfgapp::ValueDesc value_desc(static_cast<sinfgapp::ValueDesc>(row[model.value_desc]));
+               synfigapp::ValueDesc value_desc(static_cast<synfigapp::ValueDesc>(row[model.value_desc]));
 
                signal_waypoint_clicked(value_desc,waypoint,button);
        }
@@ -389,7 +390,7 @@ public:
 /* === M E T H O D S ======================================================= */
 
 Dock_Timetrack::Dock_Timetrack():
-       Dock_CanvasSpecific("timetrack",_("Timetrack"),Gtk::StockID("sinfg-timetrack"))
+       Dock_CanvasSpecific("timetrack",_("Timetrack"),Gtk::StockID("synfig-timetrack"))
 {
        table_=0;
        widget_timeslider_= new Widget_Timeslider();
@@ -444,7 +445,7 @@ Dock_Timetrack::refresh_selected_param()
        {
                LayerParamTreeStore::Model model;
                get_canvas_view()->work_area->set_selected_value_node(
-                       (sinfg::ValueNode::Handle)(*iter)[model.value_node]
+                       (synfig::ValueNode::Handle)(*iter)[model.value_node]
                );
        }
        else