don't rm emergency saves ever

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index f47700b01b843f6eb162ad2e6d7457eb2596829d..0b944b6d01e9ddd0f23664abf2d5ef46339aba04 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -36,11 +36,12 @@
 #include "support/systemcall.h"
 #include "support/lstrings.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <fstream>
 #include <algorithm>
 #include <utility>
+#include <cerrno>
 
 using std::vector;
 using std::ifstream;
@@ -62,7 +63,7 @@ void ShowMessage(Buffer const * buf,
                 string const & msg2,
                 string const & msg3)
 {
-       if (lyxrc.use_gui
+       if (lyx_gui::use_gui
            && buf && buf->getUser() && buf->getUser()->owner()) {
                        string const str = msg1 + ' ' + msg2 + ' ' + msg3;
                        buf->getUser()->owner()->message(str);
@@ -95,7 +96,7 @@ bool MenuWrite(BufferView * bv, Buffer * buffer)
        text += file + _(" could not be saved.\n\nDo you want to rename the document and try again?");
 #endif
        int const ret = Alert::prompt(_("Rename and save?"),
-               text, 0, _("&Rename"), _("&Cancel"));
+               text, 0, 1, _("&Rename"), _("&Cancel"));
 
        if (ret == 0)
                return WriteAs(bv, buffer);
@@ -154,7 +155,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
                text += file + _(" already exists.\n\nDo you want to over-write that document?");
 #endif
                int const ret = Alert::prompt(_("Over-write document?"),
-                       text, 1, _("&Over-write"), _("&Cancel"));
+                       text, 0, 1, _("&Over-write"), _("&Cancel"));
 
                if (ret == 1)
                        return false;
@@ -177,42 +178,11 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 }
 
 
-int MenuRunChktex(Buffer * buffer)
-{
-       int ret;
-
-       if (buffer->isSGML()) {
-               Alert::alert(_("Chktex does not work with SGML derived documents."));
-               return 0;
-       } else
-               ret = buffer->runChktex();
-
-       if (ret >= 0) {
-               string s;
-               string t;
-               if (ret == 0) {
-                       s = _("No warnings found.");
-               } else if (ret == 1) {
-                       s = _("One warning found.");
-                       t = _("Use `Navigate->Error' to find it.");
-               } else {
-                       s += tostr(ret);
-                       s += _(" warnings found.");
-                       t = _("Use `Navigate->Error' to find them.");
-               }
-               Alert::alert(_("Chktex run successfully"), s, t);
-       } else {
-               Alert::alert(_("Error!"), _("It seems chktex does not work."));
-       }
-       return ret;
-}
-
-
 void QuitLyX()
 {
        lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
 
-       if (lyxrc.use_gui) {
+       if (lyx_gui::use_gui) {
                if (!bufferlist.quitWriteAll())
                        return;
 
@@ -229,7 +199,16 @@ void QuitLyX()
        // do any other cleanup procedures now
        lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl;
 
-       DestroyLyXTmpDir(system_tempdir);
+       if (destroyDir(system_tempdir) != 0) {
+#if USE_BOOST_FORMAT
+               boost::format fmt = _("Could not remove the temporary directory %1$s");
+               fmt % system_tempdir;
+               string msg = fmt.str();
+#else
+               string msg = _("Could not remove the temporary directory ") + system_tempdir;
+#endif
+               Alert::warning(_("Could not remove temporary directory"), msg);
+       }
 
        lyx_gui::exit();
 }
@@ -387,9 +366,6 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
        if (tmpstr.empty())
                return;
 
-       // insert the string
-       bv->hideCursor();
-
        // clear the selection
        bool flag = (bv->text == bv->getLyXText());
        if (flag)
@@ -426,15 +402,37 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
        FileInfo fi(fname);
 
        if (!fi.readable()) {
-               Alert::err_alert(_("Error! Specified file is unreadable: "),
-                            MakeDisplayPath(fname, 50));
+               string const error = strerror(errno);
+               string const file = MakeDisplayPath(fname, 50);
+#if USE_BOOST_FORMAT
+               boost::format fmt(_("Could not read the specified document\n%1$s\ndue to the error: %2$s"));
+               fmt % file;
+               fmt % error;
+               string text = fmt.str();
+#else
+               string text = _("Could not read the specified document\n");
+               text += file + _(" due to the error: ");
+               text += error;
+#endif
+               Alert::error(_("Could not read file"), text);
                return string();
        }
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
-               Alert::err_alert(_("Error! Cannot open specified file:"),
-                            MakeDisplayPath(fname, 50));
+               string const error = strerror(errno);
+               string const file = MakeDisplayPath(fname, 50);
+#if USE_BOOST_FORMAT
+               boost::format fmt(_("Could not open the specified document\n%1$s\ndue to the error: %2$s"));
+               fmt % file;
+               fmt % error;
+               string text = fmt.str();
+#else
+               string text = _("Could not open the specified document\n");
+               text += file + _(" due to the error: ");
+               text += error;
+#endif
+               Alert::error(_("Could not open file"), text);
                return string();
        }
 
@@ -461,7 +459,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
 string const getPossibleLabel(BufferView const & bv)
 {
-       Paragraph * par = bv.getLyXText()->cursor.par();
+       Paragraph * par = &*bv.getLyXText()->cursor.par();
        LyXLayout_ptr layout = par->layout();
        if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
                Paragraph * par2 = par->previous();
@@ -513,7 +511,9 @@ void Reconfigure(BufferView * bv)
        p.pop();
        bv->owner()->message(_("Reloading configuration..."));
        lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));
-       Alert::alert(_("The system has been reconfigured."),
-                  _("You need to restart LyX to make use of any"),
-                  _("updated document class specifications."));
+
+       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."));
 }