Collapse all those LFUN_XYZ_APPLY to a single LFUN_INSET_APPLY.

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 30f2d89da14f0d98808660482f405574260099a5..e3578314111db3cc6f221767fdd4d4196ab0cddb 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -31,14 +31,16 @@
 
 #include "support/FileInfo.h"
 #include "support/filetools.h"
+#include "support/forkedcall.h"
 #include "support/path.h"
 #include "support/systemcall.h"
 #include "support/lstrings.h"
 
+#include "BoostFormat.h"
+
 #include <fstream>
 #include <algorithm>
 #include <utility>
-#include <iostream>
 
 using std::vector;
 using std::ifstream;
@@ -102,8 +104,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 
        if (filename.empty()) {
 
-               FileDialog fileDlg(bv->owner(),
-                                  _("Choose a filename to save document as"),
+               FileDialog fileDlg(_("Choose a filename to save document as"),
                        LFUN_WRITEAS,
                        make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
@@ -114,8 +115,8 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
                        fname += ".lyx";
 
                FileDialog::Result result =
-                       fileDlg.Select(OnlyPath(fname),
-                                      _("*.lyx|LyX Documents (*.lyx)"),
+                       fileDlg.save(OnlyPath(fname),
+                                      _("*.lyx| LyX Documents (*.lyx)"),
                                       OnlyFilename(fname));
 
                if (result.first == FileDialog::Later)
@@ -243,28 +244,41 @@ void QuitLyX()
 }
 
 
+namespace {
 
-void AutoSave(BufferView * bv)
-       // should probably be moved into BufferList (Lgb)
-       // Perfect target for a thread...
-{
-       if (!bv->available())
-               return;
-
-       if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
-               // We don't save now, but we'll try again later
-               bv->owner()->resetAutosaveTimer();
-               return;
+class AutoSaveBuffer : public ForkedProcess {
+public:
+       ///
+       AutoSaveBuffer(BufferView & bv, string const & fname)
+               : bv_(bv), fname_(fname) {}
+       ///
+       virtual ForkedProcess * clone() const {
+               return new AutoSaveBuffer(*this);
        }
+       ///
+       int start();
+private:
+       ///
+       virtual int generateChild();
+       ///
+       BufferView & bv_;
+       string fname_;
+};
+
+
+int AutoSaveBuffer::start()
+{
+#if USE_BOOST_FORMAT
+       command_ = boost::io::str(boost::format(_("Auto-saving %1$s")) % fname_);
+#else
+       command_ = _("Auto-saving ") + fname_;
+#endif
+       return runNonBlocking();
+}
 
-       bv->owner()->message(_("Autosaving current document..."));
-
-       // create autosave filename
-       string fname =  bv->buffer()->filePath();
-       fname += "#";
-       fname += OnlyFilename(bv->buffer()->fileName());
-       fname += "#";
 
+int AutoSaveBuffer::generateChild()
+{
        // tmp_ret will be located (usually) in /tmp
        // will that be a problem?
        pid_t const pid = fork(); // If you want to debug the autosave
@@ -278,9 +292,9 @@ void AutoSave(BufferView * bv)
 
                string const tmp_ret = lyx::tempName(string(), "lyxauto");
                if (!tmp_ret.empty()) {
-                       bv->buffer()->writeFile(tmp_ret);
+                       bv_.buffer()->writeFile(tmp_ret);
                        // assume successful write of tmp_ret
-                       if (!lyx::rename(tmp_ret, fname)) {
+                       if (!lyx::rename(tmp_ret, fname_)) {
                                failed = true;
                                // most likely couldn't move between filesystems
                                // unless write of tmp_ret failed
@@ -293,17 +307,46 @@ void AutoSave(BufferView * bv)
 
                if (failed) {
                        // failed to write/rename tmp_ret so try writing direct
-                       if (!bv->buffer()->writeFile(fname)) {
+                       if (!bv_.buffer()->writeFile(fname_)) {
                                // It is dangerous to do this in the child,
                                // but safe in the parent, so...
                                if (pid == -1)
-                                       bv->owner()->message(_("Autosave failed!"));
+                                       bv_.owner()->message(_("Autosave failed!"));
                        }
                }
                if (pid == 0) { // we are the child so...
                        _exit(0);
                }
        }
+       return pid;
+}
+
+} // namespace anon
+
+
+void AutoSave(BufferView * bv)
+       // should probably be moved into BufferList (Lgb)
+       // Perfect target for a thread...
+{
+       if (!bv->available())
+               return;
+
+       if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
+               // We don't save now, but we'll try again later
+               bv->owner()->resetAutosaveTimer();
+               return;
+       }
+
+       bv->owner()->message(_("Autosaving current document..."));
+
+       // create autosave filename
+       string fname = bv->buffer()->filePath();
+       fname += '#';
+       fname += OnlyFilename(bv->buffer()->fileName());
+       fname += '#';
+
+       AutoSaveBuffer autosave(*bv, fname);
+       autosave.start();
 
        bv->buffer()->markBakClean();
        bv->owner()->resetAutosaveTimer();
@@ -376,10 +419,10 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
        string fname = f;
 
        if (fname.empty()) {
-               FileDialog fileDlg(bv->owner(), _("Select file to insert"),
+               FileDialog fileDlg(_("Select file to insert"),
                        (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
 
-               FileDialog::Result result = fileDlg.Select(bv->owner()->buffer()->filePath());
+               FileDialog::Result result = fileDlg.open(bv->owner()->buffer()->filePath());
 
                if (result.first == FileDialog::Later)
                        return string();
@@ -400,7 +443,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
-               Alert::err_alert(_("Error! Cannot open specified file: "),
+               Alert::err_alert(_("Error! Cannot open specified file:"),
                             MakeDisplayPath(fname, 50));
                return string();
        }
@@ -429,7 +472,6 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 void MenuInsertLabel(BufferView * bv, string const & arg)
 {
        string label = arg;
-       bv->owner()->prohibitInput();
        if (label.empty()) {
                Paragraph * par = bv->getLyXText()->cursor.par();
                LyXLayout_ptr layout = par->layout();
@@ -447,7 +489,7 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
                if (layout->latexname() == "theorem")
                        text = "thm"; // Create a correct prefix for prettyref
 
-               text += ":";
+               text += ':';
                if (layout->latextype == LATEX_PARAGRAPH ||
                    lyxrc.label_init_length < 0)
                        text.erase();
@@ -474,7 +516,6 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
                InsetLabel * inset = new InsetLabel(p);
                bv->insertInset(inset);
        }
-       bv->owner()->allowInput();
 }