ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #280: Hide group placeholder while loading

Browse Source
This commit is contained in:
Jenkins nymea 2019-12-02 00:19:53 +01:00
commit 22cab348e0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-app-core/engine.cpp
View File

@ -136,9 +136,6 @@ void Engine::onConnectedChanged()
qDebug() << "Engine: inital setup required:" << m_jsonRpcClient->initialSetupRequired() << "auth required:" << m_jsonRpcClient->authenticationRequired();
if (!m_jsonRpcClient->initialSetupRequired() && !m_jsonRpcClient->authenticationRequired()) {
m_deviceManager->init();
m_ruleManager->init();
m_nymeaConfiguration->init();
m_systemController->init();
}
}
}
@ -146,6 +143,9 @@ void Engine::onConnectedChanged()
void Engine::onDeviceManagerFetchingChanged()
{
if (!m_deviceManager->fetchingData()) {
m_ruleManager->init();
m_nymeaConfiguration->init();
m_systemController->init();
if (m_jsonRpcClient->ensureServerVersion("1.7")) {
m_tagsManager->init();
}

2
nymea-app/ui/MainPage.qml
View File

@ -306,7 +306,7 @@ Page {
EmptyViewPlaceholder {
anchors { left: parent.left; right: parent.right; margins: app.margins }
anchors.verticalCenter: parent.verticalCenter
visible: groupsView.count == 0
visible: groupsView.count == 0 && !engine.deviceManager.fetchingData && !engine.tagsManager.busy
title: qsTr("There are no groups set up yet.")
text: qsTr("Grouping things can be useful to control multiple devices at once, for example an entire room. Watch out for the group symbol when interacting with things and use it to add them to groups.")
imageSource: "images/view-grid-symbolic.svg"