Merge pull request #2222

68c5527 persistentSettings: preserve fiat balance toggle on wallet restart (xiphon)
This commit is contained in:
luigi1111 2019-06-21 14:40:18 -05:00
commit 2c81f1808f
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 4 additions and 4 deletions

View file

@ -51,7 +51,6 @@ Rectangle {
property alias progressBar : progressBar
property alias daemonProgressBar : daemonProgressBar
property alias minutesToUnlockTxt: unlockedBalanceLabel.text
property bool fiatBalance: false
property int titleBarHeight: 50
property string copyValue: ""
Clipboard { id: clipboard }
@ -220,7 +219,7 @@ Rectangle {
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: {
fiatBalance = !fiatBalance
persistentSettings.fiatPriceToggle = !persistentSettings.fiatPriceToggle
}
}
}
@ -236,7 +235,7 @@ Rectangle {
width: 50
MoneroComponents.TextPlain {
visible: !(fiatBalance && persistentSettings.fiatPriceEnabled)
visible: !(persistentSettings.fiatPriceToggle && persistentSettings.fiatPriceEnabled)
id: balanceText
themeTransition: false
anchors.left: parent.left
@ -309,7 +308,7 @@ Rectangle {
MoneroComponents.TextPlain {
id: unlockedBalanceText
visible: !(fiatBalance && persistentSettings.fiatPriceEnabled)
visible: !(persistentSettings.fiatPriceToggle && persistentSettings.fiatPriceEnabled)
themeTransition: false
anchors.left: parent.left
anchors.leftMargin: 20

View file

@ -1393,6 +1393,7 @@ ApplicationWindow {
property bool blackTheme: true
property bool fiatPriceEnabled: false
property bool fiatPriceToggle: false
property string fiatPriceProvider: "kraken"
property string fiatPriceCurrency: "xmrusd"