X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=d61ebf3d1bf7eb3359fa37ecf86846bc9de0ca58;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=2a4d9b69bddf38400baa5655dcfa8503c0fd7321;hpb=179ff08011620faa94ff186bdb30ae2d9639e4e7;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 2a4d9b69bd..d61ebf3d1b 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -32,12 +32,13 @@ #include "paragraph.h" #include "frontends/Alert.h" +#include "frontends/Application.h" #include "frontends/FileDialog.h" -#include "frontends/lyx_gui.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" @@ -55,28 +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 = frontend::Alert; namespace fs = boost::filesystem; using std::back_inserter; @@ -89,11 +92,9 @@ using std::ios; using std::istream_iterator; -extern BufferList bufferlist; // this should be static, but I need it in buffer.C bool quitting; // flag, that we are quitting the program - // // Menu callbacks // @@ -101,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; } @@ -128,27 +129,26 @@ bool writeAs(Buffer * buffer, string const & filename) if (filename.empty()) { - FileDialog fileDlg(lyx::to_utf8(_("Choose a filename to save document as")), + // FIXME UNICODE + FileDialog fileDlg(_("Choose a filename to save document as"), LFUN_BUFFER_WRITE_AS, - make_pair(string(lyx::to_utf8(_("Documents|#o#O"))), - string(lyxrc.document_path)), - make_pair(string(lyx::to_utf8(_("Templates|#T#t"))), - string(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"; - FileFilterList const filter (lyx::to_utf8(_("LyX Documents (*.lyx)"))); + FileFilterList const filter (_("LyX Documents (*.lyx)")); FileDialog::Result result = - fileDlg.save(onlyPath(fname), + fileDlg.save(from_utf8(onlyPath(fname)), filter, - onlyFilename(fname)); + from_utf8(onlyFilename(fname))); if (result.first == FileDialog::Later) return false; - fname = result.second; + fname = to_utf8(result.second); if (fname.empty()) return false; @@ -188,38 +188,6 @@ bool writeAs(Buffer * buffer, string const & filename) } -void quitLyX(bool noask) -{ - lyxerr[Debug::INFO] << "Running QuitLyX." << endl; - - if (lyx_gui::use_gui) { - if (!noask && !bufferlist.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 - bufferlist.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); - } - - lyx_gui::exit(0); -} - - namespace { class AutoSaveBuffer : public ForkedProcess { @@ -245,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); } @@ -302,12 +270,12 @@ void autoSave(BufferView * bv) // should probably be moved into BufferList (Lgb) // Perfect target for a thread... { - if (!bv->available()) + if (!bv->buffer()) return; if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) { // We don't save now, but we'll try again later - bv->owner()->resetAutosaveTimer(); + bv->buffer()->resetAutosaveTimers(); return; } @@ -324,7 +292,7 @@ void autoSave(BufferView * bv) autosave.start(); bv->buffer()->markBakClean(); - bv->owner()->resetAutosaveTimer(); + bv->buffer()->resetAutosaveTimers(); } @@ -353,16 +321,17 @@ 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) { - if (!bv->available()) + if (!bv->buffer()) 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; // clear the selection - if (bv->text() == bv->getLyXText()) + LyXText const & text = bv->buffer()->text(); + if (&text == bv->getLyXText()) bv->cursor().clearSelection(); if (asParagraph) bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr); @@ -378,24 +347,24 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap string fname = f; if (fname.empty()) { - FileDialog fileDlg(lyx::to_utf8(_("Select file to insert")), + 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(), - FileFilterList(), string()); + fileDlg.open(from_utf8(bv->buffer()->filePath()), + FileFilterList(), docstring()); if (result.first == FileDialog::Later) return string(); - fname = 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); @@ -405,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); @@ -436,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(); @@ -458,3 +427,6 @@ void reconfigure(BufferView * bv) "You need to restart LyX to make use of any\n" "updated document class specifications.")); } + + +} // namespace lyx