X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=87c58a5c854c525b80ab20abc14dc766d0774af6;hb=f26a17960daf8eca62ca03d3a3bdb61096e09c7b;hp=14419be0f5f81e653e27026e958125e3bbf276c0;hpb=9bb1a9c46064f252f98f7232c5d66c0c539d6968;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 14419be..87c58a5 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1221,8 +1221,11 @@ CanvasView::init_menus()
 	action_group->add( Gtk::Action::create("options", _("Options")),
 		sigc::mem_fun0(canvas_options,&studio::CanvasOptions::present)
 	);
-	action_group->add( Gtk::Action::create("close", Gtk::StockID("gtk-close")),
-		sigc::hide_return(sigc::mem_fun(*this,&studio::CanvasView::close))
+	action_group->add( Gtk::Action::create("close", Gtk::StockID("gtk-close"), _("Close Window")),
+		sigc::hide_return(sigc::mem_fun(*this,&studio::CanvasView::close_view))
+	);
+	action_group->add( Gtk::Action::create("close-document", Gtk::StockID("gtk-close"), _("Close Document")),
+		sigc::hide_return(sigc::mem_fun(*this,&studio::CanvasView::close_instance))
 	);
 
 	//action_group->add( Gtk::Action::create("undo", Gtk::StockID("gtk-undo")),
@@ -1460,7 +1463,12 @@ CanvasView::init_menus()
 		sigc::mem_fun(canvas_options,&studio::CanvasOptions::present)
 	));
  	filemenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem());
-	filemenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-close"),sigc::hide_return(sigc::mem_fun(*this,&studio::CanvasView::close))));
+	filemenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Close View"),
+		sigc::hide_return(sigc::mem_fun(*this,&studio::CanvasView::close_view))
+	));
+	filemenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Close Document"),
+		sigc::hide_return(sigc::mem_fun(*this,&studio::CanvasView::close_document))
+	));
 
 	editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-undo"),Gtk::AccelKey('Z',Gdk::CONTROL_MASK),SLOT_EVENT(EVENT_UNDO)));
 	editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-redo"),Gtk::AccelKey('R',Gdk::CONTROL_MASK),SLOT_EVENT(EVENT_REDO)));
@@ -1940,9 +1948,40 @@ CanvasView::refresh_rend_desc()
 
 
 bool
-CanvasView::close()
+CanvasView::close_view()
+{
+	if(get_instance()->get_visible_canvases()==1)
+		close_instance();
+	else
+		hide();
+	return false;
+}
+
+static bool _close_instance(etl::handle<Instance> instance)
+{
+	etl::handle<Instance> argh(instance);
+	instance->safe_close();
+	synfig::info("closed");
+	return false;
+}
+
+bool
+CanvasView::close_instance()
 {
-	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),
+			250);
+	}
+	else
+		Glib::signal_timeout().connect(
+			sigc::bind(sigc::ptr_fun(_close_instance),
+					   (etl::handle<Instance>)get_instance()),
+			250);
 	return false;
 }
 
@@ -1960,6 +1999,8 @@ CanvasView::update_title()
 {
 	string title;
 
+	if(get_instance()->synfigapp::Instance::get_action_count())
+		title="*";
 	title+=etl::basename(get_instance()->get_file_name())
 		+" : ";
 	if(get_canvas()->get_name().empty())
@@ -1967,9 +2008,6 @@ CanvasView::update_title()
 	else
 		title+='"'+get_canvas()->get_name()+'"';
 
-	if(get_instance()->synfigapp::Instance::get_action_count())
-		title+=_(" (Unsaved)");
-
 	if(get_instance()->synfigapp::Instance::in_repository())
 	{
 		title+=" (CVS";
@@ -3099,8 +3137,8 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
 				// Strip the "file://" part from the filename
 				filename=synfig::String(filename.begin()+sizeof("file://")-1,filename.end());
 
-				String ext;
-				try{ext=(String(filename.begin()+filename.find_last_of('.')+1,filename.end()));}catch(...){continue;}
+				String ext(filename_extension(filename));
+				if (ext.size()) ext = ext.substr(1); // skip initial '.'
 
 				// If this is a SIF file, then we need to do things slightly differently
 				if(ext=="sketch")
@@ -3517,46 +3555,10 @@ CanvasView::set_ext_widget(const synfig::String& x, Gtk::Widget* y)
 		keyframe_tree=dynamic_cast<KeyframeTree*>(y);
 }
 
-static bool _close_instance(etl::handle<Instance> instance)
-{
-	etl::handle<Instance> argh(instance);
-	instance->safe_close();
-	synfig::info("closed");
-	return false;
-}
-
-bool
-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(
-				sigc::ptr_fun(_close_instance),
-				(etl::handle<Instance>)get_instance()
-			)
-			,250
-		);
-
-	return false;
-}
-
 bool
 CanvasView::on_delete_event(GdkEventAny* event)
 {
-	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 true;
-	}
-
-	close_instance_when_safe();
+	close_view();
 
 	//! \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?