anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 16:31:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return ExportStatus from Buffer to GuiView

Browse Source 
Now GuiView composes the message string.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40045 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2011-10-27 20:00:11 +00:00
parent e74468b4be
commit e02df14faa
3 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Buffer.cpp
View File

@ -3483,14 +3483,15 @@ bool Buffer::isExporting() const
} }
bool Buffer::doExport(string const & target, bool put_in_tempdir) const Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir) const
{ {
bool const update_unincluded = bool const update_unincluded =
params().maintain_unincluded_children params().maintain_unincluded_children
&& !params().getIncludedChildren().empty(); && !params().getIncludedChildren().empty();
return (doExport(target, put_in_tempdir, update_unincluded) == ExportSuccess); return doExport(target, put_in_tempdir, update_unincluded);
} }
Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir, Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir,
bool includeall, string & result_file) const bool includeall, string & result_file) const
{ {
@ -3739,13 +3740,12 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
} }
bool Buffer::preview(string const & format) const Buffer::ExportStatus Buffer::preview(string const & format) const
{ {
bool const update_unincluded = bool const update_unincluded =
params().maintain_unincluded_children params().maintain_unincluded_children
&& !params().getIncludedChildren().empty(); && !params().getIncludedChildren().empty();
ExportStatus const status = preview(format, update_unincluded); return preview(format, update_unincluded);
return (status == PreviewSuccess);
} }
Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) const Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) const

4
src/Buffer.h
View File

@ -614,9 +614,9 @@ public:
bool hasGuiDelegate() const; bool hasGuiDelegate() const;
/// ///
bool doExport(std::string const & target, bool put_in_tempdir) const; ExportStatus doExport(std::string const & target, bool put_in_tempdir) const;
/// ///
bool preview(std::string const & format) const; ExportStatus preview(std::string const & format) const;
private: private:
/// target is a format name optionally followed by a space /// target is a format name optionally followed by a space

92
src/frontends/qt4/GuiView.cpp
View File

