/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich,
* Copyright 1995-2001 The LyX Team.
*
#include <fstream>
#include <algorithm>
-#include <utility>
+#include <utility>
#include <iostream>
using std::vector;
{
// FIXME: needed ?
XFlush(GUIRunTime::x11Display());
-
+
if (!buffer->save()) {
if (Alert::askQuestion(_("Save failed. Rename and try again?"),
MakeDisplayPath(buffer->fileName(), 50),
_("Save anyway?")))
return false;
// Falls through to name change and save
- }
+ }
// No, but do we have another file with this name open?
else if (!buffer->isUnnamed() && bufferlist.exists(fname)) {
if (Alert::askQuestion(_("Another document with same name open!"),
} // Check whether the file exists
else {
FileInfo const myfile(fname);
- if (myfile.isOK() && !Alert::askQuestion(_("Document already exists:"),
+ if (myfile.isOK() && !Alert::askQuestion(_("Document already exists:"),
MakeDisplayPath(fname, 50),
_("Replace file?")))
return false;
if (buffer->isSGML()) {
Alert::alert(_("Chktex does not work with SGML derived documents."));
return 0;
- } else
+ } else
ret = buffer->runChktex();
-
+
if (ret >= 0) {
string s;
string t;
}
bv->owner()->message(_("Autosaving current document..."));
-
+
// create autosave filename
- string fname = bv->buffer()->filePath();
+ string fname = bv->buffer()->filePath();
fname += "#";
fname += OnlyFilename(bv->buffer()->fileName());
fname += "#";
-
+
// tmp_ret will be located (usually) in /tmp
// will that be a problem?
pid_t const pid = fork(); // If you want to debug the autosave
// to fork. But we will do the save
// anyway.
bool failed = false;
-
+
string const tmp_ret = lyx::tempName(string(), "lyxauto");
if (!tmp_ret.empty()) {
bv->buffer()->writeFile(tmp_ret, 1);
} else {
failed = true;
}
-
+
if (failed) {
// failed to write/rename tmp_ret so try writing direct
if (!bv->buffer()->writeFile(fname, 1)) {
_exit(0);
}
}
-
+
bv->buffer()->markBakClean();
bv->owner()->resetAutosaveTimer();
}
<< "\nName is " << name
<< "\nTemplate is " << tmpname << endl;
- // find a free buffer
+ // find a free buffer
Buffer * tmpbuf = bufferlist.newFile(name, tmpname);
if (tmpbuf)
lastfiles->newFile(tmpbuf->fileName());
// Insert ascii file (if filename is empty, prompt for one)
void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
{
- string fname = f;
+ if (!bv->available())
+ return;
- if (!bv->available())
+ string const tmpstr = getContentsOfAsciiFile(bv, f, asParagraph);
+ if (tmpstr.empty())
return;
-
+
+ // insert the string
+ bv->hideCursor();
+
+ // clear the selection
+ bool flag = (bv->text == bv->getLyXText());
+ if (flag)
+ bv->beforeChange(bv->text);
+ if (!asParagraph)
+ bv->getLyXText()->insertStringAsLines(bv, tmpstr);
+ else
+ bv->getLyXText()->insertStringAsParagraphs(bv, tmpstr);
+ if (flag)
+ bv->update(bv->text,
+ BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+}
+
+
+// Insert ascii file (if filename is empty, prompt for one)
+string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+{
+ string fname = f;
+
if (fname.empty()) {
FileDialog fileDlg(bv->owner(), _("Select file to insert"),
(asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
-
+
FileDialog::Result result = fileDlg.Select(bv->owner()->buffer()->filePath());
if (result.first == FileDialog::Later)
- return;
+ return string();
fname = result.second;
- if (fname.empty())
- return;
+ if (fname.empty())
+ return string();
}
FileInfo fi(fname);
if (!fi.readable()) {
Alert::err_alert(_("Error! Specified file is unreadable: "),
MakeDisplayPath(fname, 50));
- return;
+ return string();
}
ifstream ifs(fname.c_str());
if (!ifs) {
Alert::err_alert(_("Error! Cannot open specified file: "),
MakeDisplayPath(fname, 50));
- return;
+ return string();
}
ifs.unsetf(ios::skipws);
string const tmpstr(tmp.begin(), tmp.end());
#else
// This is what we want to use and what we will use once the
- // compilers get good enough.
+ // compilers get good enough.
//string tmpstr(ii, end); // yet a reason for using std::string
// alternate approach to get the file into a string:
string tmpstr;
copy(ii, end, back_inserter(tmpstr));
#endif
- // insert the string
- bv->hideCursor();
-
- // clear the selection
- bv->beforeChange(bv->text);
- if (!asParagraph)
- bv->text->insertStringAsLines(bv, tmpstr);
- else
- bv->text->insertStringAsParagraphs(bv, tmpstr);
- bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+ return tmpstr;
}
bv->owner()->prohibitInput();
if (label.empty()) {
Paragraph * par = bv->getLyXText()->cursor.par();
- LyXLayout const * layout =
- &textclasslist.Style(bv->buffer()->params.textclass,
- par->getLayout());
+ LyXTextClass const & tclass =
+ textclasslist[bv->buffer()->params.textclass];
+ LyXLayout const * layout = &tclass[par->layout()];
if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
Paragraph * par2 = par->previous();
- LyXLayout const * layout2 =
- &textclasslist.Style(bv->buffer()->params.textclass,
- par2->getLayout());
+ LyXLayout const * layout2 = &tclass[par2->layout()];
if (layout2->latextype != LATEX_PARAGRAPH) {
par = par2;
layout = layout2;
par_text = split(par_text, head, ' ');
if (i > 0)
text += '-'; // Is it legal to use spaces in
- // labels ?
+ // labels ?
text += head;
}
// Run configure in user lyx directory
Path p(user_lyxdir);
Systemcall one;
- one.startscript(Systemcall::Wait,
+ one.startscript(Systemcall::Wait,
AddName(system_lyxdir, "configure"));
p.pop();
bv->owner()->message(_("Reloading configuration..."));
lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));
- Alert::alert(_("The system has been reconfigured."),
+ Alert::alert(_("The system has been reconfigured."),
_("You need to restart LyX to make use of any"),
_("updated document class specifications."));
}
projects / lyx.git / blobdiff