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

Some fixes for Z-Wave

Browse Source
This commit is contained in:
Michael Zanetti 2022-08-23 00:08:52 +02:00
parent cfbf1cb61f
commit 38c964cedb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-app/zwave/zwavemanager.cpp
View File

@ -78,10 +78,10 @@ int ZWaveManager::removeNetwork(const QUuid &networkUuid)
return m_engine->jsonRpcClient()->sendCommand("ZWave.RemoveNetwork", params, this, "removeNetworkResponse"); return m_engine->jsonRpcClient()->sendCommand("ZWave.RemoveNetwork", params, this, "removeNetworkResponse");
} }
void ZWaveManager::addNode(const QUuid &networkUuid) int ZWaveManager::addNode(const QUuid &networkUuid)
{ {
QVariantMap params = {{"networkUuid", networkUuid}}; QVariantMap params = {{"networkUuid", networkUuid}};
m_engine->jsonRpcClient()->sendCommand("ZWave.AddNode", params, this, "addNodeResponse"); return m_engine->jsonRpcClient()->sendCommand("ZWave.AddNode", params, this, "addNodeResponse");
} }
void ZWaveManager::cancelPendingOperation(const QUuid &networkUuid) void ZWaveManager::cancelPendingOperation(const QUuid &networkUuid)

2
libnymea-app/zwave/zwavemanager.h
View File

@ -76,7 +76,7 @@ public:
Q_INVOKABLE int addNetwork(const QString &serialPort); Q_INVOKABLE int addNetwork(const QString &serialPort);
Q_INVOKABLE int removeNetwork(const QUuid &networkUuid); Q_INVOKABLE int removeNetwork(const QUuid &networkUuid);
Q_INVOKABLE void addNode(const QUuid &networkUuid); Q_INVOKABLE int addNode(const QUuid &networkUuid);
Q_INVOKABLE void cancelPendingOperation(const QUuid &networkUuid); Q_INVOKABLE void cancelPendingOperation(const QUuid &networkUuid);
Q_INVOKABLE int factoryResetNetwork(const QUuid &networkUuid); Q_INVOKABLE int factoryResetNetwork(const QUuid &networkUuid);
// Q_INVOKABLE void getNodes(const QUuid &networkUuid); // Q_INVOKABLE void getNodes(const QUuid &networkUuid);

8
nymea-app/ui/system/zwave/ZWaveNetworkSettingsPage.qml
View File

@ -165,11 +165,11 @@ SettingsPageBase {
Layout.rightMargin: app.margins Layout.rightMargin: app.margins
text: qsTr("Remove network") text: qsTr("Remove network")
onClicked: { onClicked: {
var dialog = Qt.createComponent(Qt.resolvedUrl("../components/MeaDialog.qml")); var dialog = Qt.createComponent(Qt.resolvedUrl("/ui/components/MeaDialog.qml"));
var text = qsTr("Are you sure you want to remove the network and all associated devices from the system?") var text = qsTr("Are you sure you want to remove the network and all associated devices from the system?")
var popup = dialog.createObject(app, var popup = dialog.createObject(app,
{ {
headerIcon: "../images/dialog-warning-symbolic.svg", headerIcon: "/ui/images/dialog-warning-symbolic.svg",
title: qsTr("Remove network"), title: qsTr("Remove network"),
text: text, text: text,
standardButtons: Dialog.Ok | Dialog.Cancel standardButtons: Dialog.Ok | Dialog.Cancel
@ -187,11 +187,11 @@ SettingsPageBase {
Layout.rightMargin: app.margins Layout.rightMargin: app.margins
text: qsTr("Factory reset controller") text: qsTr("Factory reset controller")
onClicked: { onClicked: {
var dialog = Qt.createComponent(Qt.resolvedUrl("../components/MeaDialog.qml")); var dialog = Qt.createComponent(Qt.resolvedUrl("/ui/components/MeaDialog.qml"));
var text = qsTr("Are you sure you want to factory reset the controller? This will recreate the network and remove all associated devices from the system.") var text = qsTr("Are you sure you want to factory reset the controller? This will recreate the network and remove all associated devices from the system.")
var popup = dialog.createObject(app, var popup = dialog.createObject(app,
{ {
headerIcon: "../images/dialog-warning-symbolic.svg", headerIcon: "/ui/images/dialog-warning-symbolic.svg",
title: qsTr("Reset controller"), title: qsTr("Reset controller"),
text: text, text: text,
standardButtons: Dialog.Ok | Dialog.Cancel standardButtons: Dialog.Ok | Dialog.Cancel

2
nymea-app/ui/system/zwave/ZWaveSettingsPage.qml
View File

@ -65,7 +65,7 @@ SettingsPageBase {
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: root.height - root.header.height - Style.margins Layout.preferredHeight: root.height - root.header.height - Style.margins
visible: !zwaveManager.fetchingData || !zwaveManager.zwaveAvailable || zwaveManager.networks.count == 0 visible: !zwaveManager.fetchingData && (!zwaveManager.zwaveAvailable || zwaveManager.networks.count == 0)
BusyIndicator { BusyIndicator {
anchors.centerIn: parent anchors.centerIn: parent