diff --git a/application.qrc b/application.qrc
index 51a4cc4..c93d249 100644
--- a/application.qrc
+++ b/application.qrc
@@ -23,6 +23,15 @@
res/Pinguin.png
res/Stag.png
res/Elsa.png
+ res/send.png
+ res/send.svg
+ res/addcontact.svg
+ res/send-new.svg
+ res/add_contact.svg
+ res/notification.svg
+ res/send-new-white.png
+ res/add_contact.png
+ res/notification.png
res/hushdlogo.gif
diff --git a/res/add_contact.png b/res/add_contact.png
new file mode 100644
index 0000000..c00a055
Binary files /dev/null and b/res/add_contact.png differ
diff --git a/res/add_contact.svg b/res/add_contact.svg
new file mode 100644
index 0000000..30899b8
--- /dev/null
+++ b/res/add_contact.svg
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/addcontact.svg b/res/addcontact.svg
new file mode 100644
index 0000000..1a71008
--- /dev/null
+++ b/res/addcontact.svg
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/res/notification.png b/res/notification.png
new file mode 100644
index 0000000..f746609
Binary files /dev/null and b/res/notification.png differ
diff --git a/res/notification.svg b/res/notification.svg
new file mode 100644
index 0000000..3db8333
--- /dev/null
+++ b/res/notification.svg
@@ -0,0 +1,10 @@
+
+
+
diff --git a/res/send-new-white.png b/res/send-new-white.png
new file mode 100644
index 0000000..4c7461c
Binary files /dev/null and b/res/send-new-white.png differ
diff --git a/res/send-new.svg b/res/send-new.svg
new file mode 100644
index 0000000..ce2df0a
--- /dev/null
+++ b/res/send-new.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/res/send.png b/res/send.png
new file mode 100644
index 0000000..f0fce10
Binary files /dev/null and b/res/send.png differ
diff --git a/res/send.svg b/res/send.svg
new file mode 100644
index 0000000..874d686
--- /dev/null
+++ b/res/send.svg
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/src/controller.cpp b/src/controller.cpp
index 4566827..0a0913a 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -874,7 +874,7 @@ void Controller::refreshTransactions() {
if (address == c.getPartnerAddress()){
contact = c.getName();
}else{ contact = "";}
- }
+
ChatItem item = ChatItem(
datetime,
@@ -889,7 +889,7 @@ void Controller::refreshTransactions() {
);
chatModel->addMessage(item);
-
+ }
items.push_back(TransactionItemDetail{address, amount, memo});
total_amount = total_amount + amount;
@@ -980,7 +980,7 @@ void Controller::refreshTransactions() {
contact = c.getName();
}else{ contact = "";}
- }
+
ChatItem item = ChatItem(
datetime,
address,
@@ -994,7 +994,7 @@ void Controller::refreshTransactions() {
);
chatModel->addMessage(item);
-
+ }
}
}
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index eb7b244..8385b7a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1013,12 +1013,12 @@ void MainWindow::setupchatTab() {
// if (ui->request->isChecked()) {
- QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::ContactRequest);
+ // QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::ContactRequest);
// qDebug() <request->isChecked()->text();
// }else{
- // QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::sendChatButton);
+ QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::sendChatButton);
// }
@@ -1048,20 +1048,6 @@ void MainWindow::setupchatTab() {
}
-
-
-/*
-void MainWindow::setChatItem(ChatItem * item)
-{
- this->currentChatItem = item;
-}
-
-ChatItem* MainWindow::getChatItem()
-{
- return this->currentChatItem;
-}*/
-
-
ChatMemoEdit::ChatMemoEdit(QWidget* parent) : QPlainTextEdit(parent) {
QObject::connect(this, &QPlainTextEdit::textChanged, this, &ChatMemoEdit::updateDisplay);
}
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 74739f7..045d7e0 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1332,9 +1332,9 @@
0
- 40
+ 90
341
- 601
+ 551
@@ -1354,7 +1354,7 @@
0
- 20
+ 60
341
20
@@ -1392,10 +1392,10 @@
- 720
- 640
- 114
- 25
+ 1170
+ 560
+ 91
+ 81
@@ -1404,33 +1404,28 @@
0
-
- Send
-
-
+
false
-
-
-
-
- 0
- 640
- 91
- 25
-
+
+
-
+
+
+ :/icons/res/send-new-white.png
+
+
+
- 100
- 0
+ 61
+ 62
-
- Add contact
+
+ false
- false
+ true
@@ -1484,7 +1479,7 @@
340
- 650
+ 640
261
23
@@ -1493,17 +1488,71 @@
Is this message a contact request?
+
+
+
+ 90
+ 0
+ 71
+ 61
+
+
+
+
+ 100
+ 0
+
+
+
+
+
+
+
+ :/icons/res/add_contact.png:/icons/res/add_contact.png
+
+
+
+ 43
+ 49
+
+
+
+ true
+
+
- 110
- 640
- 191
- 25
+ 170
+ 0
+ 71
+ 61
+
+
+ 100
+ 0
+
+
+
+ false
+
- Incoming contact request
+
+
+
+
+ :/icons/res/notification.png:/icons/res/notification.png
+
+
+
+ 43
+ 49
+
+
+
+ true