mirror of
https://github.com/monero-project/monero-gui.git
synced 2025-03-16 16:42:13 +00:00
Merge pull request #1337
l33tb846673
Reformat Settings->Debug Info170ddf1
Removes 'Daemon log path:' from the debug info199aedf
Dialog(s) for changing restore heightec640dc
Cursor pointer on link hover
This commit is contained in:
commit
aa74e9e026
3 changed files with 105 additions and 80 deletions
|
@ -5,6 +5,7 @@ import "../components" as MoneroComponents
|
|||
TextEdit {
|
||||
color: MoneroComponents.Style.defaultFontColor
|
||||
font.family: MoneroComponents.Style.fontRegular.name
|
||||
selectionColor: MoneroComponents.Style.dimmedFontColor
|
||||
wrapMode: Text.Wrap
|
||||
readOnly: true
|
||||
selectByMouse: true
|
||||
|
|
|
@ -23,3 +23,7 @@ function formatDate( date, params ) {
|
|||
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString
|
||||
return new Date( date ).toLocaleString( 'en-US', options );
|
||||
}
|
||||
|
||||
function isNumeric(n) {
|
||||
return !isNaN(parseFloat(n)) && isFinite(n);
|
||||
}
|
|
@ -623,101 +623,121 @@ Rectangle {
|
|||
}
|
||||
}
|
||||
|
||||
TextBlock {
|
||||
Layout.topMargin: 8
|
||||
font.pixelSize: 14
|
||||
Layout.fillWidth: true
|
||||
text: qsTr("GUI version: ") + Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")" + translationManager.emptyString
|
||||
}
|
||||
TextBlock {
|
||||
id: guiMoneroVersion
|
||||
Layout.fillWidth: true
|
||||
font.pixelSize: 14
|
||||
text: qsTr("Embedded Monero version: ") + Version.GUI_MONERO_VERSION + translationManager.emptyString
|
||||
}
|
||||
TextBlock {
|
||||
id: restoreHeightText
|
||||
Layout.fillWidth: true
|
||||
font.pixelSize: 14
|
||||
textFormat: Text.RichText
|
||||
property var txt: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C}</style>" + qsTr("Wallet creation height: ") + (currentWallet ? currentWallet.walletCreationHeight : "") + translationManager.emptyString
|
||||
property var linkTxt: qsTr(" <a href='#'>(Click to change)</a>") + translationManager.emptyString
|
||||
text: (typeof currentWallet == "undefined") ? "" : txt + linkTxt
|
||||
GridLayout {
|
||||
id: grid
|
||||
columns: 2
|
||||
columnSpacing: 20 * scaleRatio
|
||||
|
||||
onLinkActivated: {
|
||||
restoreHeightRow.visible = true;
|
||||
TextBlock {
|
||||
font.pixelSize: 14
|
||||
text: qsTr("GUI version: ") + translationManager.emptyString
|
||||
}
|
||||
|
||||
}
|
||||
TextBlock {
|
||||
font.pixelSize: 14
|
||||
font.bold: true
|
||||
text: Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")" + translationManager.emptyString
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
id: restoreHeightRow
|
||||
visible: false
|
||||
LineEdit {
|
||||
id: restoreHeight
|
||||
Layout.preferredWidth: 80
|
||||
TextBlock {
|
||||
id: guiMoneroVersion
|
||||
font.pixelSize: 14
|
||||
text: qsTr("Embedded Monero version: ") + translationManager.emptyString
|
||||
}
|
||||
|
||||
TextBlock {
|
||||
font.pixelSize: 14
|
||||
font.bold: true
|
||||
text: Version.GUI_MONERO_VERSION + translationManager.emptyString
|
||||
}
|
||||
|
||||
TextBlock {
|
||||
Layout.fillWidth: true
|
||||
text: currentWallet ? currentWallet.walletCreationHeight : "0"
|
||||
validator: IntValidator {
|
||||
bottom:0
|
||||
}
|
||||
font.pixelSize: 14
|
||||
text: qsTr("Wallet name: ") + translationManager.emptyString
|
||||
}
|
||||
|
||||
StandardButton {
|
||||
id: restoreHeightSave
|
||||
small: true
|
||||
Layout.fillWidth: false
|
||||
Layout.leftMargin: 30
|
||||
text: qsTr("Save") + translationManager.emptyString
|
||||
TextBlock {
|
||||
Layout.fillWidth: true
|
||||
font.pixelSize: 14
|
||||
font.bold: true
|
||||
text: walletName + translationManager.emptyString
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
currentWallet.walletCreationHeight = restoreHeight.text
|
||||
// Restore height is saved in .keys file. Set password to trigger rewrite.
|
||||
currentWallet.setPassword(appWindow.walletPassword)
|
||||
restoreHeightRow.visible = false
|
||||
TextBlock {
|
||||
id: restoreHeight
|
||||
font.pixelSize: 14
|
||||
textFormat: Text.RichText
|
||||
text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet creation height: ") + translationManager.emptyString
|
||||
}
|
||||
|
||||
// Show confirmation dialog
|
||||
confirmationDialog.title = qsTr("Rescan wallet cache") + translationManager.emptyString;
|
||||
confirmationDialog.text = qsTr("Are you sure you want to rebuild the wallet cache?\n"
|
||||
+ "The following information will be deleted\n"
|
||||
+ "- Recipient addresses\n"
|
||||
+ "- Tx keys\n"
|
||||
+ "- Tx descriptions\n\n"
|
||||
+ "The old wallet cache file will be renamed and can be restored later.\n"
|
||||
);
|
||||
confirmationDialog.icon = StandardIcon.Question
|
||||
confirmationDialog.cancelText = qsTr("Cancel")
|
||||
confirmationDialog.onAcceptedCallback = function() {
|
||||
walletManager.closeWallet();
|
||||
walletManager.clearWalletCache(persistentSettings.wallet_path);
|
||||
walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
|
||||
persistentSettings.nettype);
|
||||
TextBlock {
|
||||
id: restoreHeightText
|
||||
textFormat: Text.RichText
|
||||
font.pixelSize: 14
|
||||
font.bold: true
|
||||
property var style: "<style type='text/css'>a {cursor:pointer;text-decoration: none; color: #FF6C3C}</style>"
|
||||
text: (currentWallet ? currentWallet.walletCreationHeight : "") + style + qsTr(" <a href='#'> (Click to change)</a>") + translationManager.emptyString
|
||||
onLinkActivated: {
|
||||
inputDialog.labelText = qsTr("Set a new restore height:") + translationManager.emptyString;
|
||||
inputDialog.inputText = currentWallet ? currentWallet.walletCreationHeight : "0";
|
||||
inputDialog.onAcceptedCallback = function() {
|
||||
var _restoreHeight = inputDialog.inputText;
|
||||
if(Utils.isNumeric(_restoreHeight)){
|
||||
_restoreHeight = parseInt(_restoreHeight);
|
||||
if(_restoreHeight >= 0) {
|
||||
currentWallet.walletCreationHeight = restoreHeightEdit.text
|
||||
// Restore height is saved in .keys file. Set password to trigger rewrite.
|
||||
currentWallet.setPassword(appWindow.walletPassword)
|
||||
|
||||
// Show confirmation dialog
|
||||
confirmationDialog.title = qsTr("Rescan wallet cache") + translationManager.emptyString;
|
||||
confirmationDialog.text = qsTr("Are you sure you want to rebuild the wallet cache?\n"
|
||||
+ "The following information will be deleted\n"
|
||||
+ "- Recipient addresses\n"
|
||||
+ "- Tx keys\n"
|
||||
+ "- Tx descriptions\n\n"
|
||||
+ "The old wallet cache file will be renamed and can be restored later.\n"
|
||||
);
|
||||
confirmationDialog.icon = StandardIcon.Question
|
||||
confirmationDialog.cancelText = qsTr("Cancel")
|
||||
confirmationDialog.onAcceptedCallback = function() {
|
||||
walletManager.closeWallet();
|
||||
walletManager.clearWalletCache(persistentSettings.wallet_path);
|
||||
walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
|
||||
persistentSettings.nettype);
|
||||
}
|
||||
|
||||
confirmationDialog.onRejectedCallback = null;
|
||||
confirmationDialog.open()
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
appWindow.showStatusMessage(qsTr("Invalid restore height specified. Must be a number."),3);
|
||||
}
|
||||
inputDialog.onRejectedCallback = null;
|
||||
inputDialog.open()
|
||||
}
|
||||
|
||||
confirmationDialog.onRejectedCallback = null;
|
||||
|
||||
confirmationDialog.open()
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
acceptedButtons: Qt.NoButton
|
||||
cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TextBlock {
|
||||
Layout.fillWidth: true
|
||||
font.pixelSize: 14
|
||||
text: (!currentWallet) ? "" : qsTr("Wallet log path: ") + translationManager.emptyString
|
||||
}
|
||||
|
||||
|
||||
TextBlock {
|
||||
Layout.fillWidth: true
|
||||
font.pixelSize: 14
|
||||
text: (!currentWallet) ? "" : qsTr("Wallet log path: ") + currentWallet.walletLogPath + translationManager.emptyString
|
||||
}
|
||||
TextBlock {
|
||||
Layout.fillWidth: true
|
||||
font.pixelSize: 14
|
||||
text: qsTr("Wallet Name: ") + walletName + translationManager.emptyString
|
||||
}
|
||||
TextBlock {
|
||||
Layout.fillWidth: true
|
||||
font.pixelSize: 14
|
||||
text: (!currentWallet) ? "" : qsTr("Daemon log path: ") + currentWallet.daemonLogPath + translationManager.emptyString
|
||||
TextBlock {
|
||||
Layout.fillWidth: true
|
||||
font.pixelSize: 14
|
||||
text: currentWallet.walletLogPath + translationManager.emptyString
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue