using std::istream_iterator;
using boost::shared_ptr;
-
+namespace fs = boost::filesystem;
namespace lyx {
using support::Systemcall;
using support::tempName;
using support::unlink;
+using frontend::LyXView;
namespace Alert = frontend::Alert;
-namespace fs = boost::filesystem;
// this should be static, but I need it in Buffer.cpp
bool quitting; // flag, that we are quitting the program
If 'newname' is empty (the default), the user is asked via a
dialog for the buffer's new name and location.
- If 'newname' is not empty, FileName::makeAbsPath() will indirectly
- produce the following behaviour:
-
- * If 'newname' has an absolute path, use that.
-
- * If 'newname' has a relative path (or no path) and the buffer has
- a path, that path is used as the base for 'newname'. Typically
- this means that 'M-x buffer-write-as newname.lyx' will write to
- the same directory as the original file.
-
- * Otherwise use CWD as the base directory for 'newname'.
- This behavour is arguably a bug, perhaps a system depedenant
- "document directory" shoul be used instead. Note that CWD
- isn't actually used according to a simple test on Linux.
- Instead, it's based on '~', contrar to the documentation of
- makeAbsPath(). Don't know what to do. *shrug*
-
- Note: No checks are done on the extension etc of 'newname' when
- it's non-empty. This may arguably also be a bug.
-
- Note: The code may not code check that 'newname' is a valid for
- the relevant file system?
-
- Note: In Linux, it doesn't work with e.g. '~/file.lyx'. If it's
- done from e.g. a buffer '/tmp/buf.lyx', it instead tries to write
- to '/tmp/~/file.lyx'.
+ If 'newname' is non-empty and has an absolute path, that is used.
+ Otherwise the base directory of the buffer is used as the base
+ for any relative path in 'newname'.
*/
bool writeAs(Buffer * buffer, string const & newname)
buffer->markDirty();
bool unnamed = buffer->isUnnamed();
buffer->setUnnamed(false);
+ buffer->saveCheckSum(fname);
if (!menuWrite(buffer)) {
buffer->setFileName(oldname);
buffer->setUnnamed(unnamed);
+ buffer->saveCheckSum(oldname);
return false;
}
FileName const tmp_ret(tempName(FileName(), "lyxauto"));
if (!tmp_ret.empty()) {
- bv_.buffer()->writeFile(tmp_ret);
+ 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_)) {
+ if (!bv_.buffer().writeFile(fname_)) {
// It is dangerous to do this in the child,
// but safe in the parent, so...
if (pid == -1) // emit message signal.
- bv_.buffer()
- ->message(_("Autosave failed!"));
+ bv_.buffer().message(_("Autosave failed!"));
}
}
if (pid == 0) { // we are the child so...
// should probably be moved into BufferList (Lgb)
// Perfect target for a thread...
{
- if (!bv->buffer())
- return;
-
- if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
+ if (bv->buffer().isBakClean() || bv->buffer().isReadonly()) {
// We don't save now, but we'll try again later
- bv->buffer()->resetAutosaveTimers();
+ bv->buffer().resetAutosaveTimers();
return;
}
// emit message signal.
- bv->buffer()->message(_("Autosaving current document..."));
+ bv->buffer().message(_("Autosaving current document..."));
// create autosave filename
- string fname = bv->buffer()->filePath();
+ string fname = bv->buffer().filePath();
fname += '#';
- fname += onlyFilename(bv->buffer()->fileName());
+ fname += onlyFilename(bv->buffer().fileName());
fname += '#';
AutoSaveBuffer autosave(*bv, FileName(fname));
autosave.start();
- bv->buffer()->markBakClean();
- bv->buffer()->resetAutosaveTimers();
+ bv->buffer().markBakClean();
+ bv->buffer().resetAutosaveTimers();
}
// create new file with template
// SERVERCMD !
//
-void newFile(BufferView * bv, string const & filename)
+void newFile(LyXView & lv, string const & filename)
{
// Split argument by :
string name;
Buffer * const b = newFile(name, tmpname);
if (b)
- bv->setBuffer(b);
+ lv.setBuffer(b);
}
// Insert plain text file (if filename is empty, prompt for one)
void insertPlaintextFile(BufferView * bv, string const & f, bool asParagraph)
{
- if (!bv->buffer())
- return;
-
docstring const tmpstr =
getContentsOfPlaintextFile(bv, f, asParagraph);
: LFUN_FILE_INSERT_PLAINTEXT) );
FileDialog::Result result =
- fileDlg.open(from_utf8(bv->buffer()->filePath()),
+ fileDlg.open(from_utf8(bv->buffer().filePath()),
FileFilterList(), docstring());
if (result.first == FileDialog::Later)
// This function runs "configure" and then rereads lyx.defaults to
// reconfigure the automatic settings.
-void reconfigure(LyXView & lv)
+void reconfigure(LyXView & lv, string const & option)
{
// emit message signal.
lv.message(_("Running configure..."));
// Run configure in user lyx directory
support::Path p(package().user_support());
- string const configure_command = package().configure_command();
+ string configure_command = package().configure_command();
+ configure_command += option;
Systemcall one;
one.startscript(Systemcall::Wait, configure_command);
p.pop();