Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r5e0731af5ae5e11d3981e4d3065a886975fb7fc3 -r465a935949a85d3d1bebd11979737ff38ef96122 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 5e0731af5ae5e11d3981e4d3065a886975fb7fc3) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 465a935949a85d3d1bebd11979737ff38ef96122) @@ -47,8 +47,8 @@ //////////////////////////////////////////////////////////////////////////////// readonly property string sdcLabel : qsTr("SD-Card") - readonly property string dvcUnit : "MB" // no translation - readonly property string dvcUnitLabel : " (" + dvcUnit + ")\n" // no translation + readonly property string devUnit : "MB" // no translation + readonly property string devUnitLabel : " (" + devUnit + ")\n" // no translation readonly property string usbLabel : qsTr("USB Drive") readonly property int headetRowHight : 50 @@ -133,13 +133,19 @@ isUpdatePanels = false } + Connections { target: _GuiView + onSdIsReadyChanged: { + _root.updatePanels() + } + } + USBButton { id: _usbEjectButton width : 155 height : 50 anchors.right : _root.right anchors.top : _root.top anchors.margins : Variables.headerButtonsMargin - enabled : ! _GuiView.exportRunning && ! isUpdatePanels + enabled : _GuiView.usbIsReady && !_GuiView.exportRunning && ! isUpdatePanels } Row { id : _contentRect @@ -249,7 +255,7 @@ anchors.left : _SDC_progressItem.right anchors.leftMargin : _progressColumn.spacing anchors.verticalCenter : parent.verticalCenter - text : _root.sdcLabel + _root.dvcUnitLabel + ("Free : %1\nTotal: %2").arg( Variables.sizeConverted( _GuiView.sdAvail, 1000, 3) ).arg( Variables.sizeConverted( _GuiView.sdTotal, 1000, 3) ) + text : _root.sdcLabel + _root.devUnitLabel + ("Free : %1\nTotal: %2").arg( Variables.sizeConverted( _GuiView.sdAvail, 1000, 3) ).arg( Variables.sizeConverted( _GuiView.sdTotal, 1000, 3) ) } Label { anchors.fill : parent @@ -271,7 +277,7 @@ anchors.left : _USB_progressItem.right anchors.leftMargin : _progressColumn.spacing anchors.verticalCenter : parent.verticalCenter - text : _root.usbLabel + _root.dvcUnitLabel + ("Free : %1\nTotal: %2").arg( Variables.sizeConverted( _GuiView.usbAvail, 1000, 3) ).arg( Variables.sizeConverted( _GuiView.usbTotal, 1000, 3) ) + text : _root.usbLabel + _root.devUnitLabel + ("Free : %1\nTotal: %2").arg( Variables.sizeConverted( _GuiView.usbAvail, 1000, 3) ).arg( Variables.sizeConverted( _GuiView.usbTotal, 1000, 3) ) } Label { anchors.fill : parent @@ -286,7 +292,7 @@ height : Variables.touchRectHeight radius : Variables.touchRectRadius border.width : Variables.borderWidth - enabled : ! _GuiView.exportRunning && ! isUpdatePanels + enabled : _GuiView.usbIsReady && !_GuiView.exportRunning && ! isUpdatePanels onClicked : doExport() } }