Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
index 03538f8..8382465 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007, 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
@@ -128,7 +128,8 @@ CellRenderer_TimeTrack::is_selected(const Waypoint& waypoint)const
 const synfig::Time get_time_offset_from_vdesc(const synfigapp::ValueDesc &v)
 {
 #ifdef ADJUST_WAYPOINTS_FOR_TIME_OFFSET
-       if(v.get_value_type() != synfig::ValueBase::TYPE_CANVAS)
+       if(getenv("SYNFIG_SHOW_CANVAS_PARAM_WAYPOINTS") ||
+          v.get_value_type() != synfig::ValueBase::TYPE_CANVAS)
                return synfig::Time::zero();
 
        synfig::Canvas::Handle canvasparam = v.get_value().get(Canvas::Handle());
@@ -312,6 +313,7 @@ CellRenderer_TimeTrack::render_vfunc(
                                Time t_orig = i->get_time();
                                if(!t_orig.is_valid()) continue;
                                Time t = t_orig - time_offset;
+                               if(t<adjustment->get_lower() || t>adjustment->get_upper()) continue;
 
                                //if it found it... (might want to change comparison, and optimize
                                //                                       sel_times.find to not produce an overall nlogn solution)
@@ -753,7 +755,8 @@ CellRenderer_TimeTrack::activate_vfunc(
                                bool clickfound = tset && get_closest_time(*tset,actual_time+time_offset,pixel_width*cell_area.get_height(),stime);
 
                                etl::handle<synfig::Node> node;
-                               if(valdesc.get_value(stime).get_type()==ValueBase::TYPE_CANVAS)
+                               if(!getenv("SYNFIG_SHOW_CANVAS_PARAM_WAYPOINTS") &&
+                                  valdesc.get_value(stime).get_type()==ValueBase::TYPE_CANVAS)
                                {
                                        node=Canvas::Handle(valdesc.get_value(stime).get(Canvas::Handle()));
                                }
@@ -763,9 +766,7 @@ CellRenderer_TimeTrack::activate_vfunc(
                                }
 
                                if(clickfound && node)
-                               {
-                                       show_timepoint_menu(node, stime, time_offset, actual_time+time_offset<stime?Waypoint::SIDE_LEFT:Waypoint::SIDE_RIGHT);
-                               }
+                                       signal_waypoint_clicked_cellrenderer()(node, stime, time_offset, 2);
                        }
 
                break;
@@ -782,7 +783,7 @@ CellRenderer_TimeTrack::activate_vfunc(
 
                        /*if(event->button.button==3 && selection)
                        {
-                               signal_waypoint_clicked_cellrenderer_(path,*selected_waypoint,event->button.button-1);
+                               signal_waypoint_clicked_cellrenderer()(path,*selected_waypoint,event->button.button-1);
                                return true;
                        }
                        */
@@ -798,7 +799,8 @@ CellRenderer_TimeTrack::activate_vfunc(
                                        param_list.add("canvas",canvas_interface()->get_canvas());
                                        param_list.add("canvas_interface",canvas_interface());
 
-                                       if(sel_value.get_value_type() == synfig::ValueBase::TYPE_CANVAS)
+                                       if(!getenv("SYNFIG_SHOW_CANVAS_PARAM_WAYPOINTS") &&
+                                          sel_value.get_value_type() == synfig::ValueBase::TYPE_CANVAS)
                                        {
                                                param_list.add("addcanvas",sel_value.get_value().get(Canvas::Handle()));
                                        }else
@@ -822,15 +824,15 @@ CellRenderer_TimeTrack::activate_vfunc(
                                        if(mode & COPY_MASK) //copy
                                        {
                                                etl::handle<studio::Instance>::cast_static(canvas_interface()->get_instance())
-                                                       ->process_action("timepoint_copy", param_list);
+                                                       ->process_action("TimepointsCopy", param_list);
                                        }else if(delmode) //DELETE
                                        {
                                                etl::handle<studio::Instance>::cast_static(canvas_interface()->get_instance())
-                                                       ->process_action("timepoint_delete", param_list);
+                                                       ->process_action("TimepointsDelete", param_list);
                                        }else //MOVE
                                        {
                                                etl::handle<studio::Instance>::cast_static(canvas_interface()->get_instance())
-                                                       ->process_action("timepoint_move", param_list);
+                                                       ->process_action("TimepointsMove", param_list);
                                        }
 
                                        //now replace all the selected with the new selected
@@ -843,7 +845,7 @@ CellRenderer_TimeTrack::activate_vfunc(
                        /*if(value_node && selection)
                        {
                                if(selected_time==drag_time && event->button.button!=3)
-                                       signal_waypoint_clicked_cellrenderer_(path,*selected_waypoint,event->button.button-1);
+                                       signal_waypoint_clicked_cellrenderer()(path,*selected_waypoint,event->button.button-1);
                                else
                                if(event->button.button==1)
                                {
@@ -902,9 +904,3 @@ CellRenderer_TimeTrack::set_canvas_interface(etl::loose_handle<synfigapp::Canvas
 {
        canvas_interface_ = h;
 }
-
-void
-CellRenderer_TimeTrack::show_timepoint_menu(const etl::handle<synfig::Node>& node, const synfig::Time& time, const synfig::Time& time_offset, Waypoint::Side side)
-{
-       signal_waypoint_clicked_cellrenderer_(node,time,time_offset,2,side);
-}