Author: vfr
Date: Sat Oct 29 13:14:47 2011
New Revision: 40056
URL: http://www.lyx.org/trac/changeset/40056
Log:
Fix the synchronous export functionality
- Handle the return value in a special helper function
Modified:
lyx-devel/trunk/src/frontends/qt4/GuiView.cpp
Modified: lyx-devel/trunk/src/frontends/qt4/GuiView.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiView.cpp Fri Oct 28 20:28:28
2011 (r40055)
+++ lyx-devel/trunk/src/frontends/qt4/GuiView.cpp Sat Oct 29 13:14:47
2011 (r40056)
@@ -528,20 +528,9 @@
return areas;
}
-
-#if QT_VERSION >= 0x040400
-
-void GuiView::processingThreadStarted()
-{
-}
-
-
-void GuiView::processingThreadFinished(bool show_errors)
+static void handleExportStatus(GuiView * view, Buffer::ExportStatus status,
+ string const & format)
{
- QFutureWatcher<Buffer::ExportStatus> const * watcher =
- static_cast<QFutureWatcher<Buffer::ExportStatus> const
*>(sender());
-
- Buffer::ExportStatus const status = watcher->result();
docstring msg;
switch (status) {
case Buffer::ExportSuccess:
@@ -560,7 +549,24 @@
msg = _("Error while previewing format: %1$s");
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();
if (show_errors) {
@@ -3113,7 +3119,7 @@
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();
@@ -3126,21 +3132,24 @@
used_buffer->clone(),
format);
setPreviewFuture(f);
- processing_format = format;
last_export_format = used_buffer->params().bufferFormat();
(void) syncFunc;
(void) previewFunc;
// 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
- return (used_buffer->*syncFunc)(format, true);
+ 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
}
