mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-11-17 08:17:59 +00:00
Settings page: small renaming and formatting
This commit is contained in:
Ilya Kitaev
parent
da552a012d
commit
4f4cc9c8e8
1 changed files with 106 additions and 78 deletions
|
|
@ -1,21 +1,21 @@
|
|||
// Copyright (c) 2014-2015, The Monero Project
|
||||
//
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other
|
||||
// materials provided with the distribution.
|
||||
//
|
||||
//
|
||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||
// used to endorse or promote products derived from this software without specific
|
||||
// prior written permission.
|
||||
//
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
|
|
@ -34,10 +34,8 @@ import QtQuick.Dialogs 1.2
|
|||
|
||||
|
||||
import "../components"
|
||||
|
||||
import moneroComponents.Clipboard 1.0
|
||||
|
||||
|
||||
Rectangle {
|
||||
|
||||
property var daemonAddress
|
||||
|
|
@ -46,16 +44,17 @@ Rectangle {
|
|||
|
||||
Clipboard { id: clipboard }
|
||||
|
||||
function initSettings(){
|
||||
function initSettings() {
|
||||
|
||||
|
||||
// Mnemonic seed settings
|
||||
memoTextInput.text = qsTr("Click button to show seed") + translationManager.emptyString
|
||||
showSeedbtn.visible = true
|
||||
showSeedButton.visible = true
|
||||
|
||||
// Daemon settings
|
||||
|
||||
daemonAddress = persistentSettings.daemon_address.split(":");
|
||||
console.log("address" + persistentSettings.daemon_address)
|
||||
console.log("address: " + persistentSettings.daemon_address)
|
||||
// try connecting to daemon
|
||||
var connectedToDaemon = currentWallet.connectToDaemon();
|
||||
|
||||
|
|
@ -68,42 +67,65 @@ Rectangle {
|
|||
|
||||
}
|
||||
|
||||
|
||||
PasswordDialog {
|
||||
id: settingsPasswordDialog
|
||||
standardButtons: StandardButton.Ok + StandardButton.Cancel
|
||||
onAccepted: {
|
||||
if(appWindow.password == settingsPasswordDialog.password){
|
||||
memoTextInput.text = currentWallet.seed
|
||||
showSeedButton.visible = false
|
||||
}
|
||||
|
||||
}
|
||||
onRejected: {
|
||||
|
||||
}
|
||||
onDiscard: {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ColumnLayout {
|
||||
id: mainLayout
|
||||
anchors.margins: 40
|
||||
anchors.left: parent.left
|
||||
anchors.top: parent.top
|
||||
anchors.right: parent.right
|
||||
spacing: 10
|
||||
|
||||
spacing: 20
|
||||
property int labelWidth: 120
|
||||
property int editWidth: 400
|
||||
property int lineEditFontSize: 12
|
||||
|
||||
RowLayout {
|
||||
id: paymentIdRow
|
||||
Label {
|
||||
id: seedLabel
|
||||
color: "#4A4949"
|
||||
text: qsTr("Mnemonic seed") + translationManager.emptyString
|
||||
}
|
||||
Label {
|
||||
id: seedLabel
|
||||
color: "#4A4949"
|
||||
fontSize: 16
|
||||
text: qsTr("Mnemonic seed: ") + translationManager.emptyString
|
||||
Layout.preferredWidth: 100
|
||||
Layout.alignment: Qt.AlignLeft
|
||||
}
|
||||
|
||||
TextArea {
|
||||
id: memoTextInput
|
||||
textMargin: 8
|
||||
font.family: "Arial"
|
||||
font.pointSize: 15
|
||||
wrapMode: TextEdit.WordWrap
|
||||
readOnly: true
|
||||
selectByMouse: true
|
||||
height: 300
|
||||
width: 500
|
||||
}
|
||||
Image {
|
||||
TextArea {
|
||||
id: memoTextInput
|
||||
textMargin: 6
|
||||
font.family: "Arial"
|
||||
font.pointSize: 14
|
||||
wrapMode: TextEdit.WordWrap
|
||||
readOnly: true
|
||||
selectByMouse: true
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 100
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
|
||||
text: qsTr("Click button to show seed") + translationManager.emptyString
|
||||
|
||||
Image {
|
||||
id : clipboardButton
|
||||
anchors.right: memoTextInput.right
|
||||
anchors.bottom: memoTextInput.bottom
|
||||
source: "qrc:///images/greyTriangle.png"
|
||||
|
||||
Image {
|
||||
anchors.centerIn: parent
|
||||
source: "qrc:///images/copyToClipboard.png"
|
||||
|
|
@ -114,85 +136,89 @@ Rectangle {
|
|||
onClicked: clipboard.setText(memoTextInput.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Layout.fillWidth: true
|
||||
Text {
|
||||
id: wordsTipText
|
||||
font.family: "Arial"
|
||||
font.pointSize: 12
|
||||
color: "#4A4646"
|
||||
Layout.fillWidth: true
|
||||
wrapMode: Text.WordWrap
|
||||
text: qsTr("It is very important to write it down as this is the only backup you will need for your wallet.")
|
||||
+ translationManager.emptyString
|
||||
}
|
||||
|
||||
StandardButton {
|
||||
id: showSeedbtn
|
||||
width: 80
|
||||
|
||||
id: showSeedButton
|
||||
|
||||
fontSize: 14
|
||||
shadowReleasedColor: "#FF4304"
|
||||
shadowPressedColor: "#B32D00"
|
||||
releasedColor: "#FF6C3C"
|
||||
pressedColor: "#FF4304"
|
||||
text: qsTr("Show seed")
|
||||
Layout.alignment: Qt.AlignRight
|
||||
Layout.preferredWidth: 100
|
||||
onClicked: {
|
||||
settingsPasswordDialog.open();
|
||||
}
|
||||
}
|
||||
|
||||
PasswordDialog {
|
||||
id: settingsPasswordDialog
|
||||
standardButtons: StandardButton.Ok + StandardButton.Cancel
|
||||
onAccepted: {
|
||||
if(appWindow.password == settingsPasswordDialog.password){
|
||||
memoTextInput.text = currentWallet.seed
|
||||
showSeedbtn.visible = false
|
||||
}
|
||||
|
||||
}
|
||||
onRejected: {
|
||||
|
||||
}
|
||||
onDiscard: {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
id: wordsTipTextRow
|
||||
|
||||
Text {
|
||||
id: wordsTipText
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 15
|
||||
color: "#4A4646"
|
||||
wrapMode: Text.WordWrap
|
||||
text: qsTr("It is very important to write it down as this is the only backup you will need for your wallet.")
|
||||
+ translationManager.emptyString
|
||||
}
|
||||
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
height: 1
|
||||
color: "#DEDEDE"
|
||||
}
|
||||
|
||||
|
||||
RowLayout {
|
||||
id: daemonAddrRow
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 40
|
||||
Layout.topMargin: 40
|
||||
spacing: 10
|
||||
|
||||
Label {
|
||||
id: daemonAddrLabel
|
||||
|
||||
Layout.fillWidth: true
|
||||
color: "#4A4949"
|
||||
text: qsTr("Daemon adress") + translationManager.emptyString
|
||||
fontSize: 16
|
||||
}
|
||||
|
||||
|
||||
LineEdit {
|
||||
id: daemonAddr
|
||||
width: 180
|
||||
text: (daemonAddress != undefined)? daemonAddress[0] : ""
|
||||
Layout.preferredWidth: 200
|
||||
Layout.fillWidth: true
|
||||
text: (daemonAddress !== undefined) ? daemonAddress[0] : ""
|
||||
placeholderText: qsTr("Hostname / IP")
|
||||
}
|
||||
|
||||
|
||||
LineEdit {
|
||||
id: daemonPort
|
||||
width: 150
|
||||
text: (daemonAddress != undefined)? daemonAddress[1] : ""
|
||||
Layout.preferredWidth: 100
|
||||
Layout.fillWidth: true
|
||||
text: (daemonAddress !== undefined) ? daemonAddress[1] : ""
|
||||
placeholderText: qsTr("Port")
|
||||
}
|
||||
|
||||
|
||||
StandardButton {
|
||||
id: daemonAddrSave
|
||||
anchors.left: daemonPort.right
|
||||
anchors.leftMargin: 30
|
||||
|
||||
Layout.fillWidth: false
|
||||
|
||||
Layout.leftMargin: 30
|
||||
Layout.minimumWidth: 100
|
||||
width: 60
|
||||
text: qsTr("Save") + translationManager.emptyString
|
||||
shadowReleasedColor: "#FF4304"
|
||||
|
|
@ -213,8 +239,12 @@ Rectangle {
|
|||
|
||||
}
|
||||
|
||||
|
||||
RowLayout {
|
||||
id: daemonStatusRow
|
||||
|
||||
Layout.fillWidth: true
|
||||
|
||||
Text {
|
||||
id: daemonStatusText
|
||||
font.family: "Arial"
|
||||
|
|
@ -242,6 +272,7 @@ Rectangle {
|
|||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -251,8 +282,5 @@ Rectangle {
|
|||
initSettings();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue