From 076fff417af40f90ffb57fcf0018dd7f6dcfa5cc Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 7 Jan 2017 02:58:41 +0100 Subject: [PATCH] refs #855, support for timeout in CEnableForViewBasedIndicator --- src/blackgui/enableforviewbasedindicator.cpp | 6 +++--- src/blackgui/enableforviewbasedindicator.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blackgui/enableforviewbasedindicator.cpp b/src/blackgui/enableforviewbasedindicator.cpp index aaa343b58..4b9d609a9 100644 --- a/src/blackgui/enableforviewbasedindicator.cpp +++ b/src/blackgui/enableforviewbasedindicator.cpp @@ -31,10 +31,11 @@ namespace BlackGui return false; } - void CEnableForViewBasedIndicator::showLoadIndicator() + int CEnableForViewBasedIndicator::showLoadIndicator(int timeoutMs) { Q_ASSERT_X(m_viewWithIndicator, Q_FUNC_INFO, "Missing view to display indicator"); - if (m_viewWithIndicator) { m_viewWithIndicator->showLoadIndicator(); } + if (m_viewWithIndicator) { return m_viewWithIndicator->showLoadIndicatorWithTimeout(timeoutMs); } + return -1; } void CEnableForViewBasedIndicator::hideLoadIndicator() @@ -53,5 +54,4 @@ namespace BlackGui { this->m_viewWithIndicator = viewWithIndicator; } - } // namespace diff --git a/src/blackgui/enableforviewbasedindicator.h b/src/blackgui/enableforviewbasedindicator.h index 053e2931f..9c6934592 100644 --- a/src/blackgui/enableforviewbasedindicator.h +++ b/src/blackgui/enableforviewbasedindicator.h @@ -28,7 +28,7 @@ namespace BlackGui bool isShowingLoadIndicator() const; //! Show loading indicator - void showLoadIndicator(); + int showLoadIndicator(int timeoutMs = -1); //! Hide loading indicator void hideLoadIndicator();