From fb8d9bd5dc06152f12a9ce7ec8f5778e9a8d7859 Mon Sep 17 00:00:00 2001 From: "moneromooo.monero" Date: Mon, 16 Jan 2017 21:56:37 +0000 Subject: [PATCH] Settings: allow setting log categories requires #1589 --- pages/Settings.qml | 27 ++++++++++++++++++++++++--- src/libwalletqt/WalletManager.cpp | 5 +++++ src/libwalletqt/WalletManager.h | 1 + 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/pages/Settings.qml b/pages/Settings.qml index 4d8a4a49..0027e0da 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -352,14 +352,35 @@ Rectangle { ComboBox { id: logLevel - model: [0,1,2,3,4] + model: [0,1,2,3,4,"custom"] currentIndex : appWindow.persistentSettings.logLevel; onCurrentIndexChanged: { - console.log("log level changed: ",currentIndex); - walletManager.setLogLevel(currentIndex); + if (currentIndex == 5) { + console.log("log categories changed: ", logCategories.text); + walletManager.setLogCategories(logCategories.text); + } + else { + console.log("log level changed: ",currentIndex); + walletManager.setLogLevel(currentIndex); + } appWindow.persistentSettings.logLevel = currentIndex; } } + + LineEdit { + id: logCategories + Layout.preferredWidth: 200 + Layout.fillWidth: true + text: "" + placeholderText: qsTr("(e.g. *:WARNING,net.p2p:DEBUG)") + translationManager.emptyString + enabled: logLevel.currentIndex == 5 + onEditingFinished: { + if(enabled) { + console.log("log categories changed: ", text); + walletManager.setLogCategories(text); + } + } + } } // Version diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index ce37b9bb..fa06edd3 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -261,6 +261,11 @@ void WalletManager::setLogLevel(int logLevel) Monero::WalletManagerFactory::setLogLevel(logLevel); } +void WalletManager::setLogCategories(const QString &categories) +{ + Monero::WalletManagerFactory::setLogCategories(categories.toStdString()); +} + QString WalletManager::urlToLocalPath(const QUrl &url) const { return QDir::toNativeSeparators(url.toLocalFile()); diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 12972efe..5b8adf5a 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -112,6 +112,7 @@ public: Q_INVOKABLE QUrl localPathToUrl(const QString &path) const; Q_INVOKABLE void setLogLevel(int logLevel); + Q_INVOKABLE void setLogCategories(const QString &categories); Q_INVOKABLE quint64 add(quint64 x, quint64 y) const { return x + y; } Q_INVOKABLE quint64 sub(quint64 x, quint64 y) const { return x - y; }