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

Don't use ResetRole in dialog

Browse Source 
It's not working in 5.9 yet
This commit is contained in:
Michael Zanetti 2020-05-08 17:46:03 +02:00
parent 90abc8b200
commit 3a5711aeb9
1 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,8 +322,7 @@ SettingsPageBase {
id: ioConnectionsDialogComponent id: ioConnectionsDialogComponent
MeaDialog { MeaDialog {
id: ioConnectionDialog id: ioConnectionDialog
standardButtons: Dialog.Ok | Dialog.Cancel | Dialog.Reset standardButtons: Dialog.NoButton
title: qsTr("Connect Inputs/Outputs") title: qsTr("Connect Inputs/Outputs")
property StateType ioStateType: null property StateType ioStateType: null
@ -411,37 +410,59 @@ SettingsPageBase {
} }
} }
onAccepted: { RowLayout {
var inputThingId; Item {
var inputStateTypeId; Layout.fillWidth: true
var outputThingId;
var outputStateTypeId;
if (ioConnectionDialog.ioStateType.ioType == Types.IOTypeDigitalInput
|| ioConnectionDialog.ioStateType.ioType == Types.IOTypeAnalogInput) {
inputThingId = root.device.id;
inputStateTypeId = ioConnectionDialog.ioStateType.id;
outputThingId = connectableIODevices.get(ioThingComboBox.currentIndex).id;
outputStateTypeId = connectableStateTypes.get(ioStateComboBox.currentIndex).id;
} else {
inputThingId = connectableIODevices.get(ioThingComboBox.currentIndex).id;
inputStateTypeId = connectableStateTypes.get(ioStateComboBox.currentIndex).id;
outputThingId = root.device.id;
outputStateTypeId = ioConnectionDialog.ioStateType.id;
} }
print("connecting", inputThingId, inputStateTypeId, outputThingId, outputStateTypeId) Button {
engine.deviceManager.connectIO(inputThingId, inputStateTypeId, outputThingId, outputStateTypeId); text: qsTr("Cancel")
} onClicked: ioConnectionDialog.reject();
onReset: {
if (ioConnectionDialog.ioStateType.ioType == Types.IOTypeDigitalInput
|| ioConnectionDialog.ioStateType.ioType == Types.IOTypeAnalogInput) {
engine.deviceManager.disconnectIO(ioConnectionDialog.inputWatcher.ioConnection.id);
} else {
engine.deviceManager.disconnectIO(ioConnectionDialog.outputWatcher.ioConnection.id);
} }
Button {
text: qsTr("Disconnect")
ioConnectionDialog.reject(); onClicked: {
if (ioConnectionDialog.ioStateType.ioType == Types.IOTypeDigitalInput
|| ioConnectionDialog.ioStateType.ioType == Types.IOTypeAnalogInput) {
engine.deviceManager.disconnectIO(ioConnectionDialog.inputWatcher.ioConnection.id);
} else {
engine.deviceManager.disconnectIO(ioConnectionDialog.outputWatcher.ioConnection.id);
}
ioConnectionDialog.reject();
}
}
Button {
text: qsTr("Connect")
onClicked: {
var inputThingId;
var inputStateTypeId;
var outputThingId;
var outputStateTypeId;
if (ioConnectionDialog.ioStateType.ioType == Types.IOTypeDigitalInput
|| ioConnectionDialog.ioStateType.ioType == Types.IOTypeAnalogInput) {
inputThingId = root.device.id;
inputStateTypeId = ioConnectionDialog.ioStateType.id;
outputThingId = connectableIODevices.get(ioThingComboBox.currentIndex).id;
outputStateTypeId = connectableStateTypes.get(ioStateComboBox.currentIndex).id;
} else {
inputThingId = connectableIODevices.get(ioThingComboBox.currentIndex).id;
inputStateTypeId = connectableStateTypes.get(ioStateComboBox.currentIndex).id;
outputThingId = root.device.id;
outputStateTypeId = ioConnectionDialog.ioStateType.id;
}
print("connecting", inputThingId, inputStateTypeId, outputThingId, outputStateTypeId)
engine.deviceManager.connectIO(inputThingId, inputStateTypeId, outputThingId, outputStateTypeId);
ioConnectionDialog.accept();
}
}
} }
} }
} }
} }