X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=d849b4b380746a9700d1b02e786501807e1e63bf;hb=c7e365365e74237149c960b9ecaa77bc7c93e608;hp=6f8f68012ac2a3a7e41be947b5d771a73b1ecdf8;hpb=43b77ba2d722cdb8a9437926f839c1dcbf3c0b89;p=lyx.git

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 6f8f68012a..d849b4b380 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -32,12 +32,12 @@
 #include "paragraph.h"
 
 #include "frontends/Alert.h"
+#include "frontends/Application.h"
 #include "frontends/FileDialog.h"
-#include "frontends/lyx_gui.h"
-#include "frontends/LyXView.h"
 
 #include "support/filefilterlist.h"
 #include "support/filetools.h"
+#include "support/fontutils.h"
 #include "support/forkedcall.h"
 #include "support/fs_extras.h"
 #include "support/lyxlib.h"
@@ -67,7 +67,6 @@ using lyx::support::makeAbsPath;
 using lyx::support::makeDisplayPath;
 using lyx::support::onlyFilename;
 using lyx::support::onlyPath;
-using lyx::support::Path;
 using lyx::support::package;
 using lyx::support::removeAutosaveFile;
 using lyx::support::rename;
@@ -78,6 +77,7 @@ using lyx::support::unlink;
 
 using boost::shared_ptr;
 
+namespace Alert = lyx::frontend::Alert;
 namespace fs = boost::filesystem;
 
 using std::back_inserter;
@@ -90,11 +90,9 @@ using std::ios;
 using std::istream_iterator;
 
 
-extern BufferList bufferlist;
 // this should be static, but I need it in buffer.C
 bool quitting;	// flag, that we are quitting the program
 
-
 //
 // Menu callbacks
 //
