Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -rccea9f498ece7b6f75e97d85c9312e67b736f98a -r97b77e88de3f6c41504ec5f9f3606a2143d27ff8 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision ccea9f498ece7b6f75e97d85c9312e67b736f98a) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 97b77e88de3f6c41504ec5f9f3606a2143d27ff8) @@ -84,6 +84,7 @@ readonly property bool horizontalLayout : _GuiView.useLogLongName confirmVisible : false + backEnabled : ! _GuiView.exportRunning notificationMargin : Variables.defaultMargin * 2 notificationFontSize : Fonts.fontPixelStepNormal @@ -264,11 +265,7 @@ freeValue : Variables.sizeConverted( _GuiView.sdAvail, 1000, 3) totalValue : Variables.sizeConverted( _GuiView.sdTotal, 1000, 3) - contentItem: SDCProgressItem{ id: _SDC_progress - thickness : 5 -// displayInformation : false -// text : _SDC_progress.percent - } + contentItem : SDCProgressItem { id: _SDC_progress } } Rectangle { id : _sdcFolderRectangle @@ -303,7 +300,7 @@ folder : _sdcFolderColumn.currentTypeFolderApplication // FIXME: there has to be a View for this which also get changed by log type. } - delegate: ProgressBar { id : _sdcItemBackground + delegate: Item { id : _sdcItemBackground // *** IMPORTANT *** // QML kills the items when they get out of the view port in regards to the cacheBuffer, // and the next time it gets in the view port will be created with all the properties in their defaults. @@ -327,31 +324,39 @@ } } - MouseArea { - anchors.fill : parent - onClicked : exportListUpdate() + ProgressBar { id: _progressRect + anchors{ + fill : parent + leftMargin : Variables.defaultMargin + topMargin : 5 + bottomMargin : 5 + rightMargin : Variables.defaultMargin + + } + color : inExportList ? Colors.borderButton : Colors.transparent + bgColor : Colors.transparent + width : parent.width + height : parent.height + minimum : 0 + maximum : 100 // percent + value : maximum - _sdcItemBackground.exportPercent + z : 0 + radius : 5 + minText.visible : false + maxText.visible : false + marker.visible : false } - progress.z : 0 - minText.visible : false - maxText.visible : false - marker.visible : false - maximum : 100 // percent - value : maximum - exportPercent // Setting height and width to 0 when the file is not shown in the list because // it is a symlink or other conditions width : isShownInList ? _sdcFolderView.width : 0 height : isShownInList ? _contentRect.columnCellHeight : 0 - progress.anchors.bottomMargin : 5 - progress.anchors.topMargin : 5 - progress.anchors.leftMargin : Variables.defaultMargin - progress.width : width - progress.anchors.leftMargin * 2 + MouseArea { + anchors.fill : parent + onClicked : exportListUpdate() + } - bgColor : Colors.transparent - color : inExportList ? Colors.borderButton : Colors.transparent - radius : 5 - Item { width : isShownInList ? parent.width : 0 height : isShownInList ? _contentRect.columnCellHeight : 0 @@ -465,11 +470,7 @@ freeValue : Variables.sizeConverted( _GuiView.usbAvail, 1000, 3) totalValue : Variables.sizeConverted( _GuiView.usbTotal, 1000, 3) - contentItem: USBProgressItem { id: _USB_progress - thickness : 5 -// displayInformation : false -// text : _USB_progress.percent - } + contentItem : USBProgressItem { id: _USB_progress } } Rectangle { id : _usbFolderRectangle