This commit saves the need to check for lyx::use_gui in a number of places.

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index df07a860902e4ef183d0953384e7158124348b2b..d849b4b380746a9700d1b02e786501807e1e63bf 100644 (file)
--- 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
 //
@@ -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;
@@ -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,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;
@@ -217,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();
+       }
 }
 
 
@@ -303,12 +305,12 @@ 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;
        }
 
@@ -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,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();
@@ -443,7 +446,7 @@ void reconfigure(BufferView * bv)
        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);