X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=ff6eeb49ac50f8c4bdfdf252ff3b0d18edee65dd;hb=2bb86211292f416cd584023feb23dc3b86bc1761;hp=a58ed4ff6e6cc25d4ae95700f63a6b73c3c2371b;hpb=1dffc5cfe45c34d9ef42d3d58d2ed4ce855339e2;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index a58ed4ff6e..ff6eeb49ac 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -15,52 +15,79 @@ #include #include "lyx_cb.h" -#include "lyx_main.h" + #include "buffer.h" -#include "buffer_funcs.h" #include "bufferlist.h" -#include "bufferview_funcs.h" +#include "BufferView.h" +#include "cursor.h" #include "debug.h" +#include "gettext.h" #include "lastfiles.h" +#include "LaTeXFeatures.h" +#include "lyx_main.h" +#include "lyxlayout.h" #include "lyxrc.h" #include "lyxtext.h" -#include "gettext.h" -#include "BufferView.h" -#include "Lsstream.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/filefilterlist.h" #include "support/filetools.h" #include "support/forkedcall.h" -#include "support/lstrings.h" +#include "support/fs_extras.h" #include "support/lyxlib.h" +#include "support/package.h" #include "support/path.h" -#include "support/path_defines.h" -#include "support/os.h" #include "support/systemcall.h" -#include -#include -#include +#if !defined (HAVE_FORK) +# define fork() -1 +#endif + +#include +#include + #include +#include -using namespace lyx::support; +using lyx::support::AddName; +using lyx::support::bformat; +using lyx::support::destroyDir; +using lyx::support::FileFilterList; +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::package; +using lyx::support::QuoteName; +using lyx::support::removeAutosaveFile; +using lyx::support::rename; +using lyx::support::split; +using lyx::support::Systemcall; +using lyx::support::tempName; +using lyx::support::unlink; + +using boost::shared_ptr; + +namespace fs = boost::filesystem; -using std::vector; -using std::ifstream; +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 @@ -74,7 +101,7 @@ bool quitting; // flag, that we are quitting the program bool MenuWrite(Buffer * buffer) { if (buffer->save()) { - lastfiles->newFile(buffer->fileName()); + LyX::ref().lastfiles().newFile(buffer->fileName()); return true; } @@ -111,10 +138,12 @@ bool WriteAs(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; @@ -131,8 +160,7 @@ bool WriteAs(Buffer * buffer, string const & filename) } else fname = filename; - FileInfo const myfile(fname); - if (myfile.isOK()) { + if (fs::exists(fname)) { 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); @@ -160,15 +188,15 @@ bool WriteAs(Buffer * buffer, string const & filename) } -void QuitLyX() +void QuitLyX(bool noask) { lyxerr[Debug::INFO] << "Running QuitLyX." << endl; if (lyx_gui::use_gui) { - if (!bufferlist.quitWriteAll()) + if (!noask && !bufferlist.quitWriteAll()) return; - lastfiles->writeFile(lyxrc.lastfiles); + LyX::cref().lastfiles().writeFile(lyxrc.lastfiles); } // Set a flag that we do quitting from the program, @@ -179,12 +207,13 @@ void QuitLyX() bufferlist.closeAll(); // do any other cleanup procedures now - lyxerr[Debug::INFO] << "Deleting tmp dir " << os::getTmpDir() << endl; + lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl; - 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); + if (!destroyDir(package().temp_dir())) { + string const msg = + bformat(_("Unable to remove the temporary directory %1$s"), + package().temp_dir()); + Alert::warning(_("Unable to remove temporary directory"), msg); } lyx_gui::exit(); @@ -199,8 +228,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(); @@ -216,7 +246,7 @@ private: int AutoSaveBuffer::start() { command_ = bformat(_("Auto-saving %1$s"), fname_); - return runNonBlocking(); + return run(DontWait); } @@ -336,13 +366,12 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph) return; // clear the selection - bool flag = (bv->text == bv->getLyXText()); - if (flag) - bv->beforeChange(bv->text); - if (!asParagraph) - bv->getLyXText()->insertStringAsLines(tmpstr); + if (bv->text() == bv->getLyXText()) + bv->cursor().clearSelection(); + if (asParagraph) + bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr); else - bv->getLyXText()->insertStringAsParagraphs(tmpstr); + bv->getLyXText()->insertStringAsLines(bv->cursor(), tmpstr); bv->update(); } @@ -356,7 +385,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(); @@ -367,9 +398,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap return string(); } - FileInfo fi(fname); - - if (!fi.readable()) { + if (!fs::is_readable(fname)) { string const error = strerror(errno); string const file = MakeDisplayPath(fname, 50); string const text = bformat(_("Could not read the specified document\n" @@ -393,7 +422,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 @@ -409,49 +438,6 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap } -string const getPossibleLabel(BufferView const & bv) -{ - ParagraphList::iterator pit = bv.getLyXText()->cursor.par(); - ParagraphList & plist = bv.getLyXText()->ownerParagraphs(); - - LyXLayout_ptr layout = pit->layout(); - - if (layout->latextype == LATEX_PARAGRAPH && pit != plist.begin()) { - ParagraphList::iterator pit2 = boost::prior(pit); - - LyXLayout_ptr const & layout2 = pit2->layout(); - - if (layout2->latextype != LATEX_PARAGRAPH) { - pit = pit2; - 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 = pit->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) @@ -459,16 +445,20 @@ void Reconfigure(BufferView * bv) bv->owner()->message(_("Running configure...")); // Run configure in user lyx directory - Path p(user_lyxdir()); + Path p(package().user_support()); + string const configure_script = + AddName(package().system_support(), "configure"); + string const configure_command = "sh " + QuoteName(configure_script); Systemcall one; - one.startscript(Systemcall::Wait, - AddName(system_lyxdir(), "configure")); + one.startscript(Systemcall::Wait, configure_command); p.pop(); bv->owner()->message(_("Reloading configuration...")); lyxrc.read(LibFileSearch(string(), "lyxrc.defaults")); + // Re-read packages.lst + LaTeXFeatures::getAvailable(); Alert::information(_("System reconfigured"), _("The system has been reconfigured.\n" - "You need to restart LyX to make use of any \n" + "You need to restart LyX to make use of any\n" "updated document class specifications.")); }