}
#if (QT_VERSION >= 0x040400)
- void setPreviewFuture(QFuture<docstring> const & f)
+ void setPreviewFuture(QFuture<Buffer::ExportStatus> const & f)
{
if (processing_thread_watcher_.isRunning()) {
// we prefer to cancel this preview in order to keep a snappy
#if (QT_VERSION >= 0x040400)
///
QFutureWatcher<docstring> autosave_watcher_;
- QFutureWatcher<docstring> processing_thread_watcher_;
+ QFutureWatcher<Buffer::ExportStatus> processing_thread_watcher_;
///
string last_export_format;
+ string processing_format;
#else
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 compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
+ static Buffer::ExportStatus previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
+ static Buffer::ExportStatus exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
+ static Buffer::ExportStatus 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);
+ static Buffer::ExportStatus runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format);
// 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);
+ Buffer::ExportStatus (*asyncFunc)(Buffer const *, Buffer *, string const &),
+ Buffer::ExportStatus (Buffer::*syncFunc)(string const &, bool) const,
+ Buffer::ExportStatus (Buffer::*previewFunc)(string const &) const);
QVector<GuiWorkArea*> guiWorkAreas();
};
return areas;
}
+static void handleExportStatus(GuiView * view, Buffer::ExportStatus status,
+ string const & format)
+{
+ docstring msg;
+ switch (status) {
+ case Buffer::ExportSuccess:
+ msg = _("Successful export to format: %1$s");
+ break;
+ case Buffer::ExportError:
+ case Buffer::ExportNoPathToFormat:
+ case Buffer::ExportTexPathHasSpaces:
+ case Buffer::ExportConverterError:
+ msg = _("Error while exporting format: %1$s");
+ break;
+ case Buffer::PreviewSuccess:
+ msg = _("Successful preview of format: %1$s");
+ break;
+ case Buffer::PreviewError:
+ msg = _("Error while previewing format: %1$s");
+ break;
+ }
+ view->message(bformat(msg, from_utf8(format)));
+}
+
#if QT_VERSION >= 0x040400
void GuiView::processingThreadFinished(bool show_errors)
{
- QFutureWatcher<docstring> const * watcher =
- static_cast<QFutureWatcher<docstring> const *>(sender());
- message(watcher->result());
+ QFutureWatcher<Buffer::ExportStatus> const * watcher =
+ static_cast<QFutureWatcher<Buffer::ExportStatus> const *>(sender());
+
+ Buffer::ExportStatus const status = watcher->result();
+ handleExportStatus(this, status, d.processing_format);
+
updateToolbars();
if (show_errors) {
BufferView const * const bv = currentBufferView();
#if (QT_VERSION >= 0x040400)
template<class T>
-docstring GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format, string const & msg)
+Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format)
{
- bool const update_unincluded =
- buffer->params().maintain_unincluded_children
- && !buffer->params().getIncludedChildren().empty();
- bool const success = func(format, update_unincluded);
+ Buffer::ExportStatus const status = func(format);
// the cloning operation will have produced a clone of the entire set of
// documents, starting from the master. so we must delete those.
Buffer * mbuf = const_cast<Buffer *>(buffer->masterBuffer());
delete mbuf;
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 while exporting format: %1$s"), from_utf8(format));
+ return status;
}
-docstring GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus 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");
+ Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
+ return runAndDestroy(bind(mem_func, buffer, _1, true), orig, buffer, format);
}
-docstring GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus 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");
+ Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
+ return runAndDestroy(bind(mem_func, buffer, _1, false), orig, buffer, format);
}
-docstring GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
{
- bool(Buffer::* mem_func)(std::string const &, bool) const = &Buffer::preview;
- return runAndDestroy(bind(mem_func, buffer, _1, _2), orig, buffer, format, "preview");
+ Buffer::ExportStatus (Buffer::* mem_func)(std::string const &) const = &Buffer::preview;
+ return runAndDestroy(bind(mem_func, buffer, _1), orig, buffer, format);
}
#else
// not used, but the linker needs them
-docstring GuiView::GuiViewPrivate::compileAndDestroy(
+Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(
Buffer const *, Buffer *, string const &)
{
- return docstring();
+ return Buffer::ExportSuccess;
}
-docstring GuiView::GuiViewPrivate::exportAndDestroy(
+Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(
Buffer const *, Buffer *, string const &)
{
- return docstring();
+ return Buffer::ExportSuccess;
}
-docstring GuiView::GuiViewPrivate::previewAndDestroy(
+Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(
Buffer const *, Buffer *, string const &)
{
- return docstring();
+ return Buffer::ExportSuccess;
}
#endif
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)
+ Buffer::ExportStatus (*asyncFunc)(Buffer const *, Buffer *, string const &),
+ Buffer::ExportStatus (Buffer::*syncFunc)(string const &, bool) const,
+ Buffer::ExportStatus (Buffer::*previewFunc)(string const &) const)
{
if (!used_buffer)
return false;
string format = argument;
if (format.empty())
format = used_buffer->params().getDefaultOutputFormat();
-
+ processing_format = format;
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
if (!msg.empty()) {
progress_->clearMessages();
gv_->message(msg);
}
GuiViewPrivate::busyBuffers.insert(used_buffer);
- QFuture<docstring> f = QtConcurrent::run(
+ QFuture<Buffer::ExportStatus> f = QtConcurrent::run(
asyncFunc,
used_buffer,
used_buffer->clone(),
// We are asynchronous, so we don't know here anything about the success
return true;
#else
+ Buffer::ExportStatus status;
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);
+ status = (used_buffer->*syncFunc)(format, true);
} else if (previewFunc) {
- return (used_buffer->*previewFunc)(format, false);
- }
+ status = (used_buffer->*previewFunc)(format);
+ } else
+ return false;
+ handleExportStatus(gv_, status, format);
(void) asyncFunc;
- return false;
+ return (status == Buffer::ExportSuccess
+ || status == Buffer::PreviewSuccess);
#endif
}
projects / lyx.git / blobdiff