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

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index e1af6fd8fd..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"
@@ -77,6 +77,7 @@ using lyx::support::unlink;
 
 using boost::shared_ptr;
 
+namespace Alert = lyx::frontend::Alert;
 namespace fs = boost::filesystem;
 
 using std::back_inserter;
@@ -89,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
 //
@@ -128,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;
@@ -192,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();
@@ -204,7 +202,7 @@ 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;
@@ -216,7 +214,12 @@ void quitLyX(bool noask)
 		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();
+	}
 }
 
 
@@ -307,7 +310,7 @@ void autoSave(BufferView * bv)
 
 	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;
 	}
 
@@ -324,7 +327,7 @@ void autoSave(BufferView * bv)
 	autosave.start();
 
 	bv->buffer()->markBakClean();
-	bv->owner()->resetAutosaveTimer();
+	bv->buffer()->resetAutosaveTimers();
 }
 
 
@@ -362,7 +365,7 @@ void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 		return;
 
 	// clear the selection
-	LyXText & const text = bv->buffer()->text();
+	LyXText const & text = bv->buffer()->text();
 	if (&text == bv->getLyXText())
 		bv->cursor().clearSelection();
 	if (asParagraph)
@@ -379,17 +382,17 @@ 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();