projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add code to output the new time format.
[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
21ff895
..
e2ad77a
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
**
** \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
**
** 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
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());
return synfig::Time::zero();
synfig::Canvas::Handle canvasparam = v.get_value().get(Canvas::Handle());
@@
-152,7
+153,8
@@
const synfig::Time get_time_offset_from_vdesc(const synfigapp::ValueDesc &v)
//kind of a hack... pointer is ugly
const synfig::Node::time_set *get_times_from_vdesc(const synfigapp::ValueDesc &v)
{
//kind of a hack... pointer is ugly
const synfig::Node::time_set *get_times_from_vdesc(const synfigapp::ValueDesc &v)
{
- if(v.get_value_type() == synfig::ValueBase::TYPE_CANVAS)
+ if(!getenv("SYNFIG_SHOW_CANVAS_PARAM_WAYPOINTS") &&
+ v.get_value_type() == synfig::ValueBase::TYPE_CANVAS)
{
synfig::Canvas::Handle canvasparam = v.get_value().get(Canvas::Handle());
{
synfig::Canvas::Handle canvasparam = v.get_value().get(Canvas::Handle());
@@
-752,7
+754,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;
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()));
}
{
node=Canvas::Handle(valdesc.get_value(stime).get(Canvas::Handle()));
}
@@
-762,9
+765,7
@@
CellRenderer_TimeTrack::activate_vfunc(
}
if(clickfound && node)
}
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;
}
break;
@@
-781,7
+782,7
@@
CellRenderer_TimeTrack::activate_vfunc(
/*if(event->button.button==3 && selection)
{
/*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;
}
*/
return true;
}
*/
@@
-797,7
+798,8
@@
CellRenderer_TimeTrack::activate_vfunc(
param_list.add("canvas",canvas_interface()->get_canvas());
param_list.add("canvas_interface",canvas_interface());
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
{
param_list.add("addcanvas",sel_value.get_value().get(Canvas::Handle()));
}else
@@
-842,7
+844,7
@@
CellRenderer_TimeTrack::activate_vfunc(
/*if(value_node && selection)
{
if(selected_time==drag_time && event->button.button!=3)
/*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)
{
else
if(event->button.button==1)
{
@@
-901,9
+903,3
@@
CellRenderer_TimeTrack::set_canvas_interface(etl::loose_handle<synfigapp::Canvas
{
canvas_interface_ = h;
}
{
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);
-}