aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-01-08 16:55:04 -0800
committerRiccardo Spagni <ric@spagni.net>2017-01-08 16:55:04 -0800
commitb3424f73a8c37fcde011bd40b60ff5de1a0788fa (patch)
treec3e6a13054072ce2f78a9bc92727462c0d06f477
parentf3e20e746e69f2ade73b6eaa825ca6fa62ccfa23 (diff)
parentf2aefeebb32b7947fa0871ed768f887fb8b500f0 (diff)
downloadmonzero-gui-b3424f73a8c37fcde011bd40b60ff5de1a0788fa.tar.gz
monzero-gui-b3424f73a8c37fcde011bd40b60ff5de1a0788fa.tar.xz
monzero-gui-b3424f73a8c37fcde011bd40b60ff5de1a0788fa.zip
Merge pull request #374
f2aefee settings: log level selector (Jaquee)
-rw-r--r--main.qml5
-rw-r--r--pages/Settings.qml22
2 files changed, 25 insertions, 2 deletions
diff --git a/main.qml b/main.qml
index e3bc1871..201b0e29 100644
--- a/main.qml
+++ b/main.qml
@@ -150,9 +150,11 @@ ApplicationWindow {
function initialize() {
console.log("initializing..")
-
walletInitialized = false;
+ // Use stored log level
+ walletManager.setLogLevel(persistentSettings.logLevel)
+
// setup language
var locale = persistentSettings.locale
if (locale !== "") {
@@ -716,6 +718,7 @@ ApplicationWindow {
property bool is_recovering : false
property bool customDecorations : true
property string daemonFlags
+ property int logLevel: 0
}
// Information dialog
diff --git a/pages/Settings.qml b/pages/Settings.qml
index be4c2368..f735badf 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -365,6 +365,27 @@ Rectangle {
}
}
+ // Log level
+ RowLayout {
+ Label {
+ id: logLevelLabel
+ color: "#4A4949"
+ text: qsTr("Log level") + translationManager.emptyString
+ fontSize: 16
+ }
+
+ ComboBox {
+ id: logLevel
+ model: [0,1,2,3,4]
+ currentIndex : appWindow.persistentSettings.logLevel;
+ onCurrentIndexChanged: {
+ console.log("log level changed: ",currentIndex);
+ walletManager.setLogLevel(currentIndex);
+ appWindow.persistentSettings.logLevel = currentIndex;
+ }
+ }
+ }
+
Label {
id: guiVersion
Layout.topMargin: 8
@@ -379,7 +400,6 @@ Rectangle {
text: qsTr("Embedded Monero version: ") + Version.GUI_MONERO_VERSION + translationManager.emptyString
fontSize: 16
}
-
}
// Daemon console