github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2025-01-15 14:57:27 +01:00
Code Releases Activity

Reformat Settings->Debug Info

Browse Source
This commit is contained in:
Sander Ferdinand 2018-04-21 13:17:53 +02:00
parent 9f0d771f40
commit b8466739f9
2 changed files with 118 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/TextBlock.qml
View File

@ -5,6 +5,7 @@ import "../components" as MoneroComponents
TextEdit { TextEdit {
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
selectionColor: MoneroComponents.Style.dimmedFontColor
wrapMode: Text.Wrap wrapMode: Text.Wrap
readOnly: true readOnly: true
selectByMouse: true selectByMouse: true

76
pages/Settings.qml
View File

@ -623,38 +623,73 @@ Rectangle {
} }
} }
GridLayout {
id: grid
columns: 2
columnSpacing: 20 * scaleRatio
TextBlock { TextBlock {
Layout.topMargin: 8
font.pixelSize: 14 font.pixelSize: 14
Layout.fillWidth: true text: qsTr("GUI version: ") + translationManager.emptyString
text: qsTr("GUI version: ") + Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")" + translationManager.emptyString
} }
TextBlock {
font.pixelSize: 14
font.bold: true
text: Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")" + translationManager.emptyString
}
TextBlock { TextBlock {
id: guiMoneroVersion 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 Layout.fillWidth: true
font.pixelSize: 14 font.pixelSize: 14
text: qsTr("Embedded Monero version: ") + Version.GUI_MONERO_VERSION + translationManager.emptyString text: qsTr("Wallet name: ") + translationManager.emptyString
} }
TextBlock { TextBlock {
id: restoreHeightText
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 14 font.pixelSize: 14
font.bold: true
text: walletName + translationManager.emptyString
}
TextBlock {
id: restoreHeight
font.pixelSize: 14
textFormat: Text.RichText 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 text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet creation height: ") + translationManager.emptyString
property var linkTxt: qsTr(" <a href='#'>(Click to change)</a>") + translationManager.emptyString }
text: (typeof currentWallet == "undefined") ? "" : txt + linkTxt
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: { onLinkActivated: {
restoreHeightRow.visible = true; restoreHeightRow.visible = true;
} }
} }
RowLayout { RowLayout {
id: restoreHeightRow id: restoreHeightRow
visible: false visible: false
Layout.preferredWidth: parent.width
LineEdit { LineEdit {
id: restoreHeight id: restoreHeightEdit
Layout.preferredWidth: 80 Layout.preferredWidth: 80
Layout.fillWidth: true Layout.fillWidth: true
text: currentWallet ? currentWallet.walletCreationHeight : "0" text: currentWallet ? currentWallet.walletCreationHeight : "0"
@ -671,7 +706,7 @@ Rectangle {
text: qsTr("Save") + translationManager.emptyString text: qsTr("Save") + translationManager.emptyString
onClicked: { onClicked: {
currentWallet.walletCreationHeight = restoreHeight.text currentWallet.walletCreationHeight = restoreHeightEdit.text
// Restore height is saved in .keys file. Set password to trigger rewrite. // Restore height is saved in .keys file. Set password to trigger rewrite.
currentWallet.setPassword(appWindow.walletPassword) currentWallet.setPassword(appWindow.walletPassword)
restoreHeightRow.visible = false restoreHeightRow.visible = false
@ -695,29 +730,34 @@ Rectangle {
} }
confirmationDialog.onRejectedCallback = null; confirmationDialog.onRejectedCallback = null;
confirmationDialog.open() confirmationDialog.open()
} }
} }
} }
TextBlock { TextBlock {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 14 font.pixelSize: 14
text: (!currentWallet) ? "" : qsTr("Wallet log path: ") + currentWallet.walletLogPath + translationManager.emptyString text: (!currentWallet) ? "" : qsTr("Wallet log path: ") + translationManager.emptyString
} }
TextBlock { TextBlock {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 14 font.pixelSize: 14
text: qsTr("Wallet Name: ") + walletName + translationManager.emptyString text: currentWallet.walletLogPath + translationManager.emptyString
} }
TextBlock { TextBlock {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 14 font.pixelSize: 14
text: (!currentWallet) ? "" : qsTr("Daemon log path: ") + currentWallet.daemonLogPath + translationManager.emptyString text: (!currentWallet) ? "" : qsTr("Daemon log path: ") + translationManager.emptyString
}
TextBlock {
Layout.fillWidth: true
font.pixelSize: 14
text: (!currentWallet) ? "" : currentWallet.daemonLogPath + translationManager.emptyString
}
} }
} }