X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.h;h=826c8ea14f3144dce55f41234ef2c1135a5a16dc;hb=7b90fa6d64864aba582c3e8d4e0f2e8add8bd6c5;hp=3b27e8bf255e6f680d8d8ce1b8f74deb2c8e7ae8;hpb=7f9abbbc61efb68086aec4e1d2297694856e55f5;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h
index 3b27e8b..826c8ea 100644
--- 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,9 +408,11 @@ 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,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);
@@ -674,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);