X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=d437e107b35f9a3103be3a8561aa4969fa47314c;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=3fcccaec4f72fe7a4dbe8996556d518eb98c4102;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 3fcccaec4f..d437e107b3 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -21,6 +21,7 @@ #include "BufferView.h" #include "buffer_funcs.h" #include "cursor.h" +#include "CutAndPaste.h" #include "debug.h" #include "gettext.h" #include "session.h" @@ -30,14 +31,15 @@ #include "lyxrc.h" #include "lyxtext.h" #include "paragraph.h" +#include "undo.h" #include "frontends/Alert.h" #include "frontends/Application.h" #include "frontends/FileDialog.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" @@ -58,9 +60,9 @@ namespace lyx { -using support::addName; using support::bformat; using support::FileFilterList; +using support::FileName; using support::ForkedProcess; using support::isLyXFilename; using support::libFileSearch; @@ -101,7 +103,7 @@ bool quitting; // flag, that we are quitting the program bool menuWrite(Buffer * buffer) { if (buffer->save()) { - LyX::ref().session().addLastFile(buffer->fileName()); + LyX::ref().session().lastFiles().add(FileName(buffer->fileName())); return true; } @@ -121,12 +123,12 @@ bool menuWrite(Buffer * buffer) -bool writeAs(Buffer * buffer, string const & filename) +bool writeAs(Buffer * buffer, string const & newname) { string fname = buffer->fileName(); string const oldname = fname; - if (filename.empty()) { + if (newname.empty()) { // FIXME UNICODE FileDialog fileDlg(_("Choose a filename to save document as"), @@ -153,13 +155,14 @@ bool writeAs(Buffer * buffer, string const & filename) return false; // Make sure the absolute filename ends with appropriate suffix - fname = makeAbsPath(fname); + fname = makeAbsPath(fname).absFilename(); if (!isLyXFilename(fname)) fname += ".lyx"; } else - fname = filename; + fname = newname; - if (fs::exists(fname)) { + FileName const filename(fname); + if (fs::exists(filename.toFilesystemEncoding())) { 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); @@ -192,7 +195,7 @@ namespace { class AutoSaveBuffer : public ForkedProcess { public: /// - AutoSaveBuffer(BufferView & bv, string const & fname) + AutoSaveBuffer(BufferView & bv, FileName const & fname) : bv_(bv), fname_(fname) {} /// virtual shared_ptr clone() const @@ -206,13 +209,13 @@ private: virtual int generateChild(); /// BufferView & bv_; - string fname_; + FileName fname_; }; int AutoSaveBuffer::start() { - command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_))); + command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_.absFilename()))); return run(DontWait); } @@ -230,7 +233,7 @@ int AutoSaveBuffer::generateChild() // anyway. bool failed = false; - string const tmp_ret = tempName(string(), "lyxauto"); + FileName const tmp_ret(tempName(FileName(), "lyxauto")); if (!tmp_ret.empty()) { bv_.buffer()->writeFile(tmp_ret); // assume successful write of tmp_ret @@ -287,7 +290,7 @@ void autoSave(BufferView * bv) fname += onlyFilename(bv->buffer()->fileName()); fname += '#'; - AutoSaveBuffer autosave(*bv, fname); + AutoSaveBuffer autosave(*bv, FileName(fname)); autosave.start(); bv->buffer()->markBakClean(); @@ -317,37 +320,35 @@ 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) +// Insert plain text file (if filename is empty, prompt for one) +void insertPlaintextFile(BufferView * bv, string const & f, bool asParagraph) { if (!bv->buffer()) return; // FIXME: We don't know the encoding of the file - docstring const tmpstr = from_utf8(getContentsOfAsciiFile(bv, f, asParagraph)); + docstring const tmpstr = from_utf8(getContentsOfPlaintextFile(bv, f, asParagraph)); if (tmpstr.empty()) return; - // clear the selection - LyXText const & text = bv->buffer()->text(); - if (&text == bv->getLyXText()) - bv->cursor().clearSelection(); + LCursor & cur = bv->cursor(); + cap::replaceSelection(cur); + recordUndo(cur); if (asParagraph) - bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr); + cur.innerText()->insertStringAsParagraphs(cur, tmpstr); else - bv->getLyXText()->insertStringAsLines(bv->cursor(), tmpstr); - bv->update(); + cur.innerText()->insertStringAsLines(cur, tmpstr); } -// Insert ascii file (if filename is empty, prompt for one) -string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph) +// Read plain text file (if filename is empty, prompt for one) +string getContentsOfPlaintextFile(BufferView * bv, string const & f, bool asParagraph) { - string fname = f; + FileName fname(f); if (fname.empty()) { FileDialog fileDlg(_("Select file to insert"), - (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII); + (asParagraph) ? LFUN_FILE_INSERT_PLAINTEXT_PARA : LFUN_FILE_INSERT_PLAINTEXT); FileDialog::Result result = fileDlg.open(from_utf8(bv->buffer()->filePath()), @@ -356,25 +357,25 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap if (result.first == FileDialog::Later) return string(); - fname = to_utf8(result.second); + fname = makeAbsPath(to_utf8(result.second)); if (fname.empty()) return string(); } - if (!fs::is_readable(fname)) { + if (!fs::is_readable(fname.toFilesystemEncoding())) { docstring const error = from_ascii(strerror(errno)); - docstring const file = makeDisplayPath(fname, 50); + docstring const file = makeDisplayPath(fname.absFilename(), 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()); + ifstream ifs(fname.toFilesystemEncoding().c_str()); if (!ifs) { docstring const error = from_ascii(strerror(errno)); - docstring const file = makeDisplayPath(fname, 50); + docstring const file = makeDisplayPath(fname.absFilename(), 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); @@ -404,10 +405,10 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap // This function runs "configure" and then rereads lyx.defaults to // reconfigure the automatic settings. -void reconfigure(BufferView * bv) +void reconfigure(LyXView & lv) { // emit message signal. - bv->buffer()->message(_("Running configure...")); + lv.message(_("Running configure...")); // Run configure in user lyx directory support::Path p(package().user_support()); @@ -416,7 +417,7 @@ void reconfigure(BufferView * bv) one.startscript(Systemcall::Wait, configure_command); p.pop(); // emit message signal. - bv->buffer()->message(_("Reloading configuration...")); + lv.message(_("Reloading configuration...")); lyxrc.read(libFileSearch(string(), "lyxrc.defaults")); // Re-read packages.lst LaTeXFeatures::getAvailable();