ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify remote connection setup and deprecate nymea:cloud

pull/785/head
Michael Zanetti 2022-03-17 00:40:32 +01:00
parent 5812f9c47a
commit 620e50e2bc
16 changed files with 961 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libnymea-app/configuration/serverconfigurations.cpp
View File

@ -104,6 +104,7 @@ void ServerConfigurations::removeConfiguration(const QString &id)
beginRemoveRows(QModelIndex(), i, i);
m_list.takeAt(i)->deleteLater();
endRemoveRows();
emit countChanged();
return;
}
}

2
libnymea-app/thingdiscovery.cpp
View File

@ -166,7 +166,7 @@ QString ThingDiscovery::displayMessage() const
int ThingDiscovery::discoverThingsInternal(const QUuid &thingClassId, const QVariantList &discoveryParams)
{
qCDebug(dcThingManager()) << "Starting thing discovery for thing class" << m_engine->thingManager()->thingClasses()->getThingClass(thingClassId)->name() << thingClassId;
qCInfo(dcThingManager()) << "Starting thing discovery for thing class" << m_engine->thingManager()->thingClasses()->getThingClass(thingClassId)->name() << thingClassId;
QVariantMap params;
params.insert("thingClassId", thingClassId.toString());
if (!discoveryParams.isEmpty()) {

1
nymea-app/resources.qrc
View File

@ -275,5 +275,6 @@
<file>ui/system/TunnelProxyServerConfigurationDialog.qml</file>
<file>ui/delegates/StateDelegate.qml</file>
<file>ui/system/PackageDetailsPage.qml</file>
<file>ui/system/AdvancedConnectionInterfacesPage.qml</file>
</qresource>
</RCC>

113
nymea-app/translations/nymea-app-de.ts
View File

@ -83,6 +83,49 @@
<translation>Oswald Schrift von &quot;The Oswald Project&quot;</translation>
</message>
</context>
<context>
<name>AdvancedConnectionInterfacesPage</name>
<message>
<source>Connection interfaces</source>
<translation>Verbindungs-Schnittstellen</translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation>TCP Server Schnittstellen</translation>
</message>
<message>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation>WebSocket server Schnittstellen</translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<translation>Fernverbindungsschnittstellen</translation>
</message>
<message>
<source>Server: %1</source>
<translation>Server: %1</translation>
</message>
<message>
<source>nymea:cloud</source>
<translation>nymea:cloud</translation>
</message>
<message>
<source>Note: nymea:cloud based remote connection is deprecated and will be removed in a future version.</source>
<translation>Hinweis: Die nymea:cloud basiere Fernverbindung ist veraltet und wird in einer zukünftigen Version entfernt.</translation>
</message>
<message>
<source>Cloud</source>
<translation>Cloud</translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation>Verbinde dieses %1 System mit %1:cloud</translation>
</message>
</context>
<context>
<name>AppLogPage</name>
<message>
@ -102,7 +145,7 @@
</message>
<message>
<source>Cloud login</source>
<translation>Cloud Login</translation>
<translation type="vanished">Cloud Login</translation>
</message>
<message>
<source>Developer options</source>
@ -126,7 +169,7 @@
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation>Logge Dich in %1:cloud ein und Verwalte verbundene %1 systeme</translation>
<translation type="vanished">Logge Dich in %1:cloud ein und Verwalte verbundene %1 systeme</translation>
</message>
</context>
<context>
@ -965,23 +1008,47 @@
</message>
<message>
<source>TCP server interfaces</source>
<translation>TCP Server Schnittstellen</translation>
<translation type="vanished">TCP Server Schnittstellen</translation>
</message>
<message>
<source>Add</source>
<translation>Hinzufügen</translation>
<translation type="vanished">Hinzufügen</translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation>WebSocket server Schnittstellen</translation>
<translation type="vanished">WebSocket server Schnittstellen</translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<translation>Fernverbindungsschnittstellen</translation>
<translation type="vanished">Fernverbindungsschnittstellen</translation>
</message>
<message>
<source>Server: %1</source>
<translation>Server: %1</translation>
<translation type="vanished">Server: %1</translation>
</message>
<message>
<source>Connection settings</source>
<translation>Verbindungseinstellungen</translation>
</message>
<message>
<source>Remote connection</source>
<translation>Fernverbindung</translation>
</message>
<message>
<source>Enabling the remote connection will allow connecting to this %1 system from anywhere.</source>
<translation>Das Aktivieren der Fernverbindung erlaubt von überall aus auf dieses %1 system zuzugreifen.</translation>
</message>
<message>
<source>Enabled</source>
<translation>Aktivier</translation>
</message>
<message>
<source>Disabled</source>
<translation>Deaktiviert</translation>
</message>
<message>
<source>Advanced</source>
<translation>Erweitert</translation>
</message>
</context>
<context>
@ -1339,6 +1406,22 @@
<source>Configure logging categories</source>
<translation>Protokollkategorien einrichten</translation>
</message>
<message>
<source>nymea:cloud</source>
<translation></translation>
</message>
<message>
<source>Note: nymea:cloud is deprecated and will be removed in a future version.</source>
<translation></translation>
</message>
<message>
<source>Cloud login</source>
<translation>Cloud Login</translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation>Logge Dich in %1:cloud ein und Verwalte verbundene %1 systeme</translation>
</message>
</context>
<context>
<name>DeveloperTools</name>
@ -5929,7 +6012,7 @@ Möchtest Du fortfahren?</translation>
</message>
<message>
<source>Cloud</source>
<translation>Cloud</translation>
<translation type="vanished">Cloud</translation>
</message>
<message>
<source>General</source>
@ -5945,7 +6028,7 @@ Möchtest Du fortfahren?</translation>
</message>
<message>
<source>API interfaces</source>
<translation>API Schnittstellen</translation>
<translation type="vanished">API Schnittstellen</translation>
</message>
<message>
<source>MQTT broker</source>
@ -5993,7 +6076,7 @@ Möchtest Du fortfahren?</translation>
</message>
<message>
<source>Configure how clients interact with this system</source>
<translation>Richte ein, wie andere Geräte mit diesem System kommunizieren</translation>
<translation type="vanished">Richte ein, wie andere Geräte mit diesem System kommunizieren</translation>
</message>
<message>
<source>User settings</source>
@ -6013,7 +6096,7 @@ Möchtest Du fortfahren?</translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation>Verbinde dieses %1 System mit %1:cloud</translation>
<translation type="vanished">Verbinde dieses %1 System mit %1:cloud</translation>
</message>
<message>
<source>Update your %1 system</source>
@ -6031,6 +6114,14 @@ Möchtest Du fortfahren?</translation>
<source>Configure Modbus RTU master interfaces</source>
<translation>Modbug RTU Master Schnittstellen einrichten</translation>
</message>
<message>
<source>Connection settings</source>
<translation>Verbindungseinstellungen</translation>
</message>
<message>
<source>Configure how applications can connect to this system</source>
<translation>Verwalte wie sich Anwendungen zu diesem System verbinden können</translation>
</message>
</context>
<context>
<name>SetupWizard</name>

105
nymea-app/translations/nymea-app-en.ts
View File

@ -83,6 +83,49 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AdvancedConnectionInterfacesPage</name>
<message>
<source>Connection interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud based remote connection is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AppLogPage</name>
<message>
@ -104,10 +147,6 @@
<source>Customize the app&apos;s look and behavior</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud login</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Developer options</source>
<translation type="unfinished"></translation>
@ -124,10 +163,6 @@
<source>Access tools for debugging and error reporting</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AwningThingsListPage</name>
@ -890,23 +925,27 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>TCP server interfaces</source>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<source>Remote connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<source>Enabling the remote connection will allow connecting to this %1 system from anywhere.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1265,6 +1304,22 @@
<source>Configure logging categories</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud login</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeveloperTools</name>
@ -5731,14 +5786,6 @@ Do you want to proceed?</source>
<source>View system log</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>API interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MQTT broker</source>
<translation type="unfinished"></translation>
@ -5791,10 +5838,6 @@ Do you want to proceed?</source>
<source>Configure the system&apos;s network connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure how clients interact with this system</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User settings</source>
<translation type="unfinished"></translation>
@ -5811,10 +5854,6 @@ Do you want to proceed?</source>
<source>Configure ZigBee networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update your %1 system</source>
<translation type="unfinished"></translation>
@ -5831,6 +5870,14 @@ Do you want to proceed?</source>
<source>Configure Modbus RTU master interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure how applications can connect to this system</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SetupWizard</name>

105
nymea-app/translations/nymea-app-en_US.ts
View File

@ -83,6 +83,49 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AdvancedConnectionInterfacesPage</name>
<message>
<source>Connection interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud based remote connection is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AppLogPage</name>
<message>
@ -104,10 +147,6 @@
<source>Customize the app&apos;s look and behavior</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud login</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Developer options</source>
<translation type="unfinished"></translation>
@ -124,10 +163,6 @@
<source>Access tools for debugging and error reporting</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AwningThingsListPage</name>
@ -890,23 +925,27 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>TCP server interfaces</source>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<source>Remote connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<source>Enabling the remote connection will allow connecting to this %1 system from anywhere.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1265,6 +1304,22 @@
<source>Configure logging categories</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud login</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeveloperTools</name>
@ -5731,14 +5786,6 @@ Do you want to proceed?</source>
<source>View system log</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>API interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MQTT broker</source>
<translation type="unfinished"></translation>
@ -5791,10 +5838,6 @@ Do you want to proceed?</source>
<source>Configure the system&apos;s network connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure how clients interact with this system</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User settings</source>
<translation type="unfinished"></translation>
@ -5811,10 +5854,6 @@ Do you want to proceed?</source>
<source>Configure ZigBee networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update your %1 system</source>
<translation type="unfinished"></translation>
@ -5831,6 +5870,14 @@ Do you want to proceed?</source>
<source>Configure Modbus RTU master interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure how applications can connect to this system</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SetupWizard</name>

121
nymea-app/translations/nymea-app-it.ts
View File

@ -83,6 +83,49 @@
<translation>Font Oswald di The Oswald Project</translation>
</message>
</context>
<context>
<name>AdvancedConnectionInterfacesPage</name>
<message>
<source>Connection interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished">Aggiungi</translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud based remote connection is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AppLogPage</name>
<message>
@ -106,7 +149,7 @@
</message>
<message>
<source>Cloud login</source>
<translation>Login cloud</translation>
<translation type="vanished">Login cloud</translation>
</message>
<message>
<source>Developer options</source>
@ -124,10 +167,6 @@
<source>Access tools for debugging and error reporting</source>
<translation>Accedi a strumenti per debug e riportare errori</translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AwningThingsListPage</name>
@ -929,23 +968,27 @@
<translation></translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation></translation>
</message>
<message>
<source>Add</source>
<translation></translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<source>Remote connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling the remote connection will allow connecting to this %1 system from anywhere.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1304,6 +1347,22 @@
<source>Configure logging categories</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud login</source>
<translation type="unfinished">Login cloud</translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeveloperTools</name>
@ -5774,14 +5833,6 @@ Do you want to proceed?</source>
<source>View system log</source>
<translation></translation>
</message>
<message>
<source>Cloud</source>
<translation></translation>
</message>
<message>
<source>API interfaces</source>
<translation></translation>
</message>
<message>
<source>MQTT broker</source>
<translation></translation>
@ -5834,10 +5885,6 @@ Do you want to proceed?</source>
<source>Configure the system&apos;s network connection</source>
<translation></translation>
</message>
<message>
<source>Configure how clients interact with this system</source>
<translation></translation>
</message>
<message>
<source>User settings</source>
<translation></translation>
@ -5854,10 +5901,6 @@ Do you want to proceed?</source>
<source>Configure ZigBee networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update your %1 system</source>
<translation type="unfinished"></translation>
@ -5874,6 +5917,14 @@ Do you want to proceed?</source>
<source>Configure Modbus RTU master interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure how applications can connect to this system</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SetupWizard</name>

109
nymea-app/translations/nymea-app-ko.ts
View File

@ -83,6 +83,49 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AdvancedConnectionInterfacesPage</name>
<message>
<source>Connection interfaces</source>
<translation type="unfinished">연결 인터페이스</translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation type="unfinished">TCP 서버 인터페이스</translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished">추가</translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation type="unfinished">WebSocket 서버 인터페이스</translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud based remote connection is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud</source>
<translation type="unfinished">클라우드</translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AppLogPage</name>
<message>
@ -106,7 +149,7 @@
</message>
<message>
<source>Cloud login</source>
<translation>클라우드 로그인</translation>
<translation type="vanished">클라우드 로그인</translation>
</message>
<message>
<source>Developer options</source>
@ -124,10 +167,6 @@
<source>Access tools for debugging and error reporting</source>
<translation type="unfinished">디버깅 및 오류 보고를 위한 액세스 도구</translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AwningThingsListPage</name>
@ -933,22 +972,38 @@
</message>
<message>
<source>TCP server interfaces</source>
<translation>TCP 서버 인터페이스</translation>
<translation type="vanished">TCP 서버 인터페이스</translation>
</message>
<message>
<source>Add</source>
<translation>추가</translation>
<translation type="vanished">추가</translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation>WebSocket 서버 인터페이스</translation>
<translation type="vanished">WebSocket 서버 인터페이스</translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<source>Remote connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling the remote connection will allow connecting to this %1 system from anywhere.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1307,6 +1362,22 @@
<source>Configure logging categories</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud login</source>
<translation type="unfinished">클라우드 로그인</translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeveloperTools</name>
@ -5833,11 +5904,11 @@ Do you want to proceed?</source>
</message>
<message>
<source>Cloud</source>
<translation>클라우드</translation>
<translation type="vanished">클라우드</translation>
</message>
<message>
<source>API interfaces</source>
<translation>API 인터페이스</translation>
<translation type="vanished">API 인터페이스</translation>
</message>
<message>
<source>MQTT broker</source>
@ -5893,7 +5964,7 @@ Do you want to proceed?</source>
</message>
<message>
<source>Configure how clients interact with this system</source>
<translation>클라이언트가 이 시스템과 상호 작용하는 방식 구성</translation>
<translation type="vanished">클라이언트가 이 시스템과 상호 작용하는 방식 구성</translation>
</message>
<message>
<source>User settings</source>
@ -5911,10 +5982,6 @@ Do you want to proceed?</source>
<source>Configure ZigBee networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update your %1 system</source>
<translation type="unfinished"></translation>
@ -5931,6 +5998,14 @@ Do you want to proceed?</source>
<source>Configure Modbus RTU master interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure how applications can connect to this system</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SetupWizard</name>

119
nymea-app/translations/nymea-app-nl.ts
View File

@ -83,6 +83,49 @@
<translation>Oswald font door The Oswald Project</translation>
</message>
</context>
<context>
<name>AdvancedConnectionInterfacesPage</name>
<message>
<source>Connection interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud based remote connection is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AppLogPage</name>
<message>
@ -106,7 +149,7 @@
</message>
<message>
<source>Cloud login</source>
<translation>Aanmelden Cloud</translation>
<translation type="vanished">Aanmelden Cloud</translation>
</message>
<message>
<source>Developer options</source>
@ -126,7 +169,7 @@
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation>Aanmelden bij %1:cloud en beheer verbonden %1 systemen</translation>
<translation type="vanished">Aanmelden bij %1:cloud en beheer verbonden %1 systemen</translation>
</message>
</context>
<context>
@ -932,23 +975,27 @@
<translation></translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation></translation>
</message>
<message>
<source>Add</source>
<translation></translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<source>Remote connection</source>
<translation type="unfinished">Connectie op afstand</translation>
</message>
<message>
<source>Enabling the remote connection will allow connecting to this %1 system from anywhere.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1307,6 +1354,22 @@
<source>Configure logging categories</source>
<translation>Log categorieën instellen</translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud login</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished">Aanmelden bij %1:cloud en beheer verbonden %1 systemen</translation>
</message>
</context>
<context>
<name>DeveloperTools</name>
@ -5777,14 +5840,6 @@ Do you want to proceed?</source>
<source>View system log</source>
<translation></translation>
</message>
<message>
<source>Cloud</source>
<translation></translation>
</message>
<message>
<source>API interfaces</source>
<translation></translation>
</message>
<message>
<source>MQTT broker</source>
<translation></translation>
@ -5837,10 +5892,6 @@ Do you want to proceed?</source>
<source>Configure the system&apos;s network connection</source>
<translation></translation>
</message>
<message>
<source>Configure how clients interact with this system</source>
<translation></translation>
</message>
<message>
<source>User settings</source>
<translation></translation>
@ -5857,10 +5908,6 @@ Do you want to proceed?</source>
<source>Configure ZigBee networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update your %1 system</source>
<translation type="unfinished"></translation>
@ -5877,6 +5924,14 @@ Do you want to proceed?</source>
<source>Configure Modbus RTU master interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure how applications can connect to this system</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SetupWizard</name>

105
nymea-app/translations/nymea-app-tr.ts
View File

@ -83,6 +83,49 @@
<translation>Oswald yazı tipi by The Oswald Project</translation>
</message>
</context>
<context>
<name>AdvancedConnectionInterfacesPage</name>
<message>
<source>Connection interfaces</source>
<translation type="unfinished">Bağlantı arayüzleri</translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation type="unfinished">TCP sunucu arayüzleri</translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished">Ekle</translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation type="unfinished">WebSocket sunucu arayüzleri</translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud based remote connection is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud</source>
<translation type="unfinished">Bulut</translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished">Bu %1 sistemini %1:bulut&apos;a bağlayın</translation>
</message>
</context>
<context>
<name>AppLogPage</name>
<message>
@ -106,7 +149,7 @@
</message>
<message>
<source>Cloud login</source>
<translation>Bulut giriş</translation>
<translation type="vanished">Bulut giriş</translation>
</message>
<message>
<source>Developer options</source>
@ -126,7 +169,7 @@
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation>%1:bulutta oturum açın ve bağlı %1 sistemlerini yönetin</translation>
<translation type="vanished">%1:bulutta oturum açın ve bağlı %1 sistemlerini yönetin</translation>
</message>
</context>
<context>
@ -963,22 +1006,38 @@
</message>
<message>
<source>TCP server interfaces</source>
<translation>TCP sunucu arayüzleri</translation>
<translation type="vanished">TCP sunucu arayüzleri</translation>
</message>
<message>
<source>Add</source>
<translation>Ekle</translation>
<translation type="vanished">Ekle</translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation>WebSocket sunucu arayüzleri</translation>
<translation type="vanished">WebSocket sunucu arayüzleri</translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<source>Remote connection</source>
<translation type="unfinished">Uzak bağlantı</translation>
</message>
<message>
<source>Enabling the remote connection will allow connecting to this %1 system from anywhere.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabled</source>
<translation type="unfinished">Etkin</translation>
</message>
<message>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1337,6 +1396,22 @@
<source>Configure logging categories</source>
<translation>Günlük kategorilerini yapılandırın</translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud login</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished">%1:bulutta oturum açın ve bağlı %1 sistemlerini yönetin</translation>
</message>
</context>
<context>
<name>DeveloperTools</name>
@ -5870,11 +5945,11 @@ Do you want to proceed?</source>
</message>
<message>
<source>Cloud</source>
<translation>Bulut</translation>
<translation type="vanished">Bulut</translation>
</message>
<message>
<source>API interfaces</source>
<translation>API arayüzleri</translation>
<translation type="vanished">API arayüzleri</translation>
</message>
<message>
<source>MQTT broker</source>
@ -5930,7 +6005,7 @@ Do you want to proceed?</source>
</message>
<message>
<source>Configure how clients interact with this system</source>
<translation>İstemcilerin bu sistemle nasıl etkileşime gireceğini yapılandırın</translation>
<translation type="vanished">İstemcilerin bu sistemle nasıl etkileşime gireceğini yapılandırın</translation>
</message>
<message>
<source>User settings</source>
@ -5950,7 +6025,7 @@ Do you want to proceed?</source>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation>Bu %1 sistemini %1:bulut&apos;a bağlayın</translation>
<translation type="vanished">Bu %1 sistemini %1:bulut&apos;a bağlayın</translation>
</message>
<message>
<source>Modbus RTU</source>
@ -5968,6 +6043,14 @@ Do you want to proceed?</source>
<source>About %1</source>
<translation>Hakkında %1</translation>
</message>
<message>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure how applications can connect to this system</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SetupWizard</name>

123
nymea-app/translations/nymea-app-vi.ts
View File

@ -83,6 +83,49 @@
<translation></translation>
</message>
</context>
<context>
<name>AdvancedConnectionInterfacesPage</name>
<message>
<source>Connection interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud based remote connection is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AppLogPage</name>
<message>
@ -104,10 +147,6 @@
<source>Customize the app&apos;s look and behavior</source>
<translation></translation>
</message>
<message>
<source>Cloud login</source>
<translation></translation>
</message>
<message>
<source>Developer options</source>
<translation></translation>
@ -124,10 +163,6 @@
<source>Access tools for debugging and error reporting</source>
<translation></translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AwningThingsListPage</name>
@ -889,23 +924,27 @@
<translation></translation>
</message>
<message>
<source>TCP server interfaces</source>
<translation></translation>
</message>
<message>
<source>Add</source>
<translation></translation>
</message>
<message>
<source>WebSocket server interfaces</source>
<translation></translation>
</message>
<message>
<source>Remote connection server interfaces</source>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Server: %1</source>
<source>Remote connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling the remote connection will allow connecting to this %1 system from anywhere.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1264,6 +1303,22 @@
<source>Configure logging categories</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nymea:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note: nymea:cloud is deprecated and will be removed in a future version.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cloud login</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Log into %1:cloud and manage connected %1 systems</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeveloperTools</name>
@ -5714,14 +5769,6 @@ Do you want to proceed?</source>
<source>View system log</source>
<translation></translation>
</message>
<message>
<source>Cloud</source>
<translation></translation>
</message>
<message>
<source>API interfaces</source>
<translation></translation>
</message>
<message>
<source>MQTT broker</source>
<translation></translation>
@ -5774,10 +5821,6 @@ Do you want to proceed?</source>
<source>Configure the system&apos;s network connection</source>
<translation></translation>
</message>
<message>
<source>Configure how clients interact with this system</source>
<translation></translation>
</message>
<message>
<source>User settings</source>
<translation></translation>
@ -5786,10 +5829,6 @@ Do you want to proceed?</source>
<source>Configure who can log in</source>
<translation></translation>
</message>
<message>
<source>Connect this %1 system to %1:cloud</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ZigBee</source>
<translation type="unfinished"></translation>
@ -5814,6 +5853,14 @@ Do you want to proceed?</source>
<source>Configure Modbus RTU master interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure how applications can connect to this system</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SetupWizard</name>

13
nymea-app/ui/SettingsPage.qml
View File

@ -84,20 +84,11 @@ Page {
onClicked: pageStack.push(Qt.resolvedUrl("system/NetworkSettingsPage.qml"))
}
SettingsTile {
Layout.fillWidth: true
iconSource: "../images/connections/cloud.svg"
text: qsTr("Cloud")
subText: qsTr("Connect this %1 system to %1:cloud").arg(Configuration.systemName)
visible: NymeaUtils.hasPermissionScope(engine.jsonRpcClient.permissions, UserInfo.PermissionScopeAdmin)
onClicked: pageStack.push(Qt.resolvedUrl("system/CloudSettingsPage.qml"))
}
SettingsTile {
Layout.fillWidth: true
iconSource: "../images/connections/network-vpn.svg"
text: qsTr("API interfaces")
subText: qsTr("Configure how clients interact with this system")
text: qsTr("Connection settings")
subText: qsTr("Configure how applications can connect to this system")
visible: NymeaUtils.hasPermissionScope(engine.jsonRpcClient.permissions, UserInfo.PermissionScopeAdmin) && Configuration.apiSettingsEnabled
onClicked: pageStack.push(Qt.resolvedUrl("system/ConnectionInterfacesPage.qml"))
}

7
nymea-app/ui/appsettings/AppSettingsPage.qml
View File

@ -63,13 +63,6 @@ Page {
onClicked: pageStack.push(Qt.resolvedUrl("LookAndFeelSettingsPage.qml"))
}
SettingsTile {
Layout.fillWidth: true
text: qsTr("Cloud login")
subText: qsTr("Log into %1:cloud and manage connected %1 systems").arg(Configuration.systemName)
iconSource: "../images/connections/cloud.svg"
onClicked: pageStack.push(Qt.resolvedUrl("CloudLoginPage.qml"))
}
SettingsTile {
Layout.fillWidth: true
text: qsTr("Developer options")

21
nymea-app/ui/appsettings/DeveloperOptionsPage.qml
View File

@ -84,4 +84,25 @@ SettingsPageBase {
}
}
}
SettingsPageSectionHeader {
text: qsTr("nymea:cloud")
}
Label {
Layout.fillWidth: true
Layout.leftMargin: Style.margins
Layout.rightMargin: Style.margins
text: qsTr("Note: nymea:cloud is deprecated and will be removed in a future version.")
wrapMode: Text.WordWrap
}
NymeaItemDelegate {
Layout.fillWidth: true
text: qsTr("Cloud login")
subText: qsTr("Log into %1:cloud and manage connected %1 systems").arg(Configuration.systemName)
iconName: "../images/connections/cloud.svg"
onClicked: pageStack.push(Qt.resolvedUrl("CloudLoginPage.qml"))
}
}

