X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=4d108c860bc9d733b6da8d12b6ac089e563ec0e9;hb=de161c40b1e8c5896f18f503c12cf29ec57bbf1e;hp=5445ef21c9a8307ede7c9756bcf2600041591dbe;hpb=b2effebe209af199a591ee8666bf462b2a3b712b;p=lyx.git

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 5445ef21c9..4d108c860b 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -19,6 +19,7 @@
 #include "buffer.h"
 #include "bufferlist.h"
 #include "BufferView.h"
+#include "buffer_funcs.h"
 #include "cursor.h"
 #include "debug.h"
 #include "gettext.h"
@@ -54,20 +55,19 @@
 #include <cerrno>
 #include <fstream>
 
-using lyx::support::AddName;
+using lyx::docstring;
+using lyx::support::addName;
 using lyx::support::bformat;
 using lyx::support::destroyDir;
 using lyx::support::FileFilterList;
 using lyx::support::ForkedProcess;
-using lyx::support::IsLyXFilename;
-using lyx::support::LibFileSearch;
-using lyx::support::MakeAbsPath;
-using lyx::support::MakeDisplayPath;
-using lyx::support::OnlyFilename;
-using lyx::support::OnlyPath;
-using lyx::support::Path;
+using lyx::support::isLyXFilename;
+using lyx::support::libFileSearch;
+using lyx::support::makeAbsPath;
+using lyx::support::makeDisplayPath;
+using lyx::support::onlyFilename;
+using lyx::support::onlyPath;
 using lyx::support::package;
-using lyx::support::QuoteName;
 using lyx::support::removeAutosaveFile;
 using lyx::support::rename;
 using lyx::support::split;
@@ -98,7 +98,7 @@ bool quitting;	// flag, that we are quitting the program
 // Menu callbacks
 //
 
