anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replay r36745

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36754 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-12-07 00:13:14 +00:00
parent 602d1cae7a
commit 72f91cb394
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,7 +446,7 @@ GuiView::GuiView(int id)
#if (QT_VERSION >= 0x040400) #if (QT_VERSION >= 0x040400)
connect(&d.autosave_watcher_, SIGNAL(finished()), this, connect(&d.autosave_watcher_, SIGNAL(finished()), this,
SLOT(processingThreadFinished())); SLOT(autoSaveThreadFinished()));
connect(&d.processing_thread_watcher_, SIGNAL(finished()), this, connect(&d.processing_thread_watcher_, SIGNAL(finished()), this,
SLOT(processingThreadFinished())); SLOT(processingThreadFinished()));
@ -548,18 +548,30 @@ void GuiView::processingThreadStarted()
} }
void GuiView::processingThreadFinished() void GuiView::processingThreadFinished(bool show_errors)
{ {
QFutureWatcher<docstring> const * watcher = QFutureWatcher<docstring> const * watcher =
static_cast<QFutureWatcher<docstring> const *>(sender()); static_cast<QFutureWatcher<docstring> const *>(sender());
message(watcher->result()); message(watcher->result());
updateToolbars(); updateToolbars();
errors(d.last_export_format); if (show_errors) {
errors(d.last_export_format);
}
d.processing_cursor_timer_.stop(); d.processing_cursor_timer_.stop();
restoreCursorShapes(); restoreCursorShapes();
d.indicates_processing_ = false; d.indicates_processing_ = false;
} }
void GuiView::processingThreadFinished()
{
processingThreadFinished(true);
}
void GuiView::autoSaveThreadFinished()
{
processingThreadFinished(false);
}
#else #else
void GuiView::setCursorShapes(Qt::CursorShape) void GuiView::setCursorShapes(Qt::CursorShape)
@ -587,9 +599,19 @@ void GuiView::processingThreadStarted()
} }
void GuiView::processingThreadFinished(bool)
{
}
void GuiView::processingThreadFinished() void GuiView::processingThreadFinished()
{ {
} }
void GuiView::autoSaveThreadFinished()
{
}
#endif #endif

2
src/frontends/qt4/GuiView.h
View File

@ -232,7 +232,9 @@ private Q_SLOTS:
/// For completion of autosave or export threads. /// For completion of autosave or export threads.
void processingThreadStarted(); void processingThreadStarted();
void processingThreadFinished(bool show_errors);
void processingThreadFinished(); void processingThreadFinished();
void autoSaveThreadFinished();
void indicateProcessing(); void indicateProcessing();
/// must be called in GUI thread /// must be called in GUI thread