Index: leahi.qrc =================================================================== diff -u -rccea9f498ece7b6f75e97d85c9312e67b736f98a -r80e196a153549a10b01ddc52fdd3c4f09d215da6 --- leahi.qrc (.../leahi.qrc) (revision ccea9f498ece7b6f75e97d85c9312e67b736f98a) +++ leahi.qrc (.../leahi.qrc) (revision 80e196a153549a10b01ddc52fdd3c4f09d215da6) @@ -142,6 +142,7 @@ resources/images/export.png resources/images/refresh_disabled.png resources/images/export_disabled.png + resources/images/WifiError.png sources/gui/qml/components/MainMenu.qml Index: sources/device/DeviceView.cpp =================================================================== diff -u -rabb959f145f8af64bab3b8f24314bf0ba8f3bb0e -r80e196a153549a10b01ddc52fdd3c4f09d215da6 --- sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision abb959f145f8af64bab3b8f24314bf0ba8f3bb0e) +++ sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision 80e196a153549a10b01ddc52fdd3c4f09d215da6) @@ -581,6 +581,7 @@ ssid(""); } ipAddress(vData); + wifiError(vWifiError); } // ================================================= Date/Time Index: sources/device/DeviceView.h =================================================================== diff -u -rabb959f145f8af64bab3b8f24314bf0ba8f3bb0e -r80e196a153549a10b01ddc52fdd3c4f09d215da6 --- sources/device/DeviceView.h (.../DeviceView.h) (revision abb959f145f8af64bab3b8f24314bf0ba8f3bb0e) +++ sources/device/DeviceView.h (.../DeviceView.h) (revision 80e196a153549a10b01ddc52fdd3c4f09d215da6) @@ -91,6 +91,7 @@ READONLY ( QString , gateway , "" ) READONLY ( QString , subnetMask , "" ) READONLY ( QString , dns , "" ) + READONLY ( bool , wifiError , false ) Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange ) Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r0784febfc4f6b1bc4232dce72df22b93ac168685 -r80e196a153549a10b01ddc52fdd3c4f09d215da6 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 0784febfc4f6b1bc4232dce72df22b93ac168685) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 80e196a153549a10b01ddc52fdd3c4f09d215da6) @@ -207,7 +207,7 @@ IconButton { id : _wifiButton iconSize : Variables.headerIconDiameter - iconImageSource : "qrc:/images/iWifi" + iconImageSource : ! vDevice.wifiError ? "qrc:/images/iWifi" : "qrc:/images/iWifiError" extraSpace : _headerButtonRow.spacing onPressed : _headerbarWifi.openDialog(_wifiButton) Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r97b77e88de3f6c41504ec5f9f3606a2143d27ff8 -r80e196a153549a10b01ddc52fdd3c4f09d215da6 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 97b77e88de3f6c41504ec5f9f3606a2143d27ff8) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 80e196a153549a10b01ddc52fdd3c4f09d215da6) @@ -507,6 +507,30 @@ width : _usbFolderView.width height : _contentRect.columnCellHeight + ProgressBar { id: _usbProgressRect + anchors{ + fill : parent + leftMargin : Variables.defaultMargin + topMargin : 5 + bottomMargin : 5 + rightMargin : Variables.defaultMargin + + } + color : _GuiView.exportRunning ? Colors.borderButtonSelected : Colors.transparent + bgColor : Colors.transparent + width : parent.width + height : parent.height + minimum : 0 + maximum : 100 // percent + value : _GuiView.exportPercent + z : 0 + radius : 5 + minText.visible : false + maxText.visible : false + marker.visible : false + visible : index === 0 + } + Row { id : _usbFileRow anchors.fill : parent height : parent.height