mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 05:25:26 +00:00
don't show errors when auto saving, #7132
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36745 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
ec0b81e5cc
commit
099059758d
@ -446,7 +446,7 @@ GuiView::GuiView(int id)
|
||||
|
||||
#if (QT_VERSION >= 0x040400)
|
||||
connect(&d.autosave_watcher_, SIGNAL(finished()), this,
|
||||
SLOT(processingThreadFinished()));
|
||||
SLOT(autoSaveThreadFinished()));
|
||||
connect(&d.processing_thread_watcher_, SIGNAL(finished()), this,
|
||||
SLOT(processingThreadFinished()));
|
||||
|
||||
@ -548,18 +548,30 @@ void GuiView::processingThreadStarted()
|
||||
}
|
||||
|
||||
|
||||
void GuiView::processingThreadFinished()
|
||||
void GuiView::processingThreadFinished(bool show_errors)
|
||||
{
|
||||
QFutureWatcher<docstring> const * watcher =
|
||||
static_cast<QFutureWatcher<docstring> const *>(sender());
|
||||
message(watcher->result());
|
||||
updateToolbars();
|
||||
errors(d.last_export_format);
|
||||
if (show_errors) {
|
||||
errors(d.last_export_format);
|
||||
}
|
||||
d.processing_cursor_timer_.stop();
|
||||
restoreCursorShapes();
|
||||
d.indicates_processing_ = false;
|
||||
}
|
||||
|
||||
void GuiView::processingThreadFinished()
|
||||
{
|
||||
processingThreadFinished(true);
|
||||
}
|
||||
|
||||
void GuiView::autoSaveThreadFinished()
|
||||
{
|
||||
processingThreadFinished(false);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
void GuiView::setCursorShapes(Qt::CursorShape)
|
||||
@ -587,9 +599,19 @@ void GuiView::processingThreadStarted()
|
||||
}
|
||||
|
||||
|
||||
void GuiView::processingThreadFinished(bool)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
void GuiView::processingThreadFinished()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
void GuiView::autoSaveThreadFinished()
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -232,7 +232,9 @@ private Q_SLOTS:
|
||||
|
||||
/// For completion of autosave or export threads.
|
||||
void processingThreadStarted();
|
||||
void processingThreadFinished(bool show_errors);
|
||||
void processingThreadFinished();
|
||||
void autoSaveThreadFinished();
|
||||
void indicateProcessing();
|
||||
|
||||
/// must be called in GUI thread
|
||||
|
Loading…
Reference in New Issue
Block a user