static void handleExportStatus(GuiView * view, Buffer::ExportStatus status,
string const & format)
{
+ docstring const fmt = formats.prettyName(format);
docstring msg;
switch (status) {
case Buffer::ExportSuccess:
- msg = bformat(_("Successful export to format: %1$s"), from_utf8(format));
+ msg = bformat(_("Successful export to format: %1$s"), fmt);
break;
case Buffer::ExportCancel:
msg = _("Document export cancelled.");
case Buffer::ExportNoPathToFormat:
case Buffer::ExportTexPathHasSpaces:
case Buffer::ExportConverterError:
- msg = bformat(_("Error while exporting format: %1$s"), from_utf8(format));
+ msg = bformat(_("Error while exporting format: %1$s"), fmt);
break;
case Buffer::PreviewSuccess:
- msg = bformat(_("Successful preview of format: %1$s"), from_utf8(format));
+ msg = bformat(_("Successful preview of format: %1$s"), fmt);
break;
case Buffer::PreviewError:
- msg = bformat(_("Error while previewing format: %1$s"), from_utf8(format));
+ msg = bformat(_("Error while previewing format: %1$s"), fmt);
break;
}
view->message(msg);
}
-void GuiView::processingThreadFinished(bool show_errors)
+void GuiView::processingThreadFinished()
{
QFutureWatcher<Buffer::ExportStatus> const * watcher =
static_cast<QFutureWatcher<Buffer::ExportStatus> const *>(sender());
handleExportStatus(this, status, d.processing_format);
updateToolbars();
- if (show_errors) {
- BufferView const * const bv = currentBufferView();
- if (bv && !bv->buffer().errorList("Export").empty()) {
- errors("Export");
- return;
- }
- errors(d.last_export_format);
- }
-}
-
-
-void GuiView::processingThreadFinished()
-{
- processingThreadFinished(true);
+ BufferView const * const bv = currentBufferView();
+ if (bv && !bv->buffer().errorList("Export").empty()) {
+ errors("Export");
+ return;
+ }
+ errors(d.last_export_format);
}
void GuiView::autoSaveThreadFinished()
{
- processingThreadFinished(false);
+ QFutureWatcher<docstring> const * watcher =
+ static_cast<QFutureWatcher<docstring> const *>(sender());
+ message(watcher->result());
+ updateToolbars();
}
#else
-
void GuiView::processingThreadStarted()
{
}
-void GuiView::processingThreadFinished(bool)
-{
-}
-
-
void GuiView::processingThreadFinished()
{
}
#if (QT_VERSION >= 0x040400)
docstring GuiView::GuiViewPrivate::autosaveAndDestroy(
- Buffer const * orig, Buffer * buffer)
+ Buffer const * orig, Buffer * clone)
{
- bool const success = buffer->autoSave();
- delete buffer;
+ bool const success = clone->autoSave();
+ delete clone;
busyBuffers.remove(orig);
return success
? _("Automatic save done.")
#if (QT_VERSION >= 0x040400)
template<class T>
-Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * clone, string const & format)
{
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());
+ Buffer * mbuf = const_cast<Buffer *>(clone->masterBuffer());
delete mbuf;
busyBuffers.remove(orig);
return status;
}
-Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
- return runAndDestroy(bind(mem_func, buffer, _1, true), orig, buffer, format);
+ return runAndDestroy(bind(mem_func, clone, _1, true), orig, clone, format);
}
-Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
- return runAndDestroy(bind(mem_func, buffer, _1, false), orig, buffer, format);
+ return runAndDestroy(bind(mem_func, clone, _1, false), orig, clone, format);
}
-Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus (Buffer::* mem_func)(std::string const &) const = &Buffer::preview;
- return runAndDestroy(bind(mem_func, buffer, _1), orig, buffer, format);
+ return runAndDestroy(bind(mem_func, clone, _1), orig, clone, format);
}
#else