X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=14cca99832573202556feb5aec5a02fb89949df6;hb=ca6838b288daf07eec7d7a381d74c639c0de3a46;hp=861c3e9ff6b40d79e2258257304abe695a05abf3;hpb=0fc684e6e6d05f138418ded83fd02de62b9063e7;p=lyx.git

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 861c3e9ff6..14cca99832 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -34,6 +34,7 @@
 #include "frontends/Alert.h"
 #include "frontends/Application.h"
 #include "frontends/FileDialog.h"
+#include "frontends/LyXView.h"
 
 #include "support/filefilterlist.h"
 #include "support/filetools.h"
@@ -58,9 +59,9 @@
 
 namespace lyx {
 
-using support::addName;
 using support::bformat;
 using support::FileFilterList;
+using support::FileName;
 using support::ForkedProcess;
 using support::isLyXFilename;
 using support::libFileSearch;
@@ -101,7 +102,7 @@ bool quitting;	// flag, that we are quitting the program
 bool menuWrite(Buffer * buffer)
 {
 	if (buffer->save()) {
-		LyX::ref().session().LastFiles().add(buffer->fileName());
+		LyX::ref().session().lastFiles().add(FileName(buffer->fileName()));
 		return true;
 	}
 
@@ -121,12 +122,12 @@ bool menuWrite(Buffer * buffer)
 
 
 
-bool writeAs(Buffer * buffer, string const & filename)
+bool writeAs(Buffer * buffer, string const & newname)
 {
 	string fname = buffer->fileName();
 	string const oldname = fname;
 
-	if (filename.empty()) {
+	if (newname.empty()) {
 
 		// FIXME UNICODE
 		FileDialog fileDlg(_("Choose a filename to save document as"),
@@ -153,13 +154,14 @@ bool writeAs(Buffer * buffer, string const & filename)
 			return false;
 
 		// Make sure the absolute filename ends with appropriate suffix
-		fname = makeAbsPath(fname);
+		fname = makeAbsPath(fname).absFilename();
 		if (!isLyXFilename(fname))
 			fname += ".lyx";
 	} else
-		fname = filename;
+		fname = newname;
 
-	if (fs::exists(fname)) {
+	FileName const filename(fname);
+	if (fs::exists(filename.toFilesystemEncoding())) {
 		docstring const file = makeDisplayPath(fname, 30);
 		docstring text = bformat(_("The document %1$s already exists.\n\n"
 						     "Do you want to over-write that document?"), file);
@@ -192,7 +194,7 @@ namespace {
 class AutoSaveBuffer : public ForkedProcess {
 public:
 	///
-	AutoSaveBuffer(BufferView & bv, string const & fname)
+	AutoSaveBuffer(BufferView & bv, FileName const & fname)
 		: bv_(bv), fname_(fname) {}
 	///
 	virtual shared_ptr<ForkedProcess> clone() const
@@ -206,13 +208,13 @@ private:
 	virtual int generateChild();
 	///
 	BufferView & bv_;
-	string fname_;
+	FileName fname_;
 };
 
 
 int AutoSaveBuffer::start()
 {
-	command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_)));
+	command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_.absFilename())));
 	return run(DontWait);
 }
 
@@ -230,7 +232,7 @@ int AutoSaveBuffer::generateChild()
 		// anyway.
 		bool failed = false;
 
-		string const tmp_ret = tempName(string(), "lyxauto");
+		FileName const tmp_ret(tempName(FileName(), "lyxauto"));
 		if (!tmp_ret.empty()) {
 			bv_.buffer()->writeFile(tmp_ret);
 			// assume successful write of tmp_ret
@@ -287,7 +289,7 @@ void autoSave(BufferView * bv)
 	fname += onlyFilename(bv->buffer()->fileName());
 	fname += '#';
 
-	AutoSaveBuffer autosave(*bv, fname);
+	AutoSaveBuffer autosave(*bv, FileName(fname));
 	autosave.start();
 
 	bv->buffer()->markBakClean();
@@ -343,7 +345,7 @@ void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 // Insert ascii file (if filename is empty, prompt for one)
 string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 {
-	string fname = f;
+	FileName fname(f);
 
 	if (fname.empty()) {
 		FileDialog fileDlg(_("Select file to insert"),
@@ -356,25 +358,25 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 		if (result.first == FileDialog::Later)
 			return string();
 
-		fname = to_utf8(result.second);
+		fname = makeAbsPath(to_utf8(result.second));
 
 		if (fname.empty())
 			return string();
 	}
 
-	if (!fs::is_readable(fname)) {
+	if (!fs::is_readable(fname.toFilesystemEncoding())) {
 		docstring const error = from_ascii(strerror(errno));
-		docstring const file = makeDisplayPath(fname, 50);
+		docstring const file = makeDisplayPath(fname.absFilename(), 50);
 		docstring const text = bformat(_("Could not read the specified document\n"
 							   "%1$s\ndue to the error: %2$s"), file, error);
 		Alert::error(_("Could not read file"), text);
 		return string();
 	}
 
-	ifstream ifs(fname.c_str());
+	ifstream ifs(fname.toFilesystemEncoding().c_str());
 	if (!ifs) {
 		docstring const error = from_ascii(strerror(errno));
-		docstring const file = makeDisplayPath(fname, 50);
+		docstring const file = makeDisplayPath(fname.absFilename(), 50);
 		docstring const text = bformat(_("Could not open the specified document\n"
 							   "%1$s\ndue to the error: %2$s"), file, error);
 		Alert::error(_("Could not open file"), text);
@@ -404,10 +406,10 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
 // This function runs "configure" and then rereads lyx.defaults to
 // reconfigure the automatic settings.
-void reconfigure(BufferView * bv)
+void reconfigure(LyXView & lv)
 {
 	// emit message signal.
-	bv->buffer()->message(_("Running configure..."));
+	lv.message(_("Running configure..."));
 
 	// Run configure in user lyx directory
 	support::Path p(package().user_support());
@@ -416,7 +418,7 @@ void reconfigure(BufferView * bv)
 	one.startscript(Systemcall::Wait, configure_command);
 	p.pop();
 	// emit message signal.
-	bv->buffer()->message(_("Reloading configuration..."));
+	lv.message(_("Reloading configuration..."));
 	lyxrc.read(libFileSearch(string(), "lyxrc.defaults"));
 	// Re-read packages.lst
 	LaTeXFeatures::getAvailable();