Synchronise toggle buttons with keyboard and menu actions.

[synfig.git] / synfig-studio / trunk / src / gtkmm / canvasview.h

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h
index 6afc299..826c8ea 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -65,6 +65,8 @@
 
 #include "dialog_waypoint.h"
 #include "dialog_keyframe.h"
+#include "framedial.h"
+#include "toggleducksdial.h"
 
 #include "duckmatic.h"
 #include <gtkmm/scale.h>
@@ -258,20 +260,25 @@ private:
 
        Gtk::Button *stopbutton;
        Gtk::Button *refreshbutton;
-       Gtk::Button *treetogglebutton;
-       Gtk::Notebook *notebook;
-       Gtk::Widget *timebar;
+       Gtk::Button *treetogglebutton;  // not used
+       Gtk::Notebook *notebook; // not used
+       Gtk::Table *timebar;
+       Gtk::Button *animatebutton;
+       Gtk::Button *keyframebutton;
+       FrameDial *framedial;
+       ToggleDucksDial *toggleducksdial;
+       bool toggling_ducks_;
 
+
+       //! Shows current time and allows edition
        Widget_Time *current_time_widget;
        void on_current_time_widget_changed();
 
-       std::auto_ptr<Widget_Timeslider>                timeslider;
+       //! Time slider class. Same than the Time track panel
+       std::auto_ptr<Widget_Timeslider> timeslider;
 
        std::list<sigc::connection> duck_changed_connections;
 
-       Gtk::Button *animatebutton;
-       Gtk::Button *keyframebutton;
-
 /*     DEBUGPOINT_CLASS(8);
 
        Gtk::Menu duckmaskmenu;
@@ -308,6 +315,7 @@ private:
        Gtk::CheckMenuItem* duck_mask_width;
        Gtk::CheckMenuItem* duck_mask_angle;
 */
+       //! Menu members
        Gtk::Menu parammenu;
 
        Glib::RefPtr<Gtk::ToggleAction> grid_snap_toggle;
@@ -400,10 +408,12 @@ private:
 
        Gtk::Widget *create_time_bar();
 
+       //! Pop up menu for the bezier (bline, draw) tool (?)
        void popup_param_menu_bezier(float location, synfigapp::ValueDesc value_desc)
-       { popup_param_menu(value_desc,location); }
+       { popup_param_menu(value_desc,location,true); }
 
-       void popup_param_menu(synfigapp::ValueDesc value_desc, float location=0);
+       //! Pop up menu for the tools but not the bezier ones.
+       void popup_param_menu(synfigapp::ValueDesc value_desc, float location=0, bool bezier=false);
 
        void workarea_layer_selected(synfig::Layer::Handle layer);
 
@@ -595,6 +605,7 @@ public:
 
 private:
 
+       void on_select_layers();
        void on_unselect_layers();
 
        void on_input_device_changed(GdkDevice*);
@@ -673,6 +684,8 @@ private:
        //void on_audio_play();
        bool on_audio_scrub();
 
+       void on_play_stop_pressed();
+
 protected:
        bool close_instance_when_safe();
        bool on_delete_event(GdkEventAny* event);