monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Redesigned txkey/sign pages

Browse source
This commit is contained in:
Sander Ferdinand 2018-03-19 23:30:34 +01:00 committed by moneromooo-monero
parent 30bf765b75
commit 499419a23c
4 changed files with 175 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MiddlePanel.qml
View file

@ -124,7 +124,7 @@ Rectangle {
}, State { }, State {
name: "TxKey" name: "TxKey"
PropertyChanges { target: root; currentView: txkeyView } PropertyChanges { target: root; currentView: txkeyView }
PropertyChanges { target: mainFlickable; contentHeight: minHeight } PropertyChanges { target: mainFlickable; contentHeight: 1000 * scaleRatio }
}, State { }, State {
name: "SharedRingDB" name: "SharedRingDB"
PropertyChanges { target: root; currentView: sharedringdbView } PropertyChanges { target: root; currentView: sharedringdbView }

2
pages/Mining.qml
View file

@ -135,6 +135,7 @@ Rectangle {
//enabled: !walletManager.isMining() //enabled: !walletManager.isMining()
id: startSoloMinerButton id: startSoloMinerButton
width: 110 width: 110
small: true
text: qsTr("Start mining") + translationManager.emptyString text: qsTr("Start mining") + translationManager.emptyString
onClicked: { onClicked: {
var success = walletManager.startMining(appWindow.currentWallet.address(0, 0), soloMinerThreadsLine.text, persistentSettings.allow_background_mining, persistentSettings.miningIgnoreBattery) 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() //enabled: walletManager.isMining()
id: stopSoloMinerButton id: stopSoloMinerButton
width: 110 width: 110
small: true
text: qsTr("Stop mining") + translationManager.emptyString text: qsTr("Stop mining") + translationManager.emptyString
onClicked: { onClicked: {
walletManager.stopMining() walletManager.stopMining()

16
pages/Sign.qml
View file

@ -39,7 +39,7 @@ import moneroComponents.WalletManager 1.0
Rectangle { Rectangle {
id: mainLayout id: mainLayout
color: "#F0EEEE" color: "transparent"
Clipboard { id: clipboard } Clipboard { id: clipboard }
@ -105,8 +105,10 @@ Rectangle {
Text { Text {
text: qsTr("Sign a message or file contents with your address:") + translationManager.emptyString text: qsTr("Sign a message or file contents with your address:") + translationManager.emptyString
wrapMode: Text.Wrap wrapMode: Text.Wrap
font.pixelSize: 14 * scaleRatio
Layout.fillWidth: true Layout.fillWidth: true
font.family: Style.fontRegular
font.pixelSize: 16 * scaleRatio
color: Style.defaultFontColor
} }
} }
@ -160,7 +162,7 @@ Rectangle {
id: signFileRow id: signFileRow
anchors.topMargin: 17 anchors.topMargin: 17
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
FileDialog { FileDialog {
id: signFileDialog id: signFileDialog
@ -249,8 +251,10 @@ Rectangle {
Text { Text {
text: qsTr("Verify a message or file signature from an address:") + translationManager.emptyString text: qsTr("Verify a message or file signature from an address:") + translationManager.emptyString
wrapMode: Text.Wrap wrapMode: Text.Wrap
font.pixelSize: 14 * scaleRatio
Layout.fillWidth: true Layout.fillWidth: true
font.family: Style.fontRegular
font.pixelSize: 16 * scaleRatio
color: Style.defaultFontColor
} }
} }
@ -359,14 +363,14 @@ Rectangle {
Text { Text {
id: verifyAddressLabel 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") + qsTr("Signing address") +
"<font size='" + (2 * scaleRatio) + "'> ( " + "<font size='" + (2 * scaleRatio) + "'> ( " +
qsTr("Paste in or select from <a href='#'>Address book</a>") + qsTr("Paste in or select from <a href='#'>Address book</a>") +
" )</font>" + " )</font>" +
translationManager.emptyString translationManager.emptyString
wrapMode: Text.Wrap wrapMode: Text.Wrap
font.pixelSize: 14 * scaleRatio font.pixelSize: 16 * scaleRatio
Layout.fillWidth: true Layout.fillWidth: true
textFormat: Text.RichText textFormat: Text.RichText
onLinkActivated: appWindow.showPageRequest("AddressBook") onLinkActivated: appWindow.showPageRequest("AddressBook")

394
pages/TxKey.qml
View file

@ -36,7 +36,7 @@ import moneroComponents.Clipboard 1.0
Rectangle { Rectangle {
color: "#F0EEEE" color: "transparent"
Clipboard { id: clipboard } Clipboard { id: clipboard }
@ -87,260 +87,190 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom
spacing: 20 spacing: 20
property int labelWidth: 120
property int editWidth: 400
property int lineEditFontSize: 12
Text { // solo
text: qsTr("Generate a proof of your incoming/outgoing payment by supplying the transaction ID, the recipient address and an optional message. \n" + ColumnLayout {
"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 id: soloBox
wrapMode: Text.Wrap
Layout.fillWidth: true;
}
RowLayout {
Label {
fontSize: 14
text: qsTr("Transaction ID") + translationManager.emptyString
width: mainLayout.labelWidth
}
LineEdit {
id: getProofTxIdLine
fontSize: mainLayout.lineEditFontSize
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)
}
}
}
}
}
RowLayout {
Label {
fontSize: 14
text: qsTr("Address") + translationManager.emptyString
width: mainLayout.labelWidth
}
LineEdit {
id: getProofAddressLine
fontSize: mainLayout.lineEditFontSize
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)
}
}
}
}
}
RowLayout {
Label {
fontSize: 14
text: qsTr("Message") + translationManager.emptyString
width: mainLayout.labelWidth
}
LineEdit {
id: getProofMessageLine
fontSize: mainLayout.lineEditFontSize
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)
}
}
}
}
}
StandardButton {
anchors.left: parent.left anchors.left: parent.left
anchors.topMargin: 17 anchors.right: parent.right
width: 60 anchors.top: parent.top
text: qsTr("Generate") + translationManager.emptyString spacing: 20
enabled: checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || checkAddress(getProofAddressLine.text, appWindow.persistentSettings.testnet))
onClicked: {
console.log("getProof: Generate clicked: txid " + getProofTxIdLine.text + ", address " + getProofAddressLine.text + ", message: " + getProofMessageLine.text);
root.getProofClicked(getProofTxIdLine.text, getProofAddressLine.text, getProofMessageLine.text)
}
}
// underline
Rectangle {
height: 1
color: "#DBDBDB"
Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter
anchors.bottomMargin: 3
}
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;
}
RowLayout {
Label { Label {
fontSize: 14 id: soloTitleLabel
text: qsTr("Transaction ID") + translationManager.emptyString fontSize: 24
width: mainLayout.labelWidth text: qsTr("Prove Transaction") + translationManager.emptyString
} }
LineEdit { Text {
id: checkProofTxIdLine text: qsTr("Generate a proof of your incoming/outgoing payment by supplying the transaction ID, the recipient address and an optional message. \n" +
fontSize: mainLayout.lineEditFontSize "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
placeholderText: qsTr("Paste tx ID") + translationManager.emptyString wrapMode: Text.Wrap
readOnly: false
width: mainLayout.editWidth
Layout.fillWidth: true Layout.fillWidth: true
font.family: Style.fontRegular
IconButton { font.pixelSize: 14 * scaleRatio
imageSource: "../images/copyToClipboard.png" color: Style.defaultFontColor
onClicked: {
if (checkProofTxIdLine.text.length > 0) {
clipboard.setText(checkProofTxIdLine.text)
}
}
}
}
}
RowLayout {
Label {
fontSize: 14
text: qsTr("Address") + translationManager.emptyString
width: mainLayout.labelWidth
} }
LineEdit { RowLayout {
id: checkProofAddressLine LineEdit {
fontSize: mainLayout.lineEditFontSize labelText: qsTr("Transaction ID") + translationManager.emptyString
placeholderText: qsTr("Recipient's wallet address") + translationManager.emptyString; id: getProofTxIdLine
readOnly: false fontSize: 16 * scaleRatio
width: mainLayout.editWidth placeholderText: qsTr("Paste tx ID") + translationManager.emptyString
Layout.fillWidth: true readOnly: false
Layout.fillWidth: true
IconButton { copyButton: true
imageSource: "../images/copyToClipboard.png"
onClicked: {
if (checkProofAddressLine.text.length > 0) {
clipboard.setText(checkProofAddressLine.text)
}
}
} }
} }
}
RowLayout { RowLayout {
Label { LineEdit {
fontSize: 14 id: getProofAddressLine
text: qsTr("Message") + translationManager.emptyString labelText: qsTr("Address") + translationManager.emptyString
width: mainLayout.labelWidth fontSize: 16 * scaleRatio
} placeholderText: qsTr("Recipient's wallet address") + translationManager.emptyString;
readOnly: false
LineEdit { Layout.fillWidth: true
id: checkProofMessageLine copyButton: true
fontSize: mainLayout.lineEditFontSize
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)
}
}
} }
} }
}
RowLayout { RowLayout {
Label { LineEdit {
fontSize: 14 id: getProofMessageLine
text: qsTr("Signature") + translationManager.emptyString fontSize: 16 * scaleRatio
width: mainLayout.labelWidth labelText: qsTr("Message") + translationManager.emptyString
} placeholderText: qsTr("Optional message against which the signature is signed") + translationManager.emptyString;
readOnly: false
width: mainLayout.editWidth
LineEdit { Layout.fillWidth: true
id: checkProofSignatureLine copyButton: true
fontSize: mainLayout.lineEditFontSize
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)
}
}
} }
} }
}
StandardButton { StandardButton {
anchors.left: parent.left anchors.left: parent.left
anchors.topMargin: 17 anchors.topMargin: 17
width: 60 width: 60
text: qsTr("Check") + translationManager.emptyString text: qsTr("Generate") + translationManager.emptyString
enabled: checkTxID(checkProofTxIdLine.text) && checkSignature(checkProofSignatureLine.text) && ((checkProofSignatureLine.text.indexOf("SpendProofV") === 0 && checkProofAddressLine.text.length == 0) || (checkProofSignatureLine.text.indexOf("SpendProofV") !== 0 && checkAddress(checkProofAddressLine.text, appWindow.persistentSettings.testnet))) enabled: checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || checkAddress(getProofAddressLine.text, appWindow.persistentSettings.testnet))
onClicked: { onClicked: {
console.log("checkProof: Check clicked: txid " + checkProofTxIdLine.text + ", address " + checkProofAddressLine.text + ", message " + checkProofMessageLine.text + ", signature " + checkProofSignatureLine.text); console.log("getProof: Generate clicked: txid " + getProofTxIdLine.text + ", address " + getProofAddressLine.text + ", message: " + getProofMessageLine.text);
root.checkProofClicked(checkProofTxIdLine.text, checkProofAddressLine.text, checkProofMessageLine.text, checkProofSignatureLine.text) root.getProofClicked(getProofTxIdLine.text, getProofAddressLine.text, getProofMessageLine.text)
}
} }
}
// underline // underline
Rectangle { Rectangle {
height: 1 height: 1
color: "#DBDBDB" color: "#404040"
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
anchors.bottomMargin: 3 anchors.bottomMargin: 3
} }
Text { Label {
text: qsTr("If a payment had several transactions then each must be checked and the results combined.") + translationManager.emptyString id: soloTitleLabel2
wrapMode: Text.Wrap fontSize: 24
Layout.fillWidth: true; 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
font.family: Style.fontRegular
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}
RowLayout {
LineEdit {
id: checkProofTxIdLine
labelText: qsTr("Transaction ID") + translationManager.emptyString
fontSize: 16 * scaleRatio
placeholderText: qsTr("Paste tx ID") + translationManager.emptyString
readOnly: false
width: mainLayout.editWidth
Layout.fillWidth: true
copyButton: true
}
}
RowLayout {
LineEdit {
id: checkProofAddressLine
labelText: qsTr("Address") + translationManager.emptyString
fontSize: 16 * scaleRatio
placeholderText: qsTr("Recipient's wallet address") + translationManager.emptyString;
readOnly: false
width: mainLayout.editWidth
Layout.fillWidth: true
copyButton: true
}
}
RowLayout {
LineEdit {
id: checkProofMessageLine
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
copyButton: true
}
}
RowLayout {
LineEdit {
id: checkProofSignatureLine
fontSize: 16 * scaleRatio
labelText: qsTr("Signature") + translationManager.emptyString
placeholderText: qsTr("Paste tx proof") + translationManager.emptyString;
readOnly: false
width: mainLayout.editWidth
Layout.fillWidth: true
copyButton: true
}
}
StandardButton {
anchors.left: parent.left
anchors.topMargin: 17
width: 60
text: qsTr("Check") + translationManager.emptyString
enabled: checkTxID(checkProofTxIdLine.text) && checkSignature(checkProofSignatureLine.text) && ((checkProofSignatureLine.text.indexOf("SpendProofV") === 0 && checkProofAddressLine.text.length == 0) || (checkProofSignatureLine.text.indexOf("SpendProofV") !== 0 && checkAddress(checkProofAddressLine.text, appWindow.persistentSettings.testnet)))
onClicked: {
console.log("checkProof: Check clicked: txid " + checkProofTxIdLine.text + ", address " + checkProofAddressLine.text + ", message " + checkProofMessageLine.text + ", signature " + checkProofSignatureLine.text);
root.checkProofClicked(checkProofTxIdLine.text, checkProofAddressLine.text, checkProofMessageLine.text, checkProofSignatureLine.text)
}
}
// underline
Rectangle {
height: 1
color: "#404040"
Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter
anchors.bottomMargin: 3
}
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
font.family: Style.fontRegular
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}
} }
} }