X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcellrenderer_timetrack.h;h=a94f1319484c56ce2328f74551f770d4118448a8;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=bbff8b4129bdf95fbdee559db01b3250e3a868af;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h
index bbff8b4..a94f131 100644
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h
@@ -2,19 +2,21 @@
 /*!	\file cellrenderer_timetrack.h
 **	\brief Template Header
 **
-**	$Id: cellrenderer_timetrack.h,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
-**	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
 */
 /* ========================================================================= */
@@ -38,7 +40,6 @@
 #include <gtkmm/statusbar.h>
 #include <gtkmm/button.h>
 #include <gtkmm/progressbar.h>
-#include <atkmm/stateset.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
@@ -68,12 +69,6 @@
 namespace studio {
 class Widget_ValueBase;
 
-enum Side
-{
-	SIDE_LEFT,
-	SIDE_RIGHT
-};
-
 /*! \class CellRenderer_TimeTrack
 **	\brief A cell renderer that displays the waypoints for Animated ValueNodes.
 */
@@ -88,15 +83,15 @@ class CellRenderer_TimeTrack :
 private:
 	//! Time adjustment window
 	Gtk::Adjustment adjustment_;
-	
+
 	//! Signal for when the user clicks on a waypoint
-	sigc::signal<void, const Glib::ustring&,synfig::Waypoint, int> signal_waypoint_clicked_;
+	sigc::signal<void, const etl::handle<synfig::Node>&, const synfig::Time&, const synfig::Time&, int, synfig::Waypoint::Side> signal_waypoint_clicked_cellrenderer_;
 
 	sigc::signal<void, synfig::Waypoint, synfig::ValueNode::Handle> signal_waypoint_changed_;
 
 	//! Iterator for selected waypoint. (Should this be an UniqueID instead?)
 	synfig::ValueNode_Animated::WaypointList::iterator selected_waypoint;
-	
+
 	synfig::UniqueID selected;
 
 	//! selected information for time... (will work for way points etc...)
@@ -109,17 +104,17 @@ private:
 
 	//! ???
 	synfig::Time selected_time;
-    
+
 	//! The path to the current item in the tree model
 	Glib::ustring path;
-	
+
 	//! ???
 	bool selection;
 
 	bool dragging;
 
 	synfig::Time drag_time;
-	
+
 	etl::loose_handle<synfigapp::CanvasInterface>	canvas_interface_;
 
 	/*
@@ -127,7 +122,7 @@ private:
 	*/
 
 private:
-	
+
 	//! ValueBase Desc
 	Glib::Property<synfigapp::ValueDesc> property_valuedesc_;
 
@@ -158,8 +153,8 @@ public:
 
 public:
 
-	sigc::signal<void, const Glib::ustring&,synfig::Waypoint,int> &signal_waypoint_clicked()
-	{return signal_waypoint_clicked_; }
+	sigc::signal<void, const etl::handle<synfig::Node>&, const synfig::Time&, const synfig::Time&, int, synfig::Waypoint::Side> &signal_waypoint_clicked_cellrenderer()
+	{return signal_waypoint_clicked_cellrenderer_; }
 
 	sigc::signal<void, synfig::Waypoint, synfig::ValueNode::Handle> &signal_waypoint_changed()
 	{return signal_waypoint_changed_; }
@@ -172,8 +167,8 @@ public:
 
 	CellRenderer_TimeTrack();
     ~CellRenderer_TimeTrack();
-	
-	void show_timepoint_menu(const etl::handle<synfig::Node>& node, const synfig::Time& time, Side side=SIDE_RIGHT);
+
+	void show_timepoint_menu(const etl::handle<synfig::Node>&, const synfig::Time&, const synfig::Time&, synfig::Waypoint::Side side=synfig::Waypoint::SIDE_RIGHT);
 
 	void set_adjustment(Gtk::Adjustment &x);
 	Gtk::Adjustment *get_adjustment();
@@ -181,9 +176,9 @@ public:
 
 	etl::loose_handle<synfigapp::CanvasInterface>	canvas_interface()const {return canvas_interface_;}
 	void set_canvas_interface(etl::loose_handle<synfigapp::CanvasInterface> h); //this should only be called by smart people
-	
+
 	synfig::Canvas::Handle get_canvas()const;
-	
+
 	bool is_selected(const synfig::Waypoint& waypoint)const;
 
 	synfig::ValueNode_Animated::WaypointList::iterator find_waypoint(const synfig::Time& t, const synfig::Time& scope=synfig::Time::end());