X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=ff6eeb49ac50f8c4bdfdf252ff3b0d18edee65dd;hb=2bb86211292f416cd584023feb23dc3b86bc1761;hp=5838b29e143b55fd14839a4288a0737d252f8cf8;hpb=4bcfc43c2958ef6dd083210ed25db4eb5a290a87;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 5838b29e14..ff6eeb49ac 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -23,6 +23,7 @@ #include "debug.h" #include "gettext.h" #include "lastfiles.h" +#include "LaTeXFeatures.h" #include "lyx_main.h" #include "lyxlayout.h" #include "lyxrc.h" @@ -34,16 +35,22 @@ #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/globbing.h" +#include "support/fs_extras.h" #include "support/lyxlib.h" -#include "support/os.h" +#include "support/package.h" #include "support/path.h" -#include "support/path_defines.h" #include "support/systemcall.h" +#if !defined (HAVE_FORK) +# define fork() -1 +#endif + +#include +#include + #include #include @@ -51,7 +58,6 @@ 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; @@ -60,18 +66,19 @@ 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::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; + +namespace fs = boost::filesystem; -using std::auto_ptr; using std::back_inserter; using std::copy; using std::endl; @@ -153,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); @@ -182,12 +188,12 @@ 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; LyX::cref().lastfiles().writeFile(lyxrc.lastfiles); @@ -201,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(); @@ -221,8 +228,9 @@ public: AutoSaveBuffer(BufferView & bv, string const & fname) : bv_(bv), fname_(fname) {} /// - virtual auto_ptr clone() const { - return auto_ptr(new AutoSaveBuffer(*this)); + virtual shared_ptr clone() const + { + return shared_ptr(new AutoSaveBuffer(*this)); } /// int start(); @@ -238,7 +246,7 @@ private: int AutoSaveBuffer::start() { command_ = bformat(_("Auto-saving %1$s"), fname_); - return runNonBlocking(); + return run(DontWait); } @@ -390,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" @@ -432,49 +438,6 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap } -string const getPossibleLabel(BufferView const & bv) -{ - ParagraphList::iterator pit = bv.getLyXText()->cursorPar(); - ParagraphList & plist = bv.getLyXText()->paragraphs(); - - 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, ' '); - // Is it legal to use spaces in labels ? - if (i > 0) - text += '-'; - text += head; - } - - return text; -} - - // This function runs "configure" and then rereads lyx.defaults to // reconfigure the automatic settings. void Reconfigure(BufferView * bv) @@ -482,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.")); }