diff options
| -rw-r--r-- | main.qml | 4 | ||||
| -rw-r--r-- | pages/Settings.qml | 27 | ||||
| -rw-r--r-- | pages/Transfer.qml | 26 |
3 files changed, 27 insertions, 30 deletions
@@ -500,7 +500,7 @@ ApplicationWindow { currentWallet.disposeTransaction(transaction); } else if (transaction.txCount == 0) { - informationPopup.title = qsTr("No unmixable outputs to sweep") + translationManager.emptyString + informationPopup.title = qsTr("Error") + translationManager.emptyString informationPopup.text = qsTr("No unmixable outputs to sweep") + translationManager.emptyString informationPopup.icon = StandardIcon.Information informationPopup.onCloseCallback = null @@ -613,7 +613,7 @@ ApplicationWindow { currentWallet.disposeTransaction(transaction); } else if (transaction.txCount == 0) { - informationPopup.title = qsTr("No unmixable outputs to sweep") + translationManager.emptyString + informationPopup.title = qsTr("Error") + translationManager.emptyString informationPopup.text = qsTr("No unmixable outputs to sweep") + translationManager.emptyString informationPopup.icon = StandardIcon.Information informationPopup.onCloseCallback = null diff --git a/pages/Settings.qml b/pages/Settings.qml index b64d4752..038af0ae 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -82,7 +82,7 @@ Rectangle { } GridLayout { - columns: (isMobile)? 2 : 3 + columns: (isMobile)? 2 : 4 StandardButton { id: closeWalletButton text: qsTr("Close wallet") + translationManager.emptyString @@ -123,7 +123,6 @@ Rectangle { } } - /* Rescan cache - Disabled until we know it's needed StandardButton { @@ -159,6 +158,30 @@ Rectangle { } } */ + StandardButton { + id: rescanSpentButton + text: qsTr("Rescan wallet balance") + translationManager.emptyString + shadowReleasedColor: "#FF4304" + shadowPressedColor: "#B32D00" + releasedColor: "#FF6C3C" + pressedColor: "#FF4304" + onClicked: { + if (!currentWallet.rescanSpent()) { + console.error("Error: ", currentWallet.errorString); + informationPopup.title = qsTr("Error") + translationManager.emptyString; + informationPopup.text = qsTr("Error: ") + currentWallet.errorString + informationPopup.icon = StandardIcon.Critical + informationPopup.onCloseCallback = null + informationPopup.open(); + } else { + informationPopup.title = qsTr("Information") + translationManager.emptyString + informationPopup.text = qsTr("Sucessfully rescanned spent outputs") + translationManager.emptyString + informationPopup.icon = StandardIcon.Information + informationPopup.onCloseCallback = null + informationPopup.open(); + } + } + } } //! Manage daemon diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 64f05473..7a3202ff 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -554,32 +554,6 @@ Rectangle { submitTxDialog.open(); } } - - StandardButton { - id: rescanSpentButton - text: qsTr("Rescan spent") + translationManager.emptyString - shadowReleasedColor: "#FF4304" - shadowPressedColor: "#B32D00" - releasedColor: "#FF6C3C" - pressedColor: "#FF4304" - enabled: pageRoot.enabled - onClicked: { - if (!currentWallet.rescanSpent()) { - console.error("Error: ", currentWallet.errorString); - informationPopup.title = qsTr("Error") + translationManager.emptyString; - informationPopup.text = qsTr("Error: ") + currentWallet.errorString - informationPopup.icon = StandardIcon.Critical - informationPopup.onCloseCallback = null - informationPopup.open(); - } else { - informationPopup.title = qsTr("Information") + translationManager.emptyString - informationPopup.text = qsTr("Sucessfully rescanned spent outputs") + translationManager.emptyString - informationPopup.icon = StandardIcon.Information - informationPopup.onCloseCallback = null - informationPopup.open(); - } - } - } } |