X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=b88484f9051baae1af7114d1401f98721913c443;hb=c3a7f7ac4d1f045c134877baa3b84a4b2aa34287;hp=9e597d453e3128c6e5becdeab1f079ac25243be3;hpb=9872e3229a1877e8cdcdb2feb177e49e12e8ddf4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 9e597d4..b88484f 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -446,7 +447,7 @@ public:
 	{
 //		assert(view->layer_tree);
 
-		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("canvas_view.layer_tree not defined!?"); return LayerList(); }
+		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return LayerList(); }
 		return view->layer_tree->get_selected_layers();
 	}
 
@@ -455,7 +456,7 @@ public:
 	{
 //		assert(view->layer_tree);
 
-		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("canvas_view.layer_tree not defined!?"); return 0; }
+		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return 0; }
 		return view->layer_tree->get_selected_layer();
 	}
 
@@ -464,7 +465,7 @@ public:
 	{
 //		assert(view->layer_tree);
 
-		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("canvas_view.layer_tree not defined!?"); return; }
+		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return; }
 		view->layer_tree->select_layers(layer_list);
 		//view->get_smach().process_event(EVENT_REFRESH_DUCKS);
 
@@ -1265,7 +1266,10 @@ CanvasView::init_menus()
 		{
 			Glib::RefPtr<Gtk::RadioAction> action(Gtk::RadioAction::create(quality_group,strprintf("quality-%02d",i), strprintf("Set Quality to %d",i)));
 			if(i==10)
-				action->property_value()=10;
+			{
+				action->set_active();
+				work_area->set_quality(i);
+			}
 			action_group->add( action,
 				sigc::bind(
 					sigc::mem_fun(*work_area, &studio::WorkArea::set_quality),
@@ -1275,7 +1279,7 @@ CanvasView::init_menus()
 		}
 	}
 
-	action_group->add( Gtk::Action::create("play", Gtk::StockID("synfig-play")),
+	action_group->add( Gtk::Action::create("play", Gtk::Stock::MEDIA_PLAY),
 		sigc::mem_fun(*this, &studio::CanvasView::play)
 	);
 
@@ -1583,7 +1587,7 @@ CanvasView::init_menus()
 		viewmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Preview Quality"),qualitymenu));
 	}
 
-	viewmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-play"),
+	viewmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::MEDIA_PLAY,
 		sigc::mem_fun(*this, &studio::CanvasView::play)));
 	viewmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("Flipbook Dialog"),
 		sigc::mem_fun(*preview_dialog, &studio::Dialog_Preview::present)));
@@ -1938,7 +1942,16 @@ CanvasView::refresh_rend_desc()
 bool
 CanvasView::close()
 {
-	get_instance()->safe_close();
+	if (get_work_area()->get_updating())
+	{
+		get_work_area()->stop_updating(true); // stop and mark as cancelled
+
+		// give the workarea chances to stop updating
+		Glib::signal_timeout().connect(sigc::mem_fun(*this, &CanvasView::close_instance_when_safe) ,250);
+		return false;
+	}
+
+	close_instance_when_safe();
 	return false;
 }
 
@@ -3415,7 +3428,7 @@ CanvasView::on_audio_offset_notify()
 	sound_dialog->set_offset(t);
 	disp_audio->queue_draw();
 
-	synfig::info("CanvasView::on_audio_offset_notify(): offset time set to %s",t.get_string(get_canvas()->rend_desc().get_frame_rate()).c_str());
+	// synfig::info("CanvasView::on_audio_offset_notify(): offset time set to %s",t.get_string(get_canvas()->rend_desc().get_frame_rate()).c_str());
 }
 
 void
@@ -3522,10 +3535,12 @@ static bool _close_instance(etl::handle<Instance> instance)
 }
 
 bool
-CanvasView::on_delete_event(GdkEventAny* event)
+CanvasView::close_instance_when_safe()
 {
+	if (get_work_area()->get_updating())
+		return true;
+
 	if(get_instance()->get_visible_canvases()==1)
-	{
 		// Schedule a close to occur in a few moments
 		Glib::signal_timeout().connect(
 			sigc::bind(
@@ -3534,9 +3549,18 @@ CanvasView::on_delete_event(GdkEventAny* event)
 			)
 			,250
 		);
-	}
-	if(event)
-		return Gtk::Window::on_delete_event(event);
+
+	return false;
+}
+
+bool
+CanvasView::on_delete_event(GdkEventAny* event)
+{
+	close();
+
+	//! \todo This causes the window to be deleted straight away - but what if we prompt 'save?' and the user cancels?
+	//		  Is there ever any need to pass on the delete event to the window here?
+	// if(event) return Gtk::Window::on_delete_event(event);
 
 	return true;
 }