X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=185acca8f39b436e0b22138c9368bd8c316bf598;hb=adc1af4fb0c51317dc3a237c0d11bf05e768ad86;hp=e067af9d2fdeca3b8be5eb1c9970cf669b04627a;hpb=22a64c6070122f43a0a5cbd7f7328a758137e76b;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index e067af9..185acca 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file instance.cpp
+/*!	\file gtkmm/instance.cpp
 **	\brief writeme
 **
-**	$Id: instance.cpp,v 1.2 2005/01/13 18:37:30 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -50,6 +50,8 @@
 #include "widget_waypointmodel.h"
 #include <gtkmm/actiongroup.h>
 #include "iconcontroler.h"
+#include <sys/stat.h>
+#include <errno.h>
 
 #endif
 
@@ -250,15 +252,22 @@ studio::Instance::dialog_save_as()
 		}
 	}
 
-	while(App::dialog_saveas_file("SaveAs", filename))
+	// show the canvas' name if it has one, else its ID
+	while(App::dialog_save_file(_("Choose a Filename to Save As") +
+								String(" (") +
+								(canvas->get_name().empty()
+								 ? canvas->get_id()
+								 : canvas->get_name()) +
+								") ...", filename))
 	{
 		// If the filename still has wildcards, then we should
 		// continue looking for the file we want
 		if(find(filename.begin(),filename.end(),'*')!=filename.end())
 			continue;
 
-		if(find(filename.begin(),filename.end(),'.')==filename.end())
-			filename+=".sif";
+		std::string base = basename(filename);
+		if(find(base.begin(),base.end(),'.')==base.end())
+			filename+=".sifz";
 
 		try
 		{
@@ -274,6 +283,19 @@ studio::Instance::dialog_save_as()
 			continue;
 		}
 
+		{
+			struct stat	s;
+			// if stat() succeeds, or it fails with something other than 'file doesn't exist', the file exists
+			// if the file exists and the user doesn't want to overwrite it, keep prompting for a filename
+			if ((stat(filename.c_str(), &s) != -1 || errno != ENOENT) &&
+				!App::dialog_yes_no("File exists",
+									"A file named '" +
+									filename +
+									"' already exists.\n\n"
+									"Do you want to replace it with the file you are saving?"))
+				continue;
+		}
+
 		if(save_as(filename))
 			break;
 
@@ -602,7 +624,7 @@ bool
 Instance::safe_revert()
 {
 	if(synfigapp::Instance::get_action_count())
-		if(!App::dialog_yes_no(_("Revert to saved"), _("You will loose any changes you have made since your last save.\nAre you sure?")))
+		if(!App::dialog_yes_no(_("Revert to saved"), _("You will lose any changes you have made since your last save.\nAre you sure?")))
 			return false;
 	revert();
 	return true;