X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=d61ebf3d1bf7eb3359fa37ecf86846bc9de0ca58;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=d849b4b380746a9700d1b02e786501807e1e63bf;hpb=c7e365365e74237149c960b9ecaa77bc7c93e608;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index d849b4b380..d61ebf3d1b 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -34,6 +34,7 @@ #include "frontends/Alert.h" #include "frontends/Application.h" #include "frontends/FileDialog.h" +#include "frontends/LyXView.h" #include "support/filefilterlist.h" #include "support/filetools.h" @@ -55,29 +56,30 @@ #include #include -using lyx::docstring; -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::package; -using lyx::support::removeAutosaveFile; -using lyx::support::rename; -using lyx::support::split; -using lyx::support::Systemcall; -using lyx::support::tempName; -using lyx::support::unlink; + +namespace lyx { + +using support::addName; +using support::bformat; +using support::FileFilterList; +using support::ForkedProcess; +using support::isLyXFilename; +using support::libFileSearch; +using support::makeAbsPath; +using support::makeDisplayPath; +using support::onlyFilename; +using support::onlyPath; +using support::package; +using support::removeAutosaveFile; +using support::rename; +using support::split; +using support::Systemcall; +using support::tempName; +using support::unlink; using boost::shared_ptr; -namespace Alert = lyx::frontend::Alert; +namespace Alert = frontend::Alert; namespace fs = boost::filesystem; using std::back_inserter; @@ -100,7 +102,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(buffer->fileName()); return true; } @@ -130,8 +132,8 @@ bool writeAs(Buffer * buffer, string const & filename) // FIXME UNICODE FileDialog fileDlg(_("Choose a filename to save document as"), LFUN_BUFFER_WRITE_AS, - make_pair(_("Documents|#o#O"), lyx::from_utf8(lyxrc.document_path)), - make_pair(_("Templates|#T#t"), lyx::from_utf8(lyxrc.template_path))); + make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)), + make_pair(_("Templates|#T#t"), from_utf8(lyxrc.template_path))); if (!isLyXFilename(fname)) fname += ".lyx"; @@ -139,14 +141,14 @@ bool writeAs(Buffer * buffer, string const & filename) FileFilterList const filter (_("LyX Documents (*.lyx)")); FileDialog::Result result = - fileDlg.save(lyx::from_utf8(onlyPath(fname)), + fileDlg.save(from_utf8(onlyPath(fname)), filter, - lyx::from_utf8(onlyFilename(fname))); + from_utf8(onlyFilename(fname))); if (result.first == FileDialog::Later) return false; - fname = lyx::to_utf8(result.second); + fname = to_utf8(result.second); if (fname.empty()) return false; @@ -186,43 +188,6 @@ bool writeAs(Buffer * buffer, string const & filename) } -void quitLyX(bool noask) -{ - lyxerr[Debug::INFO] << "Running QuitLyX." << endl; - - if (lyx::use_gui) { - if (!noask && !theBufferList().quitWriteAll()) - return; - - LyX::cref().session().writeFile(); - } - - // Set a flag that we do quitting from the program, - // so no refreshes are necessary. - quitting = true; - - // close buffers first - theBufferList().closeAll(); - - // do any other cleanup procedures now - lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl; - - if (!destroyDir(package().temp_dir())) { - docstring const msg = - bformat(_("Unable to remove the temporary directory %1$s"), - lyx::from_utf8(package().temp_dir())); - Alert::warning(_("Unable to remove temporary directory"), msg); - } - - if (lyx::use_gui) { - theApp->exit(0); - - // Restore original font resources after Application is destroyed. - lyx::support::restoreFontResources(); - } -} - - namespace { class AutoSaveBuffer : public ForkedProcess { @@ -248,7 +213,7 @@ private: int AutoSaveBuffer::start() { - command_ = lyx::to_utf8(bformat(_("Auto-saving %1$s"), lyx::from_utf8(fname_))); + command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_))); return run(DontWait); } @@ -360,7 +325,7 @@ void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph) return; // FIXME: We don't know the encoding of the file - docstring const tmpstr = lyx::from_utf8(getContentsOfAsciiFile(bv, f, asParagraph)); + docstring const tmpstr = from_utf8(getContentsOfAsciiFile(bv, f, asParagraph)); if (tmpstr.empty()) return; @@ -386,20 +351,20 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII); FileDialog::Result result = - fileDlg.open(lyx::from_utf8(bv->buffer()->filePath()), + fileDlg.open(from_utf8(bv->buffer()->filePath()), FileFilterList(), docstring()); if (result.first == FileDialog::Later) return string(); - fname = lyx::to_utf8(result.second); + fname = to_utf8(result.second); if (fname.empty()) return string(); } if (!fs::is_readable(fname)) { - docstring const error = lyx::from_ascii(strerror(errno)); + docstring const error = from_ascii(strerror(errno)); docstring const file = makeDisplayPath(fname, 50); docstring const text = bformat(_("Could not read the specified document\n" "%1$s\ndue to the error: %2$s"), file, error); @@ -409,7 +374,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap ifstream ifs(fname.c_str()); if (!ifs) { - docstring const error = lyx::from_ascii(strerror(errno)); + docstring const error = from_ascii(strerror(errno)); docstring const file = makeDisplayPath(fname, 50); docstring const text = bformat(_("Could not open the specified document\n" "%1$s\ndue to the error: %2$s"), file, error); @@ -440,19 +405,19 @@ 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 - lyx::support::Path p(package().user_support()); + support::Path p(package().user_support()); string const configure_command = package().configure_command(); Systemcall one; 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(); @@ -462,3 +427,6 @@ void reconfigure(BufferView * bv) "You need to restart LyX to make use of any\n" "updated document class specifications.")); } + + +} // namespace lyx