X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=807a63e560db321badc4fb16c1697b9eb6f0114b;hb=5afd6a885fa84a1932cfd0e97db37f80ba970d80;hp=1a941c8a53dbf8f42b8d83f40efbd3e205f73550;hpb=adfc80c126f482d7ea2bac38001a2c4a7c7df88c;p=synfig.git

diff --git a/synfig-studio/src/gtkmm/canvasview.cpp b/synfig-studio/src/gtkmm/canvasview.cpp
index 1a941c8..807a63e 100644
--- a/synfig-studio/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/src/gtkmm/canvasview.cpp
@@ -684,10 +684,10 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
 	//keyframe_tree_store_	(KeyframeTreeStore::create(canvas_interface_)),
 	time_adjustment_		(0,0,25,0,0,0),
 	time_window_adjustment_	(0,0,25,0,0,0),
+	statusbar				(manage(new class Gtk::Statusbar())),
 	quality_adjustment_		(8,1,10,1,1,0),
 	future_onion_adjustment_ (0,0,2,1,1,0),
 	past_onion_adjustment_  (0,0,2,1,1,0),
-	statusbar				(manage(new class Gtk::Statusbar())),
 
 	timeslider				(new Widget_Timeslider),
 	widget_kf_list			(new Widget_Keyframe_List),
@@ -1123,7 +1123,7 @@ CanvasView::create_status_bar()
 Gtk::Widget*
 CanvasView::create_display_bar()
 {
-	displaybar = manage(new class Gtk::Table(10, 1, false));
+	displaybar = manage(new class Gtk::Table(16, 1, false));
 	Gtk::IconSize iconsize=Gtk::IconSize::from_name("synfig-small_icon_16x16");
 	// Setup the ToggleDuckDial widget
 	toggleducksdial = Gtk::manage(new class ToggleDucksDial(iconsize));
@@ -1163,11 +1163,17 @@ CanvasView::create_display_bar()
 			sigc::mem_fun(*this, &studio::CanvasView::toggle_low_res_pixel_flag));
 	resolutiondial->show();
 
-	// Set up a separator
+	// Set up some separators
 	Gtk::VSeparator *separator1 = Gtk::manage(new class Gtk::VSeparator());
 	separator1->show();
 	Gtk::VSeparator *separator2 = Gtk::manage(new class Gtk::VSeparator());
 	separator2->show();
+	Gtk::VSeparator *separator3 = Gtk::manage(new class Gtk::VSeparator());
+	separator3->show();
+	Gtk::VSeparator *separator4 = Gtk::manage(new class Gtk::VSeparator());
+	separator4->show();
+	Gtk::VSeparator *separator5 = Gtk::manage(new class Gtk::VSeparator());
+	separator5->show();
 
 	// Set up quality spin button
 	quality_spin=Gtk::manage(new class Gtk::SpinButton(quality_adjustment_));
@@ -1229,17 +1235,46 @@ CanvasView::create_display_bar()
 	tooltips.set_tip(*future_onion_spin, _("Future onion skins"));
 	future_onion_spin->show();
 
+	// Setup render options dialog button
+	render_options_button = Gtk::manage(new class Gtk::Button());
+	Gtk::Image *icon4 = manage(new Gtk::Image(Gtk::StockID("synfig-render_options"), iconsize));
+	icon4->set_padding(0, 0);
+	icon4->show();
+	render_options_button->add(*icon4);
+	render_options_button->signal_clicked().connect(
+			sigc::mem_fun0(render_settings,&studio::RenderSettings::present));
+	tooltips.set_tip(*render_options_button, _("Shows the Render Settings Dialog"));
+	render_options_button->set_relief(Gtk::RELIEF_NONE);
+	render_options_button->show();
+
+	// Setup preview options dialog button
+	preview_options_button = Gtk::manage(new class Gtk::Button());
+	Gtk::Image *icon5 = manage(new Gtk::Image(Gtk::StockID("synfig-preview_options"), iconsize));
+	icon5->set_padding(0, 0);
+	icon5->show();
+	preview_options_button->add(*icon5);
+	preview_options_button->signal_clicked().connect(
+			sigc::mem_fun(*this,&CanvasView::on_preview_option));
+	tooltips.set_tip(*preview_options_button, _("Shows the Preview Settings Dialog"));
+	preview_options_button->set_relief(Gtk::RELIEF_NONE);
+	preview_options_button->show();
+
 
 	displaybar->attach(*toggleducksdial, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
 	displaybar->attach(*separator1, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
 	displaybar->attach(*resolutiondial, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
 	displaybar->attach(*separator2, 3, 4, 0, 1, Gtk::FILL, Gtk::FILL);
 	displaybar->attach(*quality_spin, 4, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
-	displaybar->attach(*show_grid, 5, 6, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
-	displaybar->attach(*snap_grid, 6, 7, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
-	displaybar->attach(*past_onion_spin, 7, 8, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
-	displaybar->attach(*onion_skin, 8, 9, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
-	displaybar->attach(*future_onion_spin, 9, 10, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+	displaybar->attach(*separator3, 5, 6, 0, 1, Gtk::FILL, Gtk::FILL);
+	displaybar->attach(*show_grid, 6, 7, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+	displaybar->attach(*snap_grid, 7, 8, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+	displaybar->attach(*separator4, 8, 9, 0, 1, Gtk::FILL, Gtk::FILL);
+	displaybar->attach(*past_onion_spin, 9, 10, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+	displaybar->attach(*onion_skin, 10, 11, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+	displaybar->attach(*future_onion_spin, 11, 12, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+	displaybar->attach(*separator5, 12, 13, 0, 1, Gtk::FILL, Gtk::FILL);
+	displaybar->attach(*render_options_button, 13, 14, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+	displaybar->attach(*preview_options_button, 14, 15, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
 
 	displaybar->show();
 
@@ -1390,7 +1425,7 @@ CanvasView::init_menus()
 	- canvasmenu
 	- viewmenu
 	*/
-	action_group = Gtk::ActionGroup::create();
+	action_group = Gtk::ActionGroup::create("canvasview");
 
 	//action_group->add( Gtk::Action::create("MenuFile", _("_File")) );
 	action_group->add( Gtk::Action::create("new", Gtk::Stock::NEW),