mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 03:59:38 +00:00
Merge pull request #2222
68c5527
persistentSettings: preserve fiat balance toggle on wallet restart (xiphon)
This commit is contained in:
commit
2c81f1808f
2 changed files with 4 additions and 4 deletions
|
@ -51,7 +51,6 @@ Rectangle {
|
||||||
property alias progressBar : progressBar
|
property alias progressBar : progressBar
|
||||||
property alias daemonProgressBar : daemonProgressBar
|
property alias daemonProgressBar : daemonProgressBar
|
||||||
property alias minutesToUnlockTxt: unlockedBalanceLabel.text
|
property alias minutesToUnlockTxt: unlockedBalanceLabel.text
|
||||||
property bool fiatBalance: false
|
|
||||||
property int titleBarHeight: 50
|
property int titleBarHeight: 50
|
||||||
property string copyValue: ""
|
property string copyValue: ""
|
||||||
Clipboard { id: clipboard }
|
Clipboard { id: clipboard }
|
||||||
|
@ -220,7 +219,7 @@ Rectangle {
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
cursorShape: Qt.PointingHandCursor
|
cursorShape: Qt.PointingHandCursor
|
||||||
onClicked: {
|
onClicked: {
|
||||||
fiatBalance = !fiatBalance
|
persistentSettings.fiatPriceToggle = !persistentSettings.fiatPriceToggle
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -236,7 +235,7 @@ Rectangle {
|
||||||
width: 50
|
width: 50
|
||||||
|
|
||||||
MoneroComponents.TextPlain {
|
MoneroComponents.TextPlain {
|
||||||
visible: !(fiatBalance && persistentSettings.fiatPriceEnabled)
|
visible: !(persistentSettings.fiatPriceToggle && persistentSettings.fiatPriceEnabled)
|
||||||
id: balanceText
|
id: balanceText
|
||||||
themeTransition: false
|
themeTransition: false
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
|
@ -309,7 +308,7 @@ Rectangle {
|
||||||
|
|
||||||
MoneroComponents.TextPlain {
|
MoneroComponents.TextPlain {
|
||||||
id: unlockedBalanceText
|
id: unlockedBalanceText
|
||||||
visible: !(fiatBalance && persistentSettings.fiatPriceEnabled)
|
visible: !(persistentSettings.fiatPriceToggle && persistentSettings.fiatPriceEnabled)
|
||||||
themeTransition: false
|
themeTransition: false
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.leftMargin: 20
|
anchors.leftMargin: 20
|
||||||
|
|
1
main.qml
1
main.qml
|
@ -1393,6 +1393,7 @@ ApplicationWindow {
|
||||||
property bool blackTheme: true
|
property bool blackTheme: true
|
||||||
|
|
||||||
property bool fiatPriceEnabled: false
|
property bool fiatPriceEnabled: false
|
||||||
|
property bool fiatPriceToggle: false
|
||||||
property string fiatPriceProvider: "kraken"
|
property string fiatPriceProvider: "kraken"
|
||||||
property string fiatPriceCurrency: "xmrusd"
|
property string fiatPriceCurrency: "xmrusd"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue