X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=213ff3967687d8eb375f36ec1a2f8c5236375742;hb=86e0dfa3e11957318ca4f3f549248326aa806eb4;hp=c1ea6d4fdd01fac12511c51e949ef36bd037cd81;hpb=05a4c4d79fff606a98da8acdc6a135b9b984f547;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index c1ea6d4fdd..213ff39676 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -1,103 +1,123 @@ -/* This file is part of - * ====================================================== +/** + * \file lyx_cb.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author Lars Gullik Bjønnes + * \author Angus Leeming + * \author John Levon + * \author André Pönitz + * \author Jürgen Vigna * - * Copyright 1995 Matthias Ettrich, - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ + * Full author contact details are available in file CREDITS. + */ #include #include "lyx_cb.h" -#include "lyx_main.h" + #include "buffer.h" #include "bufferlist.h" -#include "bufferview_funcs.h" +#include "BufferView.h" +#include "cursor.h" #include "debug.h" +#include "gettext.h" #include "lastfiles.h" +#include "lyx_main.h" +#include "lyxlayout.h" #include "lyxrc.h" #include "lyxtext.h" -#include "gettext.h" -#include "BufferView.h" - -#include "insets/insetlabel.h" +#include "paragraph.h" -#include "frontends/lyx_gui.h" -#include "frontends/LyXView.h" #include "frontends/Alert.h" #include "frontends/FileDialog.h" +#include "frontends/lyx_gui.h" +#include "frontends/LyXView.h" #include "support/FileInfo.h" #include "support/filetools.h" #include "support/forkedcall.h" +#include "support/globbing.h" +#include "support/lyxlib.h" +#include "support/os.h" #include "support/path.h" +#include "support/path_defines.h" #include "support/systemcall.h" -#include "support/lstrings.h" -#include "BoostFormat.h" +#include +#include #include -#include -#include -using std::vector; -using std::ifstream; +using lyx::support::AddName; +using lyx::support::bformat; +using lyx::support::destroyDir; +using lyx::support::FileFilterList; +using lyx::support::FileInfo; +using lyx::support::ForkedProcess; +using lyx::support::IsLyXFilename; +using lyx::support::LibFileSearch; +using lyx::support::MakeAbsPath; +using lyx::support::MakeDisplayPath; +using lyx::support::OnlyFilename; +using lyx::support::OnlyPath; +using lyx::support::Path; +using lyx::support::removeAutosaveFile; +using lyx::support::rename; +using lyx::support::split; +using lyx::support::system_lyxdir; +using lyx::support::Systemcall; +using lyx::support::tempName; +using lyx::support::unlink; +using lyx::support::user_lyxdir; + +namespace os = lyx::support::os; + +using boost::shared_ptr; + +using std::back_inserter; using std::copy; using std::endl; +using std::make_pair; +using std::string; +using std::ifstream; using std::ios; -using std::back_inserter; using std::istream_iterator; -using std::pair; -using std::make_pair; + extern BufferList bufferlist; // this should be static, but I need it in buffer.C bool quitting; // flag, that we are quitting the program -void ShowMessage(Buffer const * buf, - string const & msg1, - string const & msg2, - string const & msg3) -{ - if (lyxrc.use_gui - && buf && buf->getUser() && buf->getUser()->owner()) { - string const str = msg1 + ' ' + msg2 + ' ' + msg3; - buf->getUser()->owner()->message(str); - } else - lyxerr << msg1 << msg2 << msg3 << endl; -} - - // // Menu callbacks // -// -// File menu -// -// should be moved to lyxfunc.C -bool MenuWrite(BufferView * bv, Buffer * buffer) +bool MenuWrite(Buffer * buffer) { - if (!buffer->save()) { - if (Alert::askQuestion(_("Save failed. Rename and try again?"), - MakeDisplayPath(buffer->fileName(), 50), - _("(If not, document is not saved.)"))) { - return WriteAs(bv, buffer); - } - return false; - } else - lastfiles->newFile(buffer->fileName()); - return true; + if (buffer->save()) { + LyX::ref().lastfiles().newFile(buffer->fileName()); + return true; + } + + // FIXME: we don't tell the user *WHY* the save failed !! + + string const file = MakeDisplayPath(buffer->fileName(), 30); + + string text = bformat(_("The document %1$s could not be saved.\n\n" + "Do you want to rename the document and try again?"), file); + int const ret = Alert::prompt(_("Rename and save?"), + text, 0, 1, _("&Rename"), _("&Cancel")); + + if (ret == 0) + return WriteAs(buffer); + return false; } -// should be moved to BufferView.C -// Half of this func should be in LyXView, the rest in BufferView. -bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) +bool WriteAs(Buffer * buffer, string const & filename) { string fname = buffer->fileName(); string const oldname = fname; @@ -114,10 +134,12 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) if (!IsLyXFilename(fname)) fname += ".lyx"; + FileFilterList const filter (_("LyX Documents (*.lyx)")); + FileDialog::Result result = fileDlg.save(OnlyPath(fname), - _("*.lyx| LyX Documents (*.lyx)"), - OnlyFilename(fname)); + filter, + OnlyFilename(fname)); if (result.first == FileDialog::Later) return false; @@ -134,36 +156,15 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) } else fname = filename; - // Same name as we have already? - if (!buffer->isUnnamed() && fname == oldname) { - if (!Alert::askQuestion(_("Same name as document already has:"), - MakeDisplayPath(fname, 50), - _("Save anyway?"))) - return false; - // Falls through to name change and save - } - // No, but do we have another file with this name open? - else if (!buffer->isUnnamed() && bufferlist.exists(fname)) { - if (Alert::askQuestion(_("Another document with same name open!"), - MakeDisplayPath(fname, 50), - _("Replace with current document?"))) - { - bufferlist.close(bufferlist.getBuffer(fname)); - - // Ok, change the name of the buffer, but don't save! - buffer->setFileName(fname); - buffer->markDirty(); - - ShowMessage(buffer, _("Document renamed to '"), - MakeDisplayPath(fname), _("', but not saved...")); - } - return false; - } // Check whether the file exists - else { - FileInfo const myfile(fname); - if (myfile.isOK() && !Alert::askQuestion(_("Document already exists:"), - MakeDisplayPath(fname, 50), - _("Replace file?"))) + FileInfo const myfile(fname); + if (myfile.isOK()) { + string const file = MakeDisplayPath(fname, 30); + string text = bformat(_("The document %1$s already exists.\n\n" + "Do you want to over-write that document?"), file); + int const ret = Alert::prompt(_("Over-write document?"), + text, 0, 1, _("&Over-write"), _("&Cancel")); + + if (ret == 1) return false; } @@ -173,59 +174,26 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) bool unnamed = buffer->isUnnamed(); buffer->setUnnamed(false); - if (!MenuWrite(bv, buffer)) { - buffer->setFileName(oldname); - buffer->setUnnamed(unnamed); - ShowMessage(buffer, _("Document could not be saved!"), - _("Holding the old name."), MakeDisplayPath(oldname)); - return false; + if (!MenuWrite(buffer)) { + buffer->setFileName(oldname); + buffer->setUnnamed(unnamed); + return false; } - // now remove the oldname autosave file if existant! + removeAutosaveFile(oldname); return true; } -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 (!bufferlist.qwriteAll()) + if (lyx_gui::use_gui) { + if (!bufferlist.quitWriteAll()) return; - lastfiles->writeFile(lyxrc.lastfiles); + LyX::cref().lastfiles().writeFile(lyxrc.lastfiles); } // Set a flag that we do quitting from the program, @@ -236,9 +204,13 @@ void QuitLyX() bufferlist.closeAll(); // do any other cleanup procedures now - lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl; + lyxerr[Debug::INFO] << "Deleting tmp dir " << os::getTmpDir() << endl; - DestroyLyXTmpDir(system_tempdir); + if (destroyDir(os::getTmpDir()) != 0) { + string msg = bformat(_("Could not remove the temporary directory %1$s"), + os::getTmpDir()); + Alert::warning(_("Could not remove temporary directory"), msg); + } lyx_gui::exit(); } @@ -252,8 +224,9 @@ public: AutoSaveBuffer(BufferView & bv, string const & fname) : bv_(bv), fname_(fname) {} /// - virtual ForkedProcess * clone() const { - return new AutoSaveBuffer(*this); + virtual shared_ptr clone() const + { + return shared_ptr(new AutoSaveBuffer(*this)); } /// int start(); @@ -268,12 +241,8 @@ private: 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(); + command_ = bformat(_("Auto-saving %1$s"), fname_); + return run(DontWait); } @@ -290,16 +259,16 @@ int AutoSaveBuffer::generateChild() // anyway. bool failed = false; - string const tmp_ret = lyx::tempName(string(), "lyxauto"); + string const tmp_ret = tempName(string(), "lyxauto"); if (!tmp_ret.empty()) { bv_.buffer()->writeFile(tmp_ret); // assume successful write of tmp_ret - if (!lyx::rename(tmp_ret, fname_)) { + if (!rename(tmp_ret, fname_)) { failed = true; // most likely couldn't move between filesystems // unless write of tmp_ret failed // so remove tmp file (if it exists) - lyx::unlink(tmp_ret); + unlink(tmp_ret); } } else { failed = true; @@ -360,7 +329,7 @@ void AutoSave(BufferView * bv) // create new file with template // SERVERCMD ! // -Buffer * NewFile(string const & filename) +void NewFile(BufferView * bv, string const & filename) { // Split argument by : string name; @@ -378,11 +347,7 @@ Buffer * NewFile(string const & filename) << "\nName is " << name << "\nTemplate is " << tmpname << endl; - // find a free buffer - Buffer * tmpbuf = bufferlist.newFile(name, tmpname); - if (tmpbuf) - lastfiles->newFile(tmpbuf->fileName()); - return tmpbuf; + bv->newFile(name, tmpname); } @@ -396,20 +361,14 @@ 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) - bv->beforeChange(bv->text); - if (!asParagraph) - bv->getLyXText()->insertStringAsLines(bv, tmpstr); + if (bv->text() == bv->getLyXText()) + bv->cursor().clearSelection(); + if (asParagraph) + bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr); else - bv->getLyXText()->insertStringAsParagraphs(bv, tmpstr); - if (flag) - bv->update(bv->text, - BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); + bv->getLyXText()->insertStringAsLines(bv->cursor(), tmpstr); + bv->update(); } @@ -422,7 +381,9 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap 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()); + FileDialog::Result result = + fileDlg.open(bv->owner()->buffer()->filePath(), + FileFilterList(), string()); if (result.first == FileDialog::Later) return string(); @@ -436,15 +397,21 @@ 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); + string 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()); if (!ifs) { - Alert::err_alert(_("Error! Cannot open specified file:"), - MakeDisplayPath(fname, 50)); + string const error = strerror(errno); + string const file = MakeDisplayPath(fname, 50); + string 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); return string(); } @@ -453,7 +420,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap istream_iterator end; #if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD) // We use this until the compilers get better... - vector tmp; + std::vector tmp; copy(ii, end, back_inserter(tmp)); string const tmpstr(tmp.begin(), tmp.end()); #else @@ -469,46 +436,6 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap } -string const getPossibleLabel(BufferView const & bv) -{ - Paragraph * par = bv.getLyXText()->cursor.par(); - LyXLayout_ptr layout = par->layout(); - if (layout->latextype == LATEX_PARAGRAPH && par->previous()) { - Paragraph * par2 = par->previous(); - - LyXLayout_ptr const & layout2 = par2->layout(); - - if (layout2->latextype != LATEX_PARAGRAPH) { - par = par2; - layout = layout2; - } - } - - string text = layout->latexname().substr(0, 3); - if (layout->latexname() == "theorem") - text = "thm"; // Create a correct prefix for prettyref - - text += ':'; - if (layout->latextype == LATEX_PARAGRAPH || - lyxrc.label_init_length < 0) - text.erase(); - - string par_text = par->asString(bv.buffer(), false); - for (int i = 0; i < lyxrc.label_init_length; ++i) { - if (par_text.empty()) - break; - string head; - par_text = split(par_text, head, ' '); - if (i > 0) - text += '-'; // Is it legal to use spaces in - // labels ? - text += head; - } - - return text; -} - - // This function runs "configure" and then rereads lyx.defaults to // reconfigure the automatic settings. void Reconfigure(BufferView * bv) @@ -516,14 +443,16 @@ void Reconfigure(BufferView * bv) bv->owner()->message(_("Running configure...")); // Run configure in user lyx directory - Path p(user_lyxdir); + Path p(user_lyxdir()); Systemcall one; one.startscript(Systemcall::Wait, - AddName(system_lyxdir, "configure")); + AddName(system_lyxdir(), "configure")); 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.")); }