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 0000000..a68ab62 Binary files /dev/null and b/res/emoji/SD.png differ diff --git a/res/emoji/hush-money-white.png b/res/emoji/hush-money-white.png new file mode 100644 index 0000000..d0e1ebd Binary files /dev/null and b/res/emoji/hush-money-white.png differ 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();