#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 <QtConcurrentRun>
#endif
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <sstream>
# include <unistd.h>
#endif
+
using namespace std;
using namespace lyx::support;
/// Toolbar store providing access to individual toolbars by name.
typedef map<string, GuiToolbar *> ToolbarMap;
-typedef boost::shared_ptr<Dialog> DialogPtr;
+typedef shared_ptr<Dialog> DialogPtr;
} // namespace anon
// TODO cleanup, remove the singleton, handle multiple Windows?
progress_ = ProgressInterface::instance();
- if (!dynamic_cast<GuiProgress*>(progress_)) {
+ if (!dynamic_cast<GuiProgress*>(progress_)) {
progress_ = new GuiProgress(); // TODO who deletes it
- ProgressInterface::setInstance(progress_);
+ ProgressInterface::setInstance(progress_);
}
QObject::connect(
- dynamic_cast<GuiProgress*>(progress_),
- SIGNAL(updateStatusBarMessage(QString const&)),
+ dynamic_cast<GuiProgress*>(progress_),
+ SIGNAL(updateStatusBarMessage(QString const&)),
gv, SLOT(updateStatusBarMessage(QString const&)));
QObject::connect(
- dynamic_cast<GuiProgress*>(progress_),
- SIGNAL(clearMessageText()),
+ dynamic_cast<GuiProgress*>(progress_),
+ SIGNAL(clearMessageText()),
gv, SLOT(clearMessageText()));
}
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
ToolbarMap toolbars_;
ProgressInterface* progress_;
/// The main layout box.
- /**
+ /**
* \warning Don't Delete! The layout box is actually owned by
* whichever toolbar contains it. All the GuiView class needs is a
* means of accessing it.
#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_;
+ struct DummyWatcher { bool isRunning(){return false;} };
+ 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
// filling, at least for the static special menu item on Mac. Otherwise
// they are greyed out.
guiApp->setCurrentView(this);
-
+
// Fill up the menu bar.
guiApp->menus().fillMenuBar(menuBar(), this, true);
// Start autosave timer
if (lyxrc.autosave) {
- d.autosave_timeout_.timeout.connect(boost::bind(&GuiView::autoSave, this));
+ d.autosave_timeout_.timeout.connect(bind(&GuiView::autoSave, this));
d.autosave_timeout_.setTimeout(lyxrc.autosave * 1000);
d.autosave_timeout_.start();
}
#if (QT_VERSION >= 0x040400)
connect(&d.autosave_watcher_, SIGNAL(finished()), this,
- SLOT(threadFinished()));
- connect(&d.preview_watcher_, SIGNAL(finished()), this,
- SLOT(threadFinished()));
+ SLOT(processingThreadFinished()));
+ 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()
{
-#if (QT_VERSION >= 0x040400)
QFutureWatcher<docstring> const * watcher =
static_cast<QFutureWatcher<docstring> const *>(sender());
message(watcher->result());
+ updateToolbars();
errors(d.last_export_format);
-#endif
+ d.processing_cursor_timer_.stop();
+ restoreCursorShapes();
+ d.indicates_processing_ = false;
+}
+
+#else
+
+void GuiView::setCursorShapes(Qt::CursorShape)
+{
+}
+
+
+void GuiView::restoreCursorShapes()
+{
+}
+
+
+void GuiView::saveCursorShapes()
+{
+}
+
+
+void GuiView::indicateProcessing()
+{
+}
+
+
+void GuiView::processingThreadStarted()
+{
}
+void GuiView::processingThreadFinished()
+{
+}
+#endif
+
+
void GuiView::saveLayout() const
{
QSettings settings;
}
+bool GuiView::closeScheduled()
+{
+ closing_ = true;
+ return close();
+}
+
+
/** Destroy only all tabbed WorkAreas. Destruction of other WorkAreas
** is responsibility of the container (e.g., dialog)
**/
LYXERR(Debug::DEBUG, "GuiView::closeEvent()");
if (!GuiViewPrivate::busyBuffers.isEmpty()) {
- Alert::warning(_("Exit LyX"), _("Could not exit LyX, 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;
}
+ // If the user pressed the x (so we didn't call closeView
+ // programmatically), we want to clear all existing entries.
+ if (!closing_)
+ theSession().lastOpened().clear();
closing_ = true;
writeSession();
vector<const Format *> found_formats;
// Find all formats that have the correct extension.
- vector<const Format *> const & import_formats
+ vector<const Format *> const & import_formats
= theConverters().importableFormats();
vector<const Format *>::const_iterator it = import_formats.begin();
for (; it != import_formats.end(); ++it)
}
string const arg = found_formats[0]->name() + " " + file;
cmd = FuncRequest(LFUN_BUFFER_IMPORT, arg);
- }
+ }
else {
//FIXME: do we have to explicitly check whether it's a lyx file?
LYXERR(Debug::FILES,
"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();
}
{
if (ForkedProcess::iAmAChild())
return;
-
+
// call is moved to GUI-thread by GuiProgress
d.progress_->appendMessage(toqstr(str));
}
}
+bool GuiView::busy() const
+{
+ return busy_ > 0;
+}
+
+
void GuiView::setBusy(bool 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()
GuiWorkArea * GuiView::addWorkArea(Buffer & buffer)
{
// Automatically create a TabWorkArea if there are none yet.
- TabWorkArea * tab_widget = d.splitter_->count()
+ TabWorkArea * tab_widget = d.splitter_->count()
? d.currentTabWorkArea() : addTabWorkArea();
return tab_widget->addWorkArea(buffer, *this);
}
// FIXME: I've no clue why this is here and why it accesses
// theGuiApp()->currentView, which might be 0 (bug 6464).
// See also 27525 (vfr).
- if (theGuiApp()->currentView() == this
- && theGuiApp()->currentView()->currentWorkArea() == wa)
+ if (theGuiApp()->currentView() == this
+ && theGuiApp()->currentView()->currentWorkArea() == wa)
return;
if (currentBufferView())
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();
}
-BufferView const * GuiView::documentBufferView() const
+BufferView const * GuiView::documentBufferView() const
{
return currentMainWorkArea()
? ¤tMainWorkArea()->bufferView()
#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();
}
if (cmd.origin() == FuncRequest::TOC) {
GuiToc * toc = static_cast<GuiToc*>(findOrBuild("toc", false));
- FuncStatus fs;
- if (toc->getStatus(documentBufferView()->cursor(), cmd, fs))
- flag |= fs;
- else
+ if (!toc || !toc->getStatus(documentBufferView()->cursor(), cmd, flag))
flag.setEnabled(false);
return true;
}
break;
case LFUN_MASTER_BUFFER_UPDATE:
- case LFUN_MASTER_BUFFER_VIEW:
+ 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;
}
break;
}
b = theBufferList().next(b);
- } while (b != first);
+ } while (b != first);
break;
}
flag.setOnOff(t->isVisible());
else {
enable = false;
- docstring const msg =
+ docstring const msg =
bformat(_("Unknown toolbar \"%1$s\""), from_utf8(name));
flag.message(msg);
}
}
case LFUN_DROP_LAYOUTS_CHOICE:
- enable = buf;
+ enable = buf;
break;
case LFUN_UI_TOGGLE:
enable = doc_buffer->isExportable("dvi")
&& lyxrc.print_command != "none";
else if (name == "character" || name == "symbols") {
- if (!buf || buf->isReadonly()
- || !currentBufferView()->cursor().inTexted())
+ if (!buf || buf->isReadonly())
enable = false;
else {
// FIXME we should consider passthru
case LFUN_BUFFER_ZOOM_IN:
enable = doc_buffer;
break;
-
+
case LFUN_BUFFER_NEXT:
case LFUN_BUFFER_PREVIOUS:
// FIXME: should we check is there is an previous or next buffer?
flag.setOnOff(enable && doc_buffer->lyxvc().locking());
break;
case LFUN_VC_REVERT:
- enable = doc_buffer && doc_buffer->lyxvc().inUse();
+ enable = doc_buffer && doc_buffer->lyxvc().inUse() && !doc_buffer->isReadonly();
break;
case LFUN_VC_UNDO_LAST:
enable = doc_buffer && doc_buffer->lyxvc().undoLastEnabled();
break;
case LFUN_VC_REPO_UPDATE:
- enable = doc_buffer && doc_buffer->lyxvc().inUse();
+ enable = doc_buffer && doc_buffer->lyxvc().repoUpdateEnabled();
break;
case LFUN_VC_COMMAND: {
if (cmd.argument().empty())
break;
}
case LFUN_VC_COMPARE:
- enable = doc_buffer && !cmd.argument().empty()
- && doc_buffer->lyxvc().prepareFileRevisionEnabled();
+ enable = doc_buffer && doc_buffer->lyxvc().prepareFileRevisionEnabled();
break;
case LFUN_SERVER_GOTO_FILE_ROW:
{
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."));
setBusy(false);
return 0;
}
-
- 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);
- }
+ newBuffer->errors("Parse");
+ setBuffer(newBuffer);
if (tolastfiles)
theSession().lastFiles().add(filename);
FileDialog dlg(qt_("Select document to open"), LFUN_FILE_OPEN);
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Examples|#E#e"),
- toqstr(addPath(package().system_support().absFilename(), "examples")));
+ toqstr(addPath(package().system_support().absFileName(), "examples")));
QStringList filter(qt_("LyX Documents (*.lyx)"));
filter << qt_("LyX-1.3.x Documents (*.lyx13)")
filename = fname;
// get absolute path of file and add ".lyx" to the filename if
- // necessary.
- FileName const fullname =
+ // necessary.
+ FileName const fullname =
fileSearch(string(), filename, "lyx", support::may_not_exist);
if (!fullname.empty())
- filename = fullname.absFilename();
+ filename = fullname.absFileName();
if (!fullname.onlyPath().isDirectory()) {
Alert::warning(_("Invalid filename"),
bformat(_("The directory in the given path\n%1$s\ndoes not exist."),
- from_utf8(fullname.absFilename())));
+ from_utf8(fullname.absFileName())));
return;
}
- // if the file doesn't exist and isn't already open (bug 6645),
+ // if the file doesn't exist and isn't already open (bug 6645),
// let the user create one
if (!fullname.exists() && !theBufferList().exists(fullname)) {
// the user specifically chose this name. Believe him.
docstring str2;
Buffer * buf = loadDocument(fullname);
if (buf) {
- 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()) +
static bool import(GuiView * lv, FileName const & filename,
string const & format, ErrorList & errorList)
{
- FileName const lyxfile(support::changeExtension(filename.absFilename(), ".lyx"));
+ FileName const lyxfile(support::changeExtension(filename.absFileName(), ".lyx"));
string loader_format;
vector<string> loaders = theConverters().loaders();
continue;
string const tofile =
- support::changeExtension(filename.absFilename(),
+ support::changeExtension(filename.absFileName(),
formats.extension(*it));
if (!theConverters().convert(0, filename, FileName(tofile),
filename, format, *it, errorList))
Buffer * buf = lv->loadDocument(lyxfile);
if (!buf)
return false;
- buf->updateBuffer();
- lv->setBuffer(buf);
- buf->errors("Parse");
} else {
- Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
+ Buffer * const b = newFile(lyxfile.absFileName(), string(), true);
if (!b)
return false;
lv->setBuffer(b);
bool as_paragraphs = loader_format == "textparagraph";
- string filename2 = (loader_format == format) ? filename.absFilename()
- : support::changeExtension(filename.absFilename(),
+ string filename2 = (loader_format == format) ? filename.absFileName()
+ : support::changeExtension(filename.absFileName(),
formats.extension(loader_format));
lv->currentBufferView()->insertPlaintextFile(FileName(filename2),
as_paragraphs);
FileDialog dlg(toqstr(text), LFUN_BUFFER_IMPORT);
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Examples|#E#e"),
- toqstr(addPath(package().system_support().absFilename(), "examples")));
+ toqstr(addPath(package().system_support().absFileName(), "examples")));
docstring filter = formats.prettyName(format);
filter += " (*.";
// get absolute path of file
FileName const fullname(support::makeAbsPath(filename));
- FileName const lyxfile(support::changeExtension(fullname.absFilename(), ".lyx"));
+ FileName const lyxfile(support::changeExtension(fullname.absFileName(), ".lyx"));
// Check if the document already is open
Buffer * buf = theBufferList().getBuffer(lyxfile);
}
}
- docstring const displaypath = makeDisplayPath(lyxfile.absFilename(), 30);
+ docstring const displaypath = makeDisplayPath(lyxfile.absFileName(), 30);
// if the file exists already, and we didn't do
// -i lyx thefile.lyx, warn
string templatefile;
if (from_template) {
- templatefile = selectTemplateFile().absFilename();
+ templatefile = selectTemplateFile().absFileName();
if (templatefile.empty())
return;
}
-
+
Buffer * b;
if (filename.empty())
b = newUnnamedFile(initpath, to_utf8(_("newfile")), templatefile);
if (b)
setBuffer(b);
- // If no new document could be created, it is unsure
+ // If no new document could be created, it is unsure
// whether there is a valid BufferView.
if (currentBufferView())
// Ensure the cursor is correctly positioned on screen.
// FIXME UNICODE
FileName filename(to_utf8(fname));
-
- 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;
+ 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;
- // 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");
}
// FIXME UNICODE
FileName filename(to_utf8(fname));
-
+
if (!filename.empty()) {
bv->insertPlaintextFile(filename, asParagraph);
return;
if (!newname.empty()) {
// FIXME UNICODE
- fname = support::makeAbsPath(to_utf8(newname), oldname.onlyPath().absFilename());
+ fname = support::makeAbsPath(to_utf8(newname), oldname.onlyPath().absFileName());
} else {
// Switch to this Buffer.
setBuffer(&b);
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
- if (!isLyXFilename(fname.absFilename()))
+ if (!isLyXFileName(fname.absFileName()))
fname.changeExtension(".lyx");
FileDialog::Result result =
- dlg.save(toqstr(fname.onlyPath().absFilename()),
+ dlg.save(toqstr(fname.onlyPath().absFileName()),
QStringList(qt_("LyX Documents (*.lyx)")),
toqstr(fname.onlyFileName()));
if (fname.empty())
return false;
- if (!isLyXFilename(fname.absFilename()))
+ if (!isLyXFileName(fname.absFileName()))
fname.changeExtension(".lyx");
}
// fname is now the new Buffer location.
if (FileName(fname).exists()) {
- docstring const file = makeDisplayPath(fname.absFilename(), 30);
+ docstring const file = makeDisplayPath(fname.absFileName(), 30);
docstring text = bformat(_("The document %1$s already "
"exists.\n\nDo you want to "
- "overwrite that document?"),
+ "overwrite that document?"),
file);
int const ret = Alert::prompt(_("Overwrite document?"),
text, 0, 2, _("&Overwrite"), _("&Rename"), _("&Cancel"));
}
}
- 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;
}
setCurrentWorkArea(currentMainWorkArea());
// We might be in a situation that there is still a tabWorkArea, but
- // there are no tabs anymore. This can happen when we get here after a
+ // there are no tabs anymore. This can happen when we get here after a
// TabWorkArea::lastWorkAreaRemoved() signal. Therefore we count how
// many TabWorkArea's have no documents anymore.
int empty_twa = 0;
Buffer & buf = wa->bufferView().buffer();
if (close_buffer && GuiViewPrivate::busyBuffers.contains(&buf)) {
- Alert::warning(_("Close document "), _("Could not close document, because it is processed by LyX."));
+ Alert::warning(_("Close document"),
+ _("Document could not be closed because it is being processed by LyX."));
return false;
}
// in the session file in the correct order. If we close the master
// buffer, we can close or release the child buffers here too.
if (!closing_) {
- vector<Buffer *> clist = buf.getChildren(false);
- for (vector<Buffer *>::const_iterator it = clist.begin();
- it != clist.end(); ++it) {
+ ListOfBuffers clist = buf.getChildren();
+ ListOfBuffers::const_iterator it = clist.begin();
+ ListOfBuffers::const_iterator const bend = clist.end();
+ for (; it != bend; ++it) {
// If a child is dirty, do not close
// without user intervention
//FIXME: should we look in other tabworkareas?
// We only want to close the buffer if the same buffer is not visible
// in another view, and if this is not a child and if we are closing
// a view (not a tabgroup).
- bool const close_buffer =
+ bool const close_buffer =
!inMultiViews(wa) && !b.parent() && closing_;
if (!closeWorkArea(wa, close_buffer))
docstring const text = bformat(_("The document %1$s has not been "
"saved yet.\n\nDo you want to save "
"the document?"), file);
- ret = Alert::prompt(_("Save new document?"),
+ ret = Alert::prompt(_("Save new document?"),
text, 0, 1, _("&Save"), _("&Cancel"));
if (ret == 1)
++ret;
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:
for (int i = 0; i != ids.size() && found_twa <= 1; ++i) {
if (id_ == ids[i])
continue;
-
+
if (guiApp->view(ids[i]).workArea(buf))
return true;
}
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);
}
"changes.\n\nDo you want to save "
"the document?"), file);
title = _("Save changed document?");
-
+
} else {
text = bformat(_("The document %1$s has not been "
"saved yet.\n\nDo you want to save "
}
-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;
}
case LFUN_VC_COMPARE: {
+ if (cmd.argument().empty()) {
+ lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "comparehistory"));
+ break;
+ }
+
string rev1 = cmd.getArg(0);
string f1, f2;
if (!buffer->lyxvc().prepareFileRevision(rev2, f2))
break;
}
- // FIXME We need to call comparison feature here.
- // This is quick and dirty code for testing VC.
- // We need that comparison feature has some LFUN_COMPARE <FLAG> file1 file1
- // where <FLAG> specifies whether we want GUI dialog or just launch
- // running with defaults.
- /*
- FileName initpath(lyxrc.document_path);
- Buffer * dest = newUnnamedFile(initpath, to_utf8(_("differences")));
- CompareOptions options;
- Compare * compare = new Compare(loadIfNeeded(FileName(f1)), loadIfNeeded(FileName(f2)), dest, options);
- compare->start(QThread::LowPriority);
- Sleep::millisec(200);
- lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH, dest->absFileName()));
- */
+
+ LYXERR(Debug::LYXVC, "Launching comparison for fetched revisions:\n" <<
+ f1 << "\n" << f2 << "\n" );
+ string par = "compare run " + quoteName(f1) + " " + quoteName(f2);
+ lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par));
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);
- child->masterBuffer()->updateBuffer();
- setBuffer(child);
- if (parsed)
- child->errors("Parse");
+ if (child)
+ child->setParent(&buffer);
}
return false;
}
Buffer * buf = 0;
- string const abstmp = package().temp_dir().absFilename();
+ string const abstmp = package().temp_dir().absFileName();
string const realtmp = package().temp_dir().realPath();
// We have to use os::path_prefix_is() here, instead of
// simply prefixIs(), because the file name comes from
buf = theBufferList().getBuffer(s);
else if (s.exists()) {
buf = loadDocument(s);
- buf->updateBuffer();
- buf->errors("Parse");
+ if (!buf)
+ return false;
} 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);
+
+ // Try with the document BufferView dispatch if any.
+ BufferView * doc_bv = documentBufferView();
+ if (doc_bv && !dr.dispatched())
+ doc_bv->dispatch(cmd, dr);
+
+ // OK, so try the current Buffer itself...
+ if (!dr.dispatched())
+ bv->buffer().dispatch(cmd, dr);
+
+ // and with the document Buffer.
+ if (doc_bv && !dr.dispatched())
+ doc_bv->buffer().dispatch(cmd, dr);
+
+ // Then let the current Cursor dispatch its own actions.
+ if (!dr.dispatched()) {
+ Cursor old = bv->cursor();
+ bv->cursor().dispatch(cmd);
+
+ // notify insets we just left
+ // FIXME: move this code to Cursor::dispatch
+ if (bv->cursor() != old) {
+ old.beginUndoGroup();
+ old.fixIfBroken();
+ bool badcursor = notifyCursorLeavesOrEnters(old, bv->cursor());
+ if (badcursor) {
+ bv->cursor().fixIfBroken();
+ bv->fixInlineCompletionPos();
+ }
+ old.endUndoGroup();
+ }
+
+ // 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:
- if (FileName::isAbsolute(to_utf8(cmd.argument()))) {
- Buffer * buffer =
- theBufferList().getBuffer(FileName(to_utf8(cmd.argument())));
- if (buffer)
- setBuffer(buffer);
- else {
- dr.setError(true);
- dr.setMessage(_("Document not loaded"));
+ case LFUN_BUFFER_SWITCH: {
+ string const file_name = to_utf8(cmd.argument());
+ if (!FileName::isAbsolute(file_name)) {
+ dr.setError(true);
+ dr.setMessage(_("Absolute filename expected."));
+ break;
+ }
+
+ Buffer * buffer = theBufferList().getBuffer(FileName(file_name));
+ if (!buffer) {
+ dr.setError(true);
+ dr.setMessage(_("Document not loaded"));
+ break;
+ }
+
+ // Do we open or switch to the buffer in this view ?
+ if (workArea(*buffer)
+ || lyxrc.open_buffers_in_tabs || !documentBufferView()) {
+ setBuffer(buffer);
+ break;
+ }
+
+ // Look for the buffer in other views
+ QList<int> const ids = guiApp->viewIds();
+ int i = 0;
+ for (; i != ids.size(); ++i) {
+ GuiView & gv = guiApp->view(ids[i]);
+ if (gv.workArea(*buffer)) {
+ gv.activateWindow();
+ gv.setBuffer(buffer);
+ break;
}
}
+
+ // If necessary, open a new window as a last resort
+ if (i == ids.size()) {
+ lyx::dispatch(FuncRequest(LFUN_WINDOW_NEW));
+ lyx::dispatch(cmd);
+ }
break;
+ }
case LFUN_BUFFER_NEXT:
gotoNextOrPreviousBuffer(NEXTBUFFER);
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;
}
LYXERR(Debug::ACTION, "Saved " << b->absFileName());
}
b = theBufferList().next(b);
- } while (b != first);
+ } while (b != first);
dr.setMessage(_("All documents saved."));
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;
}
if (!data.empty())
showDialog("character", data);
} else if (name == "latexlog") {
- Buffer::LogType type;
+ Buffer::LogType type;
string const logfile = doc_buffer->logName(&type);
switch (type) {
case Buffer::latexlog:
}
}
break;
-
+
case LFUN_COMPLETION_INLINE:
if (d.current_work_area_)
d.current_work_area_->completer().showInline();
if (lyxrc.zoom < 10)
lyxrc.zoom = 10;
-
+
// The global QPixmapCache is used in GuiPainter to cache text
// painting so we must reset it.
QPixmapCache::clear();
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;
case LFUN_FORWARD_SEARCH: {
- string command = lyxrc.forward_search_dvi;
FileName const path(doc_buffer->temppath());
string const texname = doc_buffer->latexName();
- string outname = support::changeExtension(texname, "dvi");
- if (!FileName(addName(path.absFilename(), outname)).exists()) {
- outname = support::changeExtension(texname, "pdf");
+ FileName const dviname(addName(path.absFileName(),
+ support::changeExtension(texname, "dvi")));
+ FileName const pdfname(addName(path.absFileName(),
+ support::changeExtension(texname, "pdf")));
+ if (!dviname.exists() && !pdfname.exists()) {
+ dr.setMessage(_("Please, preview the document first."));
+ break;
+ }
+ string outname = dviname.onlyFileName();
+ string command = lyxrc.forward_search_dvi;
+ if (!dviname.exists() ||
+ pdfname.lastModified() > dviname.lastModified()) {
+ outname = pdfname.onlyFileName();
command = lyxrc.forward_search_pdf;
- if (!FileName(addName(path.absFilename(), outname)).exists())
- break;
}
int row = doc_buffer->texrow().getRowFromIdPos(bv->cursor().paragraph().id(), bv->cursor().pos());
+ LYXERR(Debug::ACTION, "Forward search: row:" << row
+ << " id:" << bv->cursor().paragraph().id());
if (!row || command.empty()) {
dr.setMessage(_("Couldn't proceed."));
break;
PathChanger p(path);
Systemcall one;
- one.startscript(Systemcall::Wait, command);
+ one.startscript(Systemcall::DontWait, command);
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;
}
// docs in LyXAction.cpp.
char const * const dialognames[] = {
+
"aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
-"citation", "compare", "document", "errorlist", "ert", "external", "file",
-"findreplace", "findreplaceadv", "float", "graphics", "href", "include",
-"index", "index_print", "info", "listings", "label", "log", "mathdelimiter",
-"mathmatrix", "mathspace", "nomenclature", "nomencl_print", "note",
-"paragraph", "phantom", "prefs", "print", "ref", "sendto", "space",
-"spellchecker", "symbols", "tabular", "tabularcreate", "thesaurus", "texinfo",
-"toc", "view-source", "vspace", "wrap", "progress"};
+"citation", "compare", "comparehistory", "document", "errorlist", "ert",
+"external", "file", "findreplace", "findreplaceadv", "float", "graphics",
+"href", "include", "index", "index_print", "info", "listings", "label", "line",
+"log", "mathdelimiter", "mathmatrix", "mathspace", "nomenclature",
+"nomencl_print", "note", "paragraph", "phantom", "prefs", "print", "ref",
+"sendto", "space", "spellchecker", "symbols", "tabular", "tabularcreate",
+"thesaurus", "texinfo", "toc", "view-source", "vspace", "wrap", "progress"};
char const * const * const end_dialognames =
dialognames + (sizeof(dialognames) / sizeof(char *));
try {
Dialog * dialog = findOrBuild(name, false);
if (dialog) {
+ bool const visible = dialog->isVisibleView();
dialog->showData(data);
if (inset && currentBufferView())
currentBufferView()->editInset(name, inset);
+ // We only set the focus to the new dialog if it was not yet
+ // visible in order not to change the existing previous behaviour
+ if (visible) {
+ // activateWindow is needed for floating dockviews
+ dialog->asQWidget()->raise();
+ dialog->asQWidget()->activateWindow();
+ dialog->asQWidget()->setFocus();
+ }
}
}
catch (ExceptionMessage const & ex) {
for(; it != end; ++it) {
Dialog * dialog = it->second.get();
if (dialog) {
- if (dialog->isBufferDependent() && !documentBufferView())
+ if (dialog->needBufferOpen() && !documentBufferView())
hideDialog(fromqstr(dialog->name()), 0);
else if (dialog->isVisibleView())
dialog->checkStatus();
Dialog * createGuiCharacter(GuiView & lv);
Dialog * createGuiCitation(GuiView & lv);
Dialog * createGuiCompare(GuiView & lv);
+Dialog * createGuiCompareHistory(GuiView & lv);
Dialog * createGuiDelimiter(GuiView & lv);
Dialog * createGuiDocument(GuiView & lv);
Dialog * createGuiErrorList(GuiView & lv);
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 createGuiCitation(*this);
if (name == "compare")
return createGuiCompare(*this);
+ if (name == "comparehistory")
+ return createGuiCompareHistory(*this);
if (name == "document")
return createGuiDocument(*this);
if (name == "errorlist")
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