diff --git a/application.qrc b/application.qrc
index 09ec74c..51a4cc4 100644
--- a/application.qrc
+++ b/application.qrc
@@ -22,10 +22,10 @@
res/Garfield.png
res/Pinguin.png
res/Stag.png
+ res/Elsa.png
res/hushdlogo.gif
- res/logobig.gif
res/silentdragonlite-animated.gif
res/silentdragonlite-animated-dark.gif
res/silentdragonlite-animated-startup.gif
diff --git a/res/Elsa.png b/res/Elsa.png
new file mode 100644
index 0000000..b9d1341
Binary files /dev/null and b/res/Elsa.png differ
diff --git a/src/addressbook.ui b/src/addressbook.ui
index b6d8d0a..f7877bf 100644
--- a/src/addressbook.ui
+++ b/src/addressbook.ui
@@ -73,6 +73,16 @@
+ -
+
+ Elsa
+
+
+
+ :/icons/res/Elsa.png
+
+
+
-
Denio
diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index e80c436..034500f 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -228,12 +228,13 @@ Tx MainWindow::createTxFromChatPage() {
QString hmemo= createHeaderMemo(type,cid,myAddr);
QString memo = ui->memoTxtChat->toPlainText().trimmed();
+
- // ui->memoSizeChat->setLenDisplayLabel();// Todo -> activate lendisplay for chat
-
- tx.toAddrs.push_back(ToFields{addr, amt, hmemo}) ;
-
+ // ui->memoSizeChat->setLenDisplayLabel();// Todo -> activate lendisplay for chat
tx.toAddrs.push_back(ToFields{addr, amt, memo});
+ tx.toAddrs.push_back(ToFields{addr, amt, hmemo});
+
+
qDebug() << "pushback chattx";
} }
@@ -472,9 +473,9 @@ Tx MainWindow::createTxForSafeContactRequest() {
QString hmemo= createHeaderMemo(type,cid,myAddr);
QString memo = ui->memoTxtChat->toPlainText().trimmed();
-
- tx.toAddrs.push_back(ToFields{addr, amt, hmemo});
tx.toAddrs.push_back(ToFields{addr, amt, memo});
+ tx.toAddrs.push_back(ToFields{addr, amt, hmemo});
+
qDebug() << "pushback chattx";
diff --git a/src/contactrequest.ui b/src/contactrequest.ui
index 5edcfa6..e2939ee 100644
--- a/src/contactrequest.ui
+++ b/src/contactrequest.ui
@@ -28,7 +28,7 @@
- -
+
-
-
@@ -40,6 +40,16 @@
+ -
+
+ Elsa
+
+
+
+ :/icons/res/Elsa.png
+
+
+
-
Denio
@@ -162,7 +172,7 @@
- -
+
-
-
@@ -172,12 +182,8 @@
- -
-
-
-
-
-
+
-
+
-
diff --git a/src/controller.cpp b/src/controller.cpp
index 81676e6..5fdb7e6 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -882,7 +882,7 @@ void Controller::refreshTransactions() {
QString cid;
QString contact;
-
+
for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
{
if (ui->contactNameMemo->text().trimmed() == c.getName()) {
@@ -894,7 +894,7 @@ void Controller::refreshTransactions() {
contact = c.getName();
}else{ contact = "";}
-
+
ChatItem item = ChatItem(
datetime,
address,
@@ -906,6 +906,7 @@ void Controller::refreshTransactions() {
);
chatModel->addMessage(item);
+
}
}
@@ -918,11 +919,9 @@ void Controller::refreshTransactions() {
QList addresses;
for (auto item : items) {
// Concat all the addresses
- if (item.amount == 0) {
-
- }else{
+
- addresses.push_back(item.address); }
+ addresses.push_back(item.address);
}
@@ -932,6 +931,7 @@ void Controller::refreshTransactions() {
txdata.push_back(TransactionItem{
"send", datetime, address, txid,confirmations, items
});
+
} else {
// Incoming Transaction
address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"]));
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a4bee22..325f076 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1077,10 +1077,6 @@ void ChatMemoEdit::setMaxLen(int len) {
updateDisplay();
}
-void ChatMemoEdit::setLenDisplayLabel(QLabel* label_40) {
- this->lenDisplayLabel = label_40;
-}
-
void ChatMemoEdit::setSendChatButton(QPushButton* button) {
this->sendChatButton = button;
}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index a98e622..ee2e5ee 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -93,6 +93,7 @@ private:
void setupBalancesTab();
void setuphushdTab();
void setupchatTab();
+ void setLenDisplayLabel(QLabel* label);
void updateContacts();
void updateChat();
@@ -168,7 +169,7 @@ public:
ChatMemoEdit(QWidget* parent);
void setMaxLen(int len);
- void setLenDisplayLabel(QLabel* label_40);
+
void setSendChatButton(QPushButton* button);
void includeReplyTo(QString replyToAddress);
void updateDisplay();
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 4c958a3..b5f3539 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1337,6 +1337,18 @@
601
+
+ true
+
+
+ QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked
+
+
+ false
+
+
+ QAbstractItemView::SingleSelection
+
@@ -1364,22 +1376,6 @@
font: 11pt "Noto Color Emoji";
-
-
-
- 1190
- 650
- 47
- 17
-
-
-
- 0 / 512
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-