diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-09-27 13:06:15 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-10-04 08:14:40 +0000 |
| commit | ba42ff33c9d84bf8da482e673f61e9d1de33e1a3 (patch) | |
| tree | 4d6b8240616206a96852c4a3f67ec784d296cb91 /tradeshow/iot-sensortag/resources/base | |
| parent | d53a691180070e8126c24fae2115cb7afd867a94 (diff) | |
iot-sensortag: Add logging window
This is most useful in the embedded use-case. Usually there is
no debug connection and initialization of a bluetooth connection
can take very long.
Change-Id: If5b6e8a6e684d2340d6a52b8b21bec25630d6874
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/resources/base')
| -rw-r--r-- | tradeshow/iot-sensortag/resources/base/TopToolbar.qml | 24 | ||||
| -rw-r--r-- | tradeshow/iot-sensortag/resources/base/main.qml | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml index 6e5d9d2..69722b7 100644 --- a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml +++ b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml @@ -67,6 +67,26 @@ Item { visible: true } + Image { + id: logWindow + source: "images/bg_blue.jpg" + x: sensorItem.x + y: topToolbar.height + width: Math.min(mainWindow.width, 600) + height: Math.min(mainWindow.height - topToolbar.height, 400) + anchors.horizontalCenter: parent.horizontalCenter + visible: false + Text { + clip: true + color: "white" + font.pixelSize: 26 + text: mainWindow.loggingOutput ? mainWindow.loggingOutput : "...debug..." + anchors.fill: parent + anchors.margins: 15 + } + } + + Item { id: sensorItem height: topToolbar.height @@ -134,6 +154,10 @@ Item { font.pixelSize: Style.topToolbarLargeFontSize anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom + MouseArea { + anchors.fill: parent + onClicked: clickBait.activate(logWindow) + } } Timer { diff --git a/tradeshow/iot-sensortag/resources/base/main.qml b/tradeshow/iot-sensortag/resources/base/main.qml index caa8617..c756c6d 100644 --- a/tradeshow/iot-sensortag/resources/base/main.qml +++ b/tradeshow/iot-sensortag/resources/base/main.qml @@ -63,6 +63,7 @@ Window { property real globalBlinkOpacity: 1.0 property string addresses : "" property bool localSelected : true + property var loggingOutput : null function getCurrentPool() { if (localSelected) |