#include "BufferView.h"
#include "buffer_funcs.h"
#include "cursor.h"
+#include "CutAndPaste.h"
#include "debug.h"
#include "gettext.h"
#include "session.h"
#include "lyxrc.h"
#include "lyxtext.h"
#include "paragraph.h"
+#include "undo.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"
#include <cerrno>
#include <fstream>
-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::bformat;
+using support::FileFilterList;
+using support::FileName;
+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;
// this should be static, but I need it in buffer.C
bool quitting; // flag, that we are quitting the program
-
//
// Menu callbacks
//
bool menuWrite(Buffer * buffer)
{
if (buffer->save()) {
- LyX::ref().session().addLastFile(buffer->fileName());
+ LyX::ref().session().lastFiles().add(FileName(buffer->fileName()));
return true;
}
-bool writeAs(Buffer * buffer, string const & filename)
+bool writeAs(Buffer * buffer, string const & newname)
{
string fname = buffer->fileName();
string const oldname = fname;
- if (filename.empty()) {
+ if (newname.empty()) {
// 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";
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;
// Make sure the absolute filename ends with appropriate suffix
- fname = makeAbsPath(fname);
+ fname = makeAbsPath(fname).absFilename();
if (!isLyXFilename(fname))
fname += ".lyx";
} else
- fname = filename;
+ fname = newname;
- if (fs::exists(fname)) {
+ FileName const filename(fname);
+ if (fs::exists(filename.toFilesystemEncoding())) {
docstring const file = makeDisplayPath(fname, 30);
docstring text = bformat(_("The document %1$s already exists.\n\n"
"Do you want to over-write that document?"), file);
}
-void quitLyX(bool noask)
-{
- lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
-
- if (lyx_gui::use_gui) {
- if (!noask && !theApp->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
- theApp->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);
- }
-
- theApp->exit(0);
- // Restore original font resources after Application is destroyed.
- lyx::support::restoreFontResources();
-}
-
-
namespace {
class AutoSaveBuffer : public ForkedProcess {
public:
///
- AutoSaveBuffer(BufferView & bv, string const & fname)
+ AutoSaveBuffer(BufferView & bv, FileName const & fname)
: bv_(bv), fname_(fname) {}
///
virtual shared_ptr<ForkedProcess> clone() const
virtual int generateChild();
///
BufferView & bv_;
- string fname_;
+ FileName fname_;
};
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_.absFilename())));
return run(DontWait);
}
// anyway.
bool failed = false;
- string const tmp_ret = tempName(string(), "lyxauto");
+ FileName const tmp_ret(tempName(FileName(), "lyxauto"));
if (!tmp_ret.empty()) {
bv_.buffer()->writeFile(tmp_ret);
// assume successful write of tmp_ret
fname += onlyFilename(bv->buffer()->fileName());
fname += '#';
- AutoSaveBuffer autosave(*bv, fname);
+ AutoSaveBuffer autosave(*bv, FileName(fname));
autosave.start();
bv->buffer()->markBakClean();
}
-// Insert ascii file (if filename is empty, prompt for one)
-void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+// Insert plain text file (if filename is empty, prompt for one)
+void insertPlaintextFile(BufferView * bv, string const & f, bool asParagraph)
{
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(getContentsOfPlaintextFile(bv, f, asParagraph));
if (tmpstr.empty())
return;
- // clear the selection
- LyXText const & text = bv->buffer()->text();
- if (&text == bv->getLyXText())
- bv->cursor().clearSelection();
+ LCursor & cur = bv->cursor();
+ cap::replaceSelection(cur);
+ recordUndo(cur);
if (asParagraph)
- bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr);
+ cur.innerText()->insertStringAsParagraphs(cur, tmpstr);
else
- bv->getLyXText()->insertStringAsLines(bv->cursor(), tmpstr);
- bv->update();
+ cur.innerText()->insertStringAsLines(cur, tmpstr);
}
-// Insert ascii file (if filename is empty, prompt for one)
-string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+// Read plain text file (if filename is empty, prompt for one)
+string getContentsOfPlaintextFile(BufferView * bv, string const & f, bool asParagraph)
{
- string fname = f;
+ FileName fname(f);
if (fname.empty()) {
FileDialog fileDlg(_("Select file to insert"),
- (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
+ (asParagraph) ? LFUN_FILE_INSERT_PLAINTEXT_PARA : LFUN_FILE_INSERT_PLAINTEXT);
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 = makeAbsPath(to_utf8(result.second));
if (fname.empty())
return string();
}
- if (!fs::is_readable(fname)) {
- docstring const error = lyx::from_ascii(strerror(errno));
- docstring const file = makeDisplayPath(fname, 50);
+ if (!fs::is_readable(fname.toFilesystemEncoding())) {
+ docstring const error = from_ascii(strerror(errno));
+ docstring const file = makeDisplayPath(fname.absFilename(), 50);
docstring 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());
+ ifstream ifs(fname.toFilesystemEncoding().c_str());
if (!ifs) {
- docstring const error = lyx::from_ascii(strerror(errno));
- docstring const file = makeDisplayPath(fname, 50);
+ docstring const error = from_ascii(strerror(errno));
+ docstring const file = makeDisplayPath(fname.absFilename(), 50);
docstring 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);
// 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();
"You need to restart LyX to make use of any\n"
"updated document class specifications."));
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff