From 6991743b5f41fb2107a684c2847083e18f923bb7 Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Wed, 6 May 2020 16:54:15 +0200 Subject: [PATCH] new Button Design, only for darkmode atm --- application.qrc | 9 ++++ res/add_contact.png | Bin 0 -> 1889 bytes res/add_contact.svg | 9 ++++ res/addcontact.svg | 7 +++ res/notification.png | Bin 0 -> 1479 bytes res/notification.svg | 10 ++++ res/send-new-white.png | Bin 0 -> 1714 bytes res/send-new.svg | 19 +++++++ res/send.png | Bin 0 -> 4178 bytes res/send.svg | 6 +++ src/controller.cpp | 8 +-- src/mainwindow.cpp | 18 +------ src/mainwindow.ui | 113 +++++++++++++++++++++++++++++------------ 13 files changed, 147 insertions(+), 52 deletions(-) create mode 100644 res/add_contact.png create mode 100644 res/add_contact.svg create mode 100644 res/addcontact.svg create mode 100644 res/notification.png create mode 100644 res/notification.svg create mode 100644 res/send-new-white.png create mode 100644 res/send-new.svg create mode 100644 res/send.png create mode 100644 res/send.svg 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 0000000000000000000000000000000000000000..c00a055a21402dca0832a1bf5b8553ba5dde3601 GIT binary patch literal 1889 zcmZ9M3s4hx9>+J2C7T5ygf$@LkLoAg?QkXa%1U1d^DP zKx6=W?IDetpdKwgn%H_wtJr{HK&d#)X&DP@q^JkB#Vbw^5#|0XICs5dGQa+u6;o@$gQZX|C)IK}zj)`4{K9STLy)kc zykV8<3K7wjwZ2H%YSM5@ddQ<9YmH><{2CI!iJo22sGGu<7pm6jBH#hj!Dw4LE3_ap zQU@nJVR*0htNWG7(^>1b1V8R5k>0&iHq_2AZ*3^l42C&I|9<39w|95GGT^enuy^-~ z==Qh2Jd~kMc08E;rmF6XeQC#TO${ACk#c=wz>{ik{C9ENhxZJBzGl#OX>CM4oUv&2 z;wbT`$y=w}u(IMu`@Rg{k(~IC?SBXiu|12?G&RouW3B$Mq3y5*7jlo> z8o!zqc5SRTMc49p$ao{MVjS^+k+B5fj3sgFj7m z%=q@TX+FpuNDsLkmwGM15k8TMfYQ9Mxf>>1^)v@yf8!ufv z@pW6}jhoM()6jW4%eUlASAu)-%T0Mt0nJcfM|;ahKw%fFGIoJ09H4$QnebCR5Lvs` zYm}@J*e`GabH)BVz`>bnMbe-2Km2?rGxd!mjwP+F>t)-}O8oj2#Q$%Vt*tjQpuP5y z-m^IOXQjIR-*i>|VoOr83ZXpyLG>sEvmW7!aPL7{hF7(pwb5L*6ax=YzGtWsx zFoBNr6F~3aphhCjEaP(mfW(vwne_jWUJn<(a=o%yw}BAN1=x}}-l<9>-I$G7RD7Nc z=UOc!!ZhKSfVL+$Z8-FmU}fgw*epX#X-}425g4_v`TAwNH}9UD%POB}%@w<5UE;9T zd|>_D_`KF!8ZV$N%L{&3Yh`+CmDU8D%Sq%7-ZQ9(Y3;W1k_JPBTmO90=(2S-8CIUo z?X}e~M{2r$4aL|!p|(>?W4QJ4yr_J73C|*??cdOKI5e2u6KNY=%IDTgdB@VAvQS`% zHC-VMywsrV8_lj5$M>yaFJUEptgCaBb|w@1o_SL@|H|ch6>&!^S!EDY-F`Sd z+}r)npz2CdV@2sCgYK@KOdMMP$0Y#T?v53q*_(xD*ph;DEym~VlI5&1{Da|&J!a`_ zf^2kO2IWmmyM%@krz^%cl%A6Y*Xj9=3`(k3Y#1J z|1$#r-lssoPk(wG)4WK~_pg;sJnEtL=aUPkvp0L1p{T;MVkaa*396r&-V=h}6To2G zSrzY^Nr>v`xkl<8Y%S(FuIoNHCyi0k&;^jUM|sSoL<-Jy^41-2YCwvybnZfn_i8b4 z;#v%S#F8Y6P|qk$gjyyT_DCKa_wcDJ79{ME(cNIZc|4%^WrhIbgEZ}Yu%|Ecbiy+z zID#UX(4e$+KBEex&jsdq^0m#q3jrmZ7x(y6j{IKom-HUbH zt>>z9oE-np-l)b~SU%9s_e8wxK$_mg7QeH~)1)mcl_WVfF9i8}&8}ESUsGc^$cHyj z@6rE~eQ)MX^m*YIE;?hh3 z_M3EdH7p439%T8Q%)~x{KQV)*3pd^ + + + + + + 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 @@ + + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ No newline at end of file diff --git a/res/notification.png b/res/notification.png new file mode 100644 index 0000000000000000000000000000000000000000..f746609c5cffa2681e15dfee53173638f8cf0848 GIT binary patch literal 1479 zcmeAS@N?(olHy`uVBq!ia0vp^j~EyjWjNS?tXuyxfD(+Yna<7up3cq+1x5L3nK`Kp z3>p(_C)#=(c91z5ADr#FswqsM@I=5|osKSxEYYq2#VcHEt!BjhQZ&i*2#S$mz24L; z-yO;>o*pY3!|M2f`N+wOo)=xc{=^4m2);g8Xn*f+^_{)UEm;#Y!){9~c)4w6&+#KA zX|6o`lp4xP7R&E7+T0WA>9yeLk6rEk>&pY@UHx@u{$lU5Q9K_yj~JgZ$bD4$Xr=G% z2YdWw(pV!^?bPK=Up5`-j|sP_dpxH+^1;kRK}G(Q~#Y&Aj^lWW2Ky#7;k0bRgOd|{Z%+MV(i+28VZS*46hrNHhv%!VN7u?P z=XdDZ<#mUFz5Rg4yiM1m_UvA~b9?>yE5Cm;a`6_`W+eWp2gVCqlDE4H!+#K5uy^@n zpa^GyM`STD3a^7Oqm#z$3ZNi+iKnkC`x90+J_+5#3#axmFfbqXba4!+xb^m~V_uS@ zfQzI0_x;7c8R8;tJW4MuKT@@1qJ(`qW6}xn+Y#Ao%m39(s<`s)f&8lj46K?iY^)j{ zibfg^j$9KH1-k+}csc`moKieml0=l8l|&W`ND3{KNUx~mIG_}D*wdaTEU*J8dRat3 z$-=jAnw7t4lHr@c&wbs-^c#;brv-;ULA*omk9{Y*J#zSbL0|a>q3Sq>Ih01`0d3T#mVO1pMQ=<^0PG>I(Y5PW=Bu?y%p5rw8b<}M)RN-jO+ z?HW!XwH+Vd3Ak#wDRv1M-jiL#aa6-aQ0driXAwp9BNBp2VDWcSi#RNGk97zbe*0PH zvZ3Re!0H{L9ZFB0NX%W9Ah=dBtgu_a^#re>mG90&U*ccr^UGQIx^@U(&EyihD3v6t zs}$jq-4QwmXv$7gx8<5(-jI+RLr17;NiE+S0cMUUr}mu-O?7} z+Rd?;L$HP8$~@(&x{l|aVuEv)9cU1kyEH*C@ks=SpbjtuB_3V;?!71Aa9E+ukGe&! zEXy?!AuI80<9E+J?I)%++I)#alfxDIv=n#fP;kMG4Pxj0@V*vx+WG9Zi7GekKrvAS zimRuf*gOr2qG`a0NzwsE-H`}BVBBq#0mg2!rHkO9|H(ZZ3+0ntIQ~i~JH0qAA?Rce zjIdvZZY>x34V7BzdIS}}5TWF!{&&ZY1_4}{5txghz)Y0?VEUY2bCvejirdsbzAO&& zm_bMQ0lODl!u|FpWeI`|I#}#t4#YF;3h1~ayO^WZ!_b3~YhqE4l8Dk$jic%=UV&ZwF#Dmj#c}hs(n}}r Sf1{rb67h8Pb6Mw<&;$U?F(3#4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4c7461c389fb00f80909fa9d0a79bbcfeb5d3d95 GIT binary patch literal 1714 zcmeAS@N?(olHy`uVBq!ia0y~yVAKI(84fm}NG*Hk4IrmA)7d$|)7e>}peR2rGbfdS zL1SX=L|c!;4l+mMgR@;%HH8Tjo(Pz$)6r#-CE69Bc!g`N)r^>5iYA#JK`}C{*PEK< zyF=N<(_>|0SRFqwA31r^^P;QQpZK5*!Pf^1?eE>KzO$FPC2L}4*lmdgFSpI?Iew%h z&6Q`LQbSqEV)?yBn|mTXy%s$Ev8%m*eR<%#tH18dU+jH0iswV;5#uukxsOU8t@OS9 zV2{5{8f&Dgow}Uq%cdj!G2u3KkLQ#}KA4$kJavvTpK$k2wXj(;M16WICRr@XvUa=&va?2JAu?-xYN+MG>HY(+~WM1{$IAO`(2=4z2UQa)< zbV4?BkIZKc$L2S`4*q{ozCA22>5ezo(S`%vk860C55_JCE1dH_`S{AY4FA#}c;)}_ z4o&zq`HPoxw+y50?E^^aB_n0&8dG(T4VSs>=);sVyNBj@O;(v=vw*Z z{0?2ayzVftw;%ABx9NJ+p52RgZm&Oo<@aw!F5aTrjKn|nz<6Ox@^*J&_z!{$_AZ|c z6yYrJh%5$1;dKyZbkdkz0Tg5}@$_|Nf5OVfC&9ien>mAlfn}Yii(^Q|t+%%f^NuQr zxE@qU{U2R6Ysv4_uIdjyuCLWgSPngZef_h|`TM`-6z^j=Hpl;&m)qL`|23K54u8X6N6!OSLAAit@# zqA`I}oMRe@5PQT5HjD#<*;=3&0Tm^RsSpD;45Sv!Y)#-4JJg!c2;_H&11;tdZ(;@V z72`O>pv=Y!PLh}kF<=uw+R&M*5lyU*R3jP+fF@2)kYwiwSBjY5A<+@87LmkusMK`> z3-6KFvl2QbIj)Ny6fzN5m))eArVtm-;(g)4-iK9JxtnJ=TF3lbAZl_%`!eG}A>$J* z-atJ@4~29Ln|<~Gl_?18A%s7Ig?B)Ooz9#%;=Mt@1f=>%kIxPkZbxNd{ewVZpdoPK zJz!zIgG`2}fx-?KjDUs+Z1&sI!{Fkz!C}IWcM*sR^AzDoVgWU|AW!IZeY+4J-^aq*DlF z$RZY?A=4BbfrhAhP2jo;^t{If{;Qz}g;aN#2klJY6xw4QQViq?teOerbX*D9;KJFG zr3N(5$y8J)kZIy9{%HY?0c(G6<8@fV!Y!b6kZGZi4jQwC3oeSu6wqYhhKfR&PAhyI zH#jU2&=JsL;a=#3&IBulh+;AYGzD~^qEM#O3Wp82nG2Z?!W3XKUATbuLli)nLRtB)Jtzcp=0YYG?-dQJn^l7j)NE+sngI+*#>+sN z1iJ_))-&utxtBma2J%3K&zga{N`N+l6@3QUl3*2~1X1)efm0M%K;Z}ZpP6l!m!Am} RyPO76=;`X`vd$@?2>?mlX@UR% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f0fce109a66c1332bbafc5c1abcb952c4d3f4ad2 GIT binary patch literal 4178 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 \ 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