X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=71ad5bacb0071672d5d4c102985cce8c1fb4a34e;hb=823db6d3004c792ca4377ed0fe5606a0f74f716a;hp=226848fff97382518aa974f08e6914d75958d26a;hpb=c50c9ca115419aeb0c0c6e3dad2215765ae66efe;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 226848f..71ad5ba 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1298,22 +1298,29 @@ CanvasView::init_menus()
 		sigc::mem_fun0(*preview_dialog, &studio::Dialog_Preview::present)
 	);
 
-	action_group->add( Gtk::Action::create("toggle-grid-show", _("Toggle Grid Show")),
-		sigc::mem_fun(*work_area, &studio::WorkArea::toggle_grid)
-	);
-	action_group->add( Gtk::Action::create("toggle-grid-snap", _("Toggle Grid Snap")),
-		sigc::mem_fun(*work_area, &studio::WorkArea::toggle_grid_snap)
-	);
-	action_group->add( Gtk::Action::create("toggle-guide-show", _("Toggle Guide Show")),
-		sigc::mem_fun(*work_area, &studio::WorkArea::toggle_guide_snap)
-	);
-	action_group->add( Gtk::Action::create("toggle-low-res", _("Toggle Low-Res")),
-		sigc::mem_fun(*work_area, &studio::WorkArea::toggle_low_resolution_flag)
-	);
-	action_group->add( Gtk::Action::create("toggle-onion-skin", _("Toggle Onion Skin")),
-		sigc::mem_fun(*work_area, &studio::WorkArea::toggle_onion_skin)
-	);
+	{
+		Glib::RefPtr<Gtk::ToggleAction> action;
+
+		action = Gtk::ToggleAction::create("toggle-grid-show", _("Show Grid"));
+		action->set_active(work_area->grid_status());
+		action_group->add(action, sigc::mem_fun(*work_area, &studio::WorkArea::toggle_grid));
+
+		action = Gtk::ToggleAction::create("toggle-grid-snap", _("Snap to Grid"));
+		action->set_active(work_area->get_grid_snap());
+		action_group->add(action, sigc::mem_fun(*work_area, &studio::WorkArea::toggle_grid_snap));
 
+		action = Gtk::ToggleAction::create("toggle-guide-show", _("Show Guides"));
+		action->set_active(work_area->get_show_guides());
+		action_group->add(action, sigc::mem_fun(*work_area, &studio::WorkArea::toggle_guide_snap));
+
+		action = Gtk::ToggleAction::create("toggle-low-res", _("Use Low-Res"));
+		action->set_active(work_area->get_low_resolution_flag());
+		action_group->add(action, sigc::mem_fun(*work_area, &studio::WorkArea::toggle_low_resolution_flag));
+
+		action = Gtk::ToggleAction::create("toggle-onion-skin", _("Show Onion Skin"));
+		action->set_active(work_area->get_onion_skin());
+		action_group->add(action, sigc::mem_fun(*work_area, &studio::WorkArea::toggle_onion_skin));
+	}
 
 	action_group->add( Gtk::Action::create("canvas-zoom-fit", Gtk::StockID("gtk-zoom-fit")),
 		sigc::mem_fun(*work_area, &studio::WorkArea::zoom_fit)
@@ -2523,22 +2530,18 @@ CanvasView::on_keyframe_button_pressed()
 {
 	synfigapp::CanvasInterface::Mode mode(get_mode());
 
+	//   future && past   -->             past
 	if((mode&synfigapp::MODE_ANIMATE_FUTURE) && (mode&synfigapp::MODE_ANIMATE_PAST))
-	{
 		set_mode(get_mode()-synfigapp::MODE_ANIMATE_FUTURE);
-	}
+	//             past   -->   future
 	else if(!(mode&synfigapp::MODE_ANIMATE_FUTURE) && (mode&synfigapp::MODE_ANIMATE_PAST))
-	{
-		set_mode(get_mode()-synfigapp::MODE_ANIMATE_PAST|synfigapp::MODE_ANIMATE_FUTURE);
-	}
+		set_mode((get_mode()-synfigapp::MODE_ANIMATE_PAST)|synfigapp::MODE_ANIMATE_FUTURE);
+	//   future           -->       (nothing)
 	else if((mode&synfigapp::MODE_ANIMATE_FUTURE) && !(mode&synfigapp::MODE_ANIMATE_PAST))
-	{
 		set_mode(get_mode()-synfigapp::MODE_ANIMATE_FUTURE);
-	}
+	//      (nothing)     -->   future && past
 	else if(!(mode&synfigapp::MODE_ANIMATE_FUTURE) && !(mode&synfigapp::MODE_ANIMATE_PAST))
-	{
 		set_mode(get_mode()|synfigapp::MODE_ANIMATE_FUTURE|synfigapp::MODE_ANIMATE_PAST);
-	}
 }
 
 bool
@@ -3578,7 +3581,7 @@ CanvasView::set_ext_widget(const synfig::String& x, Gtk::Widget* y)
 }
 
 bool
-CanvasView::on_delete_event(GdkEventAny* event)
+CanvasView::on_delete_event(GdkEventAny* event __attribute__ ((unused)))
 {
 	close_view();