diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-12-18 09:25:36 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-12-18 09:25:36 -0600 |
| commit | 29df4ab2442be93443866368a37aa85e4697eadb (patch) | |
| tree | 39e7459448d549878d674029c55f3535ba994698 | |
| parent | 923fe7b02bb1307854450c5c4361338108bd3065 (diff) | |
| parent | 564f256f81ecaa23af099dfdf5edda79d1e6b9e1 (diff) | |
| download | monzero-gui-29df4ab2442be93443866368a37aa85e4697eadb.tar.gz monzero-gui-29df4ab2442be93443866368a37aa85e4697eadb.tar.xz monzero-gui-29df4ab2442be93443866368a37aa85e4697eadb.zip | |
Merge pull request #1813
564f256 settingsLog: fix layout glitch when loaded first time (mmbyday)
| -rw-r--r-- | pages/settings/SettingsLog.qml | 77 |
1 files changed, 36 insertions, 41 deletions
diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml index d43c1dd1..286cbbef 100644 --- a/pages/settings/SettingsLog.qml +++ b/pages/settings/SettingsLog.qml @@ -68,57 +68,52 @@ Rectangle { text: qsTr("Log level") + translationManager.emptyString } - GridLayout { - id: logGrid - columns: appWindow.persistentSettings.logLevel === 5 ? 2 : 1 + ColumnLayout { + spacing: 10 * scaleRatio Layout.fillWidth: true - columnSpacing: 32 * scaleRatio + id: logColumn z: parent.z + 1 - ColumnLayout { - spacing: 0 - Layout.fillWidth: true - - ListModel { - id: logLevel - ListElement { column1: "0"; name: "none"; } - ListElement { column1: "1"; } - ListElement { column1: "2"; } - ListElement { column1: "3"; } - ListElement { column1: "4"; } - ListElement { column1: "custom"; } - } + ListModel { + id: logLevel + ListElement { column1: "0"; name: "none"; } + ListElement { column1: "1"; } + ListElement { column1: "2"; } + ListElement { column1: "3"; } + ListElement { column1: "4"; } + ListElement { column1: "custom"; } + } - MoneroComponents.StandardDropdown { - id: logLevelDropdown - dataModel: logLevel - itemTopMargin: 2 * scaleRatio - currentIndex: appWindow.persistentSettings.logLevel; - onChanged: { - 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; + MoneroComponents.StandardDropdown { + id: logLevelDropdown + dataModel: logLevel + itemTopMargin: 2 * scaleRatio + currentIndex: appWindow.persistentSettings.logLevel; + onChanged: { + if (currentIndex == 5) { + console.log("log categories changed: ", logCategories.text); + walletManager.setLogCategories(logCategories.text); + } + else { + console.log("log level changed: ",currentIndex); + walletManager.setLogLevel(currentIndex); } - Layout.fillWidth: true - Layout.preferredWidth: logGrid.width / 2 - shadowReleasedColor: "#FF4304" - shadowPressedColor: "#B32D00" - releasedColor: "#363636" - pressedColor: "#202020" + appWindow.persistentSettings.logLevel = currentIndex; } + Layout.fillWidth: true + Layout.preferredWidth: logColumn.width + shadowReleasedColor: "#FF4304" + shadowPressedColor: "#B32D00" + releasedColor: "#363636" + pressedColor: "#202020" + z: parent.z + 1 } MoneroComponents.LineEdit { id: logCategories - visible: persistentSettings.logLevel === 5 + visible: logLevelDropdown.currentIndex === 5 Layout.fillWidth: true - Layout.preferredWidth: logGrid.width / 2 + Layout.preferredWidth: logColumn.width text: appWindow.persistentSettings.logCategories placeholderText: "(e.g. *:WARNING,net.p2p:DEBUG)" placeholderFontSize: 14 * scaleRatio @@ -236,7 +231,7 @@ Rectangle { } Component.onCompleted: { - logLevelDropdown.currentIndex = persistentSettings.logLevel; + logLevelDropdown.currentIndex = appWindow.persistentSettings.logLevel; logLevelDropdown.update(); if(typeof daemonManager != "undefined") |