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=6f1f87ef69ae560d82283281d1db78e0d362ab83;hpb=cb8203d4a2196e403c959cc154e027cc269fca68;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h
index 6f1f87e..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>
@@ -260,9 +263,15 @@ private:
 	Gtk::Button *refreshbutton;
 	Gtk::Button *treetogglebutton;  // not used
 	Gtk::Notebook *notebook; // not used
-	Gtk::Widget *timebar;
+	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
@@ -403,6 +412,8 @@ 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,true); }
@@ -423,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 -----------------------------------------
@@ -679,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);