@@ -108,12 +106,12 @@ 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(lyx::to_utf8(_("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(lyx::to_utf8(_("Rename and save?")),
-		text, 0, 1, lyx::to_utf8(_("&Rename")), lyx::to_utf8(_("&Cancel")));
+	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);
@@ -129,27 +127,26 @@ bool writeAs(Buffer * buffer, string const & filename)
 
 	if (filename.empty()) {
 
-		FileDialog fileDlg(lyx::to_utf8(_("Choose a filename to save document as")),
+		// FIXME UNICODE
+		FileDialog fileDlg(_("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(lyx::to_utf8(_("Templates|#T#t"))),
-				  string(lyxrc.template_path)));
+			make_pair(_("Documents|#o#O"), lyx::from_utf8(lyxrc.document_path)),
+			make_pair(_("Templates|#T#t"), lyx::from_utf8(lyxrc.template_path)));
 
 		if (!isLyXFilename(fname))
 			fname += ".lyx";
 
-		FileFilterList const filter (lyx::to_utf8(_("LyX Documents (*.lyx)")));
+		FileFilterList const filter (_("LyX Documents (*.lyx)"));
 
 		FileDialog::Result result =
-			fileDlg.save(onlyPath(fname),
+			fileDlg.save(lyx::from_utf8(onlyPath(fname)),
 				     filter,
-				     onlyFilename(fname));
+				     lyx::from_utf8(onlyFilename(fname)));
 
 		if (result.first == FileDialog::Later)
 			return false;
 
-		fname = result.second;
+		fname = lyx::to_utf8(result.second);
 
 		if (fname.empty())
 			return false;
@@ -162,11 +159,11 @@ bool writeAs(Buffer * buffer, string const & filename)
 		fname = filename;
 
 	if (fs::exists(fname)) {
-		string const file = makeDisplayPath(fname, 30);
-		string text = bformat(lyx::to_utf8(_("The document %1$s already exists.\n\n"
-						     "Do you want to over-write that document?")), file);
-		int const ret = Alert::prompt(lyx::to_utf8(_("Over-write document?")),
-			text, 0, 1, lyx::to_utf8(_("&Over-write")), lyx::to_utf8(_("&Cancel")));
+		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"));
 
 		if (ret == 1)
 			return false;
@@ -193,8 +190,8 @@ void quitLyX(bool noask)
 {
 	lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
 
-	if (lyx_gui::use_gui) {
-		if (!noask && !bufferlist.quitWriteAll())
+	if (lyx::use_gui) {
+		if (!noask && !theBufferList().quitWriteAll())
 			return;
 
 		LyX::cref().session().writeFile();
@@ -205,19 +202,24 @@ void quitLyX(bool noask)
 	quitting = true;
 
 	// close buffers first
-	bufferlist.closeAll();
+	theBufferList().closeAll();
 
 	// do any other cleanup procedures now
 	lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl;
 
 	if (!destroyDir(package().temp_dir())) {
-		string const msg =
-			bformat(lyx::to_utf8(_("Unable to remove the temporary directory %1$s")),
-			package().temp_dir());
-		Alert::warning(lyx::to_utf8(_("Unable to remove temporary directory")), msg);
+		docstring const msg =
+			bformat(_("Unable to remove the temporary directory %1$s"),
+			lyx::from_utf8(package().temp_dir()));
+		Alert::warning(_("Unable to remove temporary directory"), msg);
 	}
 
-	lyx_gui::exit(0);
+	if (lyx::use_gui) {
+		theApp->exit(0);
+
+		// Restore original font resources after Application is destroyed.
+		lyx::support::restoreFontResources();
+	}
 }
 
 
@@ -246,7 +248,7 @@ private:
 
 int AutoSaveBuffer::start()
 {
-	command_ = bformat(lyx::to_utf8(_("Auto-saving %1$s")), fname_);
+	command_ = lyx::to_utf8(bformat(_("Auto-saving %1$s"), lyx::from_utf8(fname_)));
 	return run(DontWait);
 }
 
@@ -286,7 +288,7 @@ int AutoSaveBuffer::generateChild()
 				// but safe in the parent, so...
 				if (pid == -1)
 					// emit message signal.
-					bv_.buffer()->message(lyx::to_utf8(_("Autosave failed!")));
+					bv_.buffer()->message(_("Autosave failed!"));
 			}
 		}
 		if (pid == 0) { // we are the child so...
@@ -303,17 +305,17 @@ 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()) {
 		// We don't save now, but we'll try again later
-		bv->owner()->resetAutosaveTimer();
+		bv->buffer()->resetAutosaveTimers();
 		return;
 	}
 
 	// emit message signal.
-	bv->buffer()->message(lyx::to_utf8(_("Autosaving current document...")));
+	bv->buffer()->message(_("Autosaving current document..."));
 
 	// create autosave filename
 	string fname = bv->buffer()->filePath();
@@ -325,7 +327,7 @@ void autoSave(BufferView * bv)
 	autosave.start();
 
 	bv->buffer()->markBakClean();
-	bv->owner()->resetAutosaveTimer();
+	bv->buffer()->resetAutosaveTimers();
 }
 
 
@@ -354,7 +356,7 @@ void newFile(BufferView * bv, string const & filename)
 // Insert ascii file (if filename is empty, prompt for one)
 void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 {
-	if (!bv->available())
+	if (!bv->buffer())
 		return;
 
 	// FIXME: We don't know the encoding of the file
@@ -363,7 +365,8 @@ void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 		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);
@@ -379,38 +382,38 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 	string fname = f;
 
 	if (fname.empty()) {
-		FileDialog fileDlg(lyx::to_utf8(_("Select file to insert")),
+		FileDialog fileDlg(_("Select file to insert"),
 			(asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
 
 		FileDialog::Result result =
-			fileDlg.open(bv->owner()->buffer()->filePath(),
-				     FileFilterList(), string());
+			fileDlg.open(lyx::from_utf8(bv->buffer()->filePath()),
+				     FileFilterList(), docstring());
 
 		if (result.first == FileDialog::Later)
 			return string();
 
-		fname = result.second;
+		fname = lyx::to_utf8(result.second);
 
 		if (fname.empty())
 			return string();
 	}
 
 	if (!fs::is_readable(fname)) {
-		string const error = strerror(errno);
-		string const file = makeDisplayPath(fname, 50);
-		string const text = bformat(lyx::to_utf8(_("Could not read the specified document\n"
-							   "%1$s\ndue to the error: %2$s")), file, error);
-		Alert::error(lyx::to_utf8(_("Could not read file")), text);
+		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(lyx::to_utf8(_("Could not open the specified document\n"
-							   "%1$s\ndue to the error: %2$s")), file, error);
-		Alert::error(lyx::to_utf8(_("Could not open file")), text);
+		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,22 +443,22 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 void reconfigure(BufferView * bv)
 {
 	// emit message signal.
-	bv->buffer()->message(lyx::to_utf8(_("Running configure...")));
+	bv->buffer()->message(_("Running configure..."));
 
 	// Run configure in user lyx directory
-	Path p(package().user_support());
+	lyx::support::Path p(package().user_support());
 	string const configure_command = package().configure_command();
 	Systemcall one;
 	one.startscript(Systemcall::Wait, configure_command);
 	p.pop();
 	// emit message signal.
-	bv->buffer()->message(lyx::to_utf8(_("Reloading configuration...")));
+	bv->buffer()->message(_("Reloading configuration..."));
 	lyxrc.read(libFileSearch(string(), "lyxrc.defaults"));
 	// Re-read packages.lst
 	LaTeXFeatures::getAvailable();
 
-	Alert::information(lyx::to_utf8(_("System reconfigured")),
-			   lyx::to_utf8(_("The system has been reconfigured.\n"
+	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.")));
+					  "updated document class specifications."));
 }