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

Merge PR #385: Add ID to the thing config page

Browse Source
This commit is contained in:
Jenkins nymea 2020-06-08 11:34:49 +02:00
commit 6f2986d3ce
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-app/types/interfaces.cpp
View File

@ -130,7 +130,7 @@ Interfaces::Interfaces(QObject *parent) : QAbstractListModel(parent)
addInterface("extendedevcharger", tr("EV chargers"), {"evcharger"});
addStateType("extendedevcharger", "maxChargingCurrent", QVariant::UInt, true, tr("Maximum charging current"), tr("Maximum charging current changed"), tr("Set maximum charging current"));
addInterface("heating", tr("Heatings"));
addInterface("heating", tr("Heating"));
addStateType("heating", "power", QVariant::Bool, true, tr("Heating enabled"), tr("Heating enabled changed"), tr("Enable heating"));
addInterface("extendedheating", tr("Heatings"), {"heating"});

13
nymea-app/platformhelper.cpp
View File

@ -30,6 +30,9 @@
#include "platformhelper.h"
#include <QApplication>
#include <QClipboard>
PlatformHelper::PlatformHelper(QObject *parent) : QObject(parent)
{
@ -85,3 +88,13 @@ void PlatformHelper::setBottomPanelColor(const QColor &color)
emit bottomPanelColorChanged();
}
}
void PlatformHelper::toClipBoard(const QString &text)
{
QApplication::clipboard()->setText(text);
}
QString PlatformHelper::fromClipBoard()
{
return QApplication::clipboard()->text();
}

3
nymea-app/platformhelper.h
View File

@ -85,6 +85,9 @@ public:
Q_INVOKABLE virtual void vibrate(HapticsFeedback feedbackType) = 0;
Q_INVOKABLE virtual void toClipBoard(const QString &text);
Q_INVOKABLE virtual QString fromClipBoard();
signals:
void permissionsRequestFinished();
void screenTimeoutChanged();

66
nymea-app/ui/thingconfiguration/ConfigureThingPage.qml
View File

@ -110,42 +110,36 @@ SettingsPageBase {
}
}
Label {
Layout.fillWidth: true
Layout.margins: app.margins
SettingsPageSectionHeader {
text: qsTr("Information")
color: app.accentColor
}
RowLayout {
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
Label {
text: qsTr("Vendor:")
Layout.fillWidth: true
}
Label {
text: engine.deviceManager.vendors.getVendor(root.deviceClass.vendorId).displayName
}
NymeaListItemDelegate {
Layout.fillWidth: true
text: qsTr("Vendor:")
subText: engine.deviceManager.vendors.getVendor(root.deviceClass.vendorId).displayName
progressive: false
}
RowLayout {
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
Label {
text: qsTr("Type:")
Layout.fillWidth: true
}
Label {
text: root.deviceClass.displayName
NymeaListItemDelegate {
Layout.fillWidth: true
text: qsTr("Type:")
subText: root.deviceClass.displayName
progressive: false
}
NymeaListItemDelegate {
Layout.fillWidth: true
text: qsTr("ID:")
subText: root.device.id.toString().replace(/[{}]/g, "")
progressive: false
onClicked: {
PlatformHelper.toClipBoard(root.device.id.toString().replace(/[{}]/g, ""));
ToolTip.show(qsTr("ID copied to clipboard"), 500);
}
}
Label {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
Layout.topMargin: app.margins
SettingsPageSectionHeader {
text: qsTr("Parameters")
color: app.accentColor
visible: root.deviceClass.paramTypes.count > 0
visible: root.device.params.count > 0
}
Repeater {
@ -158,13 +152,8 @@ SettingsPageBase {
}
}
Label {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
Layout.topMargin: app.margins
SettingsPageSectionHeader {
text: qsTr("Input/Output Connections")
color: app.accentColor
visible: ioModel.count > 0
}
@ -224,13 +213,8 @@ SettingsPageBase {
}
Label {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
Layout.topMargin: app.margins
SettingsPageSectionHeader {
text: qsTr("Settings")
color: app.accentColor
visible: root.deviceClass.settingsTypes.count > 0
}