diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-06-07 10:24:22 +0300 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-06-07 07:45:05 +0000 |
| commit | f1b8ce3893ac6897f3651f539763a4f89b930405 (patch) | |
| tree | 46ee78b7a2ee88ab25934d54b5dcc4f65ffb7463 | |
| parent | 189cd39bd524d880b3fcfd7e9513cbe7bfe5e3d3 (diff) | |
Prevent erroneous progress indications
Task-number: QT3DS-1893
Change-Id: I6057973e57e3784d20aaaf3d191455e79c47cfb4
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| -rw-r--r-- | tools/q3dsviewer/q3dsremotedeploymentmanager.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/q3dsviewer/q3dsremotedeploymentmanager.cpp b/tools/q3dsviewer/q3dsremotedeploymentmanager.cpp index 83eb017..57586c3 100644 --- a/tools/q3dsviewer/q3dsremotedeploymentmanager.cpp +++ b/tools/q3dsviewer/q3dsremotedeploymentmanager.cpp @@ -154,6 +154,7 @@ void Q3DSRemoteDeploymentManager::remoteProjectChanging() void Q3DSRemoteDeploymentManager::loadRemoteProject() { + setErrorMessage(tr("Loading Presentation...")); if (m_isReadyToShow && m_isRemoteProjectLoaded) { setState(RemoteProject); const QString remoteProject = m_server->fileName(); @@ -214,7 +215,11 @@ void Q3DSRemoteDeploymentManager::setErrorMessage(const QString &errorString) void Q3DSRemoteDeploymentManager::setProgress(int progress) { - setErrorMessage(tr("Receiving (%1%)").arg(progress)); + // Don't wait for 100%, as it'll already start loading and text isn't updated anymore + if (progress >= 98) + setErrorMessage(tr("Loading Presentation...")); + else + setErrorMessage(tr("Receiving (%1%)").arg(progress)); } QT_END_NAMESPACE |