From 099059758d9f429315ddbeb05ce72f36a6060085 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Mon, 6 Dec 2010 20:54:03 +0000 Subject: [PATCH] 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 --- src/frontends/qt4/GuiView.cpp | 28 +++++++++++++++++++++++++--- src/frontends/qt4/GuiView.h | 2 ++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 554fd90afc..8585fb4cb1 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -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 const * watcher = static_cast 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 diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h index a7fd79e8ca..38ace23676 100644 --- a/src/frontends/qt4/GuiView.h +++ b/src/frontends/qt4/GuiView.h @@ -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 -- 2.39.2