add more emojis

application.qrc

@@ -70,8 +70,17 @@
     <file>res/emoji/joy.png</file>
     <file>res/emoji/innocent.png</file>
     <file>res/emoji/partying_face.png</file>
-    <file>res/emoji/heart_eyes.png</file>
-    <file>res/emoji/fire.png</file>
+    <file>res/emoji/face_with_3hearts.png</file>
+    <file>res/emoji/face-with-rolling-eyes.png</file>
+    <file>res/emoji/face-with-tongue.png</file>
+    <file>res/emoji/heart_shaped_eyes.png</file>
+    <file>res/emoji/nauseated-face.png</file>
+    <file>res/emoji/pile-of-poo.png</file>
+    <file>res/emoji/serious-face-with-symbols-covering-mouth.png</file>
+    <file>res/emoji/smiling-face-with-sunglasses.png</file>
+    <file>res/emoji/stuck-out.png</file>
+    <file>res/emoji/sweet_smile.png</file>
+
 
     </qresource>
     <qresource prefix="/translations">

src/Chat/Helper/ChatDelegator.h

@@ -61,6 +61,17 @@ inline void ListViewDelegate::paint(QPainter *painter, QStyleOptionViewItem cons
     bodydoc.setHtml(bodytext.replace(":partying_face:",  "<img src=':/emoji/res/emoji/partying_face.png'>"));
     bodydoc.setHtml(bodytext.replace(":heart_eyes:",  "<img src=':/emoji/res/emoji/heart_eyes.png'>"));
     bodydoc.setHtml(bodytext.replace(":fire:",  "<img src=':/emoji/res/emoji/fire.png'>"));
+    bodydoc.setHtml(bodytext.replace(":rolling_eyes:",  "<img src=':/emoji/res/emoji/face-with-rolling-eyes.png'>"));
+    bodydoc.setHtml(bodytext.replace(":stuck_out_tongue:",  "<img src=':/emoji/res/emoji/face-with-tongue.png'>"));
+    bodydoc.setHtml(bodytext.replace(":p",  "<img src=':/emoji/res/emoji/face-with-tongue.png'>"));
+    bodydoc.setHtml(bodytext.replace(":face_with_3hearts:",  "<img src=':/emoji/res/emoji/face_with_3hearts.png'>"));
+    bodydoc.setHtml(bodytext.replace(":heart_eyes:",  "<img src=':/emoji/res/emoji/heart_shaped_eyes.png'>"));
+    bodydoc.setHtml(bodytext.replace(":nauseated:",  "<img src=':/emoji/res/emoji/nauseated-face.png'>"));
+    bodydoc.setHtml(bodytext.replace(":poop:",  "<img src=':/emoji/res/emoji/pile-of-poo.png'>"));
+    bodydoc.setHtml(bodytext.replace(":symbols_mouth:",  "<img src=':/emoji/res/emoji/serious-face-with-symbols-covering-mouth.png'>"));
+    bodydoc.setHtml(bodytext.replace(":sunglass:",  "<img src=':/emoji/res/emoji/smiling-face-with-sunglasses.png'>"));
+    bodydoc.setHtml(bodytext.replace(":stuck_out:",  "<img src=':/emoji/res/emoji/stuck-out.png'>"));
+    bodydoc.setHtml(bodytext.replace(";p",  "<img src=':/emoji/res/emoji/stuck-out.png'>"));
     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:",  "<img src=':/emoji/res/emoji/partying_face.png'>"));
     bodydoc.setHtml(bodytext.replace(":heart_eyes:",  "<img src=':/emoji/res/emoji/heart_eyes.png'>"));
     bodydoc.setHtml(bodytext.replace(":fire:",  "<img src=':/emoji/res/emoji/fire.png'>"));
-
+    bodydoc.setHtml(bodytext.replace(":rolling_eyes:",  "<img src=':/emoji/res/emoji/face-with-rolling-eyes.png'>"));
+    bodydoc.setHtml(bodytext.replace(":stuck_out_tongue:",  "<img src=':/emoji/res/emoji/face-with-tongue.png'>"));
+    bodydoc.setHtml(bodytext.replace(":p",  "<img src=':/emoji/res/emoji/face-with-tongue.png'>"));
+    bodydoc.setHtml(bodytext.replace(":face_with_3hearts:",  "<img src=':/emoji/res/emoji/face_with_3hearts.png'>"));
+    bodydoc.setHtml(bodytext.replace(":heart_eyes:",  "<img src=':/emoji/res/emoji/heart_shaped_eyes.png'>"));
+    bodydoc.setHtml(bodytext.replace(":nauseated:",  "<img src=':/emoji/res/emoji/nauseated-face.png'>"));
+    bodydoc.setHtml(bodytext.replace(":poop:",  "<img src=':/emoji/res/emoji/pile-of-poo.png'>"));
+    bodydoc.setHtml(bodytext.replace(":symbols_mouth:",  "<img src=':/emoji/res/emoji/serious-face-with-symbols-covering-mouth.png'>"));
+    bodydoc.setHtml(bodytext.replace(":sunglass:",  "<img src=':/emoji/res/emoji/smiling-face-with-sunglasses.png'>"));
+    bodydoc.setHtml(bodytext.replace(":stuck_out:",  "<img src=':/emoji/res/emoji/stuck-out.png'>"));
+    bodydoc.setHtml(bodytext.replace(";p",  "<img src=':/emoji/res/emoji/stuck-out.png'>"));
 
     // 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;

src/emoji.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>261</width>
-    <height>46</height>
+    <height>152</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -135,6 +135,173 @@
      </item>
     </layout>
    </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="leftMargin">
+      <number>6</number>
+     </property>
+     <property name="topMargin">
+      <number>6</number>
+     </property>
+     <property name="rightMargin">
+      <number>6</number>
+     </property>
+     <property name="bottomMargin">
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="rolling_eyes">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/emoji/res/emoji/face-with-rolling-eyes.png</normalon>
+        </iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="tongue">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/emoji/res/emoji/face-with-tongue.png</normalon>
+        </iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="hearts3">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/emoji/res/emoji/face_with_3hearts.png</normalon>
+        </iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="heart_eyes">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/emoji/res/emoji/heart_shaped_eyes.png</normalon>
+        </iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="nauseated">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/emoji/res/emoji/nauseated-face.png</normalon>
+        </iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="poop">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/emoji/res/emoji/pile-of-poo.png</normalon>
+        </iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="symbols_mouth">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/emoji/res/emoji/serious-face-with-symbols-covering-mouth.png</normalon>
+        </iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <property name="leftMargin">
+      <number>6</number>
+     </property>
+     <property name="topMargin">
+      <number>6</number>
+     </property>
+     <property name="rightMargin">
+      <number>6</number>
+     </property>
+     <property name="bottomMargin">
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="sunglass">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/emoji/res/emoji/smiling-face-with-sunglasses.png</normalon>
+        </iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="stuck_out">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/emoji/res/emoji/stuck-out.png</normalon>
+        </iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources/>

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();
 }

src/mainwindow.ui

@@ -1712,6 +1712,33 @@
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QPushButton" name="emojiButton">
+              <property name="minimumSize">
+               <size>
+                <width>20</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="icon">
+               <iconset>
+                <normalon>:/emoji/res/emoji/emoji1.png</normalon>
+               </iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>17</width>
+                <height>17</height>
+               </size>
+              </property>
+              <property name="flat">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
             <item>
              <layout class="QVBoxLayout" name="verticalLayout_7">
               <property name="leftMargin">
@@ -1726,33 +1753,6 @@
               <property name="bottomMargin">
                <number>6</number>
               </property>
-              <item>
-               <widget class="QPushButton" name="emojiButton">
-                <property name="minimumSize">
-                 <size>
-                  <width>20</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset>
-                  <normalon>:/emoji/res/emoji/emoji1.png</normalon>
-                 </iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>17</width>
-                  <height>17</height>
-                 </size>
-                </property>
-                <property name="flat">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
               <item>
                <widget class="QPushButton" name="sendChatButton">
                 <property name="sizePolicy">