changend default emoticons path.

fixed underline icon 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@471 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/ChatDialog.cpp

@@ -92,6 +92,12 @@ ChatDialog::ChatDialog(QWidget *parent)
   
   setChatInfo(tr("Welcome to RetroShare's group chat."), QString::fromUtf8("blue"));
   
+  QMenu * grpchatmenu = new QMenu();
+  grpchatmenu->addAction(ui.actionClearChat);
+  ui.menuButton->setMenu(grpchatmenu);
+  
+  _underline = false;
+
 
   /* Hide platform specific features */
 #ifdef Q_WS_WIN
@@ -364,10 +370,17 @@ void ChatDialog::setFont()
   font.setBold(ui.textboldChatButton->isChecked());
   font.setUnderline(ui.textunderlineChatButton->isChecked());
   font.setItalic(ui.textitalicChatButton->isChecked());
+  //font.setStrikeOut(ui.textstrikeChatButton->isChecked());
   ui.lineEdit->setFont(font);
   
 }
 
+void ChatDialog::underline() 
+{
+ 	        _underline = !_underline;
+ 	        ui.lineEdit->setFontUnderline(_underline);
+}
+ 
 
 // Update Chat Info information
 void ChatDialog::setChatInfo(QString info, QColor color) 
@@ -398,8 +411,7 @@ void ChatDialog::displayInfoChatMenu(const QPoint& pos)
 
 void ChatDialog::loadEmoticonsgroupchat()
 {
-	QDir smdir(QApplication::applicationDirPath() + "/emoticons/kopete");
-	//QDir smdir(":/gui/images/emoticons/kopete");
+	QDir smdir(QApplication::applicationDirPath() + "/emoticons/default");
 	QFileInfoList sminfo = smdir.entryInfoList(QStringList() << "*.gif" << "*.png", QDir::Files, QDir::Name);
 	foreach(QFileInfo info, sminfo)
 	{
@@ -420,7 +432,7 @@ void ChatDialog::smileyWidgetgroupchat()
 	QWidget *smWidget = new QWidget;
 	smWidget->setWindowTitle("Emoticons");
 	smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png")));
-	smWidget->setFixedSize(256,256);
+	//smWidget->setFixedSize(256,256);
 
 	
 	
@@ -435,6 +447,7 @@ void ChatDialog::smileyWidgetgroupchat()
 		smButton->setIconSize(QSize(24,24));
 		smButton->setIcon(QPixmap(i.value()));
 		smButton->setToolTip(i.key());
+		//smButton->setFixedSize(24,24);
 		++x;
 		if(x > 4)
 		{

retroshare-gui/src/gui/ChatDialog.h

@@ -24,9 +24,11 @@
 
 #include "mainpage.h"
 #include "ui_ChatDialog.h"
+#include "ui_SmWidget.h"
 
 #include "chat/PopupChatDialog.h"
 
+class QFont;
 class QAction;
 class QTextEdit;
 class QTextCharFormat;
@@ -71,6 +73,8 @@ void toggleSendItem( QTreeWidgetItem *item, int col );
   
   void setFont();
   void getFont();
+  void underline(); 
+
   
   
   void on_actionClearChat_triggered();
@@ -92,6 +96,7 @@ private:
   	
   QColor textColor;
   QColor _currentColor;
+  bool _underline;
 
   QHash<QString, QString> smileys;
 

retroshare-gui/src/gui/ChatDialog.ui

@@ -853,7 +853,7 @@
           <string/>
          </property>
          <property name="icon" >
-          <iconset resource="images.qrc" >:/images/edit-underline.png</iconset>
+          <iconset resource="images.qrc" >:/images/edit-italic.png</iconset>
          </property>
          <property name="checkable" >
           <bool>true</bool>
@@ -881,7 +881,7 @@
           <string/>
          </property>
          <property name="icon" >
-          <iconset resource="images.qrc" >:/images/edit-italic.png</iconset>
+          <iconset resource="images.qrc" >:/images/edit-underline.png</iconset>
          </property>
          <property name="checkable" >
           <bool>true</bool>
@@ -988,6 +988,25 @@
          </property>
         </widget>
        </item>
+       <item row="0" column="7" >
+        <widget class="QPushButton" name="menuButton" >
+         <property name="minimumSize" >
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize" >
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string/>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
      <item row="1" column="0" >
@@ -1052,7 +1071,7 @@
   </action>
   <action name="actionClearChat" >
    <property name="text" >
-    <string>ClearChat</string>
+    <string>Clear Chat History</string>
    </property>
   </action>
  </widget>