From fc0ed91c74d30e75ac41bdadb9bae79660c0aa5e Mon Sep 17 00:00:00 2001
From: agilob <info@agilob.net>
Date: Wed, 8 Oct 2014 16:10:57 +0100
Subject: [PATCH] preview of emoticons

---
 widget/form/settings/generalform.cpp    | 13 ++++++
 widget/form/settings/generalform.h      |  1 +
 widget/form/settings/generalsettings.ui | 56 ++++++++++++++++++++++++-
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index 0df370048..5644f3eaf 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -38,6 +38,7 @@ GeneralForm::GeneralForm() :
         bodyUI->smileyPackBrowser->addItem(entry.first, entry.second);
     }
     bodyUI->smileyPackBrowser->setCurrentIndex(bodyUI->smileyPackBrowser->findData(Settings::getInstance().getSmileyPack()));
+    reloadSmiles();
 
     bodyUI->cbUDPDisabled->setChecked(Settings::getInstance().getForceTCP());
     bodyUI->proxyAddr->setText(Settings::getInstance().getProxyAddr());
@@ -89,6 +90,7 @@ void GeneralForm::onSmileyBrowserIndexChanged(int index)
 {
     QString filename = bodyUI->smileyPackBrowser->itemData(index).toString();
     Settings::getInstance().setSmileyPack(filename);
+    reloadSmiles();
 }
 
 void GeneralForm::onUDPUpdated()
@@ -119,3 +121,14 @@ void GeneralForm::onUseProxyUpdated()
     bodyUI->proxyPort->setEnabled(state);
     Settings::getInstance().setUseProxy(state);
 }
+
+void GeneralForm::reloadSmiles()
+{
+    QString smiles[] = {":)", ";)", ":p", ":O", ":'("};
+    int pixSize = 30;
+    bodyUI->smile1->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[0]).pixmap(pixSize, pixSize));
+    bodyUI->smile2->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[1]).pixmap(pixSize, pixSize));
+    bodyUI->smile3->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[2]).pixmap(pixSize, pixSize));
+    bodyUI->smile4->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[3]).pixmap(pixSize, pixSize));
+    bodyUI->smile5->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[4]).pixmap(pixSize, pixSize));
+}
diff --git a/widget/form/settings/generalform.h b/widget/form/settings/generalform.h
index 224c6ee26..babf08787 100644
--- a/widget/form/settings/generalform.h
+++ b/widget/form/settings/generalform.h
@@ -45,6 +45,7 @@ private slots:
 
 private:
     Ui::GeneralSettings *bodyUI;
+    void reloadSmiles();
 };
 
 #endif
diff --git a/widget/form/settings/generalsettings.ui b/widget/form/settings/generalsettings.ui
index e0ffb3ab4..23515cf2e 100644
--- a/widget/form/settings/generalsettings.ui
+++ b/widget/form/settings/generalsettings.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>527</width>
-    <height>369</height>
+    <height>397</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -72,6 +72,60 @@
       <item>
        <widget class="QComboBox" name="smileyPackBrowser"/>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="smile1">
+          <property name="toolTip">
+           <string>:)</string>
+          </property>
+          <property name="text">
+           <string>:)</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="smile2">
+          <property name="toolTip">
+           <string>;)</string>
+          </property>
+          <property name="text">
+           <string>;)</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="smile3">
+          <property name="toolTip">
+           <string>:p</string>
+          </property>
+          <property name="text">
+           <string>:p</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="smile4">
+          <property name="toolTip">
+           <string>:O</string>
+          </property>
+          <property name="text">
+           <string>:O</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="smile5">
+          <property name="toolTip">
+           <string>:'(</string>
+          </property>
+          <property name="text">
+           <string>:'(</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>