X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=bbc02ca869bf4b43756ebfc611431bb656c8008c;hb=777b2d8282159de60313dd466c86fb906677350b;hp=ab500e4e073f3607efc0e92bb5659ef05e89ca78;hpb=b6011ebece2f8d2df0eab728b6f2b5029836b1fa;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index ab500e4..bbc02ca 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2009 Carlos López
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -710,6 +711,7 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
 	changing_resolution_=false;
 	updating_quality_=false;
 	toggling_show_grid=false;
+	toggling_snap_grid=false;
 
 	smach_.set_default_state(&state_normal);
 
@@ -1103,7 +1105,7 @@ CanvasView::create_status_bar()
 Gtk::Widget*
 CanvasView::create_display_bar()
 {
-	displaybar = manage(new class Gtk::Table(1, 6, false));
+	displaybar = manage(new class Gtk::Table(1, 7, false));
 
 	// Setup the ToggleDuckDial widget
 	toggleducksdial = Gtk::manage(new class ToggleDucksDial());
@@ -1156,24 +1158,40 @@ CanvasView::create_display_bar()
 	tooltips.set_tip(*quality_spin, _("Quality (lower is better)"));
 	quality_spin->show();
 
-	// Set up the show grid check button
-	show_grid = Gtk::manage(new class Gtk::CheckButton());
+	// Set up the show grid toggle button
+	show_grid = Gtk::manage(new class Gtk::ToggleButton());
 	show_grid->set_active(work_area->grid_status());
-	Gtk::Image *icon = manage(new Gtk::Image(Gtk::Stock::REMOVE, Gtk::IconSize::from_name("synfig-small_icon")));
+	Gtk::Image *icon = manage(new Gtk::Image(Gtk::StockID("synfig-toggle_show_grid"), Gtk::IconSize::from_name("synfig-small_icon")));
 	icon->set_padding(0, 0);
 	icon->show();
 	show_grid->add(*icon);
 	show_grid->signal_toggled().connect(
 			sigc::mem_fun(*this, &studio::CanvasView::toggle_show_grid));
 	tooltips.set_tip(*show_grid, _("Show grid when enabled"));
+	show_grid->set_relief(Gtk::RELIEF_NONE);
 	show_grid->show();
 
+	// Set up the snap to grid toggle button
+	snap_grid = Gtk::manage(new class Gtk::ToggleButton());
+	snap_grid->set_active(work_area->grid_status());
+	Gtk::Image *icon2 = manage(new Gtk::Image(Gtk::StockID("synfig-toggle_snap_grid"), Gtk::IconSize::from_name("synfig-small_icon")));
+	icon2->set_padding(0, 0);
+	icon2->show();
+	snap_grid->add(*icon2);
+	snap_grid->signal_toggled().connect(
+			sigc::mem_fun(*this, &studio::CanvasView::toggle_snap_grid));
+	tooltips.set_tip(*snap_grid, _("snap grid when enabled"));
+	snap_grid->set_relief(Gtk::RELIEF_NONE);
+	snap_grid->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->show();
 
@@ -1493,7 +1511,7 @@ CanvasView::init_menus()
 
 		grid_snap_toggle = Gtk::ToggleAction::create("toggle-grid-snap", _("Snap to Grid"));
 		grid_snap_toggle->set_active(work_area->get_grid_snap());
-		action_group->add(grid_snap_toggle, sigc::mem_fun(*work_area, &studio::WorkArea::toggle_grid_snap));
+		action_group->add(grid_snap_toggle, sigc::mem_fun(*this, &studio::CanvasView::toggle_snap_grid));
 
 		action = Gtk::ToggleAction::create("toggle-guide-show", _("Show Guides"));
 		action->set_active(work_area->get_show_guides());
@@ -3241,6 +3259,21 @@ CanvasView::toggle_show_grid()
 	toggling_show_grid=false;
 }
 
+void
+CanvasView::toggle_snap_grid()
+{
+	if(toggling_snap_grid)
+		return;
+	toggling_snap_grid=true;
+	work_area->toggle_grid_snap();
+	// Update the toggle grid snap action
+	set_grid_snap_toggle(work_area->get_grid_snap());
+	// Update the toggle grid snap check button
+	snap_grid->set_active(work_area->get_grid_snap());
+	toggling_snap_grid=false;
+}
+
+
 
 void
 CanvasView::on_dirty_preview()