+@Q$7Zk^ZU>%t}@#69K!Lg|idK5aA
z3w4|-ktbYS6+Jf2vr#;p9FZqloSD7gSSHXjOT0F{Cl(6I6D``eewRl?9I(Xea&4TUllajlPmZC>
zbA03Lp+xRxxs^Y}C_{8&yuN%RO4|MdD*velEiWiR{xg>%h>^VfbLcL*Rm73r$yLvc
zAxW8NL4GN!ICTzTtFNy|XU?2K!xGk_rzgdse$y5qm1cvNe=c^C>w0(@s@3sAVmg|$
zaW~p?;xuY&zr_P@Z*NB@Po6}F4jn?Z7cTSA4Wr+b1f+~!>&2vw?u<)~n_%C*PzHSG
z2#HTa5otS6!O?2eaTkt
z44Xs2Fh+0Kin7Y8(A66)$dX;Ta)p1(w`|#hu3fvve=Rh2wMFne{I6Ge=dFhpZcYj(
z^>21{;2*5sjMkMNK^L!HL$<7;p#dE{co5~}BC&+}h9ajwxSbi?RBYZ-!L(jNT`
z0krO#Q$Zf&eYvg(``;@!q2!$h(dot}WY4faudAy=Wo2b3J3AX4KYqOPdr6y1?1IO`
ze|i!`{5o-@aq;HAE9vN7S+)@+Y~7Ele!hqtHSEu;s;WBQ^wQGOJHG##HpLL3+V~q>6>~N{WelaNnMdj{AWwrI_)-B|eVSj$)$dOLy1qB7@=FOX(-~X|`
z!C~l~V{$xF&R^phKd;fX`BPcHbs(B&mr4=#z=Sk3BdZwgs;YzSS37dWus_E^9EQGW
z(k*j9#
z=M@zdozTTRtO&S*;VNHQyU(a!uIRG>k3fXflAbLy&1V{
z27hi0U9Z=pW5Pkpw$5IR`B*D&y0mLL2ty
z7`Q3)&6_u)*49?D-;bYzAyF#@1K$z!;WTfmP`UeIw$ilUiyih$OR^AMun!$Q+kiY_
z#{S#@JvTR(hn|&{g)U#V{E(H^oD~+j(NNC&PJjT9{o1dy_(@m9?M9S3vO)zxjv)C;@1<$8>XD@dw=%d)rEr5qR+k7DfhI({p!a7uQ
z;gZ+=xdA#>&KN^4Dk|dTQ}zt+HlCle#OL5U(!7i9*7o@($>!x)xIM{NXTBgx4Vk+f
zZ98(pYyR9Cbi8jj$fxYt&dO?0KzB6FYf*0x8oNV2J@5zeWB;j%yn02*98FVGlbJua
z1|0`;=l(CBa>Sd#@bR(S%~U=-^d6*tyqRUdR2xXl{Kt^GX-vdjs+CP
z&~Y$lET6KQRLkZ{d!w(;mRpgLd%9=m71s#`LP32Se
z46Att%v?kSc;h2nxShPE1kPsB9rOnQqTz@Ca4BO`<8IBL8wP%>O`&IGWbo(QoVEOl
zDq^4;AK~(k{B|-itxj-S((uE-IBx|iud8>;pId{DgE@TU$rT&7I-5A~c=&}!O|q1$
zPZ4d4k9oIs>Pp!1F?%Z<^5=ML+qTUNIv#uX?zLHQvu4+tTT#&Tg=B&s6E)h>c1|m1
z+MzCtQihANrcXW4^zKwL1@W-E_T@!K5XdB
z2i1JXm_f(Kovg{H9I^0}EMmbw5&GHFmio>QCP83{_oj}1P&$<}3+7IrKJ9u{??y9H
zO-m#adY^HcD~cXH9xwyne?i8hq^N8A&vs1a6uU0%4)BK$A9gDfn7RKbv2T0d@aRK;
z`EF|}+lxfNhinu+W^C`nCh9Ufp_i1DI8<@7WusQ56AQj~*!(P8y804gboBrqHx{z>
zVUxIxJak-)xqkh+ThM<2Sy;f-1Y*JW85-=^Q3q=T=k2d|l%#Kp0DsI*cr;7Vei6?iN9}`_}HLx?v*_V?EU&kv@j6d+iwVMQa
z+t-(r6TQs$88d&WBTWqxh;7>q6)3DZH~!FTcKzTscw8VN8GP@sx$jB7uV1$DKO+0oc!9B^^Fi@fbe*VD)kypeu$~45Fj?
zu`xx?TuksC@lE?Db^`Tz&BFy;E{RYsKemDDcVnVH2+l;>&jJQ
z3#8Kh%2>sNMHI)*IHsK+mbjMeXnyqEP!}#KVErX^Q4h2eF-*uy(X05}yDh7`c$w^=
zZo+~(MM%hfuH8pNu~|}rZ>-`OxiZaWTa^`srGzi@k<;C~A6{Y|F7dHq!{jW?-)$BA
zTXAd1jpQRV=eqrC#3OFqO9N->3M2=AZbw@(9I+Q#IH*~DzLD%LT==|5_ivb_*dbEv
zZEH~R;PY>$N3<7j*+VY$ahk@Sua4~QHhBIDGMXut9DE}cPbj_mj^+%nQz_(v9}}e&
z?26HVSp5so!~T{O;Tu#u5ve&mbbL^g*nloVbGBD#csGTR1|p4QN%pTdQt_nhJb)7N
ziV057s)fB&__hj{5HY5UDxUsO)qCOVrDX2gzlz!pnC?+{!bmuDA+(Bzhz#8XZFBF>
zrUfZHW;lmWk`h+{6%X+WTA@t2fb9!Q{uRl>*N_DtDsTsT4j+EM!W#yu-1nt?S&^xV
zN3?!@JoU>{A4dczylDV`h1B62t9ZIh6mQQ4#k2R5s>pR!#UnCF)hfVnm%V3$zG#p^-zexlob0mOi;U&;Tx-X
zeCE?9XwP{)n6qEIXGco?YEokrk1rzl-e1lds1T!pKy#+#;YX(UBs1st)x6gfVm8?3
zO_e%)V-=6befk8d2}-T6D@ZVCkNPR}#%+@{{JASV@6*R?&Oa5V9;6`20%O@wfPY=e
z@bLw}9;~fbKlSmn00oK0chb@_jgp2B*MbNymZZy{{9OIGf@D)_xn9sbaj#_I<68bK
z;clVw8>?CU*hiBeR7k->l9TU)iXJU#_%oKc8N|_7`-Vr2^jR9#(|%vFOFs|awHqt?
zMraTFjhdrUNZC|zx+meD`fTZ{c#<4n)+bV}06nS4n_oPj=qkpic{NOJS5@)!j#yCA
zH*C(cimqrK-8Zeg{Gmtg`mx?9qLe`h16J`?Gy
zeiNugJx8j$D`Yc&0B{?Y09tobGAf=4@t6F@#n62|n*2wZupJwq(ft|Ukp?S3Gr3Vd
zQx9>>M5TJkLo!ikR{+iWZXNg9>qt4fcY}9X6!XRqbtK_Rw*w9XGERvoC}PKd5l
zOLIH09w9`_JtC9xl)>p;to4J0Nf`9$;ow2I;C;}#AF(TfD&%n7|5t|M3*%4s=z}3E
zI35y1E8)iEodGm=P9Vtb0W@
\ 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