clean up emotes, removed some unused.

changed icons for emotes button.
reduze the size of the emoticons

retroshare-gui/src/gui/chat/ChatWidget.ui

@@ -11,12 +11,21 @@
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <property name="verticalSpacing">
     <number>2</number>
    </property>
-   <property name="margin">
-    <number>0</number>
-   </property>
    <item row="1" column="0">
     <layout class="QHBoxLayout" name="hl_TextChat">
      <property name="spacing">
@@ -37,7 +46,16 @@
         <enum>QFrame::Raised</enum>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -113,7 +131,16 @@
            <enum>QFrame::Box</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_2">
-           <property name="margin">
+           <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>
@@ -299,7 +326,16 @@ border-image: url(:/images/closepressed.png)
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>2</number>
+           </property>
+           <property name="topMargin">
+            <number>2</number>
+           </property>
+           <property name="rightMargin">
+            <number>2</number>
+           </property>
+           <property name="bottomMargin">
             <number>2</number>
            </property>
            <item>
@@ -326,8 +362,8 @@ border-image: url(:/images/closepressed.png)
               <enum>Qt::NoFocus</enum>
              </property>
              <property name="icon">
-              <iconset resource="../images.qrc">
+              <iconset resource="../emojione.qrc">
-               <normaloff>:/images/emoticons/kopete/kopete020.png</normaloff>:/images/emoticons/kopete/kopete020.png</iconset>
+               <normaloff>:/emojione/1F603.png</normaloff>:/emojione/1F603.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -486,7 +522,16 @@ border-image: url(:/images/closepressed.png)
               <enum>QFrame::Plain</enum>
              </property>
              <layout class="QHBoxLayout" name="HL_pluginButtonFrame">
-              <property name="margin">
+              <property name="leftMargin">
+               <number>2</number>
+              </property>
+              <property name="topMargin">
+               <number>2</number>
+              </property>
+              <property name="rightMargin">
+               <number>2</number>
+              </property>
+              <property name="bottomMargin">
                <number>2</number>
               </property>
              </layout>
@@ -556,7 +601,16 @@ border-image: url(:/images/closepressed.png)
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QHBoxLayout" name="hlTitleBarFrame">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>2</number>
+        </property>
+        <property name="topMargin">
+         <number>2</number>
+        </property>
+        <property name="rightMargin">
+         <number>2</number>
+        </property>
+        <property name="bottomMargin">
          <number>2</number>
         </property>
         <item>
@@ -637,7 +691,16 @@ border-image: url(:/images/closepressed.png)
            <enum>QFrame::Plain</enum>
           </property>
           <layout class="QHBoxLayout" name="HL_pluginTitleFrame">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>2</number>
+           </property>
+           <property name="topMargin">
+            <number>2</number>
+           </property>
+           <property name="rightMargin">
+            <number>2</number>
+           </property>
+           <property name="bottomMargin">
             <number>2</number>
            </property>
           </layout>
@@ -652,7 +715,16 @@ border-image: url(:/images/closepressed.png)
            <enum>QFrame::Raised</enum>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item row="0" column="5">
@@ -980,7 +1052,7 @@ border-image: url(:/images/closepressed.png)
     <string>Quotes the selected text</string>
    </property>
   </action>
-    <action name="actionSave_image">
+  <action name="actionSave_image">
    <property name="icon">
     <iconset resource="../images.qrc">
      <normaloff>:/images/document_save.png</normaloff>:/images/document_save.png</iconset>
@@ -1020,6 +1092,7 @@ border-image: url(:/images/closepressed.png)
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../emojione.qrc"/>
  </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/emojione.qrc

@@ -188,16 +188,6 @@
     <file>emojione/1F199.png</file>
     <file>emojione/1F201.png</file>
     <file>emojione/1F202.png</file>
-    <file>emojione/1F232.png</file>
-    <file>emojione/1F233.png</file>
-    <file>emojione/1F234.png</file>
-    <file>emojione/1F235.png</file>
-    <file>emojione/1F236.png</file>
-    <file>emojione/1F237.png</file>
-    <file>emojione/1F238.png</file>
-    <file>emojione/1F239.png</file>
-    <file>emojione/1F250.png</file>
-    <file>emojione/1F251.png</file>
     <file>emojione/1F300.png</file>
     <file>emojione/1F301.png</file>
     <file>emojione/1F302.png</file>
@@ -544,8 +534,6 @@
     <file>emojione/2934.png</file>
     <file>emojione/2935.png</file>
     <file>emojione/3030.png</file>
-    <file>emojione/3297.png</file>
-    <file>emojione/3299.png</file>
     <file>emojione/1f910.png</file>
     <file>emojione/1f911.png</file>
     <file>emojione/1f912.png</file>