monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #707

Browse source 
443eb47 UX: move 'rescan spent' to settings and rename to 'Rescan wallet balance' (Jaquee)
1375305 UX: remove wide header (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-06-04 12:17:05 +02:00
commit 9e121fb676
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.qml
View file

@ -500,7 +500,7 @@ ApplicationWindow {
currentWallet.disposeTransaction(transaction); currentWallet.disposeTransaction(transaction);
} else if (transaction.txCount == 0) { } 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.text = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
informationPopup.icon = StandardIcon.Information informationPopup.icon = StandardIcon.Information
informationPopup.onCloseCallback = null informationPopup.onCloseCallback = null
@ -613,7 +613,7 @@ ApplicationWindow {
currentWallet.disposeTransaction(transaction); currentWallet.disposeTransaction(transaction);
} else if (transaction.txCount == 0) { } 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.text = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
informationPopup.icon = StandardIcon.Information informationPopup.icon = StandardIcon.Information
informationPopup.onCloseCallback = null informationPopup.onCloseCallback = null

27
pages/Settings.qml
View file

@ -82,7 +82,7 @@ Rectangle {
} }
GridLayout { GridLayout {
columns: (isMobile)? 2 : 3 columns: (isMobile)? 2 : 4
StandardButton { StandardButton {
id: closeWalletButton id: closeWalletButton
text: qsTr("Close wallet") + translationManager.emptyString text: qsTr("Close wallet") + translationManager.emptyString
@ -123,7 +123,6 @@ Rectangle {
} }
} }
/* Rescan cache - Disabled until we know it's needed /* Rescan cache - Disabled until we know it's needed
StandardButton { 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 //! Manage daemon

26
pages/Transfer.qml
View file

@ -554,32 +554,6 @@ Rectangle {
submitTxDialog.open(); 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();
}
}
}
} }