From a344f17cd1716c34672e2c201137d772b165da2e Mon Sep 17 00:00:00 2001 From: Jaquee Date: Sat, 10 Dec 2016 02:01:04 +0100 Subject: AddressBook: basic functions --- src/model/AddressBookModel.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 src/model/AddressBookModel.cpp (limited to 'src/model/AddressBookModel.cpp') diff --git a/src/model/AddressBookModel.cpp b/src/model/AddressBookModel.cpp new file mode 100644 index 00000000..5e78200b --- /dev/null +++ b/src/model/AddressBookModel.cpp @@ -0,0 +1,75 @@ +#include "AddressBookModel.h" +#include "AddressBook.h" +#include +#include +#include + +AddressBookModel::AddressBookModel(QObject *parent, AddressBook *addressBook) + : QAbstractListModel(parent) , m_addressBook(addressBook) +{ + qDebug(__FUNCTION__); + connect(m_addressBook,SIGNAL(refreshStarted()),this,SLOT(startReset())); + connect(m_addressBook,SIGNAL(refreshFinished()),this,SLOT(endReset())); + +} + +void AddressBookModel::startReset(){ + qDebug(__FUNCTION__); + beginResetModel(); +} +void AddressBookModel::endReset(){ + qDebug(__FUNCTION__); + endResetModel(); +} + +int AddressBookModel::rowCount(const QModelIndex &parent) const +{ + return m_addressBook->count(); +} + +QVariant AddressBookModel::data(const QModelIndex &index, int role) const +{ + if (!index.isValid()) + return QVariant(); + + if (index.row() < 0 || (unsigned)index.row() >= m_addressBook->count()) { + return QVariant(); + } + + Bitmonero::AddressBookRow * ar = m_addressBook->getRow(index.row()); + + QVariant result = ""; + switch (role) { + case AddressBookAddressRole: + result = QString::fromStdString(ar->getAddress()); + break; + case AddressBookDescriptionRole: + result = QString::fromStdString(ar->getDescription()); + break; + case AddressBookPaymentIdRole: + result = QString::fromStdString(ar->getPaymentId()); + break; + case AddressBookRowIdRole: + result = ar->getRowId(); + break; + } + + return result; +} + +bool AddressBookModel::deleteRow(int row) +{ + m_addressBook->deleteRow(row); +} + +QHash AddressBookModel::roleNames() const +{ + QHash roleNames = QAbstractListModel::roleNames(); + roleNames.insert(AddressBookAddressRole, "address"); + roleNames.insert(AddressBookPaymentIdRole, "paymentId"); + roleNames.insert(AddressBookDescriptionRole, "description"); + roleNames.insert(AddressBookRowIdRole, "rowId"); + + + return roleNames; +} -- cgit v1.2.3 From 0e5329ab6c8e09b5b78120b917c19e6e6a455156 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Wed, 14 Dec 2016 23:28:20 +0100 Subject: Addressbook: updated references to bitmonero --- src/libwalletqt/AddressBook.cpp | 6 +++--- src/libwalletqt/AddressBook.h | 12 ++++++------ src/model/AddressBookModel.cpp | 2 +- src/model/AddressBookModel.h | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) (limited to 'src/model/AddressBookModel.cpp') diff --git a/src/libwalletqt/AddressBook.cpp b/src/libwalletqt/AddressBook.cpp index 971fa17b..3535bb67 100644 --- a/src/libwalletqt/AddressBook.cpp +++ b/src/libwalletqt/AddressBook.cpp @@ -1,7 +1,7 @@ #include "AddressBook.h" #include -AddressBook::AddressBook(Bitmonero::AddressBook *abImpl,QObject *parent) +AddressBook::AddressBook(Monero::AddressBook *abImpl,QObject *parent) : QObject(parent), m_addressBookImpl(abImpl) { qDebug(__FUNCTION__); @@ -18,7 +18,7 @@ int AddressBook::errorCode() const return m_addressBookImpl->errorCode(); } -QList AddressBook::getAll(bool update) const +QList AddressBook::getAll(bool update) const { qDebug(__FUNCTION__); @@ -38,7 +38,7 @@ QList AddressBook::getAll(bool update) const } -Bitmonero::AddressBookRow * AddressBook::getRow(int index) const +Monero::AddressBookRow * AddressBook::getRow(int index) const { return m_rows.at(index); } diff --git a/src/libwalletqt/AddressBook.h b/src/libwalletqt/AddressBook.h index 2262e00f..7a1f2da8 100644 --- a/src/libwalletqt/AddressBook.h +++ b/src/libwalletqt/AddressBook.h @@ -6,7 +6,7 @@ #include #include -namespace Bitmonero { +namespace Monero { class AddressBook; } class AddressBookRow; @@ -15,8 +15,8 @@ class AddressBook : public QObject { Q_OBJECT public: - Q_INVOKABLE QList getAll(bool update = false) const; - Q_INVOKABLE Bitmonero::AddressBookRow * getRow(int index) const; + Q_INVOKABLE QList getAll(bool update = false) const; + Q_INVOKABLE Monero::AddressBookRow * getRow(int index) const; Q_INVOKABLE bool addRow(const QString &address, const QString &payment_id, const QString &description) const; Q_INVOKABLE bool deleteRow(int rowId) const; quint64 count() const; @@ -41,10 +41,10 @@ signals: public slots: private: - explicit AddressBook(Bitmonero::AddressBook * abImpl, QObject *parent); + explicit AddressBook(Monero::AddressBook * abImpl, QObject *parent); friend class Wallet; - Bitmonero::AddressBook * m_addressBookImpl; - mutable QList m_rows; + Monero::AddressBook * m_addressBookImpl; + mutable QList m_rows; }; #endif // ADDRESSBOOK_H diff --git a/src/model/AddressBookModel.cpp b/src/model/AddressBookModel.cpp index 5e78200b..e8e673fa 100644 --- a/src/model/AddressBookModel.cpp +++ b/src/model/AddressBookModel.cpp @@ -36,7 +36,7 @@ QVariant AddressBookModel::data(const QModelIndex &index, int role) const return QVariant(); } - Bitmonero::AddressBookRow * ar = m_addressBook->getRow(index.row()); + Monero::AddressBookRow * ar = m_addressBook->getRow(index.row()); QVariant result = ""; switch (role) { diff --git a/src/model/AddressBookModel.h b/src/model/AddressBookModel.h index d6fd01e8..b239bd65 100644 --- a/src/model/AddressBookModel.h +++ b/src/model/AddressBookModel.h @@ -2,7 +2,6 @@ #define ADDRESSBOOKMODEL_H #include -//#include "wallet/wallet2_api.h" // we need to have an access to the Bitmonero::Wallet::AddressBook class AddressBook; -- cgit v1.2.3 From 3788943d9d035fbba54c6b3dec46fbc68a89de14 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Thu, 15 Dec 2016 15:26:20 +0100 Subject: Addressbook: Fix size_t build error --- src/model/AddressBookModel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/model/AddressBookModel.cpp') diff --git a/src/model/AddressBookModel.cpp b/src/model/AddressBookModel.cpp index e8e673fa..7ec0074b 100644 --- a/src/model/AddressBookModel.cpp +++ b/src/model/AddressBookModel.cpp @@ -50,7 +50,8 @@ QVariant AddressBookModel::data(const QModelIndex &index, int role) const result = QString::fromStdString(ar->getPaymentId()); break; case AddressBookRowIdRole: - result = ar->getRowId(); + // Qt doesnt support size_t overload type casting + result.setValue(ar->getRowId()); break; } -- cgit v1.2.3