212
nymea-app/ui/system/AdvancedConnectionInterfacesPage.qml Normal file
View File

@ -0,0 +1,212 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2022, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
* This project including source code and documentation is protected by
* copyright law, and remains the property of nymea GmbH. All rights, including
* reproduction, publication, editing and translation, are reserved. The use of
* this project is subject to the terms of a license agreement to be concluded
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
* under https://nymea.io/license
*
* GNU General Public License Usage
* Alternatively, this project may be redistributed and/or modified under the
* terms of the GNU General Public License as published by the Free Software
* Foundation, GNU version 3. This project is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
* this project. If not, see <https://www.gnu.org/licenses/>.
*
* For any further details and any questions please contact us under
* contact@nymea.io or see our FAQ/Licensing Information on
* https://nymea.io/license/faq
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import Nymea 1.0
import "../components"
SettingsPageBase {
id: root
title: qsTr("Connection interfaces")
SettingsPageSectionHeader {
text: qsTr("TCP server interfaces")
}
Repeater {
model: engine.nymeaConfiguration.tcpServerConfigurations
delegate: ConnectionInterfaceDelegate {
Layout.fillWidth: true
iconColor: inUse ? Style.accentColor : Style.iconColor
readonly property bool inUse: (engine.jsonRpcClient.currentConnection.hostAddress === model.address || model.address === "0.0.0.0")
&& engine.jsonRpcClient.currentConnection.port === model.port
canDelete: !inUse
onClicked: {
var component = Qt.createComponent(Qt.resolvedUrl("ServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: engine.nymeaConfiguration.tcpServerConfigurations.get(index).clone() });
popup.accepted.connect(function() {
engine.nymeaConfiguration.setTcpServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
onDeleteClicked: {
engine.nymeaConfiguration.deleteTcpServerConfiguration(model.id)
}
}
}
Button {
Layout.fillWidth: true
Layout.margins: app.margins
text: qsTr("Add")
onClicked: {
var config = engine.nymeaConfiguration.createServerConfiguration("0.0.0.0", 2222 + engine.nymeaConfiguration.tcpServerConfigurations.count, false, false);
var component = Qt.createComponent(Qt.resolvedUrl("ServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: config });
popup.accepted.connect(function() {
engine.nymeaConfiguration.setTcpServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
}
SettingsPageSectionHeader {
text: qsTr("WebSocket server interfaces")
}
Repeater {
model: engine.nymeaConfiguration.webSocketServerConfigurations
delegate: ConnectionInterfaceDelegate {
Layout.fillWidth: true
iconColor: inUse ? Style.accentColor : Style.iconColor
readonly property bool inUse: (engine.jsonRpcClient.currentConnection.hostAddress === model.address || model.address === "0.0.0.0")
&& engine.jsonRpcClient.currentConnection.port === model.port
canDelete: !inUse
onClicked: {
var component = Qt.createComponent(Qt.resolvedUrl("ServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: engine.nymeaConfiguration.webSocketServerConfigurations.get(index).clone() });
popup.accepted.connect(function() {
print("configuring:", popup.serverConfiguration.port)
engine.nymeaConfiguration.setWebSocketServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
onDeleteClicked: {
print("should delete", model.id)
engine.nymeaConfiguration.deleteWebSocketServerConfiguration(model.id)
}
}
}
Button {
Layout.fillWidth: true
Layout.margins: app.margins
text: qsTr("Add")
onClicked: {
var config = engine.nymeaConfiguration.createServerConfiguration("0.0.0.0", 4444 + engine.nymeaConfiguration.webSocketServerConfigurations.count, false, false);
var component = Qt.createComponent(Qt.resolvedUrl("ServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: config });
popup.accepted.connect(function() {
engine.nymeaConfiguration.setWebSocketServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
}
SettingsPageSectionHeader {
text: qsTr("Remote connection server interfaces")
visible: engine.jsonRpcClient.ensureServerVersion("6.0")
}
Repeater {
model: engine.nymeaConfiguration.tunnelProxyServerConfigurations
delegate: ConnectionInterfaceDelegate {
Layout.fillWidth: true
text: qsTr("Server: %1").arg(model.address)
iconColor: inUse ? Style.accentColor : Style.iconColor
readonly property bool inUse: (engine.jsonRpcClient.currentConnection.hostAddress === model.address || model.address === "0.0.0.0")
&& engine.jsonRpcClient.currentConnection.port === model.port
canDelete: !inUse
onClicked: {
var component = Qt.createComponent(Qt.resolvedUrl("TunnelProxyServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: engine.nymeaConfiguration.tunnelProxyServerConfigurations.get(index).clone() });
popup.accepted.connect(function() {
print("configuring:", popup.serverConfiguration.port)
engine.nymeaConfiguration.setTunnelProxyServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
onDeleteClicked: {
engine.nymeaConfiguration.deleteTunnelProxyServerConfiguration(model.id)
}
}
}
Button {
Layout.fillWidth: true
Layout.margins: app.margins
text: qsTr("Add")
visible: engine.jsonRpcClient.ensureServerVersion("6.0")
onClicked: {
var config = engine.nymeaConfiguration.createTunnelProxyServerConfiguration("remoteproxy.nymea.io", 2213, true, true, false);
var component = Qt.createComponent(Qt.resolvedUrl("TunnelProxyServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: config });
popup.accepted.connect(function() {
engine.nymeaConfiguration.setTunnelProxyServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
}
SettingsPageSectionHeader {
text: qsTr("nymea:cloud")
}
Label {
Layout.fillWidth: true
Layout.leftMargin: Style.margins
Layout.rightMargin: Style.margins
text: qsTr("Note: nymea:cloud based remote connection is deprecated and will be removed in a future version.")
wrapMode: Text.WordWrap
}
NymeaItemDelegate {
Layout.fillWidth: true
iconName: "../images/connections/cloud.svg"
text: qsTr("Cloud")
subText: qsTr("Connect this %1 system to %1:cloud").arg(Configuration.systemName)
visible: NymeaUtils.hasPermissionScope(engine.jsonRpcClient.permissions, UserInfo.PermissionScopeAdmin)
onClicked: pageStack.push(Qt.resolvedUrl("CloudSettingsPage.qml"))
}
}

162
nymea-app/ui/system/ConnectionInterfacesPage.qml
View File

@ -36,155 +36,43 @@ import "../components"
SettingsPageBase {
id: root
title: qsTr("Connection interfaces")
title: qsTr("Connection settings")
SettingsPageSectionHeader {
text: qsTr("TCP server interfaces")
text: qsTr("Remote connection")
}
Label {
Layout.fillWidth: true
Layout.leftMargin: Style.margins
Layout.rightMargin: Style.margins
text: qsTr("Enabling the remote connection will allow connecting to this %1 system from anywhere.").arg(Configuration.systemName)
wrapMode: Text.WordWrap
}
Repeater {
model: engine.nymeaConfiguration.tcpServerConfigurations
delegate: ConnectionInterfaceDelegate {
Layout.fillWidth: true
iconColor: inUse ? Style.accentColor : Style.iconColor
readonly property bool inUse: (engine.jsonRpcClient.currentConnection.hostAddress === model.address || model.address === "0.0.0.0")
&& engine.jsonRpcClient.currentConnection.port === model.port
canDelete: !inUse
onClicked: {
var component = Qt.createComponent(Qt.resolvedUrl("ServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: engine.nymeaConfiguration.tcpServerConfigurations.get(index).clone() });
popup.accepted.connect(function() {
engine.nymeaConfiguration.setTcpServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
onDeleteClicked: {
engine.nymeaConfiguration.deleteTcpServerConfiguration(model.id)
}
}
}
Button {
SwitchDelegate {
Layout.fillWidth: true
Layout.margins: app.margins
text: qsTr("Add")
text: checked ? qsTr("Enabled") : qsTr("Disabled")
checked: engine.nymeaConfiguration.tunnelProxyServerConfigurations.count > 0
onClicked: {
var config = engine.nymeaConfiguration.createServerConfiguration("0.0.0.0", 2222 + engine.nymeaConfiguration.tcpServerConfigurations.count, false, false);
var component = Qt.createComponent(Qt.resolvedUrl("ServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: config });
popup.accepted.connect(function() {
engine.nymeaConfiguration.setTcpServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
if (!checked) {
for (var i = 0; i < engine.nymeaConfiguration.tunnelProxyServerConfigurations.count; i++) {
var config = engine.nymeaConfiguration.tunnelProxyServerConfigurations.get(i);
engine.nymeaConfiguration.deleteTunnelProxyServerConfiguration(config.id)
}
} else {
var config = engine.nymeaConfiguration.createTunnelProxyServerConfiguration("remoteproxy.nymea.io", 2213, true, true, false);
engine.nymeaConfiguration.setTunnelProxyServerConfiguration(config)
}
}
}
SettingsPageSectionHeader {
text: qsTr("WebSocket server interfaces")
text: qsTr("Advanced")
}
Repeater {
model: engine.nymeaConfiguration.webSocketServerConfigurations
delegate: ConnectionInterfaceDelegate {
Layout.fillWidth: true
iconColor: inUse ? Style.accentColor : Style.iconColor
readonly property bool inUse: (engine.jsonRpcClient.currentConnection.hostAddress === model.address || model.address === "0.0.0.0")
&& engine.jsonRpcClient.currentConnection.port === model.port
canDelete: !inUse
onClicked: {
var component = Qt.createComponent(Qt.resolvedUrl("ServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: engine.nymeaConfiguration.webSocketServerConfigurations.get(index).clone() });
popup.accepted.connect(function() {
print("configuring:", popup.serverConfiguration.port)
engine.nymeaConfiguration.setWebSocketServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
onDeleteClicked: {
print("should delete", model.id)
engine.nymeaConfiguration.deleteWebSocketServerConfiguration(model.id)
}
}
}
Button {
NymeaItemDelegate {
Layout.fillWidth: true
Layout.margins: app.margins
text: qsTr("Add")
onClicked: {
var config = engine.nymeaConfiguration.createServerConfiguration("0.0.0.0", 4444 + engine.nymeaConfiguration.webSocketServerConfigurations.count, false, false);
var component = Qt.createComponent(Qt.resolvedUrl("ServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: config });
popup.accepted.connect(function() {
engine.nymeaConfiguration.setWebSocketServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
}
SettingsPageSectionHeader {
text: qsTr("Remote connection server interfaces")
visible: engine.jsonRpcClient.ensureServerVersion("6.0")
}
Repeater {
model: engine.nymeaConfiguration.tunnelProxyServerConfigurations
delegate: ConnectionInterfaceDelegate {
Layout.fillWidth: true
text: qsTr("Server: %1").arg(model.address)
iconColor: inUse ? Style.accentColor : Style.iconColor
readonly property bool inUse: (engine.jsonRpcClient.currentConnection.hostAddress === model.address || model.address === "0.0.0.0")
&& engine.jsonRpcClient.currentConnection.port === model.port
canDelete: !inUse
onClicked: {
var component = Qt.createComponent(Qt.resolvedUrl("TunnelProxyServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: engine.nymeaConfiguration.tunnelProxyServerConfigurations.get(index).clone() });
popup.accepted.connect(function() {
print("configuring:", popup.serverConfiguration.port)
engine.nymeaConfiguration.setTunnelProxyServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
onDeleteClicked: {
engine.nymeaConfiguration.deleteTunnelProxyServerConfiguration(model.id)
}
}
}
Button {
Layout.fillWidth: true
Layout.margins: app.margins
text: qsTr("Add")
visible: engine.jsonRpcClient.ensureServerVersion("6.0")
onClicked: {
var config = engine.nymeaConfiguration.createTunnelProxyServerConfiguration("dev-remoteproxy.nymea.io", 2213, true, true, false);
var component = Qt.createComponent(Qt.resolvedUrl("TunnelProxyServerConfigurationDialog.qml"));
var popup = component.createObject(root, { serverConfiguration: config });
popup.accepted.connect(function() {
engine.nymeaConfiguration.setTunnelProxyServerConfiguration(popup.serverConfiguration)
popup.serverConfiguration.destroy();
})
popup.rejected.connect(function() {
popup.serverConfiguration.destroy();
})
popup.open()
}
text: qsTr("Connection interfaces")
onClicked: pageStack.push("AdvancedConnectionInterfacesPage.qml")
}
}