Deprecate intermediate Gtk::Table variable 'table'. Not needed.

[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 cb0c0f3..2ed261e 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -65,6 +65,7 @@
 
 #include "dialog_waypoint.h"
 #include "dialog_keyframe.h"
+#include "framedial.h"
 
 #include "duckmatic.h"
 #include <gtkmm/scale.h>
@@ -173,6 +174,9 @@ public:
 
        typedef synfigapp::CanvasInterface::Mode Mode;
 
+       void set_grid_snap_toggle(bool flag) { grid_snap_toggle->set_active(flag); }
+       void set_grid_show_toggle(bool flag) { grid_show_toggle->set_active(flag); }
+
        /*
  -- ** -- P R I V A T E   D A T A ---------------------------------------------
        */
@@ -232,7 +236,6 @@ private:
        std::map<synfig::String,Glib::RefPtr<Glib::ObjectBase> > ref_obj_book_;
        std::map<synfig::String,Gtk::Widget*> ext_widget_book_;
 
-
        //! The time adjustment's scope is defined by the time_window adjustment
        Gtk::Adjustment time_adjustment_;
 
@@ -240,7 +243,6 @@ private:
        //Gtk::Adjustment time_window_adjustment_;
        studio::Adjust_Window time_window_adjustment_;
 
-
        LayerTree *layer_tree;
 
        ChildrenTree *children_tree;
@@ -257,22 +259,23 @@ 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;
 
+
+       //! 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;
@@ -309,22 +312,17 @@ private:
        Gtk::CheckMenuItem* duck_mask_width;
        Gtk::CheckMenuItem* duck_mask_angle;
 */
+       //! Menu members
        Gtk::Menu parammenu;
 
-
-       Glib::RefPtr<Gtk::ToggleAction> duck_mask_position;
-       Glib::RefPtr<Gtk::ToggleAction> duck_mask_vertex;
-       Glib::RefPtr<Gtk::ToggleAction> duck_mask_tangent;
-       Glib::RefPtr<Gtk::ToggleAction> duck_mask_radius;
-       Glib::RefPtr<Gtk::ToggleAction> duck_mask_width;
-       Glib::RefPtr<Gtk::ToggleAction> duck_mask_angle;
+       Glib::RefPtr<Gtk::ToggleAction> grid_snap_toggle;
+       Glib::RefPtr<Gtk::ToggleAction> grid_show_toggle;
 
        Gtk::RadioButtonGroup quality_group;
        Gtk::RadioButtonGroup low_res_pixel_size_group;
 
        Glib::RefPtr<Gtk::ActionGroup> action_group;
 
-
        etl::handle<synfigapp::UIInterface> ui_interface_;
        etl::handle<synfigapp::SelectionManager> selection_manager_;
 
@@ -353,7 +351,6 @@ public:
 
        bool cancel;
 
-
        /*
  -- ** -- D I A L O G S -------------------------------------------------------
        */
@@ -408,20 +405,17 @@ 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); }
-
-       void popup_param_menu(synfigapp::ValueDesc value_desc, float location=0);
+       { popup_param_menu(value_desc,location,true); }
 
+       //! 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);
 
        void selected_layer_color_set(synfig::Color color);
 
-
-
        void register_layer_type(synfig::Layer::Book::value_type &lyr,std::map<synfig::String,Gtk::Menu*>*);
 
        //! Rebuilds the "new layer" menu
@@ -594,7 +588,7 @@ public:
 
        void image_import();
 
-       void on_waypoint_clicked_canvasview(synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >, int button, synfig::Waypoint::Side side);
+       void on_waypoint_clicked_canvasview(synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >, int button);
 
        void preview_option() {on_preview_option();}
 
@@ -608,6 +602,7 @@ public:
 
 private:
 
+       void on_select_layers();
        void on_unselect_layers();
 
        void on_input_device_changed(GdkDevice*);
@@ -686,6 +681,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);