Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -rb012c6d1d980d4341faad8719dd33a0bed49b7f8 -rb27d866493d3289f3b40b97e9d8dca5dfb8a95d2 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision b012c6d1d980d4341faad8719dd33a0bed49b7f8) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision b27d866493d3289f3b40b97e9d8dca5dfb8a95d2) @@ -69,13 +69,6 @@ } } - property bool isUpdatePanels: false - function updatePanels (vIndex) { - isUpdatePanels = true - _GuiView.doExportListRemove() - isUpdatePanels = false - } - Connections { target: _GuiView function onDidExportStat ( vIndex, vFileName, vPercent ) { _sdcFolderView.positionViewAtIndex(vIndex, ListView.Center) } @@ -89,7 +82,7 @@ anchors.right : _root.right anchors.top : _root.top anchors.margins : Variables.headerButtonsMargin - enabled : _GuiView.usbIsReady && !_GuiView.exportRunning && ! isUpdatePanels + enabled : _GuiView.usbIsReady && !_GuiView.exportRunning } Row { id : _contentRect @@ -132,7 +125,7 @@ _GuiView.doExportListRemove() //DEBUG console.log(">>>Index " + currentIndex) } - enabled : ! _GuiView.exportRunning && ! isUpdatePanels + enabled : ! _GuiView.exportRunning currentIndex : 0 displayText : currentText font.pixelSize : Fonts.fontPixelTextRectExtra @@ -242,7 +235,7 @@ height : Variables.touchRectHeight radius : Variables.touchRectRadius border.width : Variables.borderWidth - enabled : _GuiView.usbIsReady && !_GuiView.exportRunning && ! isUpdatePanels + enabled : _GuiView.usbIsReady && !_GuiView.exportRunning onClicked : doExport() } } @@ -272,7 +265,7 @@ } ListView { id : _sdcFolderView - enabled : !_GuiView.exportRunning && ! isUpdatePanels + enabled : !_GuiView.exportRunning clip : true anchors.fill : parent anchors.margins : 10 Index: sources/storage/Logger.h =================================================================== diff -u -r61f87c52ccba9ce140fd8039915e025b6c790575 -rb27d866493d3289f3b40b97e9d8dca5dfb8a95d2 --- sources/storage/Logger.h (.../Logger.h) (revision 61f87c52ccba9ce140fd8039915e025b6c790575) +++ sources/storage/Logger.h (.../Logger.h) (revision b27d866493d3289f3b40b97e9d8dca5dfb8a95d2) @@ -90,9 +90,10 @@ }; Q_ENUM(LogType) - static QList getLogTypeList ( ) { return {LogType::eLogAppED, LogType::eLogDebug, LogType::eLogTrtmt};} - const char* getPathOfLogType (LogType vType) { return _logBasePathNames.value(vType); } - LogType getLogType(const QString &vPath); + static QList getLogTypeList () { return {LogType::eLogAppED, LogType::eLogDebug, LogType::eLogTrtmt};} + QString getStoredLogPath (LogType vType) { return _logPathNames.value(vType); } + QString getLogBasePath (LogType vType) { return _logBasePathNames.value(vType); } + LogType getLogType (const QString &vPath); private: Index: sources/view/settings/VLogFilesModel.cpp =================================================================== diff -u -re30e11b7d2620d1b1cc54ac4a8da8255714d83ca -rb27d866493d3289f3b40b97e9d8dca5dfb8a95d2 --- sources/view/settings/VLogFilesModel.cpp (.../VLogFilesModel.cpp) (revision e30e11b7d2620d1b1cc54ac4a8da8255714d83ca) +++ sources/view/settings/VLogFilesModel.cpp (.../VLogFilesModel.cpp) (revision b27d866493d3289f3b40b97e9d8dca5dfb8a95d2) @@ -260,7 +260,7 @@ foreach(Storage::Logger::LogType type , logTypes) { // determine where the corresponding log folders live for each log type - QString folderPath = QString("%1%2").arg(Storage::Log_Folder_Base).arg(_Logger.getPathOfLogType(type)); + QString folderPath = _Logger.getStoredLogPath(type); // Add to systemWatcher to monitor for changes _DeviceController.doAddDirectoryWatch(folderPath); @@ -324,8 +324,9 @@ foreach(Storage::Logger::LogType type , logTypes) { // determine where the corresponding log folders live for each log type - QString folderPath = QString("%1%2").arg(Storage::USB_Mount_Point).arg(_Logger.getPathOfLogType(type)); + QString folderPath = QString("%1%2").arg(Storage::USB_Mount_Point).arg(_Logger.getLogBasePath(type)); + //DEBUG qDebug()<< "USB folder: " << folderPath; // Add to systemWatcher to monitor for changes _DeviceController.doAddDirectoryWatch(folderPath);