#include "GuiToc.h"
#include "GuiToolbar.h"
#include "GuiWorkArea.h"
+#include "GuiProgress.h"
#include "LayoutBox.h"
#include "Menus.h"
#include "TocModel.h"
#include "support/Systemcall.h"
#include "support/Timeout.h"
#include "support/ProgressInterface.h"
-#include "GuiProgress.h"
#include <QAction>
#include <QApplication>
# include <unistd.h>
#endif
+
using namespace std;
using namespace lyx::support;
bg_widget_->setFocus();
}
+ int tabWorkAreaCount()
+ {
+ return splitter_->count();
+ }
+
TabWorkArea * tabWorkArea(int i)
{
return dynamic_cast<TabWorkArea *>(splitter_->widget(i));
TabWorkArea * currentTabWorkArea()
{
- if (splitter_->count() == 1)
+ int areas = tabWorkAreaCount();
+ if (areas == 1)
// The first TabWorkArea is always the first one, if any.
return tabWorkArea(0);
- for (int i = 0; i != splitter_->count(); ++i) {
+ for (int i = 0; i != areas; ++i) {
TabWorkArea * twa = tabWorkArea(i);
if (current_main_work_area_ == twa->currentWorkArea())
return twa;
#if (QT_VERSION >= 0x040400)
void setPreviewFuture(QFuture<docstring> const & f)
{
- if (preview_watcher_.isRunning()) {
+ if (processing_thread_watcher_.isRunning()) {
// we prefer to cancel this preview in order to keep a snappy
// interface.
return;
}
- preview_watcher_.setFuture(f);
+ processing_thread_watcher_.setFuture(f);
}
#endif
#if (QT_VERSION >= 0x040400)
///
QFutureWatcher<docstring> autosave_watcher_;
- QFutureWatcher<docstring> preview_watcher_;
+ QFutureWatcher<docstring> processing_thread_watcher_;
///
string last_export_format;
#else
struct DummyWatcher { bool isRunning(){return false;} };
- DummyWatcher preview_watcher_;
+ DummyWatcher processing_thread_watcher_;
#endif
static QSet<Buffer const *> busyBuffers;
static docstring previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
static docstring exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
- static docstring saveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname);
-
+ static docstring compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
+ static docstring autosaveAndDestroy(Buffer const * orig, Buffer * buffer);
+
+ template<class T>
+ static docstring runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format, string const & msg);
+
+ // TODO syncFunc/previewFunc: use bind
+ bool asyncBufferProcessing(string const & argument,
+ Buffer const * used_buffer,
+ docstring const & msg,
+ docstring (*asyncFunc)(Buffer const *, Buffer *, string const &),
+ bool (Buffer::*syncFunc)(string const &, bool, bool) const,
+ bool (Buffer::*previewFunc)(string const &, bool) const);
+
+ QTimer processing_cursor_timer_;
+ bool indicates_processing_;
+ QMap<GuiWorkArea*, Qt::CursorShape> orig_cursors_;
+ QVector<GuiWorkArea*> guiWorkAreas();
};
QSet<Buffer const *> GuiView::GuiViewPrivate::busyBuffers;
GuiView::GuiView(int id)
- : d(*new GuiViewPrivate(this)), id_(id), closing_(false)
+ : d(*new GuiViewPrivate(this)), id_(id), closing_(false), busy_(0)
{
// GuiToolbars *must* be initialised before the menu bar.
normalSizedIcons(); // at least on Mac the default is 32 otherwise, which is huge
#if (QT_VERSION >= 0x040400)
connect(&d.autosave_watcher_, SIGNAL(finished()), this,
- SLOT(threadFinished()));
- connect(&d.preview_watcher_, SIGNAL(finished()), this,
- SLOT(threadFinished()));
+ SLOT(autoSaveThreadFinished()));
+ connect(&d.processing_thread_watcher_, SIGNAL(finished()), this,
+ SLOT(processingThreadFinished()));
+
+ d.processing_cursor_timer_.setInterval(1000 * 3);
+ connect(&d.processing_cursor_timer_, SIGNAL(timeout()), this,
+ SLOT(indicateProcessing()));
#endif
connect(this, SIGNAL(triggerShowDialog(QString const &, QString const &, Inset *)),
}
-void GuiView::threadFinished()
+QVector<GuiWorkArea*> GuiView::GuiViewPrivate::guiWorkAreas()
+{
+ QVector<GuiWorkArea*> areas;
+ for (int i = 0; i < tabWorkAreaCount(); i++) {
+ TabWorkArea* ta = tabWorkArea(i);
+ for (int u = 0; u < ta->count(); u++) {
+ areas << ta->workArea(u);
+ }
+ }
+ return areas;
+}
+
+
+#if QT_VERSION >= 0x040400
+void GuiView::setCursorShapes(Qt::CursorShape shape)
+{
+ QVector<GuiWorkArea*> areas = d.guiWorkAreas();
+ Q_FOREACH(GuiWorkArea* wa, areas) {
+ wa->setCursorShape(shape);
+ }
+}
+
+
+void GuiView::restoreCursorShapes()
+{
+ QVector<GuiWorkArea*> areas = d.guiWorkAreas();
+ Q_FOREACH(GuiWorkArea* wa, areas) {
+ if (d.orig_cursors_.contains(wa)) {
+ wa->setCursorShape(d.orig_cursors_[wa]);
+ }
+ }
+}
+
+
+void GuiView::saveCursorShapes()
+{
+ d.orig_cursors_.clear();
+ QVector<GuiWorkArea*> areas = d.guiWorkAreas();
+ Q_FOREACH(GuiWorkArea* wa, areas) {
+ d.orig_cursors_[wa] = wa->cursorShape();
+ }
+}
+
+
+void GuiView::indicateProcessing()
+{
+ if (d.indicates_processing_) {
+ restoreCursorShapes();
+ } else {
+ setCursorShapes(Qt::BusyCursor);
+ }
+ d.indicates_processing_ = !d.indicates_processing_;
+}
+
+
+void GuiView::processingThreadStarted()
+{
+ saveCursorShapes();
+ d.indicates_processing_ = false;
+ indicateProcessing();
+ d.processing_cursor_timer_.start();
+}
+
+
+void GuiView::processingThreadFinished(bool show_errors)
{
-#if (QT_VERSION >= 0x040400)
QFutureWatcher<docstring> const * watcher =
static_cast<QFutureWatcher<docstring> const *>(sender());
message(watcher->result());
updateToolbars();
- errors(d.last_export_format);
-#endif
+ if (show_errors) {
+ errors(d.last_export_format);
+ }
+ d.processing_cursor_timer_.stop();
+ restoreCursorShapes();
+ d.indicates_processing_ = false;
+}
+
+void GuiView::processingThreadFinished()
+{
+ processingThreadFinished(true);
}
+void GuiView::autoSaveThreadFinished()
+{
+ processingThreadFinished(false);
+}
+
+#else
+
+void GuiView::setCursorShapes(Qt::CursorShape)
+{
+}
+
+
+void GuiView::restoreCursorShapes()
+{
+}
+
+
+void GuiView::saveCursorShapes()
+{
+}
+
+
+void GuiView::indicateProcessing()
+{
+}
+
+
+void GuiView::processingThreadStarted()
+{
+}
+
+
+void GuiView::processingThreadFinished(bool)
+{
+}
+
+
+void GuiView::processingThreadFinished()
+{
+}
+
+
+void GuiView::autoSaveThreadFinished()
+{
+}
+#endif
+
void GuiView::saveLayout() const
{
LYXERR(Debug::DEBUG, "GuiView::closeEvent()");
if (!GuiViewPrivate::busyBuffers.isEmpty()) {
- Alert::warning(_("Exit LyX"), _("LyX could not be closed because documents are processed by LyX."));
+ Alert::warning(_("Exit LyX"),
+ _("LyX could not be closed because documents are being processed by LyX."));
close_event->setAccepted(false);
return;
}
"No formats found, trying to open it as a lyx file");
cmd = FuncRequest(LFUN_FILE_OPEN, file);
}
-
- // Asynchronously post the event. DropEvent usually comes
- // from the BufferView. But reloading a file might close
- // the BufferView from within its own event handler.
- guiApp->dispatchDelayed(cmd);
+ // add the functions to the queue
+ guiApp->addToFuncRequestQueue(cmd);
event->accept();
}
+ // now process the collected functions. We perform the events
+ // asynchronously. This prevents potential problems in case the
+ // BufferView is closed within an event.
+ guiApp->processFuncRequestQueueAsync();
}
bool GuiView::busy() const
{
- return busy_;
+ return busy_ > 0;
}
void GuiView::setBusy(bool busy)
{
- busy_ = busy;
+ bool const busy_before = busy_ > 0;
+ busy ? ++busy_ : --busy_;
+ if ((busy_ > 0) == busy_before)
+ // busy state didn't change
+ return;
+
if (d.current_work_area_) {
d.current_work_area_->setUpdatesEnabled(!busy);
if (busy)
}
+GuiWorkArea * GuiView::workArea(int index)
+{
+ if (TabWorkArea * twa = d.currentTabWorkArea())
+ if (index < twa->count())
+ return dynamic_cast<GuiWorkArea *>(twa->widget(index));
+ return 0;
+}
+
+
GuiWorkArea * GuiView::workArea(Buffer & buffer)
{
if (currentWorkArea()
theGuiApp()->setCurrentView(this);
d.current_work_area_ = wa;
+
+ // We need to reset this now, because it will need to be
+ // right if the tabWorkArea gets reset in the for loop. We
+ // will change it back if we aren't in that case.
+ GuiWorkArea * const old_cmwa = d.current_main_work_area_;
+ d.current_main_work_area_ = wa;
+
for (int i = 0; i != d.splitter_->count(); ++i) {
if (d.tabWorkArea(i)->setCurrentWorkArea(wa)) {
- //if (d.current_main_work_area_)
- // d.current_main_work_area_->setFrameStyle(QFrame::NoFrame);
- d.current_main_work_area_ = wa;
- //d.current_main_work_area_->setFrameStyle(QFrame::Box | QFrame::Plain);
- //d.current_main_work_area_->setLineWidth(2);
- LYXERR(Debug::DEBUG, "Current wa: " << currentWorkArea() << ", Current main wa: " << currentMainWorkArea());
+ LYXERR(Debug::DEBUG, "Current wa: " << currentWorkArea()
+ << ", Current main wa: " << currentMainWorkArea());
return;
}
}
+
+ d.current_main_work_area_ = old_cmwa;
+
LYXERR(Debug::DEBUG, "This is not a tabbed wa");
on_currentWorkAreaChanged(wa);
BufferView & bv = wa->bufferView();
if (wa == 0) {
newBuffer->masterBuffer()->updateBuffer();
wa = addWorkArea(*newBuffer);
+ // scroll to the position when the BufferView was last closed
+ if (lyxrc.use_lastfilepos) {
+ LastFilePosSection::FilePos filepos =
+ theSession().lastFilePos().load(newBuffer->fileName());
+ wa->bufferView().moveToPosition(filepos.pit, filepos.pos, 0, 0);
+ }
} else {
//Disconnect the old buffer...there's no new one.
disconnectBuffer();
#if (QT_VERSION >= 0x040400)
-docstring GuiView::GuiViewPrivate::saveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname)
+docstring GuiView::GuiViewPrivate::autosaveAndDestroy(
+ Buffer const * orig, Buffer * buffer)
{
- bool failed = true;
- FileName const tmp_ret = FileName::tempName("lyxauto");
- if (!tmp_ret.empty()) {
- if (buffer->writeFile(tmp_ret))
- failed = !tmp_ret.moveTo(fname);
- }
- if (failed) {
- // failed to write/rename tmp_ret so try writing direct
- failed = buffer->writeFile(fname);
- }
+ bool const success = buffer->autoSave();
delete buffer;
busyBuffers.remove(orig);
- return failed
- ? _("Automatic save failed!")
- : _("Automatic save done.");
+ return success
+ ? _("Automatic save done.")
+ : _("Automatic save failed!");
}
#endif
#if (QT_VERSION >= 0x040400)
GuiViewPrivate::busyBuffers.insert(buffer);
- QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::saveAndDestroy, buffer, buffer->clone(),
- buffer->getAutosaveFileName());
+ QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::autosaveAndDestroy,
+ buffer, buffer->clone());
d.autosave_watcher_.setFuture(f);
#else
buffer->autoSave();
#endif
+ resetAutosaveTimers();
}
case LFUN_MASTER_BUFFER_UPDATE:
case LFUN_MASTER_BUFFER_VIEW:
enable = doc_buffer && doc_buffer->parent() != 0
- && !d.preview_watcher_.isRunning();
+ && !d.processing_thread_watcher_.isRunning();
break;
case LFUN_BUFFER_UPDATE:
case LFUN_BUFFER_VIEW: {
- if (!doc_buffer || d.preview_watcher_.isRunning()) {
+ if (!doc_buffer || d.processing_thread_watcher_.isRunning()) {
enable = false;
break;
}
{
FileDialog dlg(qt_("Select template file"));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
- dlg.setButton1(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
+ dlg.setButton2(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
FileDialog::Result result = dlg.open(toqstr(lyxrc.template_path),
QStringList(qt_("LyX Documents (*.lyx)")));
{
setBusy(true);
- Buffer * newBuffer = checkAndLoadLyXFile(filename);
+ Buffer * newBuffer = 0;
+ try {
+ newBuffer = checkAndLoadLyXFile(filename);
+ } catch (ExceptionMessage const & e) {
+ setBusy(false);
+ throw(e);
+ }
if (!newBuffer) {
message(_("Document not loaded."));
return 0;
}
+ newBuffer->errors("Parse");
setBuffer(newBuffer);
- // scroll to the position when the file was last closed
- if (lyxrc.use_lastfilepos) {
- LastFilePosSection::FilePos filepos =
- theSession().lastFilePos().load(filename);
- documentBufferView()->moveToPosition(filepos.pit, filepos.pos, 0, 0);
- }
-
if (tolastfiles)
theSession().lastFiles().add(filename);
docstring str2;
Buffer * buf = loadDocument(fullname);
if (buf) {
- // I don't think this is needed, since it will be done in setBuffer().
- // buf->updateBuffer();
- setBuffer(buf);
- buf->errors("Parse");
str2 = bformat(_("Document %1$s opened."), disp_fn);
if (buf->lyxvc().inUse())
str2 += " " + from_utf8(buf->lyxvc().versionString()) +
Buffer * buf = lv->loadDocument(lyxfile);
if (!buf)
return false;
- // I don't think this is needed, since it will be done in setBuffer().
- // buf->updateBuffer();
- lv->setBuffer(buf);
- buf->errors("Parse");
} else {
Buffer * const b = newFile(lyxfile.absFileName(), string(), true);
if (!b)
// FIXME UNICODE
FileName filename(to_utf8(fname));
+ if (filename.empty()) {
+ // Launch a file browser
+ // FIXME UNICODE
+ string initpath = lyxrc.document_path;
+ string const trypath = bv->buffer().filePath();
+ // If directory is writeable, use this as default.
+ if (FileName(trypath).isDirWritable())
+ initpath = trypath;
- if (!filename.empty()) {
- bv->insertLyXFile(filename);
- return;
- }
-
- // Launch a file browser
- // FIXME UNICODE
- string initpath = lyxrc.document_path;
- string const trypath = bv->buffer().filePath();
- // If directory is writeable, use this as default.
- if (FileName(trypath).isDirWritable())
- initpath = trypath;
-
- // FIXME UNICODE
- FileDialog dlg(qt_("Select LyX document to insert"), LFUN_FILE_INSERT);
- dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
- dlg.setButton2(qt_("Examples|#E#e"),
- toqstr(addPath(package().system_support().absFileName(),
- "examples")));
+ // FIXME UNICODE
+ FileDialog dlg(qt_("Select LyX document to insert"), LFUN_FILE_INSERT);
+ dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+ dlg.setButton2(qt_("Examples|#E#e"),
+ toqstr(addPath(package().system_support().absFileName(),
+ "examples")));
- FileDialog::Result result = dlg.open(toqstr(initpath),
- QStringList(qt_("LyX Documents (*.lyx)")));
+ FileDialog::Result result = dlg.open(toqstr(initpath),
+ QStringList(qt_("LyX Documents (*.lyx)")));
- if (result.first == FileDialog::Later)
- return;
+ if (result.first == FileDialog::Later)
+ return;
- // FIXME UNICODE
- filename.set(fromqstr(result.second));
+ // FIXME UNICODE
+ filename.set(fromqstr(result.second));
- // check selected filename
- if (filename.empty()) {
- // emit message signal.
- message(_("Canceled."));
- return;
+ // check selected filename
+ if (filename.empty()) {
+ // emit message signal.
+ message(_("Canceled."));
+ return;
+ }
}
bv->insertLyXFile(filename);
+ bv->buffer().errors("Parse");
}
}
}
- FileName oldauto = b.getAutosaveFileName();
-
- // Ok, change the name of the buffer
- b.setFileName(fname.absFileName());
- b.markDirty();
- bool unnamed = b.isUnnamed();
- b.setUnnamed(false);
- b.saveCheckSum(fname);
-
- // bring the autosave file with us, just in case.
- b.moveAutosaveFile(oldauto);
-
- if (!saveBuffer(b)) {
- oldauto = b.getAutosaveFileName();
- b.setFileName(oldname.absFileName());
- b.setUnnamed(unnamed);
- b.saveCheckSum(oldname);
- b.moveAutosaveFile(oldauto);
- return false;
- }
+ return saveBuffer(b, fname);
+}
- // the file has now been saved to the new location.
- // we need to check that the locations of child buffers
- // are still valid.
- b.checkChildBuffers();
- return true;
+bool GuiView::saveBuffer(Buffer & b) {
+ return saveBuffer(b, FileName());
}
-bool GuiView::saveBuffer(Buffer & b)
+bool GuiView::saveBuffer(Buffer & b, FileName const & fn)
{
if (workArea(b) && workArea(b)->inDialogMode())
return true;
- if (b.isUnnamed())
- return renameBuffer(b, docstring());
+ if (fn.empty() && b.isUnnamed())
+ return renameBuffer(b, docstring());
- if (b.save()) {
+ bool success;
+ if (fn.empty())
+ success = b.save();
+ else
+ success = b.saveAs(fn);
+
+ if (success) {
theSession().lastFiles().add(b.fileName());
return true;
}
Buffer & buf = wa->bufferView().buffer();
if (close_buffer && GuiViewPrivate::busyBuffers.contains(&buf)) {
- Alert::warning(_("Close document "), _("Document could not be closed because it is processed by LyX."));
+ Alert::warning(_("Close document"),
+ _("Document could not be closed because it is being processed by LyX."));
return false;
}
return false;
break;
case 1:
- // if we crash after this we could
- // have no autosave file but I guess
- // this is really improbable (Jug)
- // Sometime improbable things happen, bug 6857 (ps)
+ // If we crash after this we could have no autosave file
+ // but I guess this is really improbable (Jug).
+ // Sometimes improbable things happen:
+ // - see bug http://www.lyx.org/trac/ticket/6587 (ps)
// buf.removeAutosaveFile();
if (hiding)
// revert all changes
- buf.reload();
+ reloadBuffer(buf);
buf.markClean();
break;
case 2:
void GuiView::gotoNextOrPreviousBuffer(NextOrPrevious np)
{
- Buffer * const curbuf = documentBufferView()
- ? &documentBufferView()->buffer() : 0;
- Buffer * nextbuf = curbuf;
- while (true) {
- if (np == NEXTBUFFER)
- nextbuf = theBufferList().next(nextbuf);
- else
- nextbuf = theBufferList().previous(nextbuf);
- if (nextbuf == curbuf)
- break;
- if (nextbuf == 0) {
- nextbuf = curbuf;
- break;
+ if (!documentBufferView())
+ return;
+
+ if (TabWorkArea * twa = d.currentTabWorkArea()) {
+ Buffer * const curbuf = &documentBufferView()->buffer();
+ int nwa = twa->count();
+ for (int i = 0; i < nwa; ++i) {
+ if (&workArea(i)->bufferView().buffer() == curbuf) {
+ int next_index;
+ if (np == NEXTBUFFER)
+ next_index = (i == nwa - 1 ? 0 : i + 1);
+ else
+ next_index = (i == 0 ? nwa - 1 : i - 1);
+ setBuffer(&workArea(next_index)->bufferView().buffer());
+ break;
+ }
}
- if (workArea(*nextbuf))
- break;
}
- setBuffer(nextbuf);
}
}
-void GuiView::reloadBuffer()
+bool GuiView::reloadBuffer(Buffer & buf)
{
- Buffer * buf = &documentBufferView()->buffer();
- buf->reload();
+ Buffer::ReadStatus status = buf.reload();
+ return status == Buffer::ReadSuccess;
}
BufferList::iterator bit = theBufferList().begin();
BufferList::iterator const bend = theBufferList().end();
for (; bit != bend; ++bit) {
- if ((*bit)->fileName().exists()
- && (*bit)->isExternallyModified(Buffer::checksum_method)) {
+ Buffer * buf = *bit;
+ if (buf->fileName().exists()
+ && buf->isExternallyModified(Buffer::checksum_method)) {
docstring text = bformat(_("Document \n%1$s\n has been externally modified."
" Reload now? Any local changes will be lost."),
- from_utf8((*bit)->absFileName()));
+ from_utf8(buf->absFileName()));
int const ret = Alert::prompt(_("Reload externally changed document?"),
text, 0, 1, _("&Reload"), _("&Cancel"));
if (!ret)
- (*bit)->reload();
+ reloadBuffer(*buf);
}
}
}
-//FIXME use a DispatchResult object to transmit messages
-void GuiView::dispatchVC(FuncRequest const & cmd)
+void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
{
- // message for statusbar
- string msg;
Buffer * buffer = documentBufferView()
? &(documentBufferView()->buffer()) : 0;
if (!buffer || !ensureBufferClean(buffer))
break;
if (!buffer->lyxvc().inUse()) {
- if (buffer->lyxvc().registrer())
- reloadBuffer();
+ if (buffer->lyxvc().registrer()) {
+ reloadBuffer(*buffer);
+ dr.suppressMessageUpdate();
+ }
}
break;
if (!buffer || !ensureBufferClean(buffer))
break;
if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
- msg = buffer->lyxvc().checkIn();
- if (!msg.empty())
- reloadBuffer();
+ dr.setMessage(buffer->lyxvc().checkIn());
+ if (!dr.message().empty())
+ reloadBuffer(*buffer);
}
break;
if (!buffer || !ensureBufferClean(buffer))
break;
if (buffer->lyxvc().inUse()) {
- msg = buffer->lyxvc().checkOut();
- reloadBuffer();
+ dr.setMessage(buffer->lyxvc().checkOut());
+ reloadBuffer(*buffer);
}
break;
frontend::Alert::error(_("Revision control error."),
_("Error when setting the locking property."));
} else {
- msg = res;
- reloadBuffer();
+ dr.setMessage(res);
+ reloadBuffer(*buffer);
}
}
break;
case LFUN_VC_REVERT:
LASSERT(buffer, return);
- buffer->lyxvc().revert();
- reloadBuffer();
+ if (buffer->lyxvc().revert()) {
+ reloadBuffer(*buffer);
+ dr.suppressMessageUpdate();
+ }
break;
case LFUN_VC_UNDO_LAST:
LASSERT(buffer, return);
buffer->lyxvc().undoLast();
- reloadBuffer();
+ reloadBuffer(*buffer);
+ dr.suppressMessageUpdate();
break;
case LFUN_VC_REPO_UPDATE:
LASSERT(buffer, return);
if (ensureBufferClean(buffer)) {
- msg = buffer->lyxvc().repoUpdate();
+ dr.setMessage(buffer->lyxvc().repoUpdate());
checkExternallyModifiedBuffers();
}
break;
if (contains(flag, 'I'))
buffer->markDirty();
if (contains(flag, 'R'))
- reloadBuffer();
+ reloadBuffer(*buffer);
break;
}
default:
break;
}
-
- if (!msg.empty())
- message(from_utf8(msg));
}
FileName const filename = support::makeAbsPath(fname, buffer.filePath());
documentBufferView()->saveBookmark(false);
Buffer * child = 0;
- bool parsed = false;
if (theBufferList().exists(filename)) {
child = theBufferList().getBuffer(filename);
+ setBuffer(child);
} else {
message(bformat(_("Opening child document %1$s..."),
- makeDisplayPath(filename.absFileName())));
+ makeDisplayPath(filename.absFileName())));
child = loadDocument(filename, false);
- parsed = true;
}
- if (!child)
- return;
-
// Set the parent name of the child document.
// This makes insertion of citations and references in the child work,
// when the target is in the parent or another child document.
- child->setParent(&buffer);
-
- // I don't think this is needed, since it will be called in
- // setBuffer().
- // child->masterBuffer()->updateBuffer();
- setBuffer(child);
- if (parsed)
- child->errors("Parse");
+ if (child)
+ child->setParent(&buffer);
}
buf = loadDocument(s);
if (!buf)
return false;
- // I don't think this is needed. loadDocument() calls
- // setBuffer(), which calls updateBuffer().
- // buf->updateBuffer();
- buf->errors("Parse");
} else {
message(bformat(
_("File does not exist: %1$s"),
#if (QT_VERSION >= 0x040400)
-docstring GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+template<class T>
+docstring GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format, string const & msg)
{
bool const update_unincluded =
buffer->params().maintain_unincluded_children
&& !buffer->params().getIncludedChildren().empty();
- bool const success = buffer->doExport(format, true, update_unincluded);
+ bool const success = func(format, update_unincluded);
delete buffer;
busyBuffers.remove(orig);
+ if (msg == "preview") {
+ return success
+ ? bformat(_("Successful preview of format: %1$s"), from_utf8(format))
+ : bformat(_("Error while previewing format: %1$s"), from_utf8(format));
+ }
return success
? bformat(_("Successful export to format: %1$s"), from_utf8(format))
- : bformat(_("Error exporting to format: %1$s"), from_utf8(format));
+ : bformat(_("Error while exporting format: %1$s"), from_utf8(format));
+}
+
+
+docstring GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+{
+ bool (Buffer::* mem_func)(std::string const &, bool, bool) const = &Buffer::doExport;
+ return runAndDestroy(bind(mem_func, buffer, _1, true, _2), orig, buffer, format, "export");
+}
+
+
+docstring GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+{
+ bool (Buffer::* mem_func)(std::string const &, bool, bool) const = &Buffer::doExport;
+ return runAndDestroy(bind(mem_func, buffer, _1, false, _2), orig, buffer, format, "export");
}
docstring GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
{
- bool const update_unincluded =
- buffer->params().maintain_unincluded_children
- && !buffer->params().getIncludedChildren().empty();
- bool const success = buffer->preview(format, update_unincluded);
- delete buffer;
- busyBuffers.remove(orig);
- return success
- ? bformat(_("Successful preview of format: %1$s"), from_utf8(format))
- : bformat(_("Error previewing format: %1$s"), from_utf8(format));
+ bool(Buffer::* mem_func)(std::string const &, bool) const = &Buffer::preview;
+ return runAndDestroy(bind(mem_func, buffer, _1, _2), orig, buffer, format, "preview");
+}
+
+#else
+
+// not used, but the linker needs them
+
+docstring GuiView::GuiViewPrivate::compileAndDestroy(
+ Buffer const *, Buffer *, string const &)
+{
+ return docstring();
+}
+
+
+docstring GuiView::GuiViewPrivate::exportAndDestroy(
+ Buffer const *, Buffer *, string const &)
+{
+ return docstring();
+}
+
+
+docstring GuiView::GuiViewPrivate::previewAndDestroy(
+ Buffer const *, Buffer *, string const &)
+{
+ return docstring();
}
+
#endif
+bool GuiView::GuiViewPrivate::asyncBufferProcessing(
+ string const & argument,
+ Buffer const * used_buffer,
+ docstring const & msg,
+ docstring (*asyncFunc)(Buffer const *, Buffer *, string const &),
+ bool (Buffer::*syncFunc)(string const &, bool, bool) const,
+ bool (Buffer::*previewFunc)(string const &, bool) const)
+{
+ if (!used_buffer)
+ return false;
+
+ string format = argument;
+ if (format.empty())
+ format = used_buffer->getDefaultOutputFormat();
+
+#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+ gv_->processingThreadStarted();
+ if (!msg.empty()) {
+ progress_->clearMessages();
+ gv_->message(msg);
+ }
+ GuiViewPrivate::busyBuffers.insert(used_buffer);
+ QFuture<docstring> f = QtConcurrent::run(
+ asyncFunc,
+ used_buffer,
+ used_buffer->clone(),
+ format);
+ setPreviewFuture(f);
+ last_export_format = used_buffer->bufferFormat();
+ (void) syncFunc;
+ (void) previewFunc;
+ // We are asynchronous, so we don't know here anything about the success
+ return true;
+#else
+ if (syncFunc) {
+ // TODO check here if it breaks exporting with Qt < 4.4
+ bool const update_unincluded =
+ used_buffer->params().maintain_unincluded_children &&
+ !used_buffer->params().getIncludedChildren().empty();
+ return (used_buffer->*syncFunc)(format, true, update_unincluded);
+ } else if (previewFunc) {
+ return (used_buffer->*previewFunc)(format, false);
+ }
+ (void) asyncFunc;
+ return false;
+#endif
+}
+
+void GuiView::dispatchToBufferView(FuncRequest const & cmd, DispatchResult & dr)
+{
+ BufferView * bv = currentBufferView();
+ LASSERT(bv, /**/);
+
+ // Let the current BufferView dispatch its own actions.
+ bv->dispatch(cmd, dr);
+ if (dr.dispatched())
+ return;
+
+ // Try with the document BufferView dispatch if any.
+ BufferView * doc_bv = documentBufferView();
+ if (doc_bv) {
+ doc_bv->dispatch(cmd, dr);
+ if (dr.dispatched())
+ return;
+ }
+
+ // Then let the current Cursor dispatch its own actions.
+ bv->cursor().dispatch(cmd);
+
+ // update completion. We do it here and not in
+ // processKeySym to avoid another redraw just for a
+ // changed inline completion
+ if (cmd.origin() == FuncRequest::KEYBOARD) {
+ if (cmd.action() == LFUN_SELF_INSERT
+ || (cmd.action() == LFUN_ERT_INSERT && bv->cursor().inMathed()))
+ updateCompletion(bv->cursor(), true, true);
+ else if (cmd.action() == LFUN_CHAR_DELETE_BACKWARD)
+ updateCompletion(bv->cursor(), false, true);
+ else
+ updateCompletion(bv->cursor(), false, false);
+ }
+
+ dr = bv->cursor().result();
+}
+
+
void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
{
BufferView * bv = currentBufferView();
// By default we won't need any update.
- dr.update(Update::None);
+ dr.screenUpdate(Update::None);
// assume cmd will be dispatched
dr.dispatched(true);
break;
// GCC only sees strfwd.h when building merged
if (::lyx::operator==(cmd.argument(), "custom")) {
- dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"),
- dr);
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"), dr);
break;
}
+#if QT_VERSION < 0x040400
if (!doc_buffer->doExport(argument, false)) {
dr.setError(true);
dr.setMessage(bformat(_("Error exporting to format: %1$s."),
cmd.argument()));
}
+#else
+ /* TODO/Review: Is it a problem to also export the children?
+ See the update_unincluded flag */
+ d.asyncBufferProcessing(argument,
+ doc_buffer,
+ _("Exporting ..."),
+ &GuiViewPrivate::exportAndDestroy,
+ &Buffer::doExport,
+ 0);
+ // TODO Inform user about success
+#endif
break;
}
case LFUN_BUFFER_UPDATE: {
- if (!doc_buffer)
- break;
- string format = argument;
- if (argument.empty())
- format = doc_buffer->getDefaultOutputFormat();
-#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- d.progress_->clearMessages();
- message(_("Exporting ..."));
- GuiViewPrivate::busyBuffers.insert(doc_buffer);
- QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::exportAndDestroy,
- doc_buffer, doc_buffer->clone(), format);
- d.setPreviewFuture(f);
- d.last_export_format = doc_buffer->bufferFormat();
-#else
- bool const update_unincluded =
- doc_buffer->params().maintain_unincluded_children
- && !doc_buffer->params().getIncludedChildren().empty();
- doc_buffer->doExport(format, true, update_unincluded);
-#endif
+ d.asyncBufferProcessing(argument,
+ doc_buffer,
+ _("Exporting ..."),
+ &GuiViewPrivate::compileAndDestroy,
+ &Buffer::doExport,
+ 0);
break;
}
case LFUN_BUFFER_VIEW: {
- if (!doc_buffer)
- break;
- string format = argument;
- if (argument.empty())
- format = doc_buffer->getDefaultOutputFormat();
-#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- d.progress_->clearMessages();
- message(_("Previewing ..."));
- GuiViewPrivate::busyBuffers.insert(doc_buffer);
- QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::previewAndDestroy,
- doc_buffer, doc_buffer->clone(), format);
- d.setPreviewFuture(f);
- d.last_export_format = doc_buffer->bufferFormat();
-#else
- bool const update_unincluded =
- doc_buffer->params().maintain_unincluded_children
- && !doc_buffer->params().getIncludedChildren().empty();
- doc_buffer->preview(format, update_unincluded);
-#endif
+ d.asyncBufferProcessing(argument,
+ doc_buffer,
+ _("Previewing ..."),
+ &GuiViewPrivate::previewAndDestroy,
+ 0,
+ &Buffer::preview);
break;
}
case LFUN_MASTER_BUFFER_UPDATE: {
- if (!doc_buffer)
- break;
- string format = argument;
- Buffer const * master = doc_buffer->masterBuffer();
- if (argument.empty())
- format = master->getDefaultOutputFormat();
-#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- GuiViewPrivate::busyBuffers.insert(master);
- QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::exportAndDestroy,
- master, master->clone(), format);
- d.setPreviewFuture(f);
- d.last_export_format = doc_buffer->bufferFormat();
-#else
- bool const update_unincluded =
- master->params().maintain_unincluded_children
- && !master->params().getIncludedChildren().empty();
- master->doExport(format, true);
-#endif
+ d.asyncBufferProcessing(argument,
+ (doc_buffer ? doc_buffer->masterBuffer() : 0),
+ docstring(),
+ &GuiViewPrivate::compileAndDestroy,
+ &Buffer::doExport,
+ 0);
break;
}
case LFUN_MASTER_BUFFER_VIEW: {
- string format = argument;
- Buffer const * master = doc_buffer->masterBuffer();
- if (argument.empty())
- format = master->getDefaultOutputFormat();
-#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- GuiViewPrivate::busyBuffers.insert(master);
- QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::previewAndDestroy,
- master, master->clone(), format);
- d.setPreviewFuture(f);
- d.last_export_format = doc_buffer->bufferFormat();
-#else
- master->preview(format);
-#endif
+ d.asyncBufferProcessing(argument,
+ (doc_buffer ? doc_buffer->masterBuffer() : 0),
+ docstring(),
+ &GuiViewPrivate::previewAndDestroy,
+ 0, &Buffer::preview);
break;
}
case LFUN_BUFFER_SWITCH: {
case LFUN_FILE_INSERT:
insertLyXFile(cmd.argument());
break;
+
case LFUN_FILE_INSERT_PLAINTEXT_PARA:
insertPlaintextFile(cmd.argument(), true);
break;
case LFUN_BUFFER_RELOAD: {
LASSERT(doc_buffer, break);
- docstring const file = makeDisplayPath(doc_buffer->absFileName(), 20);
- docstring text = bformat(_("Any changes will be lost. Are you sure "
- "you want to revert to the saved version of the document %1$s?"), file);
- int const ret = Alert::prompt(_("Revert to saved document?"),
- text, 1, 1, _("&Revert"), _("&Cancel"));
+
+ int ret = 0;
+ if (!doc_buffer->isClean()) {
+ docstring const file =
+ makeDisplayPath(doc_buffer->absFileName(), 20);
+ docstring text = bformat(_("Any changes will be lost. "
+ "Are you sure you want to revert to the saved version "
+ "of the document %1$s?"), file);
+ ret = Alert::prompt(_("Revert to saved document?"),
+ text, 1, 1, _("&Revert"), _("&Cancel"));
+ }
if (ret == 0) {
doc_buffer->markClean();
- reloadBuffer();
+ reloadBuffer(*doc_buffer);
dr.forceBufferUpdate();
}
break;
case LFUN_DIALOG_UPDATE: {
string const name = to_utf8(cmd.argument());
- if (currentBufferView()) {
+ if (name == "prefs" || name == "document")
+ updateDialog(name, string());
+ else if (name == "paragraph")
+ lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
+ else if (currentBufferView()) {
Inset * inset = currentBufferView()->editedInset(name);
// Can only update a dialog connected to an existing inset
- if (!inset)
- break;
- // FIXME: get rid of this indirection; GuiView ask the inset
- // if he is kind enough to update itself...
- FuncRequest fr(LFUN_INSET_DIALOG_UPDATE, cmd.argument());
- //FIXME: pass DispatchResult here?
- inset->dispatch(currentBufferView()->cursor(), fr);
- } else if (name == "paragraph") {
- lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
- } else if (name == "prefs" || name == "document") {
- updateDialog(name, string());
+ if (inset) {
+ // FIXME: get rid of this indirection; GuiView ask the inset
+ // if he is kind enough to update itself...
+ FuncRequest fr(LFUN_INSET_DIALOG_UPDATE, cmd.argument());
+ //FIXME: pass DispatchResult here?
+ inset->dispatch(currentBufferView()->cursor(), fr);
+ }
}
break;
}
case LFUN_VC_UNDO_LAST:
case LFUN_VC_COMMAND:
case LFUN_VC_COMPARE:
- dispatchVC(cmd);
+ dispatchVC(cmd, dr);
break;
case LFUN_SERVER_GOTO_FILE_ROW:
break;
}
default:
- dr.dispatched(false);
+ // The LFUN must be for one of BufferView, Buffer or Cursor;
+ // let's try that:
+ dispatchToBufferView(cmd, dr);
break;
}
if (statusBar()->isVisible())
statusBar()->hide();
}
-
- return;
}
Dialog * createGuiGraphics(GuiView & lv);
Dialog * createGuiInclude(GuiView & lv);
Dialog * createGuiIndex(GuiView & lv);
-Dialog * createGuiLabel(GuiView & lv);
Dialog * createGuiListings(GuiView & lv);
Dialog * createGuiLog(GuiView & lv);
Dialog * createGuiMathMatrix(GuiView & lv);
-Dialog * createGuiNomenclature(GuiView & lv);
Dialog * createGuiNote(GuiView & lv);
Dialog * createGuiParagraph(GuiView & lv);
Dialog * createGuiPhantom(GuiView & lv);
Dialog * createGuiPreferences(GuiView & lv);
Dialog * createGuiPrint(GuiView & lv);
Dialog * createGuiPrintindex(GuiView & lv);
-Dialog * createGuiPrintNomencl(GuiView & lv);
Dialog * createGuiRef(GuiView & lv);
Dialog * createGuiSearch(GuiView & lv);
Dialog * createGuiSearchAdv(GuiView & lv);
Dialog * createGuiTexInfo(GuiView & lv);
Dialog * createGuiToc(GuiView & lv);
Dialog * createGuiThesaurus(GuiView & lv);
-Dialog * createGuiHyperlink(GuiView & lv);
Dialog * createGuiViewSource(GuiView & lv);
Dialog * createGuiWrap(GuiView & lv);
Dialog * createGuiProgressView(GuiView & lv);
return createGuiSearchAdv(*this);
if (name == "graphics")
return createGuiGraphics(*this);
- if (name == "href")
- return createGuiHyperlink(*this);
if (name == "include")
return createGuiInclude(*this);
if (name == "index")
return createGuiIndex(*this);
if (name == "index_print")
return createGuiPrintindex(*this);
- if (name == "label")
- return createGuiLabel(*this);
if (name == "listings")
return createGuiListings(*this);
if (name == "log")
return createGuiDelimiter(*this);
if (name == "mathmatrix")
return createGuiMathMatrix(*this);
- if (name == "nomenclature")
- return createGuiNomenclature(*this);
- if (name == "nomencl_print")
- return createGuiPrintNomencl(*this);
if (name == "note")
return createGuiNote(*this);
if (name == "paragraph")
projects / lyx.git / blobdiff