diff options
| author | xiphon <xiphon@protonmail.com> | 2020-05-01 12:22:49 +0000 |
|---|---|---|
| committer | xiphon <xiphon@protonmail.com> | 2020-05-07 21:55:44 +0000 |
| commit | 4354a76df94c26f2298380eb657712dc3e06b470 (patch) | |
| tree | 4e0bc611d28f84c07b3a96fe8e78b1bd1cb735d4 /pages | |
| parent | 7536e922e916150497162f8becca88738a02da9e (diff) | |
| download | monzero-gui-4354a76df94c26f2298380eb657712dc3e06b470.tar.gz monzero-gui-4354a76df94c26f2298380eb657712dc3e06b470.tar.xz monzero-gui-4354a76df94c26f2298380eb657712dc3e06b470.zip | |
StandardDropdown: drop Qt 5.8 workaround
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Transfer.qml | 8 | ||||
| -rw-r--r-- | pages/settings/SettingsLayout.qml | 5 | ||||
| -rw-r--r-- | pages/settings/SettingsLog.qml | 3 |
3 files changed, 2 insertions, 14 deletions
diff --git a/pages/Transfer.qml b/pages/Transfer.qml index a44c61cf..3877db23 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -118,7 +118,6 @@ Rectangle { amountLine.text = "" setDescription(""); priorityDropdown.currentIndex = 0 - updatePriorityDropdown() } // Information dialog @@ -397,6 +396,7 @@ Rectangle { id: priorityDropdown Layout.topMargin: 5 currentIndex: 0 + dataModel: priorityModelV5 } } } @@ -745,12 +745,6 @@ Rectangle { function onPageCompleted() { console.log("transfer page loaded") updateStatus(); - updatePriorityDropdown() - } - - function updatePriorityDropdown() { - priorityDropdown.dataModel = priorityModelV5; - priorityDropdown.update() } //TODO: Add daemon sync status diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml index f6032e32..af00f024 100644 --- a/pages/settings/SettingsLayout.qml +++ b/pages/settings/SettingsLayout.qml @@ -196,6 +196,7 @@ Rectangle { MoneroComponents.StandardDropdown { id: fiatPriceCurrencyDropdown Layout.fillWidth: true + currentIndex: persistentSettings.fiatPriceCurrency === "xmrusd" ? 0 : 1 dataModel: fiatPriceCurrencyModel onChanged: { var obj = dataModel.get(currentIndex); @@ -281,10 +282,6 @@ Rectangle { i += 1; } - fiatPriceProviderDropDown.update(); - fiatPriceCurrencyDropdown.currentIndex = persistentSettings.fiatPriceCurrency === "xmrusd" ? 0 : 1; - fiatPriceCurrencyDropdown.update(); - console.log('SettingsLayout loaded'); } } diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml index cd7b35c3..3e41cb01 100644 --- a/pages/settings/SettingsLog.qml +++ b/pages/settings/SettingsLog.qml @@ -231,9 +231,6 @@ Rectangle { } Component.onCompleted: { - logLevelDropdown.currentIndex = appWindow.persistentSettings.logLevel; - logLevelDropdown.update(); - if(typeof daemonManager != "undefined") daemonManager.daemonConsoleUpdated.connect(onDaemonConsoleUpdated) } |