Index: leahi.qrc
===================================================================
diff -u -r71c0c7aaf87975e585e86c64e63b11b47de4b2ed -r164ece178bc4bbe6d31605e6ee711f513bdfc48a
--- leahi.qrc (.../leahi.qrc) (revision 71c0c7aaf87975e585e86c64e63b11b47de4b2ed)
+++ leahi.qrc (.../leahi.qrc) (revision 164ece178bc4bbe6d31605e6ee711f513bdfc48a)
@@ -43,8 +43,8 @@
sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
- sources/gui/qml/dialogs/headerbar/HeaderbarDialogWiFi.qml
- sources/gui/qml/dialogs/headerbar/HeaderbarDialogInformation.qml
+ sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml
+ sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml
resources/images/Logo d.png
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rea225816887fd5bf505727812721fd4531d3e125 -r164ece178bc4bbe6d31605e6ee711f513bdfc48a
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision ea225816887fd5bf505727812721fd4531d3e125)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 164ece178bc4bbe6d31605e6ee711f513bdfc48a)
@@ -105,7 +105,8 @@
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iWifi"
extraSpace : _headerButtonRow.spacing
- onPressed : _wifiDialog.openDialog(_wifiButton)
+
+ onPressed : _headerbarWifi.openDialog(_wifiButton)
}
IconButton { id : _bluetoothButton
@@ -147,7 +148,7 @@
iconImageSource : "qrc:/images/iInformation"
extraSpace : _headerButtonRow.spacing
- onPressed : _informationDialog.openDialog(_informationButton)
+ onPressed : _headerbarInformation.openDialog(_informationButton)
}
}
}
Fisheye: Tag 164ece178bc4bbe6d31605e6ee711f513bdfc48a refers to a dead (removed) revision in file `sources/gui/qml/dialogs/headerbar/HeaderbarDialogInformation.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 164ece178bc4bbe6d31605e6ee711f513bdfc48a refers to a dead (removed) revision in file `sources/gui/qml/dialogs/headerbar/HeaderbarDialogWiFi.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml (revision 0)
+++ sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml (revision 164ece178bc4bbe6d31605e6ee711f513bdfc48a)
@@ -0,0 +1,98 @@
+import QtQuick 2.12
+
+import "qrc:/components"
+import "qrc:/globals"
+
+HeaderBarPopup { id: _root
+ readonly property string qrCodeURL : "www.diality.com/moda-flx"
+ readonly property int rightColumnWidth : 325
+ readonly property int leftColumnWidth : 170
+ readonly property int columnSpacing : Variables.defaultMargin * 3
+
+ readonly property var _dataModel: [
+ { name: qsTr("OS Version" ) , value: vDevice.osVersion },
+ { name: qsTr("UI Version" ) , value: Qt.application.version },
+ { name: qsTr("TD Version" ) , value: vAdjustmentVersions.tdVerDevice },
+ { name: qsTr("TD FPGA Version" ) , value: vAdjustmentVersions.tdVerFPGA },
+ { name: qsTr("TD Serial Number" ) , value: vAdjustmentVersions.tdSerial },
+ { name: qsTr("DD Version" ) , value: vAdjustmentVersions.ddVerDevice },
+ { name: qsTr("DD FPGA Version" ) , value: vAdjustmentVersions.ddVerFPGA },
+ { name: qsTr("DD Serial Number" ) , value: vAdjustmentVersions.ddSerial },
+ { name: qsTr("FP Version" ) , value: vAdjustmentVersions.fpVerDevice },
+ { name: qsTr("FP FPGA Version" ) , value: vAdjustmentVersions.fpVerFPGA }
+ ]
+
+ padding : Variables.defaultMargin * 2
+
+ contentItem: Column { id: _contentColumn
+ anchors.centerIn : parent
+ spacing : Variables.defaultMargin * 2
+
+ Item { id: _versionList
+ width : rightColumnWidth + leftColumnWidth + columnSpacing
+ height : _versionColumn.implicitHeight
+
+ Column { id: _versionColumn
+ anchors.fill: parent
+
+ Repeater {
+ model: _dataModel
+
+ delegate: Item { id: _delegate
+ width : _versionColumn.width
+ height : 40
+
+ Row { id: _row
+ spacing : columnSpacing
+ width : _versionColumn.width
+ anchors.verticalCenter: parent.verticalCenter
+
+ Text { id: _name
+ color : "#2E5E92"
+ text : modelData.name
+ width : leftColumnWidth
+ font.pixelSize : Fonts.fontPixelDialogText
+ font.weight : Font.Medium
+ horizontalAlignment : Text.AlignLeft
+ }
+
+ Text { id: _value
+ color : "grey"
+ text : modelData.value
+ width : rightColumnWidth
+ font.pixelSize : 20
+ horizontalAlignment : Text.AlignRight
+ verticalAlignment : Text.AlignVCenter
+ elide : Text.ElideRight
+ }
+ }
+
+ Line { id : _spacerLine
+ anchors.bottom : parent.bottom
+ length : _versionList.width
+ color : Colors.dialogShadowColor
+ }
+ }
+ }
+ }
+ }
+
+ Row { id: _qrRow
+ spacing : Variables.defaultMargin
+ anchors.left : parent.left
+
+ QRCode { id: _qrCode
+ anchors.verticalCenter: parent.verticalCenter
+ }
+
+ Text { id: _qrCodeInstructions
+ anchors.bottom : _qrCode.bottom
+ text : qsTr("Scan for electronic instructions for use (eIFU)" )
+ color : Colors.dialogText
+ font.pixelSize : Fonts.fontPixelDialogText
+ }
+ }
+ }
+
+ Component.onCompleted: { _qrCode.qrcode = qrCodeURL }
+}
Index: sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml (revision 0)
+++ sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml (revision 164ece178bc4bbe6d31605e6ee711f513bdfc48a)
@@ -0,0 +1,28 @@
+import QtQuick 2.12
+
+import "qrc:/components"
+import "qrc:/globals"
+
+HeaderBarPopup { id: _root
+ readonly property int pixelSize : Fonts.fontPixelDialogText
+ readonly property bool isConnected : vDevice.ssid !== ""
+
+ // TODO: Later add Securty type and signal strength if needed
+ contentItem: Column { id : _dialogColumn
+ anchors.centerIn : parent
+
+ Text { id: _ssid
+ text : ("%1: %2").arg(qsTr("SSID")).arg(vDevice.ssid)
+ color : Colors.dialogText
+ font.pixelSize : _root.pixelSize
+ visible : _root.isConnected
+ }
+
+ Text { id: _ipAddress
+ text : _root.isConnected ? ("%1: %2").arg(qsTr("IP")).arg(vDevice.ipAddress) :
+ qsTr(vDevice.ipAddress)
+ color : Colors.dialogText
+ font.pixelSize : _root.pixelSize
+ }
+ }
+}
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r71c0c7aaf87975e585e86c64e63b11b47de4b2ed -r164ece178bc4bbe6d31605e6ee711f513bdfc48a
--- sources/gui/qml/main.qml (.../main.qml) (revision 71c0c7aaf87975e585e86c64e63b11b47de4b2ed)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 164ece178bc4bbe6d31605e6ee711f513bdfc48a)
@@ -347,15 +347,15 @@
}
// keyboard should always be before AlarmItem to not to covet it.
- KeyboardItem { id: _keyboard }
+ KeyboardItem { id: _keyboard }
- HeaderbarDialogWiFi { id: _wifiDialog }
- HeaderbarDialogInformation { id: _informationDialog }
- LockDialog { id: _lockDialog }
- AlarmItem { id: _alarmItem ; z: 996 }
- PowerItem { id: _powerItem ; z: 997 }
- ConfirmDialog { id: _confirmDialog ; z: 998 }
- DiagnosticsDialog { id: _diagnosticsDialog; z: 999 }
+ HeaderbarWiFi { id: _headerbarWifi }
+ HeaderbarInformation { id: _headerbarInformation }
+ LockDialog { id: _lockDialog }
+ AlarmItem { id: _alarmItem ; z: 996 }
+ PowerItem { id: _powerItem ; z: 997 }
+ ConfirmDialog { id: _confirmDialog ; z: 998 }
+ DiagnosticsDialog { id: _diagnosticsDialog; z: 999 }
// Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
// then cannot be anchored.