#include "bufferview_funcs.h"
#include "debug.h"
#include "lastfiles.h"
-#include "LyXView.h"
#include "lyxrc.h"
#include "lyxtext.h"
#include "gettext.h"
#include "BufferView.h"
-#include "lyxtextclasslist.h"
#include "insets/insetlabel.h"
+#include "frontends/lyx_gui.h"
+#include "frontends/LyXView.h"
#include "frontends/Alert.h"
#include "frontends/FileDialog.h"
-#include "frontends/GUIRunTime.h"
#include "support/FileInfo.h"
#include "support/filetools.h"
+#include "support/forkedcall.h"
#include "support/path.h"
#include "support/systemcall.h"
#include "support/lstrings.h"
+#include "support/BoostFormat.h"
+
#include <fstream>
#include <algorithm>
#include <utility>
-#include <iostream>
+#include <cerrno>
using std::vector;
using std::ifstream;
extern BufferList bufferlist;
// this should be static, but I need it in buffer.C
bool quitting; // flag, that we are quitting the program
-extern bool finished; // all cleanup done just let it run through now.
void ShowMessage(Buffer const * buf,
string const & msg2,
string const & msg3)
{
- if (lyxrc.use_gui
+ if (lyx_gui::use_gui
&& buf && buf->getUser() && buf->getUser()->owner()) {
string const str = msg1 + ' ' + msg2 + ' ' + msg3;
buf->getUser()->owner()->message(str);
// Menu callbacks
//
-//
-// File menu
-//
-// should be moved to lyxfunc.C
bool MenuWrite(BufferView * bv, Buffer * buffer)
{
- // FIXME: needed ?
- XFlush(GUIRunTime::x11Display());
-
- if (!buffer->save()) {
- if (Alert::askQuestion(_("Save failed. Rename and try again?"),
- MakeDisplayPath(buffer->fileName(), 50),
- _("(If not, document is not saved.)"))) {
- return WriteAs(bv, buffer);
- }
- return false;
- } else
+ if (buffer->save()) {
lastfiles->newFile(buffer->fileName());
- return true;
+ return true;
+ }
+
+ // FIXME: we don't tell the user *WHY* the save failed !!
+
+ string const file = MakeDisplayPath(buffer->fileName(), 30);
+
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("The document %1$s could not be saved.\n\nDo you want to rename the document and try again?"));
+ fmt % file;
+ string text = fmt.str();
+#else
+ string text = _("The document ");
+ text += file + _(" could not be saved.\n\nDo you want to rename the document and try again?");
+#endif
+ int const ret = Alert::prompt(_("Rename and save?"),
+ text, 0, 1, _("&Rename"), _("&Cancel"));
+
+ if (ret == 0)
+ return WriteAs(bv, buffer);
+ return false;
}
-// should be moved to BufferView.C
-// Half of this func should be in LyXView, the rest in BufferView.
bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
{
string fname = buffer->fileName();
if (filename.empty()) {
- FileDialog fileDlg(bv->owner(),
- _("Choose a filename to save document as"),
+ FileDialog fileDlg(_("Choose a filename to save document as"),
LFUN_WRITEAS,
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
fname += ".lyx";
FileDialog::Result result =
- fileDlg.Select(OnlyPath(fname),
- _("*.lyx|LyX Documents (*.lyx)"),
+ fileDlg.save(OnlyPath(fname),
+ _("*.lyx| LyX Documents (*.lyx)"),
OnlyFilename(fname));
if (result.first == FileDialog::Later)
} else
fname = filename;
- // Same name as we have already?
- if (!buffer->isUnnamed() && fname == oldname) {
- if (!Alert::askQuestion(_("Same name as document already has:"),
- MakeDisplayPath(fname, 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!"),
- MakeDisplayPath(fname, 50),
- _("Replace with current document?")))
- {
- bufferlist.close(bufferlist.getBuffer(fname));
-
- // Ok, change the name of the buffer, but don't save!
- buffer->setFileName(fname);
- buffer->markDirty();
-
- ShowMessage(buffer, _("Document renamed to '"),
- MakeDisplayPath(fname), _("', but not saved..."));
- }
- return false;
- } // Check whether the file exists
- else {
- FileInfo const myfile(fname);
- if (myfile.isOK() && !Alert::askQuestion(_("Document already exists:"),
- MakeDisplayPath(fname, 50),
- _("Replace file?")))
+ FileInfo const myfile(fname);
+ if (myfile.isOK()) {
+ string const file = MakeDisplayPath(fname, 30);
+
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("The document %1$s already exists.\n\nDo you want to over-write that document?"));
+ fmt % file;
+ string text = fmt.str();
+#else
+ string text = _("The document ");
+ text += file + _(" already exists.\n\nDo you want to over-write that document?");
+#endif
+ int const ret = Alert::prompt(_("Over-write document?"),
+ text, 0, 1, _("&Over-write"), _("&Cancel"));
+
+ if (ret == 1)
return false;
}
buffer->setUnnamed(false);
if (!MenuWrite(bv, buffer)) {
- buffer->setFileName(oldname);
- buffer->setUnnamed(unnamed);
- ShowMessage(buffer, _("Document could not be saved!"),
- _("Holding the old name."), MakeDisplayPath(oldname));
- return false;
+ buffer->setFileName(oldname);
+ buffer->setUnnamed(unnamed);
+ return false;
}
- // now remove the oldname autosave file if existant!
+
removeAutosaveFile(oldname);
return true;
}
-int MenuRunChktex(Buffer * buffer)
-{
- int ret;
-
- if (buffer->isSGML()) {
- Alert::alert(_("Chktex does not work with SGML derived documents."));
- return 0;
- } else
- ret = buffer->runChktex();
-
- if (ret >= 0) {
- string s;
- string t;
- if (ret == 0) {
- s = _("No warnings found.");
- } else if (ret == 1) {
- s = _("One warning found.");
- t = _("Use `Navigate->Error' to find it.");
- } else {
- s += tostr(ret);
- s += _(" warnings found.");
- t = _("Use `Navigate->Error' to find them.");
- }
- Alert::alert(_("Chktex run successfully"), s, t);
- } else {
- Alert::alert(_("Error!"), _("It seems chktex does not work."));
- }
- return ret;
-}
-
-
void QuitLyX()
{
lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
- if (lyxrc.use_gui) {
- if (!bufferlist.qwriteAll())
+ if (lyx_gui::use_gui) {
+ if (!bufferlist.quitWriteAll())
return;
lastfiles->writeFile(lyxrc.lastfiles);
// do any other cleanup procedures now
lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl;
- DestroyLyXTmpDir(system_tempdir);
+ if (destroyDir(system_tempdir) != 0) {
+#if USE_BOOST_FORMAT
+ boost::format fmt = _("Could not remove the temporary directory %1$s");
+ fmt % system_tempdir;
+ string msg = fmt.str();
+#else
+ string msg = _("Could not remove the temporary directory ") + system_tempdir;
+#endif
+ Alert::warning(_("Could not remove temporary directory"), msg);
+ }
- finished = true;
+ lyx_gui::exit();
}
+namespace {
-void AutoSave(BufferView * bv)
- // should probably be moved into BufferList (Lgb)
- // Perfect target for a thread...
-{
- if (!bv->available())
- return;
-
- if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
- // We don't save now, but we'll try again later
- bv->owner()->resetAutosaveTimer();
- return;
+class AutoSaveBuffer : public ForkedProcess {
+public:
+ ///
+ AutoSaveBuffer(BufferView & bv, string const & fname)
+ : bv_(bv), fname_(fname) {}
+ ///
+ virtual ForkedProcess * clone() const {
+ return new AutoSaveBuffer(*this);
}
+ ///
+ int start();
+private:
+ ///
+ virtual int generateChild();
+ ///
+ BufferView & bv_;
+ string fname_;
+};
+
+
+int AutoSaveBuffer::start()
+{
+#if USE_BOOST_FORMAT
+ command_ = boost::io::str(boost::format(_("Auto-saving %1$s")) % fname_);
+#else
+ command_ = _("Auto-saving ") + fname_;
+#endif
+ return runNonBlocking();
+}
- bv->owner()->message(_("Autosaving current document..."));
-
- // create autosave filename
- string fname = bv->buffer()->filePath();
- fname += "#";
- fname += OnlyFilename(bv->buffer()->fileName());
- fname += "#";
+int AutoSaveBuffer::generateChild()
+{
// 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
string const tmp_ret = lyx::tempName(string(), "lyxauto");
if (!tmp_ret.empty()) {
- bv->buffer()->writeFile(tmp_ret, 1);
+ bv_.buffer()->writeFile(tmp_ret);
// assume successful write of tmp_ret
- if (!lyx::rename(tmp_ret, fname)) {
+ if (!lyx::rename(tmp_ret, fname_)) {
failed = true;
// most likely couldn't move between filesystems
// unless write of tmp_ret failed
if (failed) {
// failed to write/rename tmp_ret so try writing direct
- if (!bv->buffer()->writeFile(fname, 1)) {
+ if (!bv_.buffer()->writeFile(fname_)) {
// It is dangerous to do this in the child,
// but safe in the parent, so...
if (pid == -1)
- bv->owner()->message(_("Autosave failed!"));
+ bv_.owner()->message(_("Autosave failed!"));
}
}
if (pid == 0) { // we are the child so...
_exit(0);
}
}
+ return pid;
+}
+
+} // namespace anon
+
+
+void AutoSave(BufferView * bv)
+ // should probably be moved into BufferList (Lgb)
+ // Perfect target for a thread...
+{
+ if (!bv->available())
+ return;
+
+ if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
+ // We don't save now, but we'll try again later
+ bv->owner()->resetAutosaveTimer();
+ return;
+ }
+
+ bv->owner()->message(_("Autosaving current document..."));
+
+ // create autosave filename
+ string fname = bv->buffer()->filePath();
+ fname += '#';
+ fname += OnlyFilename(bv->buffer()->fileName());
+ fname += '#';
+
+ AutoSaveBuffer autosave(*bv, fname);
+ autosave.start();
bv->buffer()->markBakClean();
bv->owner()->resetAutosaveTimer();
// create new file with template
// SERVERCMD !
//
-Buffer * NewLyxFile(string const & filename)
+Buffer * NewFile(string const & filename)
{
// Split argument by :
string name;
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);
+ bv->getLyXText()->insertStringAsLines(tmpstr);
else
- bv->getLyXText()->insertStringAsParagraphs(bv, tmpstr);
+ bv->getLyXText()->insertStringAsParagraphs(tmpstr);
if (flag)
- bv->update(bv->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ bv->update(BufferView::SELECT);
}
string fname = f;
if (fname.empty()) {
- FileDialog fileDlg(bv->owner(), _("Select file to insert"),
+ FileDialog fileDlg(_("Select file to insert"),
(asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
- FileDialog::Result result = fileDlg.Select(bv->owner()->buffer()->filePath());
+ FileDialog::Result result = fileDlg.open(bv->owner()->buffer()->filePath());
if (result.first == FileDialog::Later)
return string();
FileInfo fi(fname);
if (!fi.readable()) {
- Alert::err_alert(_("Error! Specified file is unreadable: "),
- MakeDisplayPath(fname, 50));
+ string const error = strerror(errno);
+ string const file = MakeDisplayPath(fname, 50);
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Could not read the specified document\n%1$s\ndue to the error: %2$s"));
+ fmt % file;
+ fmt % error;
+ string text = fmt.str();
+#else
+ string text = _("Could not read the specified document\n");
+ text += file + _(" due to the error: ");
+ text += error;
+#endif
+ Alert::error(_("Could not read file"), text);
return string();
}
ifstream ifs(fname.c_str());
if (!ifs) {
- Alert::err_alert(_("Error! Cannot open specified file: "),
- MakeDisplayPath(fname, 50));
+ string const error = strerror(errno);
+ string const file = MakeDisplayPath(fname, 50);
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Could not open the specified document\n%1$s\ndue to the error: %2$s"));
+ fmt % file;
+ fmt % error;
+ string text = fmt.str();
+#else
+ string text = _("Could not open the specified document\n");
+ text += file + _(" due to the error: ");
+ text += error;
+#endif
+ Alert::error(_("Could not open file"), text);
return string();
}
}
-void MenuInsertLabel(BufferView * bv, string const & arg)
+string const getPossibleLabel(BufferView const & bv)
{
- string label(arg);
- bv->owner()->prohibitInput();
- if (label.empty()) {
- Paragraph * par = bv->getLyXText()->cursor.par();
- 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 = &tclass[par2->layout()];
- if (layout2->latextype != LATEX_PARAGRAPH) {
- par = par2;
- layout = layout2;
- }
- }
- string text = layout->latexname().substr(0, 3);
- if (layout->latexname() == "theorem")
- text = "thm"; // Create a correct prefix for prettyref
-
- text += ":";
- if (layout->latextype == LATEX_PARAGRAPH ||
- lyxrc.label_init_length < 0)
- text.erase();
- string par_text = par->asString(bv->buffer(), false);
- for (int i = 0; i < lyxrc.label_init_length; ++i) {
- if (par_text.empty())
- break;
- string head;
- par_text = split(par_text, head, ' ');
- if (i > 0)
- text += '-'; // Is it legal to use spaces in
- // labels ?
- text += head;
- }
+ Paragraph * par = &*bv.getLyXText()->cursor.par();
+ LyXLayout_ptr layout = par->layout();
+ if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
+ Paragraph * par2 = par->previous();
+
+ LyXLayout_ptr const & layout2 = par2->layout();
- pair<bool, string> result =
- Alert::askForText(_("Enter new label to insert:"), text);
- if (result.first) {
- label = frontStrip(strip(result.second));
+ if (layout2->latextype != LATEX_PARAGRAPH) {
+ par = par2;
+ layout = layout2;
}
}
- if (!label.empty()) {
- InsetCommandParams p("label", label);
- InsetLabel * inset = new InsetLabel(p);
- bv->insertInset(inset);
+
+ string text = layout->latexname().substr(0, 3);
+ if (layout->latexname() == "theorem")
+ text = "thm"; // Create a correct prefix for prettyref
+
+ text += ':';
+ if (layout->latextype == LATEX_PARAGRAPH ||
+ lyxrc.label_init_length < 0)
+ text.erase();
+
+ string par_text = par->asString(bv.buffer(), false);
+ for (int i = 0; i < lyxrc.label_init_length; ++i) {
+ if (par_text.empty())
+ break;
+ string head;
+ par_text = split(par_text, head, ' ');
+ if (i > 0)
+ text += '-'; // Is it legal to use spaces in
+ // labels ?
+ text += head;
}
- bv->owner()->allowInput();
+
+ return text;
}
p.pop();
bv->owner()->message(_("Reloading configuration..."));
lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));
- Alert::alert(_("The system has been reconfigured."),
- _("You need to restart LyX to make use of any"),
- _("updated document class specifications."));
+
+ Alert::information(_("System reconfigured"),
+ _("The system has been reconfigured.\n"
+ "You need to restart LyX to make use of any \n"
+ "updated document class specifications."));
}
projects / lyx.git / blobdiff