diff --git a/application.qrc b/application.qrc
index b7d5138..025a9a8 100644
--- a/application.qrc
+++ b/application.qrc
@@ -70,8 +70,17 @@
res/emoji/joy.png
res/emoji/innocent.png
res/emoji/partying_face.png
- res/emoji/heart_eyes.png
- res/emoji/fire.png
+ res/emoji/face_with_3hearts.png
+ res/emoji/face-with-rolling-eyes.png
+ res/emoji/face-with-tongue.png
+ res/emoji/heart_shaped_eyes.png
+ res/emoji/nauseated-face.png
+ res/emoji/pile-of-poo.png
+ res/emoji/serious-face-with-symbols-covering-mouth.png
+ res/emoji/smiling-face-with-sunglasses.png
+ res/emoji/stuck-out.png
+ res/emoji/sweet_smile.png
+
diff --git a/res/emoji/face-with-rolling-eyes.png b/res/emoji/face-with-rolling-eyes.png
new file mode 100644
index 0000000..2ac0b71
Binary files /dev/null and b/res/emoji/face-with-rolling-eyes.png differ
diff --git a/res/emoji/face-with-tongue.png b/res/emoji/face-with-tongue.png
new file mode 100644
index 0000000..b83c921
Binary files /dev/null and b/res/emoji/face-with-tongue.png differ
diff --git a/res/emoji/face_with_3hearts.png b/res/emoji/face_with_3hearts.png
new file mode 100644
index 0000000..b8b9f5d
Binary files /dev/null and b/res/emoji/face_with_3hearts.png differ
diff --git a/res/emoji/fire.png b/res/emoji/fire.png
deleted file mode 100644
index c1b7596..0000000
Binary files a/res/emoji/fire.png and /dev/null differ
diff --git a/res/emoji/heart_eyes.png b/res/emoji/heart_eyes.png
deleted file mode 100644
index de0eed6..0000000
Binary files a/res/emoji/heart_eyes.png and /dev/null differ
diff --git a/res/emoji/heart_shaped_eyes.png b/res/emoji/heart_shaped_eyes.png
new file mode 100644
index 0000000..ddeefdc
Binary files /dev/null and b/res/emoji/heart_shaped_eyes.png differ
diff --git a/res/emoji/nauseated-face.png b/res/emoji/nauseated-face.png
new file mode 100644
index 0000000..88b70c6
Binary files /dev/null and b/res/emoji/nauseated-face.png differ
diff --git a/res/emoji/pile-of-poo.png b/res/emoji/pile-of-poo.png
new file mode 100644
index 0000000..f063a77
Binary files /dev/null and b/res/emoji/pile-of-poo.png differ
diff --git a/res/emoji/serious-face-with-symbols-covering-mouth.png b/res/emoji/serious-face-with-symbols-covering-mouth.png
new file mode 100644
index 0000000..917b8fc
Binary files /dev/null and b/res/emoji/serious-face-with-symbols-covering-mouth.png differ
diff --git a/res/emoji/smiling-face-with-sunglasses.png b/res/emoji/smiling-face-with-sunglasses.png
new file mode 100644
index 0000000..4fe13e3
Binary files /dev/null and b/res/emoji/smiling-face-with-sunglasses.png differ
diff --git a/res/emoji/stuck-out.png b/res/emoji/stuck-out.png
new file mode 100644
index 0000000..fa98c80
Binary files /dev/null and b/res/emoji/stuck-out.png differ
diff --git a/src/Chat/Helper/ChatDelegator.h b/src/Chat/Helper/ChatDelegator.h
index 602d0ac..42dac58 100644
--- a/src/Chat/Helper/ChatDelegator.h
+++ b/src/Chat/Helper/ChatDelegator.h
@@ -61,6 +61,17 @@ inline void ListViewDelegate::paint(QPainter *painter, QStyleOptionViewItem cons
bodydoc.setHtml(bodytext.replace(":partying_face:", "
"));
bodydoc.setHtml(bodytext.replace(":heart_eyes:", "
"));
bodydoc.setHtml(bodytext.replace(":fire:", "
"));
+ bodydoc.setHtml(bodytext.replace(":rolling_eyes:", "
"));
+ bodydoc.setHtml(bodytext.replace(":stuck_out_tongue:", "
"));
+ bodydoc.setHtml(bodytext.replace(":p", ""));
+ bodydoc.setHtml(bodytext.replace(":face_with_3hearts:", "
"));
+ bodydoc.setHtml(bodytext.replace(":heart_eyes:", "
"));
+ bodydoc.setHtml(bodytext.replace(":nauseated:", "
"));
+ bodydoc.setHtml(bodytext.replace(":poop:", "
"));
+ bodydoc.setHtml(bodytext.replace(":symbols_mouth:", "
"));
+ bodydoc.setHtml(bodytext.replace(":sunglass:", "
"));
+ bodydoc.setHtml(bodytext.replace(":stuck_out:", "
"));
+ bodydoc.setHtml(bodytext.replace(";p", ""));
qreal contentswidth = option.rect.width() * d_widthfraction - d_horizontalmargin - d_pointerwidth - d_leftpadding - d_rightpadding;
bodydoc.setTextWidth(contentswidth);
qreal bodyheight = bodydoc.size().height();
@@ -194,7 +205,17 @@ inline QSize ListViewDelegate::sizeHint(QStyleOptionViewItem const &option, QMod
bodydoc.setHtml(bodytext.replace(":partying_face:", ""));
bodydoc.setHtml(bodytext.replace(":heart_eyes:", ""));
bodydoc.setHtml(bodytext.replace(":fire:", ""));
-
+ bodydoc.setHtml(bodytext.replace(":rolling_eyes:", ""));
+ bodydoc.setHtml(bodytext.replace(":stuck_out_tongue:", ""));
+ bodydoc.setHtml(bodytext.replace(":p", ""));
+ bodydoc.setHtml(bodytext.replace(":face_with_3hearts:", ""));
+ bodydoc.setHtml(bodytext.replace(":heart_eyes:", ""));
+ bodydoc.setHtml(bodytext.replace(":nauseated:", ""));
+ bodydoc.setHtml(bodytext.replace(":poop:", ""));
+ bodydoc.setHtml(bodytext.replace(":symbols_mouth:", ""));
+ bodydoc.setHtml(bodytext.replace(":sunglass:", ""));
+ bodydoc.setHtml(bodytext.replace(":stuck_out:", ""));
+ bodydoc.setHtml(bodytext.replace(";p", ""));
// 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/emoji.ui b/src/emoji.ui
index 774681e..3717731 100644
--- a/src/emoji.ui
+++ b/src/emoji.ui
@@ -7,7 +7,7 @@
0
0
261
- 46
+ 152
@@ -135,6 +135,173 @@
+ -
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
-
+
+
+
+
+
+
+ :/emoji/res/emoji/face-with-rolling-eyes.png
+
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/emoji/res/emoji/face-with-tongue.png
+
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/emoji/res/emoji/face_with_3hearts.png
+
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/emoji/res/emoji/heart_shaped_eyes.png
+
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/emoji/res/emoji/nauseated-face.png
+
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/emoji/res/emoji/pile-of-poo.png
+
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/emoji/res/emoji/serious-face-with-symbols-covering-mouth.png
+
+
+
+ true
+
+
+
+
+
+ -
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
-
+
+
+
+
+
+
+ :/emoji/res/emoji/smiling-face-with-sunglasses.png
+
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/emoji/res/emoji/stuck-out.png
+
+
+
+ true
+
+
+
+
+
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9ff349a..08923ef 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2667,6 +2667,61 @@ QObject::connect(emoji.partying_face, &QPushButton::clicked, [&] () {
emojiDialog.close();
});
+QObject::connect(emoji.rolling_eyes, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":rolling_eyes:");
+
+ emojiDialog.close();
+});
+
+QObject::connect(emoji.tongue, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":stuck_out_tongue:");
+
+ emojiDialog.close();
+});
+
+QObject::connect(emoji.hearts3, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":face_with_3hearts:");
+
+ emojiDialog.close();
+});
+
+QObject::connect(emoji.heart_eyes, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":heart_eyes:");
+
+ emojiDialog.close();
+});
+
+QObject::connect(emoji.nauseated, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":nauseated:");
+
+ emojiDialog.close();
+});
+
+QObject::connect(emoji.poop, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":poop:");
+
+ emojiDialog.close();
+});
+
+QObject::connect(emoji.symbols_mouth, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":symbols_mouth:");
+
+ emojiDialog.close();
+});
+
+QObject::connect(emoji.sunglass, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":sunglass:");
+
+ emojiDialog.close();
+});
+
+QObject::connect(emoji.stuck_out, &QPushButton::clicked, [&] () {
+ ui->memoTxtChat->insertHtml(":stuck_out:");
+
+ emojiDialog.close();
+});
+
+
emojiDialog.exec();
}
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index da36c3f..8f3e13a 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1712,6 +1712,33 @@
+ -
+
+
+
+ 20
+ 0
+
+
+
+
+
+
+
+ :/emoji/res/emoji/emoji1.png
+
+
+
+
+ 17
+ 17
+
+
+
+ true
+
+
+
-
@@ -1726,33 +1753,6 @@
6
-
-
-
-
-
- 20
- 0
-
-
-
-
-
-
-
- :/emoji/res/emoji/emoji1.png
-
-
-
-
- 17
- 17
-
-
-
- true
-
-
-
-