X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=4b1d3514ccdfe054ddedaeae45e9673134432b3c;hb=2408c43789dd50d9219f5bea349ed9543e4e39ea;hp=52696812288cefe2691a36faaa2510b02690d0e7;hpb=7a631732a7ac2ea15a67456f53028fdc34b31ffc;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 5269681..4b1d351 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -790,7 +790,7 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
 
 	// If the canvas is really big, zoom out so that we can fit it all in the window
 	/*! \todo In other words, this is a zoom-to-fit, and should be
-	** in it's own function.
+	** in its own function.
 	*/
 	int w=get_canvas()->rend_desc().get_w()+70;
 	int h=get_canvas()->rend_desc().get_h()+70;
@@ -946,7 +946,7 @@ CanvasView::create_time_bar()
 	Gtk::Table *table= manage(new class Gtk::Table(2, 3, false));
 
 	//setup the audio display
-	disp_audio->set_size_request(-1,32); //disp_audio.show();
+	disp_audio->set_size_request(-1,32); //disp_audio->show();
 	disp_audio->set_time_adjustment(&time_adjustment());
 	disp_audio->signal_start_scrubbing().connect(
 		sigc::mem_fun(*audio,&AudioContainer::start_scrubbing)
@@ -1310,11 +1310,9 @@ CanvasView::init_menus()
 		action=Gtk::Action::create("seek-prev-second", Gtk::Stock::GO_BACK,_("Seek Backward"),_("Seek Backward"));
 		action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time),Time(-1)));
 
-		// Broken...!?
-		/*
 		action=Gtk::Action::create("seek-end", Gtk::Stock::GOTO_LAST,_("Seek to End"),_("Seek to End"));
 		action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time),Time::end()));
-		*/
+
 		action=Gtk::Action::create("seek-begin", Gtk::Stock::GOTO_FIRST,_("Seek to Begin"),_("Seek to Begin"));
 		action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time),Time::begin()));
 
@@ -1465,13 +1463,6 @@ CanvasView::init_menus()
 	editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-stop"),Gtk::AccelKey(GDK_Escape,static_cast<Gdk::ModifierType>(0)),SLOT_EVENT(EVENT_STOP)));
 	editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-refresh"),Gtk::AccelKey('k',Gdk::CONTROL_MASK),SLOT_EVENT(EVENT_REFRESH)));
 	editmenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem());
- 	editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-rotoscope_bline"),
-		sigc::mem_fun(*this, &studio::CanvasView::do_rotoscope_bline)));
- 	editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-rotoscope_polygon"),
-		sigc::mem_fun(*this, &studio::CanvasView::do_rotoscope_poly)));
- 	editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-eyedrop"),
-		sigc::mem_fun(*this, &studio::CanvasView::do_eyedrop)));
-	editmenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem());
 	editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-properties"),Gtk::AccelKey("F8"),
 		sigc::mem_fun(canvas_properties,&studio::CanvasProperties::present)
 	));
@@ -2884,30 +2875,6 @@ CanvasView::toggle_tables()
 }
 
 void
-CanvasView::do_rotoscope_bline()
-{
-	smach_.enter(&state_bline);
-}
-
-void
-CanvasView::do_rotoscope()
-{
-	smach_.enter(&state_draw);
-}
-
-void
-CanvasView::do_rotoscope_poly()
-{
-	smach_.enter(&state_polygon);
-}
-
-void
-CanvasView::do_eyedrop()
-{
-	smach_.enter(&state_eyedrop);
-}
-
-void
 CanvasView::show_timebar()
 {
 	timebar->show();
@@ -2933,7 +2900,7 @@ CanvasView::hide_timebar()
 }
 
 void
-CanvasView::timebar_set_sensitive(bool sensitive)
+CanvasView::set_sensitive_timebar(bool sensitive)
 {
 	timebar->set_sensitive(sensitive);
 	current_time_widget->set_sensitive(sensitive);