X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.h;h=ea3fae71a91c25878289e363a725e041093c9d19;hb=3a2a20f4d04c9a1791b6e1997e75d729326a422b;hp=448f99005a2ca912e382e62317e85d0275344874;hpb=9fc17cc46bd63a7508b82c967801a09be882fe57;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h
index 448f990..ea3fae7 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -65,6 +65,9 @@
 
 #include "dialog_waypoint.h"
 #include "dialog_keyframe.h"
+#include "framedial.h"
+#include "toggleducksdial.h"
+#include "resolutiondial.h"
 
 #include "duckmatic.h"
 #include <gtkmm/scale.h>
@@ -173,6 +176,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 ---------------------------------------------
 	*/
@@ -255,20 +261,28 @@ 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::Table *displaybar;
+	Gtk::Button *animatebutton;
+	Gtk::Button *keyframebutton;
+	FrameDial *framedial;
+	ToggleDucksDial *toggleducksdial;
+	bool toggling_ducks_;
+	ResolutionDial *resolutiondial;
+	bool changing_resolution_;
 
+
+	//! 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;
@@ -305,14 +319,11 @@ 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;
@@ -401,10 +412,14 @@ private:
 
 	Gtk::Widget *create_time_bar();
 
+	Gtk::Widget *create_display_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);
 
@@ -419,6 +434,7 @@ private:
 
 	void decrease_low_res_pixel_size();
 	void increase_low_res_pixel_size();
+	void toggle_low_res_pixel_flag();
 
 	/*
  -- ** -- P U B L I C   M E T H O D S -----------------------------------------
@@ -596,6 +612,7 @@ public:
 
 private:
 
+	void on_select_layers();
 	void on_unselect_layers();
 
 	void on_input_device_changed(GdkDevice*);
@@ -674,6 +691,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);