X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=7ce38710728c46f66df6c85c7417bd9fe27d9d21;hb=fe67325abc11f1fa871e18e7953f26225d648014;hp=23bf5be216a4d4e0bcc6d9e1cba2f403eaa52d37;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 23bf5be..7ce3871 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -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)
@@ -1465,13 +1465,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 +2877,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 +2902,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);
@@ -3354,6 +3323,7 @@ CanvasView::on_preview_create(const PreviewInfo &info)
 	Dialog_Preview *pd = preview_dialog.get();
 	assert(pd);
 
+	pd->set_default_size(700,510);
 	pd->set_preview(prev.get());
 	pd->present();
 }