monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-05-08 21:42:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 484cae36bc into f650e96363

Browse source
This commit is contained in:
rating89us 2023-04-13 09:40:16 +09:00 committed by GitHub
commit eb75f80135
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 131 additions and 7 deletions

1
components/TextPlain.qml
View file

@ -16,6 +16,7 @@ Text {
property alias tooltipLeft: tooltip.tooltipLeft property alias tooltipLeft: tooltip.tooltipLeft
property alias tooltipIconVisible: tooltip.tooltipIconVisible property alias tooltipIconVisible: tooltip.tooltipIconVisible
property alias tooltipPopup: tooltip.tooltipPopup property alias tooltipPopup: tooltip.tooltipPopup
property alias tooltipWrapMode: tooltip.tooltipWrapMode
font.family: MoneroComponents.Style.fontMedium.name font.family: MoneroComponents.Style.fontMedium.name
font.bold: false font.bold: false
font.pixelSize: 14 font.pixelSize: 14

1
components/Tooltip.qml
View file

@ -36,6 +36,7 @@ import "." as MoneroComponents
Rectangle { Rectangle {
property alias text: tooltip.text property alias text: tooltip.text
property alias tooltipPopup: popup property alias tooltipPopup: popup
property alias tooltipWrapMode: tooltip.wrapMode
property bool tooltipIconVisible: false property bool tooltipIconVisible: false
property bool tooltipLeft: false property bool tooltipLeft: false
property bool tooltipBottom: tooltipIconVisible ? false : true property bool tooltipBottom: tooltipIconVisible ? false : true

136
pages/Transfer.qml
View file

@ -35,6 +35,7 @@ import moneroComponents.Clipboard 1.0
import moneroComponents.PendingTransaction 1.0 import moneroComponents.PendingTransaction 1.0
import moneroComponents.Wallet 1.0 import moneroComponents.Wallet 1.0
import moneroComponents.NetworkType 1.0 import moneroComponents.NetworkType 1.0
import moneroComponents.AddressBookModel 1.0
import FontAwesome 1.0 import FontAwesome 1.0
import "../components" import "../components"
import "../components" as MoneroComponents import "../components" as MoneroComponents
@ -81,6 +82,8 @@ Rectangle {
} }
property string startLinkText: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><a href='#'>(%1)</a>".arg(qsTr("Start daemon")) + translationManager.emptyString property string startLinkText: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><a href='#'>(%1)</a>".arg(qsTr("Start daemon")) + translationManager.emptyString
property bool warningLongPidDescription: descriptionLine.text.match(/^[0-9a-f]{64}$/i) property bool warningLongPidDescription: descriptionLine.text.match(/^[0-9a-f]{64}$/i)
property int addressBookModelCount: 0
property var addressBookModelData: [] // representation of address book data (appWindow.currentWallet.addressBookModel)
Clipboard { id: clipboard } Clipboard { id: clipboard }
@ -340,7 +343,7 @@ Rectangle {
text: FontAwesome.infinity text: FontAwesome.infinity
visible: recipientModel.count == 1 visible: recipientModel.count == 1
tooltip: qsTr("Send all unlocked balance of this account") + translationManager.emptyString tooltip: qsTr("Send all unlocked balance of this account") + translationManager.emptyString
onClicked: recipientRepeater.itemAt(0).children[1].children[2].text = "(all)"; onClicked: recipientRepeater.itemAt(0).children[1].children[3].text = "(all)";
} }
Item { Item {
@ -373,9 +376,82 @@ Rectangle {
RowLayout { RowLayout {
spacing: 0 spacing: 0
Rectangle {
id: contactRectangle
Layout.fillWidth: true
Layout.fillHeight: true
Layout.margins: 5
color: "transparent"
visible: contactName.text != ""
RowLayout {
Layout.topMargin: 8
MoneroComponents.TextPlain {
Layout.topMargin: 11
Layout.leftMargin: 5
Layout.fillWidth: false
font.family: FontAwesome.fontFamily
font.bold: true
font.pixelSize: 18
color: MoneroComponents.Style.defaultFontColor
text: FontAwesome.addressBook
}
MoneroComponents.TextPlain {
id: contactName
Layout.topMargin: 12
Layout.leftMargin: 5
Layout.fillWidth: true
font.pixelSize:16
color: MoneroComponents.Style.inlineButtonTextColor
text: ""
opacity: contactNameMouseArea.containsMouse ? 1 : 0.85
visible: contactName.text != ""
tooltip: addressInput.text
tooltipWrapMode: Text.Wrap
MouseArea {
id: contactNameMouseArea
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
hoverEnabled: true
onEntered: parent.tooltipPopup.open()
onExited: parent.tooltipPopup.close()
}
}
MoneroComponents.TextPlain {
Layout.fillWidth: false
Layout.topMargin: 12
Layout.leftMargin: 6
font.family: FontAwesome.fontFamily
font.bold: true
color: MoneroComponents.Style.defaultFontColor
text: FontAwesome.times
opacity: removeContactMouseArea.containsMouse ? 1 : 0.85
tooltip: qsTr("Remove recipient") + translationManager.emptyString
MouseArea {
id: removeContactMouseArea
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
hoverEnabled: true
onEntered: parent.tooltipPopup.open()
onExited: parent.tooltipPopup.close()
onClicked: {
addressInput.text = "";
contactName.text = "";
}
}
}
}
}
MoneroComponents.LineEditMulti { MoneroComponents.LineEditMulti {
KeyNavigation.backtab: index > 0 ? recipientRepeater.itemAt(index - 1).children[1].children[2] : sendButton id: addressInput
KeyNavigation.tab: parent.children[2] KeyNavigation.backtab: index > 0 ? recipientRepeater.itemAt(index - 1).children[1].children[3] : sendButton
KeyNavigation.tab: parent.children[3]
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.topMargin: index > 0 ? 0 : 1 Layout.topMargin: index > 0 ? 0 : 1
Layout.bottomMargin: 2 Layout.bottomMargin: 2
@ -392,6 +468,7 @@ Rectangle {
placeholderFontSize: 14 placeholderFontSize: 14
spacing: 0 spacing: 0
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
visible: !contactRectangle.visible
placeholderText: { placeholderText: {
if(persistentSettings.nettype == NetworkType.MAINNET){ if(persistentSettings.nettype == NetworkType.MAINNET){
return "4.. / 8.. / monero:.. / OpenAlias"; return "4.. / 8.. / monero:.. / OpenAlias";
@ -402,6 +479,13 @@ Rectangle {
} }
} }
onTextChanged: { onTextChanged: {
if (addressInput.text.length >= 95) {
var getMatchesResult = getMatches();
if (getMatchesResult) {
contactName.text = getMatchesResult
amountInput.forceActiveFocus()
}
}
const parsed = walletManager.parse_uri_to_object(text); const parsed = walletManager.parse_uri_to_object(text);
if (!parsed.error) { if (!parsed.error) {
fillPaymentDetails(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name); fillPaymentDetails(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name);
@ -410,6 +494,21 @@ Rectangle {
} }
text: address text: address
function getMatches() {
var returnText = "";
for (var i = 0; i < root.addressBookModelCount; i+=1){
var item = root.addressBookModelData[i];
if (item.address == addressInput.text) {
if (returnText == "") {
returnText = item.description;
} else {
returnText += ", " + item.description;
}
}
}
return returnText;
}
MoneroComponents.InlineButton { MoneroComponents.InlineButton {
small: true small: true
text: qsTr("Resolve") + translationManager.emptyString text: qsTr("Resolve") + translationManager.emptyString
@ -425,14 +524,14 @@ Rectangle {
// prepend openalias to description // prepend openalias to description
descriptionLine.text = descriptionLine.text ? address + " " + descriptionLine.text : address descriptionLine.text = descriptionLine.text ? address + " " + descriptionLine.text : address
descriptionCheckbox.checked = true descriptionCheckbox.checked = true
recipientRepeater.itemAt(index).children[1].children[0].text = parts[1]; recipientRepeater.itemAt(index).children[1].children[1].text = parts[1];
} }
else else
oa_message(qsTr("No valid address found at this OpenAlias address")) oa_message(qsTr("No valid address found at this OpenAlias address"))
} }
else if (parts[0] === "false") { else if (parts[0] === "false") {
if (address_ok) { if (address_ok) {
recipientRepeater.itemAt(index).children[1].children[0].text = parts[1]; recipientRepeater.itemAt(index).children[1].children[1].text = parts[1];
oa_message(qsTr("Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed")) oa_message(qsTr("Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed"))
} }
else else
@ -466,8 +565,9 @@ Rectangle {
} }
MoneroComponents.LineEdit { MoneroComponents.LineEdit {
KeyNavigation.backtab: parent.children[0] id: amountInput
KeyNavigation.tab: index + 1 < recipientRepeater.count ? recipientRepeater.itemAt(index + 1).children[1].children[0] : sendButton KeyNavigation.backtab: parent.children[1]
KeyNavigation.tab: index + 1 < recipientRepeater.count ? recipientRepeater.itemAt(index + 1).children[1].children[1] : sendButton
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.topMargin: index > 0 ? 0 : 1 Layout.topMargin: index > 0 ? 0 : 1
Layout.bottomMargin: 2 Layout.bottomMargin: 2
@ -1162,12 +1262,34 @@ Rectangle {
// fires on every page load // fires on every page load
function onPageCompleted() { function onPageCompleted() {
console.log("transfer page loaded") console.log("transfer page loaded")
root.updateAddressBookFromModel()
updateStatus(); updateStatus();
} }
//TODO: Add daemon sync status //TODO: Add daemon sync status
//TODO: enable send page when we're connected and daemon is synced //TODO: enable send page when we're connected and daemon is synced
function updateAddressBookFromModel() {
// This function copies the items of `appWindow.currentWallet.addressBookModel` to `root.addressBookModelData`, as a list of javascript objects
if(currentWallet == null || typeof currentWallet.history === "undefined" ) return;
var _model = appWindow.currentWallet.addressBookModel;
var count = _model.rowCount()
root.addressBookModelData = [];
for (var i = 0; i < count; ++i) {
var idx = _model.index(i, 0);
var address = _model.data(idx, AddressBookModel.AddressBookAddressRole);
var description = _model.data(idx, AddressBookModel.AddressBookDescriptionRole);
root.addressBookModelData.push({
"i": i,
"address": address,
"description": description
});
}
root.addressBookModelCount = root.addressBookModelData.length;
}
function updateStatus() { function updateStatus() {
var messageNotConnected = qsTr("Wallet is not connected to daemon."); var messageNotConnected = qsTr("Wallet is not connected to daemon.");
if(appWindow.walletMode >= 2 && !persistentSettings.useRemoteNode) messageNotConnected += root.startLinkText; if(appWindow.walletMode >= 2 && !persistentSettings.useRemoteNode) messageNotConnected += root.startLinkText;