mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 03:59:38 +00:00
Redesigned txkey/sign pages
This commit is contained in:
Sander Ferdinand
moneromooo-monero
parent
30bf765b75
commit
499419a23c
4 changed files with 175 additions and 239 deletions
|
|
@ -124,7 +124,7 @@ Rectangle {
|
|||
}, State {
|
||||
name: "TxKey"
|
||||
PropertyChanges { target: root; currentView: txkeyView }
|
||||
PropertyChanges { target: mainFlickable; contentHeight: minHeight }
|
||||
PropertyChanges { target: mainFlickable; contentHeight: 1000 * scaleRatio }
|
||||
}, State {
|
||||
name: "SharedRingDB"
|
||||
PropertyChanges { target: root; currentView: sharedringdbView }
|
||||
|
|
|
|||
|
|
@ -135,6 +135,7 @@ Rectangle {
|
|||
//enabled: !walletManager.isMining()
|
||||
id: startSoloMinerButton
|
||||
width: 110
|
||||
small: true
|
||||
text: qsTr("Start mining") + translationManager.emptyString
|
||||
onClicked: {
|
||||
var success = walletManager.startMining(appWindow.currentWallet.address(0, 0), soloMinerThreadsLine.text, persistentSettings.allow_background_mining, persistentSettings.miningIgnoreBattery)
|
||||
|
|
@ -156,6 +157,7 @@ Rectangle {
|
|||
//enabled: walletManager.isMining()
|
||||
id: stopSoloMinerButton
|
||||
width: 110
|
||||
small: true
|
||||
text: qsTr("Stop mining") + translationManager.emptyString
|
||||
onClicked: {
|
||||
walletManager.stopMining()
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ import moneroComponents.WalletManager 1.0
|
|||
Rectangle {
|
||||
id: mainLayout
|
||||
|
||||
color: "#F0EEEE"
|
||||
color: "transparent"
|
||||
|
||||
Clipboard { id: clipboard }
|
||||
|
||||
|
|
@ -105,8 +105,10 @@ Rectangle {
|
|||
Text {
|
||||
text: qsTr("Sign a message or file contents with your address:") + translationManager.emptyString
|
||||
wrapMode: Text.Wrap
|
||||
font.pixelSize: 14 * scaleRatio
|
||||
Layout.fillWidth: true
|
||||
font.family: Style.fontRegular
|
||||
font.pixelSize: 16 * scaleRatio
|
||||
color: Style.defaultFontColor
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -249,8 +251,10 @@ Rectangle {
|
|||
Text {
|
||||
text: qsTr("Verify a message or file signature from an address:") + translationManager.emptyString
|
||||
wrapMode: Text.Wrap
|
||||
font.pixelSize: 14 * scaleRatio
|
||||
Layout.fillWidth: true
|
||||
font.family: Style.fontRegular
|
||||
font.pixelSize: 16 * scaleRatio
|
||||
color: Style.defaultFontColor
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -359,14 +363,14 @@ Rectangle {
|
|||
|
||||
Text {
|
||||
id: verifyAddressLabel
|
||||
text: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: " + (14 * scaleRatio) + "px;}</style>" +
|
||||
text: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: " + (16 * scaleRatio) + "px;}</style>" +
|
||||
qsTr("Signing address") +
|
||||
"<font size='" + (2 * scaleRatio) + "'> ( " +
|
||||
qsTr("Paste in or select from <a href='#'>Address book</a>") +
|
||||
" )</font>" +
|
||||
translationManager.emptyString
|
||||
wrapMode: Text.Wrap
|
||||
font.pixelSize: 14 * scaleRatio
|
||||
font.pixelSize: 16 * scaleRatio
|
||||
Layout.fillWidth: true
|
||||
textFormat: Text.RichText
|
||||
onLinkActivated: appWindow.showPageRequest("AddressBook")
|
||||
|
|
|
|||
186
pages/TxKey.qml
186
pages/TxKey.qml
|
|
@ -36,7 +36,7 @@ import moneroComponents.Clipboard 1.0
|
|||
|
||||
Rectangle {
|
||||
|
||||
color: "#F0EEEE"
|
||||
color: "transparent"
|
||||
|
||||
Clipboard { id: clipboard }
|
||||
|
||||
|
|
@ -87,95 +87,67 @@ Rectangle {
|
|||
anchors.left: parent.left
|
||||
anchors.top: parent.top
|
||||
anchors.right: parent.right
|
||||
|
||||
anchors.bottom: parent.bottom
|
||||
spacing: 20
|
||||
property int labelWidth: 120
|
||||
property int editWidth: 400
|
||||
property int lineEditFontSize: 12
|
||||
|
||||
// solo
|
||||
ColumnLayout {
|
||||
id: soloBox
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
spacing: 20
|
||||
|
||||
Label {
|
||||
id: soloTitleLabel
|
||||
fontSize: 24
|
||||
text: qsTr("Prove Transaction") + translationManager.emptyString
|
||||
}
|
||||
|
||||
Text {
|
||||
text: qsTr("Generate a proof of your incoming/outgoing payment by supplying the transaction ID, the recipient address and an optional message. \n" +
|
||||
"For the case of outgoing payments, you can get a 'Spend Proof' that proves the authorship of a transaction. In this case, you don't need to specify the recipient address.") + translationManager.emptyString
|
||||
wrapMode: Text.Wrap
|
||||
Layout.fillWidth: true;
|
||||
Layout.fillWidth: true
|
||||
font.family: Style.fontRegular
|
||||
font.pixelSize: 14 * scaleRatio
|
||||
color: Style.defaultFontColor
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Label {
|
||||
fontSize: 14
|
||||
text: qsTr("Transaction ID") + translationManager.emptyString
|
||||
width: mainLayout.labelWidth
|
||||
}
|
||||
|
||||
LineEdit {
|
||||
labelText: qsTr("Transaction ID") + translationManager.emptyString
|
||||
id: getProofTxIdLine
|
||||
fontSize: mainLayout.lineEditFontSize
|
||||
fontSize: 16 * scaleRatio
|
||||
placeholderText: qsTr("Paste tx ID") + translationManager.emptyString
|
||||
readOnly: false
|
||||
width: mainLayout.editWidth
|
||||
Layout.fillWidth: true
|
||||
|
||||
IconButton {
|
||||
imageSource: "../images/copyToClipboard.png"
|
||||
onClicked: {
|
||||
if (getProofTxIdLine.text.length > 0) {
|
||||
clipboard.setText(getProofTxIdLine.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
copyButton: true
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Label {
|
||||
fontSize: 14
|
||||
text: qsTr("Address") + translationManager.emptyString
|
||||
width: mainLayout.labelWidth
|
||||
}
|
||||
|
||||
LineEdit {
|
||||
id: getProofAddressLine
|
||||
fontSize: mainLayout.lineEditFontSize
|
||||
labelText: qsTr("Address") + translationManager.emptyString
|
||||
fontSize: 16 * scaleRatio
|
||||
placeholderText: qsTr("Recipient's wallet address") + translationManager.emptyString;
|
||||
readOnly: false
|
||||
width: mainLayout.editWidth
|
||||
Layout.fillWidth: true
|
||||
|
||||
IconButton {
|
||||
imageSource: "../images/copyToClipboard.png"
|
||||
onClicked: {
|
||||
if (getProofAddressLine.text.length > 0) {
|
||||
clipboard.setText(getProofAddressLine.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
copyButton: true
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Label {
|
||||
fontSize: 14
|
||||
text: qsTr("Message") + translationManager.emptyString
|
||||
width: mainLayout.labelWidth
|
||||
}
|
||||
|
||||
LineEdit {
|
||||
id: getProofMessageLine
|
||||
fontSize: mainLayout.lineEditFontSize
|
||||
fontSize: 16 * scaleRatio
|
||||
labelText: qsTr("Message") + translationManager.emptyString
|
||||
placeholderText: qsTr("Optional message against which the signature is signed") + translationManager.emptyString;
|
||||
readOnly: false
|
||||
width: mainLayout.editWidth
|
||||
Layout.fillWidth: true
|
||||
|
||||
IconButton {
|
||||
imageSource: "../images/copyToClipboard.png"
|
||||
onClicked: {
|
||||
if (getProofMessageLine.text.length > 0) {
|
||||
clipboard.setText(getProofMessageLine.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
copyButton: true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -194,124 +166,78 @@ Rectangle {
|
|||
// underline
|
||||
Rectangle {
|
||||
height: 1
|
||||
color: "#DBDBDB"
|
||||
color: "#404040"
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
anchors.bottomMargin: 3
|
||||
|
||||
}
|
||||
|
||||
Label {
|
||||
id: soloTitleLabel2
|
||||
fontSize: 24
|
||||
text: qsTr("Check Transaction") + translationManager.emptyString
|
||||
}
|
||||
|
||||
Text {
|
||||
text: qsTr("Verify that funds were paid to an address by supplying the transaction ID, the recipient address, the message used for signing and the signature.\n" +
|
||||
"For the case with Spend Proof, you don't need to specify the recipient address.") + translationManager.emptyString
|
||||
wrapMode: Text.Wrap
|
||||
Layout.fillWidth: true;
|
||||
Layout.fillWidth: true
|
||||
font.family: Style.fontRegular
|
||||
font.pixelSize: 14 * scaleRatio
|
||||
color: Style.defaultFontColor
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Label {
|
||||
fontSize: 14
|
||||
text: qsTr("Transaction ID") + translationManager.emptyString
|
||||
width: mainLayout.labelWidth
|
||||
}
|
||||
|
||||
LineEdit {
|
||||
id: checkProofTxIdLine
|
||||
fontSize: mainLayout.lineEditFontSize
|
||||
labelText: qsTr("Transaction ID") + translationManager.emptyString
|
||||
fontSize: 16 * scaleRatio
|
||||
placeholderText: qsTr("Paste tx ID") + translationManager.emptyString
|
||||
readOnly: false
|
||||
width: mainLayout.editWidth
|
||||
Layout.fillWidth: true
|
||||
|
||||
IconButton {
|
||||
imageSource: "../images/copyToClipboard.png"
|
||||
onClicked: {
|
||||
if (checkProofTxIdLine.text.length > 0) {
|
||||
clipboard.setText(checkProofTxIdLine.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
copyButton: true
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Label {
|
||||
fontSize: 14
|
||||
text: qsTr("Address") + translationManager.emptyString
|
||||
width: mainLayout.labelWidth
|
||||
}
|
||||
|
||||
LineEdit {
|
||||
id: checkProofAddressLine
|
||||
fontSize: mainLayout.lineEditFontSize
|
||||
labelText: qsTr("Address") + translationManager.emptyString
|
||||
fontSize: 16 * scaleRatio
|
||||
placeholderText: qsTr("Recipient's wallet address") + translationManager.emptyString;
|
||||
readOnly: false
|
||||
width: mainLayout.editWidth
|
||||
Layout.fillWidth: true
|
||||
|
||||
IconButton {
|
||||
imageSource: "../images/copyToClipboard.png"
|
||||
onClicked: {
|
||||
if (checkProofAddressLine.text.length > 0) {
|
||||
clipboard.setText(checkProofAddressLine.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
copyButton: true
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Label {
|
||||
fontSize: 14
|
||||
text: qsTr("Message") + translationManager.emptyString
|
||||
width: mainLayout.labelWidth
|
||||
}
|
||||
|
||||
LineEdit {
|
||||
id: checkProofMessageLine
|
||||
fontSize: mainLayout.lineEditFontSize
|
||||
fontSize: 16 * scaleRatio
|
||||
labelText: qsTr("Message") + translationManager.emptyString
|
||||
placeholderText: qsTr("Optional message against which the signature is signed") + translationManager.emptyString;
|
||||
readOnly: false
|
||||
width: mainLayout.editWidth
|
||||
Layout.fillWidth: true
|
||||
|
||||
IconButton {
|
||||
imageSource: "../images/copyToClipboard.png"
|
||||
onClicked: {
|
||||
if (checkProofMessageLine.text.length > 0) {
|
||||
clipboard.setText(checkProofMessageLine.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
copyButton: true
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Label {
|
||||
fontSize: 14
|
||||
text: qsTr("Signature") + translationManager.emptyString
|
||||
width: mainLayout.labelWidth
|
||||
}
|
||||
|
||||
|
||||
LineEdit {
|
||||
id: checkProofSignatureLine
|
||||
fontSize: mainLayout.lineEditFontSize
|
||||
fontSize: 16 * scaleRatio
|
||||
labelText: qsTr("Signature") + translationManager.emptyString
|
||||
placeholderText: qsTr("Paste tx proof") + translationManager.emptyString;
|
||||
readOnly: false
|
||||
|
||||
width: mainLayout.editWidth
|
||||
Layout.fillWidth: true
|
||||
|
||||
IconButton {
|
||||
imageSource: "../images/copyToClipboard.png"
|
||||
onClicked: {
|
||||
if (checkProofSignatureLine.text.length > 0) {
|
||||
clipboard.setText(checkProofSignatureLine.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
copyButton: true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -330,7 +256,7 @@ Rectangle {
|
|||
// underline
|
||||
Rectangle {
|
||||
height: 1
|
||||
color: "#DBDBDB"
|
||||
color: "#404040"
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
anchors.bottomMargin: 3
|
||||
|
|
@ -340,7 +266,11 @@ Rectangle {
|
|||
Text {
|
||||
text: qsTr("If a payment had several transactions then each must be checked and the results combined.") + translationManager.emptyString
|
||||
wrapMode: Text.Wrap
|
||||
Layout.fillWidth: true;
|
||||
Layout.fillWidth: true
|
||||
font.family: Style.fontRegular
|
||||
font.pixelSize: 14 * scaleRatio
|
||||
color: Style.defaultFontColor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue