1.1 --- a/main.qml Wed May 28 10:20:32 2014 +0200
1.2 +++ b/main.qml Wed May 28 11:42:49 2014 +0200
1.3 @@ -6,7 +6,7 @@
1.4 import QtQuick.Window 2.1
1.5 import Qt.labs.settings 1.0
1.6 import MiniDisplay 1.0
1.7 -
1.8 +import QtQuick.Layouts 1.1
1.9
1.10
1.11 ApplicationWindow {
1.12 @@ -18,6 +18,9 @@
1.13 SystemPalette { id: palette }
1.14 //Component.onCompleted: progressBar.visible=tabViewMain.getTab(tabViewMain.currentIndex).status !== Loader.Ready
1.15
1.16 + statusBar: DisplayStatusBar {}
1.17 +
1.18 +
1.19 Settings {
1.20 property alias x: appWindow.x
1.21 property alias y: appWindow.y
1.22 @@ -43,11 +46,29 @@
1.23 progressBar.visible = tabViewMain.getTab(tabViewMain.currentIndex).status !== Loader.Ready;
1.24 }
1.25
1.26 + /*
1.27 + function updateDisplayStatus()
1.28 + {
1.29 + if (display.isOpen)
1.30 + {
1.31 + labelDisplayStatus.text=qsTr("Connected");
1.32 + }
1.33 + else
1.34 + {
1.35 + labelDisplayStatus.text=qsTr("Disconnected");
1.36 + }
1.37 +
1.38 + labelDisplayVendor.text=display.vendor;
1.39 + labelDisplayProduct.text=display.product;
1.40 + labelDisplaySerialNumber.text=display.serialNumber;
1.41 + }*/
1.42 +
1.43 +
1.44 MiniDisplay {
1.45 id: display
1.46 - onOpened:{ textDisplayStatus.text=qsTr("Connected");}
1.47 - onClosed:textDisplayStatus.text=qsTr("Disconnected")
1.48 - onOpenError:{ textDisplayStatus.text=qsTr("Connection error");}
1.49 + //onOpened:updateDisplayStatus()
1.50 + //onClosed:updateDisplayStatus()
1.51 + //onOpenError:{ updateDisplayStatus(); labelDisplayStatus.text=qsTr("Connection error");}
1.52 }
1.53
1.54