#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 "support/filefilterlist.h"
#include "support/filetools.h"
-#include "support/fontutils.h"
#include "support/forkedcall.h"
#include "support/fs_extras.h"
#include "support/lyxlib.h"
namespace lyx {
-using support::addName;
using support::bformat;
using support::FileFilterList;
using support::FileName;
bool menuWrite(Buffer * buffer)
{
if (buffer->save()) {
- LyX::ref().session().lastFiles().add(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"),
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);
// anyway.
bool failed = false;
- FileName const tmp_ret(tempName(string(), "lyxauto"));
+ FileName const tmp_ret(tempName(FileName(), "lyxauto"));
if (!tmp_ret.empty()) {
- bv_.buffer()->writeFile(tmp_ret.absFilename());
+ bv_.buffer()->writeFile(tmp_ret);
// assume successful write of tmp_ret
if (!rename(tmp_ret, fname_)) {
failed = true;
if (failed) {
// failed to write/rename tmp_ret so try writing direct
- if (!bv_.buffer()->writeFile(fname_.absFilename())) {
+ if (!bv_.buffer()->writeFile(fname_)) {
// It is dangerous to do this in the child,
// but safe in the parent, so...
if (pid == -1)
// Split argument by :
string name;
string tmpname = split(filename, name, ':');
- lyxerr[Debug::INFO] << "Arg is " << filename
+ LYXERR(Debug::INFO) << "Arg is " << filename
<< "\nName is " << name
<< "\nTemplate is " << tmpname << endl;
}
-// 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 = 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(from_utf8(bv->buffer()->filePath()),
if (result.first == FileDialog::Later)
return string();
- fname = to_utf8(result.second);
+ fname = makeAbsPath(to_utf8(result.second));
if (fname.empty())
return string();
}
- if (!fs::is_readable(fname)) {
+ if (!fs::is_readable(fname.toFilesystemEncoding())) {
docstring const error = from_ascii(strerror(errno));
- docstring const file = makeDisplayPath(fname, 50);
+ 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 = from_ascii(strerror(errno));
- docstring const file = makeDisplayPath(fname, 50);
+ 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);