anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 23:07:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the synchronous export functionality

Browse Source 
- Handle the return value in a special helper function

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40056 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2011-10-29 11:14:47 +00:00
parent ef4f08daef
commit ab8a290040
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,20 +528,9 @@ QVector<GuiWorkArea*> GuiView::GuiViewPrivate::guiWorkAreas()
return areas; return areas;
} }
static void handleExportStatus(GuiView * view, Buffer::ExportStatus status,
#if QT_VERSION >= 0x040400 string const & format)
void GuiView::processingThreadStarted()
{ {
}
void GuiView::processingThreadFinished(bool show_errors)
{
QFutureWatcher<Buffer::ExportStatus> const * watcher =
static_cast<QFutureWatcher<Buffer::ExportStatus> const *>(sender());
Buffer::ExportStatus const status = watcher->result();
docstring msg; docstring msg;
switch (status) { switch (status) {
case Buffer::ExportSuccess: case Buffer::ExportSuccess:
@ -560,7 +549,24 @@ void GuiView::processingThreadFinished(bool show_errors)
msg = _("Error while previewing format: %1$s"); msg = _("Error while previewing format: %1$s");
break; break;
} }
message(bformat(msg, from_utf8(d.processing_format))); view->message(bformat(msg, from_utf8(format)));
}
#if QT_VERSION >= 0x040400
void GuiView::processingThreadStarted()
{
}
void GuiView::processingThreadFinished(bool show_errors)
{
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(); updateToolbars();
if (show_errors) { if (show_errors) {
@ -3113,7 +3119,7 @@ bool GuiView::GuiViewPrivate::asyncBufferProcessing(
string format = argument; string format = argument;
if (format.empty()) if (format.empty())
format = used_buffer->params().getDefaultOutputFormat(); format = used_buffer->params().getDefaultOutputFormat();
processing_format = format;
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400) #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
if (!msg.empty()) { if (!msg.empty()) {
progress_->clearMessages(); progress_->clearMessages();
@ -3126,21 +3132,24 @@ bool GuiView::GuiViewPrivate::asyncBufferProcessing(
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;
// We are asynchronous, so we don't know here anything about the success // We are asynchronous, so we don't know here anything about the success
return true; return true;
#else #else
Buffer::ExportStatus status;
if (syncFunc) { if (syncFunc) {
// TODO check here if it breaks exporting with Qt < 4.4 // TODO check here if it breaks exporting with Qt < 4.4
return (used_buffer->*syncFunc)(format, true); status = (used_buffer->*syncFunc)(format, true);
} else if (previewFunc) { } else if (previewFunc) {
return (used_buffer->*previewFunc)(format, false); status = (used_buffer->*previewFunc)(format);
} } else
(void) asyncFunc;
return false; return false;
handleExportStatus(gv_, status, format);
(void) asyncFunc;
return (status == Buffer::ExportSuccess
|| status == Buffer::PreviewSuccess);
#endif #endif
} }