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

Merge pull request #103

Browse source 
1036eef Removes the donation and mining texts from wizard's finish page (maitscha)
4097c71 Restyles the wizard's finish page (maitscha)
This commit is contained in:
Riccardo Spagni 2016-11-05 10:11:47 +02:00
commit 925449ed88
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
wizard/WizardFinish.qml
View file

@ -38,19 +38,37 @@ Item {
onOpacityChanged: visible = opacity !== 0
function buildSettingsString() {
var str = "<br>" + qsTr("<b>Language:</b> ") + wizard.settings['language'] + "<br>"
+ qsTr("<b>Account name:</b> ") + wizard.settings['account_name'] + "<br>"
+ qsTr("<b>Words:</b> ") + wizard.settings['wallet'].seed + "<br>"
+ qsTr("<b>Wallet Path: </b>") + wizard.settings['wallet_path'] + "<br>"
+ qsTr("<b>Enable auto donation: </b>") + wizard.settings['auto_donations_enabled'] + "<br>"
+ qsTr("<b>Auto donation amount: </b>") + wizard.settings['auto_donations_amount'] + "<br>"
+ qsTr("<b>Allow background mining: </b>") + wizard.settings['allow_background_mining'] + "<br>"
+ qsTr("<b>Daemon address: </b>") + wizard.settings['daemon_address'] + "<br>"
+ qsTr("<b>testnet: </b>") + wizard.settings['testnet'] + "<br>"
+ (wizard.settings['restore_height'] === undefined ? "" : qsTr("<b>Restore height: </b>") + wizard.settings['restore_height']) + "<br>"
+ translationManager.emptyString
return str;
var trStart = '<tr><td style="padding-top:5px;"><b>',
trMiddle = '</b></td><td style="padding-left:10px;padding-top:5px;">',
trEnd = "</td></tr>",
autoDonationEnabled = wizard.settings['auto_donations_enabled'] === true,
autoDonationText = autoDonationEnabled ? qsTr("Enabled") : qsTr("Disabled"),
autoDonationAmount = wizard.settings["auto_donations_amount"] + " %",
backgroundMiningEnabled = wizard.settings["allow_background_mining"] === true,
backgroundMiningText = backgroundMiningEnabled ? qsTr("Enabled") : qsTr("Disabled"),
testnetEnabled = wizard.settings['testnet'] === true,
testnetText = testnetEnabled ? qsTr("Enabled") : qsTr("Disabled"),
restoreHeightEnabled = wizard.settings['restore_height'] !== undefined;
return "<table>"
+ trStart + qsTr("Language") + trMiddle + wizard.settings["language"] + trEnd
+ trStart + qsTr("Account name") + trMiddle + wizard.settings["account_name"] + trEnd
+ trStart + qsTr("Words") + trMiddle + wizard.settings["wallet"].seed + trEnd
+ trStart + qsTr("Wallet path") + trMiddle + wizard.settings["wallet_path"] + trEnd
// + trStart + qsTr("Auto donations") + trMiddle + autoDonationText + trEnd
// + (autoDonationEnabled
// ? trStart + qsTr("Donation amount") + trMiddle + autoDonationAmount + trEnd
// : "")
// + trStart + qsTr("Background mining") + trMiddle + backgroundMiningText + trEnd
+ trStart + qsTr("Daemon address") + trMiddle + wizard.settings["daemon_address"] + trEnd
+ trStart + qsTr("Testnet") + trMiddle + testnetText + trEnd
+ (restoreHeightEnabled
? trStart + qsTr("Restore height") + trMiddle + wizard.settings['restore_height'] + trEnd
: "")
+ "</table>"
+ translationManager.emptyString;
}
function updateSettingsSummary() {
settingsText.text = qsTr("An overview of your Monero configuration is below:") + translationManager.emptyString
+ "<br>"
@ -115,10 +133,10 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
font.family: "Arial"
font.pixelSize: 18
font.pixelSize: 16
wrapMode: Text.Wrap
textFormat: Text.RichText
horizontalAlignment: Text.AlignHCenter
horizontalAlignment: Text.AlignHLeft
//renderType: Text.NativeRendering
color: "#4A4646"
}