#include "lyxrc.h"
#include "lyxtext.h"
#include "lyx_cb.h"
+#include "bufferview_funcs.h"
#include "gettext.h"
#include "LyXView.h"
#include "vc-backend.h"
#include "TextCache.h"
-extern int RunLinuxDoc(int, string const &);
+extern BufferView * current_view; // called too many times in this file...
+using std::vector;
using std::find;
+using std::endl;
//
// Class BufferStorage
}
-Buffer * BufferStorage::newBuffer(string const & s,
- LyXRC * lyxrc,
- bool ronly)
+Buffer * BufferStorage::newBuffer(string const & s, bool ronly)
{
- Buffer * tmpbuf = new Buffer(s, lyxrc, ronly);
+ Buffer * tmpbuf = new Buffer(s, ronly);
tmpbuf->params.useClassDefaults();
lyxerr.debug() << "Assigning to buffer "
<< container.size() << endl;
}
-extern void MenuWrite(Buffer *);
+extern bool MenuWrite(Buffer *);
+extern bool MenuWriteAs(Buffer *);
bool BufferList::QwriteAll()
{
for(BufferStorage::iterator it = bstore.begin();
it != bstore.end(); ++it) {
if (!(*it)->isLyxClean()) {
- switch(AskConfirmation(_("Changes in document:"),
- MakeDisplayPath((*it)->fileName(),
- 50),
- _("Save document?"))) {
- case 1: // Yes
- MenuWrite((*it));
- break;
- case 2: // No
- askMoreConfirmation = true;
- unsaved += MakeDisplayPath((*it)->fileName(),
- 50);
- unsaved += "\n";
- break;
- case 3: // Cancel
- return false;
+ string fname;
+ if ((*it)->isUnnamed())
+ fname = OnlyFilename((*it)->fileName());
+ else
+ fname = MakeDisplayPath((*it)->fileName(), 50);
+ bool reask = true;
+ while(reask) {
+ switch(AskConfirmation(_("Changes in document:"),
+ fname,
+ _("Save document?"))) {
+ case 1: // Yes
+ if ((*it)->isUnnamed())
+ reask = !MenuWriteAs((*it));
+ else {
+ reask = !MenuWrite((*it));
+ }
+ break;
+ case 2: // No
+ // if we crash after this we could
+ // have no autosave file but I guess
+ // this is really inprobable (Jug)
+ if ((*it)->isUnnamed()) {
+ removeAutosaveFile((*it)->fileName());
+ }
+ askMoreConfirmation = true;
+ unsaved += MakeDisplayPath(fname, 50);
+ unsaved += "\n";
+ reask = false;
+ break;
+ case 3: // Cancel
+ return false;
+ }
}
}
}
if (askMoreConfirmation &&
- lyxrc->exit_confirmation &&
+ lyxrc.exit_confirmation &&
!AskQuestion(_("Some documents were not saved:"),
unsaved, _("Exit anyway?"))) {
return false;
bool BufferList::close(Buffer * buf)
{
- if (buf->getUser()) buf->getUser()->insetUnlock();
+ // CHECK
+ // Trace back why we need to use buf->getUser here.
+ // Perhaps slight rewrite is in order? (Lgb)
+ if (buf->getUser()) buf->getUser()->insetUnlock();
if (buf->paragraph && !buf->isLyxClean() && !quitting) {
- ProhibitInput();
- switch(AskConfirmation(_("Changes in document:"),
- MakeDisplayPath(buf->fileName(), 50),
- _("Save document?"))){
- case 1: // Yes
- if (buf->save(lyxrc->make_backup)) {
- lastfiles->newFile(buf->fileName());
- } else {
- AllowInput();
+ if (buf->getUser())
+ ProhibitInput(buf->getUser());
+ string fname;
+ if (buf->isUnnamed())
+ fname = OnlyFilename(buf->fileName());
+ else
+ fname = MakeDisplayPath(buf->fileName(), 50);
+ bool reask = true;
+ while(reask) {
+ switch(AskConfirmation(_("Changes in document:"),
+ fname,
+ _("Save document?"))){
+ case 1: // Yes
+ if (buf->isUnnamed())
+ reask = !MenuWriteAs(buf);
+ else if (buf->save()) {
+ lastfiles->newFile(buf->fileName());
+ } else {
+ if (buf->getUser())
+ AllowInput(buf->getUser());
+ return false;
+ }
+ break;
+ case 2:
+ if (buf->isUnnamed()) {
+ removeAutosaveFile(buf->fileName());
+ }
+ reask = false;
+ break;
+ case 3: // Cancel
+ if (buf->getUser())
+ AllowInput(buf->getUser());
return false;
}
- break;
- case 3: // Cancel
- AllowInput();
- return false;
- }
- AllowInput();
+ }
+ if (buf->getUser())
+ AllowInput(buf->getUser());
}
bstore.release(buf);
if (!(*it)->isDepClean(mastertmpdir)) {
string writefile = mastertmpdir;
writefile += '/';
- writefile += ChangeExtension((*it)->fileName(),
- ".tex", true);
+ writefile += (*it)->getLatexName();
(*it)->makeLaTeXFile(writefile, mastertmpdir,
false, true);
(*it)->markDepClean(mastertmpdir);
bool madeit = false;
lyxerr <<_("lyx: Attempting to save"
- " document ")
- << (*it)->fileName()
- << _(" as...") << endl;
+ " document ");
+ if ((*it)->isUnnamed())
+ lyxerr << OnlyFilename((*it)->fileName());
+ else
+ lyxerr << (*it)->fileName();
+ lyxerr << _(" as...") << endl;
for (int i = 0; i < 3 && !madeit; ++i) {
string s;
// 2) In HOME directory.
// 3) In "/tmp" directory.
if (i == 0) {
+ if ((*it)->isUnnamed())
+ continue;
s = (*it)->fileName();
} else if (i == 1) {
s = AddName(GetEnvPath("HOME"),
Buffer * BufferList::readFile(string const & s, bool ronly)
{
- Buffer * b = bstore.newBuffer(s, lyxrc, ronly);
+ Buffer * b = bstore.newBuffer(s, ronly);
string ts = s;
string e = OnlyPath(s);
Buffer * BufferList::newFile(string const & name, string tname)
{
// get a free buffer
- Buffer * b = bstore.newBuffer(name, lyxrc);
+ Buffer * b = bstore.newBuffer(name);
// use defaults.lyx as a default template if it exists.
if (tname.empty()) {
b->paragraph = new LyXParagraph;
}
- b->markDirty();
+#warning Why mark a new document dirty? I deactivate this (Jug)
+ if (!lyxrc.new_ask_filename) {
+// b->markDirty();
+ b->setUnnamed();
+ }
b->setReadonly(false);
return b;
// make sure our path is absolute
string s = MakeAbsPath(filename);
- // Is this done too early?
- // Is it LinuxDoc?
- if (IsSGMLFilename(s)) {
- FileInfo fi(s);
- if (fi.exist() && fi.readable()) {
- if (!RunLinuxDoc(-1, s)) {
- s = ChangeExtension (s, ".lyx", false);
- } else { // sgml2lyx failed
- WriteAlert(_("Error!"),
- _("Could not convert file"), s);
- return 0;
- }
- } else {
- // just change the extension and it will be
- // handled like a regular lyx file that does
- // not exist.
- s = ChangeExtension(s, ".lyx", false);
- }
- }
-
// file already open?
if (exists(s)) {
if (AskQuestion(_("Document is already open:"),
if (LyXVC::file_not_found_hook(s)) {
// Ask if the file should be checked out for
// viewing/editing, if so: load it.
- if (AskQuestion(_("Do you want to retrive file under version control?"))) {
+ if (AskQuestion(_("Do you want to retrieve file under version control?"))) {
// How can we know _how_ to do the checkout?
// With the current VC support it has to be,
// a RCS file since CVS do not have special ,v files.
projects / lyx.git / blobdiff