X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.h;h=1ac09911872d0f6f64ddcbded9794f4d2469d6e1;hb=d845287cb7b04975efb055cbebcd94074b9b42ca;hp=844a57fd8d7f5cf8b4a92b6374aa1e1dafb02675;hpb=44a6e894eaa7af4bcebb7c317a303f547878e01c;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h
index 844a57f..1ac0991 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -41,6 +41,7 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/notebook.h>
 #include <gdkmm/device.h>
+#include <gtkmm/spinbutton.h>
 
 #include <synfigapp/canvasinterface.h>
 #include <synfigapp/selectionmanager.h>
@@ -66,6 +67,8 @@
 #include "dialog_waypoint.h"
 #include "dialog_keyframe.h"
 #include "framedial.h"
+#include "toggleducksdial.h"
+#include "resolutiondial.h"
 
 #include "duckmatic.h"
 #include <gtkmm/scale.h>
@@ -261,12 +264,22 @@ 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_;
+	Gtk::Adjustment quality_adjustment_;
+	Gtk::SpinButton *quality_spin;
+	bool updating_quality_;
+	Gtk::ToggleButton *show_grid;
+	Gtk::ToggleButton *snap_grid;
+	bool toggling_show_grid;
+	bool toggling_snap_grid;
 	//! Shows current time and allows edition
 	Widget_Time *current_time_widget;
 	void on_current_time_widget_changed();
@@ -405,6 +418,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); }
@@ -425,6 +440,10 @@ private:
 
 	void decrease_low_res_pixel_size();
 	void increase_low_res_pixel_size();
+	void toggle_low_res_pixel_flag();
+	void set_quality(int x);
+	void toggle_show_grid();
+	void toggle_snap_grid();
 
 	/*
  -- ** -- P U B L I C   M E T H O D S -----------------------------------------
@@ -596,6 +615,8 @@ public:
 
 	bool is_playing() { return is_playing_; }
 
+	void update_quality();
+
 	/*
  -- ** -- S I G N A L   T E R M I N A L S -------------------------------------
 	*/