aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-02-08 12:43:29 +0200
committerRiccardo Spagni <ric@spagni.net>2017-02-08 12:43:29 +0200
commitfa4078f38c51ea56e399673f3b068d124308b7a5 (patch)
tree6efef43d53d40d1dff790e713dd2f606271c3163
parente145793d2f29c5762541c8faef593a5731d0001f (diff)
parent40540cb38a0db80f77f440e23613d139e2717161 (diff)
downloadmonzero-gui-fa4078f38c51ea56e399673f3b068d124308b7a5.tar.gz
monzero-gui-fa4078f38c51ea56e399673f3b068d124308b7a5.tar.xz
monzero-gui-fa4078f38c51ea56e399673f3b068d124308b7a5.zip
Merge pull request #459
40540cb Save custom log categories to persistent settings (moneromooo.monero)
-rw-r--r--main.qml6
-rw-r--r--pages/Settings.qml3
2 files changed, 7 insertions, 2 deletions
diff --git a/main.qml b/main.qml
index 477548c0..d779ba0e 100644
--- a/main.qml
+++ b/main.qml
@@ -160,7 +160,10 @@ ApplicationWindow {
walletInitialized = false;
// Use stored log level
- walletManager.setLogLevel(persistentSettings.logLevel)
+ if (persistentSettings.logLevel == 5)
+ walletManager.setLogCategories(persistentSettings.logCategories)
+ else
+ walletManager.setLogLevel(persistentSettings.logLevel)
// setup language
var locale = persistentSettings.locale
@@ -784,6 +787,7 @@ ApplicationWindow {
property bool customDecorations : true
property string daemonFlags
property int logLevel: 0
+ property string logCategories: ""
}
// Information dialog
diff --git a/pages/Settings.qml b/pages/Settings.qml
index 9bbb0ee3..de18bac7 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -388,13 +388,14 @@ Rectangle {
id: logCategories
Layout.preferredWidth: 200
Layout.fillWidth: true
- text: ""
+ text: appWindow.persistentSettings.logCategories
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);
+ appWindow.persistentSettings.logCategories = text;
}
}
}