X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.h;h=812958d6cc1da1ed17f9f05eeedd655c5347941d;hb=72dc78092947e9abef71cc98651a11495682bbaf;hp=a69247a3c5e516d4a94f85bc91f0f837087840fc;hpb=449972484abe4b99beef5ac1ed918814e76041c6;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h index a69247a..812958d 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.h +++ b/synfig-studio/trunk/src/gtkmm/canvasview.h @@ -98,6 +98,10 @@ /* === C L A S S E S & S T R U C T S ======================================= */ +namespace synfig { + class TransformStack; +} + namespace studio { class CanvasViewUIInterface; @@ -121,7 +125,6 @@ class Widget_Time; class Dialog_SoundSelect; class Dialog_Preview; -class synfig::TransformStack; class Dock_Layers; class Dock_Children; class Dock_Keyframes; @@ -155,7 +158,7 @@ public: typedef ChildrenTreeStore::Model ChildrenTreeModel; //! Create an instance of this class whenever doing a longer task. - /*! Make sure that you check the bool value of this class occasionaly + /*! Make sure that you check the bool value of this class occasionally ** to make sure the action has not been canceled. */ class IsWorking { @@ -185,31 +188,31 @@ private: synfig::Rect bbox; - DEBUGPOINT_CLASS(1); + // DEBUGPOINT_CLASS(1); //! State Machine Smach smach_; - DEBUGPOINT_CLASS(2); + // DEBUGPOINT_CLASS(2); etl::loose_handle instance_; etl::handle canvas_interface_; - DEBUGPOINT_CLASS(3); + // DEBUGPOINT_CLASS(3); //! Sound and information to play it etl::handle audio; studio::Widget_Sound *disp_audio; //should this be put into thing too? - SigC::Connection playcon; - SigC::Connection stopcon; + sigc::connection playcon; + sigc::connection stopcon; std::auto_ptr universal_scrubber; //! Tooltip controller Gtk::Tooltips tooltips; - DEBUGPOINT_CLASS(4); + // DEBUGPOINT_CLASS(4); //! TreeModel for the layers LayerTreeModel layer_tree_model; @@ -223,7 +226,7 @@ private: //Glib::RefPtr keyframe_tree_store_; - DEBUGPOINT_CLASS(5); + // DEBUGPOINT_CLASS(5); //std::map > tree_model_book_; std::map > ref_obj_book_; @@ -668,6 +671,7 @@ private: void on_audio_offset_notify(); bool on_duck_changed(const synfig::Point &value,const synfigapp::ValueDesc& value_desc); + bool on_duck_angle_changed(const synfig::Angle &rotation,const synfigapp::ValueDesc& value_desc); void on_layer_toggle(synfig::Layer::Handle);