diff options
| author | Rainer Keller <Rainer.Keller@qt.io> | 2018-09-04 09:30:20 +0200 |
|---|---|---|
| committer | Rainer Keller <Rainer.Keller@qt.io> | 2019-02-05 14:05:21 +0000 |
| commit | d3d92c6c35cc4c9b2dada19e13638635ce75260a (patch) | |
| tree | 7ab96af60ee393a2dff59d6bd0201162eb458141 /examples | |
| parent | d08122755bf88b33351e1818714a8a9f0512ef5b (diff) | |
example: Use display name UI texts
Change-Id: Ia3d4d979740e380f0ef65876700412201cacb7c6
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Diffstat (limited to 'examples')
4 files changed, 8 insertions, 0 deletions
diff --git a/examples/opcua/waterpump/waterpump-qml/MachineDisplay.qml b/examples/opcua/waterpump/waterpump-qml/MachineDisplay.qml index cdec1ff..50659a7 100644 --- a/examples/opcua/waterpump/waterpump-qml/MachineDisplay.qml +++ b/examples/opcua/waterpump/waterpump-qml/MachineDisplay.qml @@ -65,6 +65,8 @@ RowLayout { machine.tank1.percentFilled > 0 && machine.tank2.percentFilled < machine.tank2.targetPercent stopButtonEnabled: connection.connected && machine.state === Machine.MachineState.Pumping percentFilled: machine.tank1.percentFilled + startButtonText: machine.startMethod.displayName.text + stopButtonText: machine.stopMethod.displayName.text id: tank1unit Layout.fillHeight: true @@ -86,6 +88,7 @@ RowLayout { flushButtonEnabled: connection.connected && machine.state === Machine.MachineState.Idle && machine.tank2.percentFilled > machine.tank2.targetPercent percentFilled: machine.tank2.percentFilled valveState: machine.tank2valveState + flushButtonText: machine.flushMethod.displayName.text Layout.fillHeight: true Layout.fillWidth: true diff --git a/examples/opcua/waterpump/waterpump-qml/ServerControl.qml b/examples/opcua/waterpump/waterpump-qml/ServerControl.qml index 700e9d1..877f03b 100644 --- a/examples/opcua/waterpump/waterpump-qml/ServerControl.qml +++ b/examples/opcua/waterpump/waterpump-qml/ServerControl.qml @@ -58,6 +58,7 @@ RowLayout { readonly property alias backend: backendSelector.currentText property QtOpcUa.Connection connection signal resetSimulation() + property alias resetButtonText: resetButton.text TextField { id: uaUrl @@ -80,6 +81,7 @@ RowLayout { } } Button { + id: resetButton text: "Reset simulation" enabled: connection.connected onClicked: resetSimulation() diff --git a/examples/opcua/waterpump/waterpump-qml/Tank1Unit.qml b/examples/opcua/waterpump/waterpump-qml/Tank1Unit.qml index eb8410d..907d991 100644 --- a/examples/opcua/waterpump/waterpump-qml/Tank1Unit.qml +++ b/examples/opcua/waterpump/waterpump-qml/Tank1Unit.qml @@ -58,6 +58,8 @@ Item { property alias startButtonEnabled: startButton.enabled property alias stopButtonEnabled: stopButton.enabled property alias percentFilled: tank1.percentFilled + property alias startButtonText: startButton.text + property alias stopButtonText: stopButton.text signal startPump() signal stopPump() diff --git a/examples/opcua/waterpump/waterpump-qml/Tank2Unit.qml b/examples/opcua/waterpump/waterpump-qml/Tank2Unit.qml index 05efdd6..0b5d231 100644 --- a/examples/opcua/waterpump/waterpump-qml/Tank2Unit.qml +++ b/examples/opcua/waterpump/waterpump-qml/Tank2Unit.qml @@ -56,6 +56,7 @@ import QtQuick.Layouts 1.3 Item { property alias flushButtonEnabled: flushButton.enabled property alias percentFilled: tank2.percentFilled + property alias flushButtonText: flushButton.text property bool valveState signal flushTank() |