Index: sources/gui/qml/components/ReviewContainer.qml =================================================================== diff -u -rabb959f145f8af64bab3b8f24314bf0ba8f3bb0e -rcbe04ec89eb7261a6950871dc89a3eb7f18ce9fc --- sources/gui/qml/components/ReviewContainer.qml (.../ReviewContainer.qml) (revision abb959f145f8af64bab3b8f24314bf0ba8f3bb0e) +++ sources/gui/qml/components/ReviewContainer.qml (.../ReviewContainer.qml) (revision cbe04ec89eb7261a6950871dc89a3eb7f18ce9fc) @@ -17,6 +17,8 @@ property int cellHeight : Variables.createRxLabelUnitContainerHeight property int valuePixelSize : Fonts.fontPixelValueControl + property color headerColor : Colors.panelBackgroundColor + property int delegateFontWeight : Font.Normal height : _column.implicitHeight + 10 width : parent.width @@ -33,12 +35,12 @@ Rectangle { id: _header width : _root.width height : _root.cellHeight - color : Colors.panelBackgroundColor + color : _root.headerColor radius : _root.radius border { - width: 1 - color: Colors.panelBorderColor + width: _root.border.width + color: _root.border.color } Text { id: _title @@ -61,12 +63,13 @@ width : delegate.implicitWidth delegate : LabelUnitContainer { id: _delegate - text : modelData - color : Colors.transparent - width : parent.width - height : _root.cellHeight - unitText : _root.units[index] - border.width: 0 + text : modelData + color : Colors.transparent + width : parent.width + height : _root.cellHeight + unitText : _root.units[index] + border.width : 0 + titleFontWeight : _root.delegateFontWeight contentItem : Item { id: _contentItem Row { id: _row Index: sources/gui/qml/compounds/LabelUnitContainer.qml =================================================================== diff -u -r1132f049e169cc87a059261f72fca0ceb7d739f1 -rcbe04ec89eb7261a6950871dc89a3eb7f18ce9fc --- sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision 1132f049e169cc87a059261f72fca0ceb7d739f1) +++ sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision cbe04ec89eb7261a6950871dc89a3eb7f18ce9fc) @@ -30,6 +30,7 @@ property bool valid : true property bool showEdit : false property int titleFontSize : Fonts.fontPixelDefaultButton + property int titleFontWeight : Font.Normal property int unitFontSize : Fonts.fontUnit property bool needsAttention : false property bool editEnabled : true @@ -58,6 +59,7 @@ anchors.verticalCenter : _titleRow.verticalCenter color : Colors.offWhite font.pixelSize : _root.titleFontSize + font.weight : _root.titleFontWeight } Text { id: _unit Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r7360f85ae13ee2a460ddfb11bc455203d6edf3ff -rcbe04ec89eb7261a6950871dc89a3eb7f18ce9fc --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 7360f85ae13ee2a460ddfb11bc455203d6edf3ff) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision cbe04ec89eb7261a6950871dc89a3eb7f18ce9fc) @@ -404,16 +404,15 @@ } } - ExportButton { id : _logTypeExportButton + IconButton { id: _exportButton anchors.centerIn: parent - width : 100 - height : Variables.touchRectHeight - radius : Variables.touchRectRadius - border.width : Variables.borderWidth - enabled : _GuiView.usbIsReady && !_GuiView.exportRunning && ! isUpdatePanels - onClicked : doExport() + iconImageSource : "qrc:/images/iExport" + enabled : _GuiView.usbIsReady && !_GuiView.exportRunning && ! isUpdatePanels + isDefault : true + onPressed : doExport() } + Column { id : _usbFolderColumn property string currentTypeFolderApplication : _root.typeFolderApplicationDst @@ -536,7 +535,7 @@ Column { id : _progressColumn property int progressWidth : 170 - property int progressHeight : height - _logTypeCombo.height - _logTypeExportButton.height + property int progressHeight : height - _logTypeCombo.height //- _logTypeExportButton.height spacing : 10 width : _contentRect.columnWidthProgress Index: sources/gui/qml/pages/settings/SettingsWiFi.qml =================================================================== diff -u -r7360f85ae13ee2a460ddfb11bc455203d6edf3ff -rcbe04ec89eb7261a6950871dc89a3eb7f18ce9fc --- sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 7360f85ae13ee2a460ddfb11bc455203d6edf3ff) +++ sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision cbe04ec89eb7261a6950871dc89a3eb7f18ce9fc) @@ -63,56 +63,34 @@ width : parent.width / 2.5 - Text { id : _wifiInfoTitle + ReviewContainer { id: _currentWifiInfo anchors { top : parent.top left: parent.left } - width : parent.width - height : 60 - text : qsTr("Current Wi-Fi Information") - font.pixelSize : Fonts.fontPixelButton - font.weight : Font.Medium - color : Colors.offWhite - - Line { id: _divider - color : Colors.panelBorderColor - anchors { - bottom : parent.bottom - bottomMargin: 10 - left : parent.left - right : parent.right - } - } - } - - TouchGrid { id: _currentWifi - anchors { - top : _wifiInfoTitle.bottom - left: _wifiInfoTitle.left - } + title : qsTr("Current Wi-Fi Information") width : parent.width - touchable : false - alignCenter : false - rowCount : 5 - colCount : 1 - itemWidth : width - itemsText : [ qsTr("SSID") , - qsTr("IP Address") , - qsTr("Gateway") , - qsTr("Subnet Mask") , - qsTr("DNS") ] - lineColor : Colors.panelBorderColor + cellHeight : 100 + valuePixelSize : Fonts.fontPixelTextRectTitle + color : Colors.transparent + headerColor : Colors.transparent + border.width : 0 + delegateFontWeight : Font.Medium - itemsValue : [ vDevice.ssid , - _root.isConnected ? vDevice.ipAddress : "" , - vDevice.gateway , - vDevice.subnetMask , - vDevice.dns ] + label : [ qsTr("SSID") , + qsTr("IP Address") , + qsTr("Gateway") , + qsTr("Subnet Mask") , + qsTr("DNS") ] - delegateColor : Colors.transparent - itemsHasLine : Array(itemsText.length).fill(true) // sets all to true - itemsHasImage : Array(itemsText.length).fill(false) // sets all to false + initial : [ vDevice.ssid , + _root.isConnected ? vDevice.ipAddress : "" , + vDevice.gateway , + vDevice.subnetMask , + vDevice.dns ] + + actual : [ "" , "" , "" , "" , "" ] + units : [ "" , "" , "" , "" , "" ] } } @@ -274,11 +252,11 @@ height : Variables.completeDialogHeight - 130 // need to make room for keyboard width : Variables.completeDialogWidth y : 0 - titleText : isPassword ? qsTr("Join") + separator + ssid : - qsTr("Disconnect") + separator + ssid + titleText : isPassword ? qsTr("Join ") + ssid : + qsTr("Disconnect ") + ssid messageText : isPassword ? qsTr("Password") : qsTr("Do you want to disconnect from `%1`?").arg(ssid) messageTextPixel : Fonts.fontPixelTextRectExtra - notificationText : vDevice.status + footerBottomMargin : Variables.defaultMargin * 2 Item { id: _passwordItem readonly property string passwordCurrent : _passwordEntry.textInput.text