monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-09 12:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AddressBook: description edits, remove hack

Browse source 
Co-authored-by: dsc <dsc@xmr.pm>
This commit is contained in:
selsta 2020-09-21 00:41:02 +02:00
parent d313c2de37
commit 99ad8ef1ba
No known key found for this signature in database
GPG key ID: 2EA0A99A8B07AE5E
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pages/AddressBook.qml
View file

@ -286,11 +286,12 @@ Rectangle {
MoneroComponents.Label { MoneroComponents.Label {
fontSize: 32 fontSize: 32
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: (root.editEntry ? qsTr("Edit an address") : qsTr("Add an address")) + translationManager.emptyString text: (root.editEntry ? qsTr("Edit entry") : qsTr("Add an address")) + translationManager.emptyString
} }
MoneroComponents.LineEditMulti { MoneroComponents.LineEditMulti {
id: addressLine id: addressLine
visible: !root.editEntry
Layout.topMargin: 20 Layout.topMargin: 20
labelText: "<style type='text/css'>a {text-decoration: none; color: #858585; font-size: 14px;}</style> %1" labelText: "<style type='text/css'>a {text-decoration: none; color: #858585; font-size: 14px;}</style> %1"
.arg(qsTr("Address")) + translationManager.emptyString .arg(qsTr("Address")) + translationManager.emptyString
@ -380,7 +381,7 @@ Rectangle {
enabled: root.checkInformation(addressLine.text, appWindow.persistentSettings.nettype) enabled: root.checkInformation(addressLine.text, appWindow.persistentSettings.nettype)
onClicked: { onClicked: {
console.log("Add") console.log("Add")
if (!currentWallet.addressBook.addRow(addressLine.text.trim(),"", descriptionLine.text)) { if (!root.editEntry && !currentWallet.addressBook.addRow(addressLine.text.trim(),"", descriptionLine.text)) {
informationPopup.title = qsTr("Error") + translationManager.emptyString; informationPopup.title = qsTr("Error") + translationManager.emptyString;
// TODO: check currentWallet.addressBook.errorString() instead. // TODO: check currentWallet.addressBook.errorString() instead.
if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Address) if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Address)
@ -393,11 +394,9 @@ Rectangle {
informationPopup.onCloseCallback = null informationPopup.onCloseCallback = null
informationPopup.open(); informationPopup.open();
} else { } else {
if (root.editEntry) { currentWallet.addressBook.setDescription(addressBookListView.currentIndex, descriptionLine.text);
currentWallet.addressBook.deleteRow(addressBookListView.currentIndex);
}
root.showAddressBook();
} }
root.showAddressBook()
} }
} }

16
src/libwalletqt/AddressBook.cpp
View file

@ -139,3 +139,19 @@ QString AddressBook::getDescription(const QString &address) const
} }
return QString::fromStdString(m_rows.value(*it)->getDescription()); return QString::fromStdString(m_rows.value(*it)->getDescription());
} }
void AddressBook::setDescription(int index, const QString &description)
{
bool result;
{
QWriteLocker locker(&m_lock);
result = m_addressBookImpl->setDescription(index, description.toStdString());
}
if (result)
{
getAll();
}
}

1
src/libwalletqt/AddressBook.h
View file

@ -53,6 +53,7 @@ public:
Q_INVOKABLE int errorCode() const; Q_INVOKABLE int errorCode() const;
Q_INVOKABLE int lookupPaymentID(const QString &payment_id) const; Q_INVOKABLE int lookupPaymentID(const QString &payment_id) const;
Q_INVOKABLE QString getDescription(const QString &address) const; Q_INVOKABLE QString getDescription(const QString &address) const;
Q_INVOKABLE void setDescription(int index, const QString &label);
enum ErrorCode { enum ErrorCode {
Status_Ok, Status_Ok,