From ab2140b72d5e4fa63c2c9b170aaae09e7870e8ae Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Mon, 22 Jun 2020 11:13:10 +0200
Subject: [PATCH] add hush/sd emoji, scroll to the end of chat after clicking
new contact
---
application.qrc | 4 ++--
res/emoji/SD.png | Bin 0 -> 9759 bytes
res/emoji/hush-money-white.png | Bin 0 -> 2131 bytes
src/Chat/Helper/ChatDelegator.h | 4 ++++
src/addressbook.cpp | 3 +++
src/controller.cpp | 5 +++++
src/emoji.ui | 32 +++++++++++++++++++++++++++++++-
src/mainwindow.cpp | 12 ++++++++++++
8 files changed, 57 insertions(+), 3 deletions(-)
create mode 100644 res/emoji/SD.png
create mode 100644 res/emoji/hush-money-white.png
diff --git a/application.qrc b/application.qrc
index 025a9a8..5fc7a70 100644
--- a/application.qrc
+++ b/application.qrc
@@ -80,8 +80,8 @@
res/emoji/smiling-face-with-sunglasses.png
res/emoji/stuck-out.png
res/emoji/sweet_smile.png
-
-
+ res/emoji/hush-money-white.png
+ res/emoji/SD.png
res/silentdragonlite_de.qm
diff --git a/res/emoji/SD.png b/res/emoji/SD.png
new file mode 100644
index 0000000000000000000000000000000000000000..a68ab62fd56f99acd746322d50434b69a5729054
GIT binary patch
literal 9759
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
literal 0
HcmV?d00001
diff --git a/res/emoji/hush-money-white.png b/res/emoji/hush-money-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e1ebd24ca68b4498054c8ed7a97b381323dd8a
GIT binary patch
literal 2131
zcmV-Z2(0&sP)
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U;0vcI74v{m&}81SBB@%i;5!?x4%>74}Q=GMP-K
z?Z4)6Y%rE3ajz`o7uH{Y?(heG%o;;dE4k(z@k=#TZWxq!{pvYWOy_+4=H1ite4vK_
zV@lA=b!qLEZL(o`4{<|QN%XO`OoxsHY-z??{%%N
zr3^ Z?5tdZ>Y52jp@d%V>r}F}BkxT8S+VP(I^`9c@r02I4zVqDhT5t>
zL(e=|&Rh}W%0L!8C2zFZq{@^6{sylgf@yy7g^t~N>(5a?Qk&sbw=OR;?8&
zsc6Z?N-4Fp%2kj9wdQKI)LL8P&|s)RSA%@ROy@2=b?v!ZFTM6Q5I!Rf9eLO&qmDLt
z%0!x&dD<+q&bBBlWQvuRuDooORae`HwJkes-Fe$CyYBYF8r`q$`}P~G(ajnkrd-Zm
zSi@{Ed#E5!C+eJmF-`==%^5&IvvU>;rNqvha~3P(rBH^G>fD4$&KM|6i&!_kaQDjG
zmv{?WzQh~HmAFwukpBsm<>n(Ilqu}ks{Z(36MfL*Bn~Loj;m|T9
z!QS$Q(BfRYFNtJiyt|28?sf0NtM+rJ!U8-9eMVWa+8$Nc1l?;c!2@+ASLw<=Gt+z7
zu!4Y;O`L1plzPg294m3J)`58^xZPK-YqV4*8KMU{SW6jkRF1YJAxc#yrJ%m&;`C2?
za^HJ0UrvxQ<+wSJ8@9s+Pgag?x3NAa%A8F)BB*J|u`f;7
zffK^d2o7hPLv1WTisWNufQ_PQ+A$b)3ZNrj)Yy}BMmWS?L|`w0KqExy@X;Vk(_b-U
zt*@&J$ZDUdaxgQbe~H<@0{dIhx1w)F--`Z!itrt9GP>Ex!j0PY9E<{f%#(^$>16LZ
z_m$9d4_8LdB4<}crRw<{y5_G`nW2CyGPEvEGljjl<}y*hU=*k3wPsEzB5a7vg$Jdua`nVKd<}SDq-!yx!VXxenqM5{-=7vg}N{rM&^hce)E2-{}rG4$Ubu)}(_K
z1BA4F6nbm}IHPP+s7Hy1uV!c|Y3)-G`Nx+oFNshK33*XeTJxGp`d#cyL$L#}Ph`33bK*8n{{mT!rn+RCwTPJXWzv
z|EFc=4|JEveE|p`JR1)mdvo=Oi9IWT{2MDp6s-~oMdAPe0fcEoLr_UWLm+T+Z)Rz1
zWdHyuk$sUpNW(xJ#a~mkMJf&!5pl>+oh*o7IBFG&P$AR`tvZ-o`UOoIk`xz5!L{Jv
z$70pN#aUMeS3wZ`0C943Qgo3L|Cbh8#CUMrk9YSTckck9R$`jfF$QS5Z6@O}F`Zcz
z1Fz^pKZ2M-L}r#TCrJr-j<0+8_<9%RS>EUV96f5*Vt`L1o@It<6K@btZ`uauec~`H
z$SUzU@u*1`B!1+&(%?7Fd6xyA88%bNdEzj!m~UgHjak9eh$o37s-{!EkZ!Qbd5g1F
zs<7rg`3pl?ePx;JG=~t!B9j(dX-`!fdiSb5KCRA0S2B7*_2($PgBU{fcG={rVP+`3v{nFdTZ|E^Z`gwSBV?o;1C$eQ}(*Y
zyMyh${d=a_-w&c@a=MT1T{{2(00v@9M??Vs0RI60puMM)00009a7bBm000fw000fw
z0YWI7cmMzZ2XskIMF->t76>)~JUq@C0003(NklBsfjjiutDS{d+dmlh0AlfJhDFjP3MA2j6T>0m^;DKeA
z*>jeeGqVhkDywxGsNiH_7EXFDKbkX|^PHDn2b~F
zF=7rogO?xTY-{aDPxQ44-^K=>;3pQbnxyqaugdOst+nrE^%q>j1MKaIMp!~iatUWz
zYpHnaHWwH1yqr6UM@go=f`_8XU{9s`U(paRa39}#mt$<={akzt_d5I!*c@RQ&&po4
z-^5!Stfr>cM)Chn`MxB#YsS`U-VP@@n&if?PhBLrGW$=x``@eWtNkNv@HYSe002ov
JPDHLkV1j{F^1lE8
literal 0
HcmV?d00001
diff --git a/src/Chat/Helper/ChatDelegator.h b/src/Chat/Helper/ChatDelegator.h
index 42dac58..cccac36 100644
--- a/src/Chat/Helper/ChatDelegator.h
+++ b/src/Chat/Helper/ChatDelegator.h
@@ -72,6 +72,8 @@ inline void ListViewDelegate::paint(QPainter *painter, QStyleOptionViewItem cons
bodydoc.setHtml(bodytext.replace(":sunglass:", ""));
bodydoc.setHtml(bodytext.replace(":stuck_out:", ""));
bodydoc.setHtml(bodytext.replace(";p", ""));
+ bodydoc.setHtml(bodytext.replace(":hush_white:", ""));
+ bodydoc.setHtml(bodytext.replace(":sd:", ""));
qreal contentswidth = option.rect.width() * d_widthfraction - d_horizontalmargin - d_pointerwidth - d_leftpadding - d_rightpadding;
bodydoc.setTextWidth(contentswidth);
qreal bodyheight = bodydoc.size().height();
@@ -216,6 +218,8 @@ inline QSize ListViewDelegate::sizeHint(QStyleOptionViewItem const &option, QMod
bodydoc.setHtml(bodytext.replace(":sunglass:", ""));
bodydoc.setHtml(bodytext.replace(":stuck_out:", ""));
bodydoc.setHtml(bodytext.replace(";p", ""));
+ bodydoc.setHtml(bodytext.replace(":hush_white:", ""));
+ bodydoc.setHtml(bodytext.replace(":sd:", ""));
// the width of the contents are the (a fraction of the window width) minus (margins + padding + width of the bubble's tail)
qreal contentswidth = option.rect.width() * d_widthfraction - d_horizontalmargin - d_pointerwidth - d_leftpadding - d_rightpadding;
diff --git a/src/addressbook.cpp b/src/addressbook.cpp
index 1f19fff..4271324 100644
--- a/src/addressbook.cpp
+++ b/src/addressbook.cpp
@@ -250,6 +250,9 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
);
+ parent->ui->listChat->verticalScrollBar()->setValue(
+ parent->ui->listChat->verticalScrollBar()->maximum());
+
});
// AddressBook::getInstance()->addAddressLabel(newLabel, ab.addr->text(), cid);
diff --git a/src/controller.cpp b/src/controller.cpp
index b777da2..cb3d9f3 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -101,6 +101,9 @@ void Controller::setConnection(Connection* c)
ui->listContactWidget
);
+
+ ui->listChat->verticalScrollBar()->setValue(
+ ui->listChat->verticalScrollBar()->maximum());
}
std::string Controller::encryptDecrypt(std::string toEncrypt)
@@ -1482,6 +1485,8 @@ void Controller::refreshChat(QListView *listWidget, QLabel *label)
void Controller::refreshContacts(QListView *listWidget)
{
contactModel->renderContactList(listWidget);
+ ui->listChat->verticalScrollBar()->setValue(
+ ui->listChat->verticalScrollBar()->maximum());
}
// If the wallet is encrpyted and locked, we need to unlock it
diff --git a/src/emoji.ui b/src/emoji.ui
index 3717731..8118466 100644
--- a/src/emoji.ui
+++ b/src/emoji.ui
@@ -7,7 +7,7 @@
0
0
261
- 152
+ 150
@@ -300,6 +300,36 @@
+ -
+
+
+
+
+
+
+ :/emoji/res/emoji/hush-money-white.png
+
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/emoji/res/emoji/SD.png
+
+
+
+ true
+
+
+
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 08923ef..4e94a2b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2721,6 +2721,18 @@ QObject::connect(emoji.stuck_out, &QPushButton::clicked, [&] () {
emojiDialog.close();
});
+QObject::connect(emoji.hush_white, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":hush_white:");
+
+ emojiDialog.close();
+});
+
+QObject::connect(emoji.sd, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":sd:");
+
+ emojiDialog.close();
+});
+
emojiDialog.exec();