@ -331,7 +331,7 @@ struct GuiView::GuiViewPrivate
} }
#if (QT_VERSION >= 0x040400) #if (QT_VERSION >= 0x040400)
void setPreviewFuture(QFuture<docstring> const & f) void setPreviewFuture(QFuture<Buffer::ExportStatus> const & f)
{ {
if (processing_thread_watcher_.isRunning()) { if (processing_thread_watcher_.isRunning()) {
// we prefer to cancel this preview in order to keep a snappy // we prefer to cancel this preview in order to keep a snappy
@ -382,30 +382,31 @@ public:
#if (QT_VERSION >= 0x040400) #if (QT_VERSION >= 0x040400)
/// ///
QFutureWatcher<docstring> autosave_watcher_; QFutureWatcher<docstring> autosave_watcher_;
QFutureWatcher<docstring> processing_thread_watcher_; QFutureWatcher<Buffer::ExportStatus> processing_thread_watcher_;
/// ///
string last_export_format; string last_export_format;
string processing_format;
#else #else
struct DummyWatcher { bool isRunning(){return false;} }; struct DummyWatcher { bool isRunning(){return false;} };
DummyWatcher processing_thread_watcher_; DummyWatcher processing_thread_watcher_;
#endif #endif
static QSet<Buffer const *> busyBuffers; static QSet<Buffer const *> busyBuffers;
static docstring previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format); static Buffer::ExportStatus previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
static docstring exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format); static Buffer::ExportStatus exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
static docstring compileAndDestroy(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); static docstring autosaveAndDestroy(Buffer const * orig, Buffer * buffer);
template<class T> 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, string const & msg);
// TODO syncFunc/previewFunc: use bind // TODO syncFunc/previewFunc: use bind
bool asyncBufferProcessing(string const & argument, bool asyncBufferProcessing(string const & argument,
Buffer const * used_buffer, Buffer const * used_buffer,
docstring const & msg, docstring const & msg,
docstring (*asyncFunc)(Buffer const *, Buffer *, string const &), Buffer::ExportStatus (*asyncFunc)(Buffer const *, Buffer *, string const &),
bool (Buffer::*syncFunc)(string const &, bool) const, Buffer::ExportStatus (Buffer::*syncFunc)(string const &, bool) const,
bool (Buffer::*previewFunc)(string const &) const); Buffer::ExportStatus (Buffer::*previewFunc)(string const &) const);
QVector<GuiWorkArea*> guiWorkAreas(); QVector<GuiWorkArea*> guiWorkAreas();
}; };
@ -537,9 +538,30 @@ void GuiView::processingThreadStarted()
void GuiView::processingThreadFinished(bool show_errors) void GuiView::processingThreadFinished(bool show_errors)
{ {
QFutureWatcher<docstring> const * watcher = QFutureWatcher<Buffer::ExportStatus> const * watcher =
static_cast<QFutureWatcher<docstring> const *>(sender()); static_cast<QFutureWatcher<Buffer::ExportStatus> const *>(sender());
message(watcher->result());
Buffer::ExportStatus const status = watcher->result();
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;
}
message(bformat(msg, from_utf8(d.processing_format)));
updateToolbars(); updateToolbars();
if (show_errors) { if (show_errors) {
BufferView const * const bv = currentBufferView(); BufferView const * const bv = currentBufferView();
@ -3017,43 +3039,36 @@ bool GuiView::goToFileRow(string const & argument)
#if (QT_VERSION >= 0x040400) #if (QT_VERSION >= 0x040400)
template<class T> 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, string const & msg)
{ {
bool const success = func(format); Buffer::ExportStatus const status = func(format);
// the cloning operation will have produced a clone of the entire set of // the cloning operation will have produced a clone of the entire set of
// documents, starting from the master. so we must delete those. // documents, starting from the master. so we must delete those.
Buffer * mbuf = const_cast<Buffer *>(buffer->masterBuffer()); Buffer * mbuf = const_cast<Buffer *>(buffer->masterBuffer());
delete mbuf; delete mbuf;
busyBuffers.remove(orig); busyBuffers.remove(orig);
if (msg == "preview") { return status;
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));
} }
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) const = &Buffer::doExport; Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
return runAndDestroy(bind(mem_func, buffer, _1, true), orig, buffer, format, "export"); return runAndDestroy(bind(mem_func, buffer, _1, true), orig, buffer, format, "export");
} }
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) const = &Buffer::doExport; Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
return runAndDestroy(bind(mem_func, buffer, _1, false), orig, buffer, format, "export"); return runAndDestroy(bind(mem_func, buffer, _1, false), orig, buffer, format, "export");
} }
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 &) const = &Buffer::preview; Buffer::ExportStatus (Buffer::* mem_func)(std::string const &) const = &Buffer::preview;
return runAndDestroy(bind(mem_func, buffer, _1), orig, buffer, format, "preview"); return runAndDestroy(bind(mem_func, buffer, _1), orig, buffer, format, "preview");
} }
@ -3061,24 +3076,24 @@ docstring GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer
// not used, but the linker needs them // not used, but the linker needs them
docstring GuiView::GuiViewPrivate::compileAndDestroy( Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(
Buffer const *, Buffer *, string const &) Buffer const *, Buffer *, string const &)
{ {
return docstring(); return Buffer::ExportSuccess;
} }
docstring GuiView::GuiViewPrivate::exportAndDestroy( Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(
Buffer const *, Buffer *, string const &) Buffer const *, Buffer *, string const &)
{ {
return docstring(); return Buffer::ExportSuccess;
} }
docstring GuiView::GuiViewPrivate::previewAndDestroy( Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(
Buffer const *, Buffer *, string const &) Buffer const *, Buffer *, string const &)
{ {
return docstring(); return Buffer::ExportSuccess;
} }
#endif #endif
@ -3088,9 +3103,9 @@ bool GuiView::GuiViewPrivate::asyncBufferProcessing(
string const & argument, string const & argument,
Buffer const * used_buffer, Buffer const * used_buffer,
docstring const & msg, docstring const & msg,
docstring (*asyncFunc)(Buffer const *, Buffer *, string const &), Buffer::ExportStatus (*asyncFunc)(Buffer const *, Buffer *, string const &),
bool (Buffer::*syncFunc)(string const &, bool) const, Buffer::ExportStatus (Buffer::*syncFunc)(string const &, bool) const,
bool (Buffer::*previewFunc)(string const &) const) Buffer::ExportStatus (Buffer::*previewFunc)(string const &) const)
{ {
if (!used_buffer) if (!used_buffer)
return false; return false;
@ -3105,12 +3120,13 @@ bool GuiView::GuiViewPrivate::asyncBufferProcessing(
gv_->message(msg); gv_->message(msg);
} }
GuiViewPrivate::busyBuffers.insert(used_buffer); GuiViewPrivate::busyBuffers.insert(used_buffer);
QFuture<docstring> f = QtConcurrent::run( QFuture<Buffer::ExportStatus> f = QtConcurrent::run(
asyncFunc, asyncFunc,
used_buffer, used_buffer,
used_buffer->clone(), used_buffer->clone(),
format); format);
setPreviewFuture(f); setPreviewFuture(f);
processing_format = format;
last_export_format = used_buffer->params().bufferFormat(); last_export_format = used_buffer->params().bufferFormat();
(void) syncFunc; (void) syncFunc;
(void) previewFunc; (void) previewFunc;