Index: leahi.qrc =================================================================== diff -u -r3bee9f20350882eca47f3d18b0accf5bec3933d4 -r544066717110941fc0133c22d197fd50953e65d5 --- leahi.qrc (.../leahi.qrc) (revision 3bee9f20350882eca47f3d18b0accf5bec3933d4) +++ leahi.qrc (.../leahi.qrc) (revision 544066717110941fc0133c22d197fd50953e65d5) @@ -34,7 +34,6 @@ sources/gui/qml/dialogs/NotificationDialog.qml sources/gui/qml/dialogs/AlarmListDialog.qml sources/gui/qml/dialogs/LockDialog.qml - sources/gui/qml/dialogs/WiFiDialog.qml sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml @@ -43,6 +42,9 @@ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml + + sources/gui/qml/dialogs/headerbar/WiFiDialog.qml + resources/images/Logo d.png resources/images/Logo DialityT.png Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -rdf622adadade170f17ed7f1971295f7f5f83fbd6 -r544066717110941fc0133c22d197fd50953e65d5 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision df622adadade170f17ed7f1971295f7f5f83fbd6) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 544066717110941fc0133c22d197fd50953e65d5) @@ -1,7 +1,7 @@ import QtQuick 2.12 import "qrc:/components" -import "qrc:/dialogs" +import "qrc:/dialogs/headerbar" import "qrc:/globals" Rectangle { id: _root Fisheye: Tag 544066717110941fc0133c22d197fd50953e65d5 refers to a dead (removed) revision in file `sources/gui/qml/dialogs/WiFiDialog.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/dialogs/headerbar/WiFiDialog.qml =================================================================== diff -u --- sources/gui/qml/dialogs/headerbar/WiFiDialog.qml (revision 0) +++ sources/gui/qml/dialogs/headerbar/WiFiDialog.qml (revision 544066717110941fc0133c22d197fd50953e65d5) @@ -0,0 +1,37 @@ +import QtQuick 2.12 + +import "qrc:/components" +import "qrc:/globals" + +HeaderBarPopup { id: _root + readonly property int pixelSize : 22 + readonly property bool isConnected : vDevice.ssid !== "" + + width : Math.max( _ssid.contentWidth, + _ipAddress.contentWidth) + Variables.defaultMargin * 2 + + height : isConnected ? _ssid.contentHeight + _ipAddress.contentHeight + Variables.defaultMargin : + _ipAddress.contentHeight + Variables.defaultMargin + + // TODO: Later add Securty type and signal strength if needed + + Column { id : _dialogColumn + anchors.fill : parent + anchors.leftMargin : Variables.defaultMargin + anchors.topMargin : 10 + + 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 + } + } +}