From 75f2056442c0f68ce1a1f1a533c80ef93cf7b53a Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 29 Sep 2022 16:54:00 +0200 Subject: [PATCH] Log viewer: - Display correctly all log files. - Clean it when quitting the settings. - Clip text. --- linphone-app/src/app/logger/Logger.cpp | 2 +- linphone-app/ui/views/App/Settings/SettingsWindow.qml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/linphone-app/src/app/logger/Logger.cpp b/linphone-app/src/app/logger/Logger.cpp index 1a40395b7..f351d25d1 100644 --- a/linphone-app/src/app/logger/Logger.cpp +++ b/linphone-app/src/app/logger/Logger.cpp @@ -213,7 +213,7 @@ void Logger::init (const shared_ptr &config) { QString Logger::getLogText()const{ QDir path = QString::fromStdString(linphone::Core::getLogCollectionPath()); QString prefix = QString::fromStdString(linphone::Core::getLogCollectionPrefix()); - auto files = path.entryInfoList(QStringList(prefix+"*.log"), QDir::Files | QDir::NoSymLinks | QDir::Readable, QDir::Time); + auto files = path.entryInfoList(QStringList(prefix+"*.log"), QDir::Files | QDir::NoSymLinks | QDir::Readable, QDir::Time | QDir::Reversed); QString result; for(auto fileInfo : files){ QFile file(fileInfo.filePath()); diff --git a/linphone-app/ui/views/App/Settings/SettingsWindow.qml b/linphone-app/ui/views/App/Settings/SettingsWindow.qml index 6953cb431..5ecf418a3 100644 --- a/linphone-app/ui/views/App/Settings/SettingsWindow.qml +++ b/linphone-app/ui/views/App/Settings/SettingsWindow.qml @@ -21,6 +21,7 @@ ApplicationWindow { title: qsTr('settingsTitle') onClosing: { + logViewer.active = false SettingsModel.settingsWindowClosing() tabBar.setCurrentIndex(0) } @@ -199,6 +200,7 @@ ApplicationWindow { Layout.topMargin: 20 Layout.leftMargin: 10 Layout.rightMargin: 10 + clip: true delegate: Text { width: idContentListView.width