Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -ra53bdf104b52cae3a49705a4cc8bd886530084c9 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision a53bdf104b52cae3a49705a4cc8bd886530084c9) @@ -307,20 +307,20 @@ // FIXME: there has to be a View for this, and the timer should be removed and an event driven signal should be implemented there. function updateModel() { - _sdcFolderModel.folder = currentTypeFolderApplication // FIXME: there has to be a View for this which also get changed by log type. - _sdcFolderModel.nameFilters = _root.typeFilterAll +// _sdcFolderModel.folder = currentTypeFolderApplication // FIXME: there has to be a View for this which also get changed by log type. +// _sdcFolderModel.nameFilters = _root.typeFilterAll } function clearModel() { - _sdcFolderModel.folder = _root.typePathClr - _sdcFolderModel.nameFilters = _root.typeFilterClr +// _sdcFolderModel.folder = _root.typePathClr +// _sdcFolderModel.nameFilters = _root.typeFilterClr } spacing : 5 width : _contentRect.columnWidthFolder height : parent.height anchors.verticalCenter : parent.verticalCenter Label { id : _sdcLabel - text : _root.sdcLabel + ": %1 files"/*, %2 %3"*/.arg(_sdcFolderView.visibleFileCounter) + (_GuiView.exportCount ? " [Selected: %1]".arg(_GuiView.exportCount ) : "") //.arg("__").arg(_root.dvcUnit) + text : _root.sdcLabel + ": %1 files"/*, %2 %3"*/.arg(_sdcFolderView.count) + (_GuiView.exportCount ? " [Selected: %1]".arg(_GuiView.exportCount ) : "") //.arg("__").arg(_root.dvcUnit) width : parent.width height : _root.headetRowHight verticalAlignment : Text.AlignVCenter @@ -340,27 +340,26 @@ } ListView { id : _sdcFolderView - property int visibleFileCounter : 0 enabled : !_GuiView.exportRunning && ! isUpdatePanels clip : true anchors.fill : parent anchors.margins : 10 anchors.leftMargin : 5 anchors.rightMargin : 5 spacing : 3 - FolderListModel { id : _sdcFolderModel - onStatusChanged: { - // onFolderChanged does not get emitted when switching folders, but status change does. - // Reset the displayed file counter when the state of the model is null - if (_sdcFolderModel.status == FolderListModel.Null) - { - _sdcFolderView.visibleFileCounter = 0 - } - } - showDirs : false - sortField : FolderListModel.Time - folder : _sdcFolderColumn.currentTypeFolderApplication // FIXME: there has to be a View for this which also get changed by log type. - } +// FolderListModel { id : _sdcFolderModel +// onStatusChanged: { +// // onFolderChanged does not get emitted when switching folders, but status change does. +// // Reset the displayed file counter when the state of the model is null +// if (_sdcFolderModel.status == FolderListModel.Null) +// { +// _sdcFolderView.visibleFileCounter = 0 +// } +// } +// showDirs : false +// sortField : FolderListModel.Time +// folder : _sdcFolderColumn.currentTypeFolderApplication // FIXME: there has to be a View for this which also get changed by log type. +// } Component { id : _sdcFileDelegate ProgressBar { id : _sdcItemBackground @@ -375,8 +374,7 @@ : 0 onExportPercentChanged : console.log( "%", exportPercent) - property bool isShownInList : !_GuiView.isPathSymLink(_sdcFolderColumn.currentTypeFolderApplication.replace(typePathPrefix, "") + "/" + fileName) - Component.onCompleted: if ( isShownInList ) _sdcFolderView.visibleFileCounter++ + property bool isShownInList : true//!_GuiView.isPathSymLink(_sdcFolderColumn.currentTypeFolderApplication.replace(typePathPrefix, "") + "/" + fileName) //DEBUG: onInExportListChanged: console.debug(" * ", index, inExportList) function exportListUpdate() { @@ -432,7 +430,7 @@ Text { id : _sdcFileSizeText clip : true width : isShownInList ? _contentRect.columnWidthFileSize : 0 - text : Variables.sizeConverted( fileSize, 1000, 3) + text : Variables.sizeConverted( fileSize_bytes, 1000, 3) color : Colors.textMain font.pixelSize : Fonts.fontPixelTextRectExtra verticalAlignment : Text.AlignVCenter @@ -441,7 +439,7 @@ } } } - model : _sdcFolderModel + model : vSDCardFiles delegate : _sdcFileDelegate } }