X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcellrenderer_timetrack.h;h=98af667c7340dc51df882776a52e106cf31b3ad0;hb=047740653043b7fa79a042152a70e158f4d3ab97;hp=37c0a0739f89904bc367d3b194a2d4908652b3d7;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h index 37c0a07..98af667 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h @@ -1,28 +1,29 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \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 ** -** 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 */ /* ========================================================================= */ /* === S T A R T =========================================================== */ -#ifndef __SINFG_GTKMM_CELLRENDERER_TIMETRACK_H -#define __SINFG_GTKMM_CELLRENDERER_TIMETRACK_H +#ifndef __SYNFIG_GTKMM_CELLRENDERER_TIMETRACK_H +#define __SYNFIG_GTKMM_CELLRENDERER_TIMETRACK_H /* === H E A D E R S ======================================================= */ @@ -38,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -51,12 +51,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -88,51 +88,51 @@ class CellRenderer_TimeTrack : private: //! Time adjustment window Gtk::Adjustment adjustment_; - + //! Signal for when the user clicks on a waypoint - sigc::signal signal_waypoint_clicked_; + sigc::signal signal_waypoint_clicked_; - sigc::signal signal_waypoint_changed_; + sigc::signal signal_waypoint_changed_; //! Iterator for selected waypoint. (Should this be an UniqueID instead?) - sinfg::ValueNode_Animated::WaypointList::iterator selected_waypoint; - - sinfg::UniqueID selected; + synfig::ValueNode_Animated::WaypointList::iterator selected_waypoint; + + synfig::UniqueID selected; //! selected information for time... (will work for way points etc...) //TODO: make multiple... on both time and value select... - std::set sel_times; - sinfgapp::ValueDesc sel_value; - sinfg::Time actual_time; - sinfg::Time actual_dragtime; + std::set sel_times; + synfigapp::ValueDesc sel_value; + synfig::Time actual_time; + synfig::Time actual_dragtime; int mode; //! ??? - sinfg::Time selected_time; - + synfig::Time selected_time; + //! The path to the current item in the tree model Glib::ustring path; - + //! ??? bool selection; bool dragging; - sinfg::Time drag_time; - - etl::loose_handle canvas_interface_; + synfig::Time drag_time; + + etl::loose_handle canvas_interface_; /* -- ** -- P R O P E R T I E S ------------------------------------------------- */ private: - + //! ValueBase Desc - Glib::Property property_valuedesc_; + Glib::Property property_valuedesc_; //! Canvas - Glib::Property property_canvas_; + Glib::Property property_canvas_; //! ??? \see adjustment_ Glib::Property property_adjustment_; @@ -146,9 +146,9 @@ private: public: - Glib::PropertyProxy property_value_desc(); + Glib::PropertyProxy property_value_desc(); - Glib::PropertyProxy property_canvas(); + Glib::PropertyProxy property_canvas(); Glib::PropertyProxy property_adjustment(); @@ -158,10 +158,10 @@ public: public: - sigc::signal &signal_waypoint_clicked() + sigc::signal &signal_waypoint_clicked() {return signal_waypoint_clicked_; } - sigc::signal &signal_waypoint_changed() + sigc::signal &signal_waypoint_changed() {return signal_waypoint_changed_; } /* @@ -172,21 +172,21 @@ public: CellRenderer_TimeTrack(); ~CellRenderer_TimeTrack(); - - void show_timepoint_menu(const etl::handle& node, const sinfg::Time& time, Side side=SIDE_RIGHT); + + void show_timepoint_menu(const etl::handle& node, const synfig::Time& time, const synfig::Time& time_offset, Side side=SIDE_RIGHT); void set_adjustment(Gtk::Adjustment &x); Gtk::Adjustment *get_adjustment(); const Gtk::Adjustment *get_adjustment()const; - etl::loose_handle canvas_interface()const {return canvas_interface_;} - void set_canvas_interface(etl::loose_handle h); //this should only be called by smart people - - sinfg::Canvas::Handle get_canvas()const; - - bool is_selected(const sinfg::Waypoint& waypoint)const; + etl::loose_handle canvas_interface()const {return canvas_interface_;} + void set_canvas_interface(etl::loose_handle h); //this should only be called by smart people + + synfig::Canvas::Handle get_canvas()const; + + bool is_selected(const synfig::Waypoint& waypoint)const; - sinfg::ValueNode_Animated::WaypointList::iterator find_waypoint(const sinfg::Time& t, const sinfg::Time& scope=sinfg::Time::end()); + synfig::ValueNode_Animated::WaypointList::iterator find_waypoint(const synfig::Time& t, const synfig::Time& scope=synfig::Time::end()); virtual void render_vfunc(