-bool MenuWrite(Buffer * buffer)
+bool menuWrite(Buffer * buffer)
 {
 	if (buffer->save()) {
 		LyX::ref().session().addLastFile(buffer->fileName());
@@ -107,43 +107,43 @@ bool MenuWrite(Buffer * buffer)
 
 	// FIXME: we don't tell the user *WHY* the save failed !!
 
-	string const file = MakeDisplayPath(buffer->fileName(), 30);
+	docstring const file = makeDisplayPath(buffer->fileName(), 30);
 
-	string text = bformat(_("The document %1$s could not be saved.\n\n"
-		"Do you want to rename the document and try again?"), file);
+	docstring text = bformat(_("The document %1$s could not be saved.\n\n"
+					     "Do you want to rename the document and try again?"), file);
 	int const ret = Alert::prompt(_("Rename and save?"),
 		text, 0, 1, _("&Rename"), _("&Cancel"));
 
 	if (ret == 0)
-		return WriteAs(buffer);
+		return writeAs(buffer);
 	return false;
 }
 
 
 
-bool WriteAs(Buffer * buffer, string const & filename)
+bool writeAs(Buffer * buffer, string const & filename)
 {
 	string fname = buffer->fileName();
 	string const oldname = fname;
 
 	if (filename.empty()) {
 
-		FileDialog fileDlg(_("Choose a filename to save document as"),
-			LFUN_WRITEAS,
-			make_pair(string(_("Documents|#o#O")),
+		FileDialog fileDlg(lyx::to_utf8(_("Choose a filename to save document as")),
+			LFUN_BUFFER_WRITE_AS,
+			make_pair(string(lyx::to_utf8(_("Documents|#o#O"))),
 				  string(lyxrc.document_path)),
-			make_pair(string(_("Templates|#T#t")),
+			make_pair(string(lyx::to_utf8(_("Templates|#T#t"))),
 				  string(lyxrc.template_path)));
 
-		if (!IsLyXFilename(fname))
+		if (!isLyXFilename(fname))
 			fname += ".lyx";
 
-		FileFilterList const filter (_("LyX Documents (*.lyx)"));
+		FileFilterList const filter (lyx::to_utf8(_("LyX Documents (*.lyx)")));
 
 		FileDialog::Result result =
-			fileDlg.save(OnlyPath(fname),
+			fileDlg.save(onlyPath(fname),
 				     filter,
-				     OnlyFilename(fname));
+				     onlyFilename(fname));
 
 		if (result.first == FileDialog::Later)
 			return false;
@@ -154,16 +154,16 @@ bool WriteAs(Buffer * buffer, string const & filename)
 			return false;
 
 		// Make sure the absolute filename ends with appropriate suffix
-		fname = MakeAbsPath(fname);
-		if (!IsLyXFilename(fname))
+		fname = makeAbsPath(fname);
+		if (!isLyXFilename(fname))
 			fname += ".lyx";
 	} else
 		fname = filename;
 
 	if (fs::exists(fname)) {
-		string const file = MakeDisplayPath(fname, 30);
-		string text = bformat(_("The document %1$s already exists.\n\n"
-			"Do you want to over-write that document?"), file);
+		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);
 		int const ret = Alert::prompt(_("Over-write document?"),
 			text, 0, 1, _("&Over-write"), _("&Cancel"));
 
@@ -177,7 +177,7 @@ bool WriteAs(Buffer * buffer, string const & filename)
 	bool unnamed = buffer->isUnnamed();
 	buffer->setUnnamed(false);
 
-	if (!MenuWrite(buffer)) {
+	if (!menuWrite(buffer)) {
 		buffer->setFileName(oldname);
 		buffer->setUnnamed(unnamed);
 		return false;
@@ -188,7 +188,7 @@ bool WriteAs(Buffer * buffer, string const & filename)
 }
 
 
-void QuitLyX(bool noask)
+void quitLyX(bool noask)
 {
 	lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
 
@@ -210,13 +210,13 @@ void QuitLyX(bool noask)
 	lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl;
 
 	if (!destroyDir(package().temp_dir())) {
-		string const msg =
+		docstring const msg =
 			bformat(_("Unable to remove the temporary directory %1$s"),
-			package().temp_dir());
+			lyx::from_utf8(package().temp_dir()));
 		Alert::warning(_("Unable to remove temporary directory"), msg);
 	}
 
-	lyx_gui::exit();
+	lyx_gui::exit(0);
 }
 
 
@@ -245,7 +245,7 @@ private:
 
 int AutoSaveBuffer::start()
 {
-	command_ = bformat(_("Auto-saving %1$s"), fname_);
+	command_ = lyx::to_utf8(bformat(_("Auto-saving %1$s"), lyx::from_utf8(fname_)));
 	return run(DontWait);
 }
 
@@ -284,7 +284,8 @@ int AutoSaveBuffer::generateChild()
 				// It is dangerous to do this in the child,
 				// but safe in the parent, so...
 				if (pid == -1)
-					bv_.owner()->message(_("Autosave failed!"));
+					// emit message signal.
+					bv_.buffer()->message(_("Autosave failed!"));
 			}
 		}
 		if (pid == 0) { // we are the child so...
@@ -297,11 +298,11 @@ int AutoSaveBuffer::generateChild()
 } // namespace anon
 
 
-void AutoSave(BufferView * bv)
+void autoSave(BufferView * bv)
 	// should probably be moved into BufferList (Lgb)
 	// Perfect target for a thread...
 {
-	if (!bv->available())
+	if (!bv->buffer())
 		return;
 
 	if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
@@ -310,12 +311,13 @@ void AutoSave(BufferView * bv)
 		return;
 	}
 
-	bv->owner()->message(_("Autosaving current document..."));
+	// emit message signal.
+	bv->buffer()->message(_("Autosaving current document..."));
 
 	// create autosave filename
 	string fname = bv->buffer()->filePath();
 	fname += '#';
-	fname += OnlyFilename(bv->buffer()->fileName());
+	fname += onlyFilename(bv->buffer()->fileName());
 	fname += '#';
 
 	AutoSaveBuffer autosave(*bv, fname);
@@ -333,40 +335,35 @@ void AutoSave(BufferView * bv)
 // create new file with template
 // SERVERCMD !
 //
-void NewFile(BufferView * bv, string const & filename)
+void newFile(BufferView * bv, string const & filename)
 {
 	// Split argument by :
 	string name;
 	string tmpname = split(filename, name, ':');
-#ifdef __EMX__ // Fix me! lyx_cb.C may not be low level enough to allow this.
-	if (name.length() == 1
-	    && isalpha(static_cast<unsigned char>(name[0]))
-	    && (prefixIs(tmpname, "/") || prefixIs(tmpname, "\\"))) {
-		name += ':';
-		name += token(tmpname, ':', 0);
-		tmpname = split(tmpname, ':');
-	}
-#endif
 	lyxerr[Debug::INFO] << "Arg is " << filename
 			    << "\nName is " << name
 			    << "\nTemplate is " << tmpname << endl;
 
-	bv->newFile(name, tmpname);
+	Buffer * const b = newFile(name, tmpname);
+	if (b)
+		bv->setBuffer(b);
 }
 
 
 // Insert ascii file (if filename is empty, prompt for one)
-void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 {
-	if (!bv->available())
+	if (!bv->buffer())
 		return;
 
-	string const tmpstr = getContentsOfAsciiFile(bv, f, asParagraph);
+	// FIXME: We don't know the encoding of the file
+	docstring const tmpstr = lyx::from_utf8(getContentsOfAsciiFile(bv, f, asParagraph));
 	if (tmpstr.empty())
 		return;
 
 	// clear the selection
-	if (bv->text() == bv->getLyXText())
+	LyXText const & text = bv->buffer()->text();
+	if (&text == bv->getLyXText())
 		bv->cursor().clearSelection();
 	if (asParagraph)
 		bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr);
@@ -382,7 +379,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 	string fname = f;
 
 	if (fname.empty()) {
-		FileDialog fileDlg(_("Select file to insert"),
+		FileDialog fileDlg(lyx::to_utf8(_("Select file to insert")),
 			(asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
 
 		FileDialog::Result result =
@@ -399,20 +396,20 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 	}
 
 	if (!fs::is_readable(fname)) {
-		string const error = strerror(errno);
-		string const file = MakeDisplayPath(fname, 50);
-		string const text = bformat(_("Could not read the specified document\n"
-			"%1$s\ndue to the error: %2$s"), file, error);
+		docstring const error = lyx::from_ascii(strerror(errno));
+		docstring const file = makeDisplayPath(fname, 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());
 	if (!ifs) {
-		string const error = strerror(errno);
-		string const file = MakeDisplayPath(fname, 50);
-		string const text = bformat(_("Could not open the specified document\n"
-			"%1$s\ndue to the error: %2$s"), file, error);
+		docstring const error = lyx::from_ascii(strerror(errno));
+		docstring const file = makeDisplayPath(fname, 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);
 		return string();
 	}
@@ -440,25 +437,25 @@ 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(BufferView * bv)
 {
-	bv->owner()->message(_("Running configure..."));
+	// emit message signal.
+	bv->buffer()->message(_("Running configure..."));
 
 	// Run configure in user lyx directory
-	Path p(package().user_support());
-	string const configure_script =
-		AddName(package().system_support(), "configure.py");
-	string const configure_command = "python " + QuoteName(configure_script);
+	lyx::support::Path p(package().user_support());
+	string const configure_command = package().configure_command();
 	Systemcall one;
 	one.startscript(Systemcall::Wait, configure_command);
 	p.pop();
-	bv->owner()->message(_("Reloading configuration..."));
-	lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));
+	// emit message signal.
+	bv->buffer()->message(_("Reloading configuration..."));
+	lyxrc.read(libFileSearch(string(), "lyxrc.defaults"));
 	// Re-read packages.lst
 	LaTeXFeatures::getAvailable();
 
 	Alert::information(_("System reconfigured"),
-		_("The system has been reconfigured.\n"
-		"You need to restart LyX to make use of any\n"
-		"updated document class specifications."));
+			   _("The system has been reconfigured.\n"
+					  "You need to restart LyX to make use of any\n"
+					  "updated document class specifications."));
 }