-changend plaintext to to html for Message sending

-added formating features now can send Formated Messages to Friends .
-redesigned Compose Dialog
-Added Contacts View Action for hide/show the Contacts DockWidget


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

retroshare-gui/src/gui/MessagesDialog.cpp

@@ -443,7 +443,7 @@ void MessagesDialog::insertMsgTxtAndFiles()
 		ui.filesText->setText("");
 
 		ui.subjectText->setText("");
-		ui.msgText->setText("");
+		//ui.msgText->setText("");
 		ui.msgList->clear();
 
 		return;

retroshare-gui/src/gui/images.qrc

@@ -9,6 +9,7 @@
         <file>images/channels.png</file>        
         <file>images/channeldelete.png</file>
         <file>images/channelsubscribe.png</file>
+        <file>images/contacts24.png</file>
         <file>images/FileTypeAny.png</file>
         <file>images/FileTypeArchive.png</file>
         <file>images/FileTypeAudio.png</file>
@@ -171,6 +172,13 @@
         <file>images/smplayer_icon32.png</file>
         <file>images/start.png</file>
         <file>images/startall.png</file>
+        <file>images/textedit/textbold.png</file>
+        <file>images/textedit/textitalic.png</file>
+        <file>images/textedit/textunder.png</file>
+        <file>images/textedit/textjustify.png</file>
+        <file>images/textedit/textcenter.png</file>
+        <file>images/textedit/textleft.png</file>
+        <file>images/textedit/textright.png</file>
         <file>images/toaster/chat.png</file>
         <file>images/toaster/hangup.png</file>
         <file>images/toaster/pickup.png</file>

retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp

@@ -29,12 +29,17 @@
 #include <sstream>
 
 #include <QContextMenuEvent>
+#include <QColorDialog>
 #include <QMenu>
 #include <QCursor>
 #include <QPoint>
 #include <QMouseEvent>
 #include <QPixmap>
 #include <QHeaderView>
+#include <QTextCodec>
+#include <QTextEdit>
+#include <QTextCursor>
+#include <QTextList>
 
 
 /** Constructor */
@@ -55,6 +60,16 @@ ChanMsgDialog::ChanMsgDialog(bool msg, QWidget *parent, Qt::WFlags flags)
   // connect up the buttons. 
   connect( ui.actionSend, SIGNAL( triggered (bool)), this, SLOT( sendMessage( ) ) );
   //connect( ui.actionReply, SIGNAL( triggered (bool)), this, SLOT( replyMessage( ) ) );
+  connect(ui.boldbtn, SIGNAL(clicked()), this, SLOT(textBold()));
+  connect(ui.underlinebtn, SIGNAL(clicked()), this, SLOT(textUnderline()));
+  connect(ui.italicbtn, SIGNAL(clicked()), this, SLOT(textItalic()));
+  connect(ui.colorbtn, SIGNAL(clicked()), this, SLOT(textColor()));
+  connect(ui.actionContactsView, SIGNAL(triggered()), this, SLOT(toggleContacts()));
+  
+  connect(ui.msgText, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)),
+            this, SLOT(currentCharFormatChanged(const QTextCharFormat &)));
+  connect(ui.msgText, SIGNAL(cursorPositionChanged()),
+            this, SLOT(cursorPositionChanged()));
 
   /* if Msg */
   if (mIsMsg)
@@ -77,6 +92,59 @@ ChanMsgDialog::ChanMsgDialog(bool msg, QWidget *parent, Qt::WFlags flags)
   
    /* to hide the header  */
   //ui.msgSendList->header()->hide(); 
+  
+    QActionGroup *grp = new QActionGroup(this);
+    connect(grp, SIGNAL(triggered(QAction *)), this, SLOT(textAlign(QAction *)));
+
+    actionAlignLeft = new QAction(QIcon(":/images/textedit/textleft.png"), tr("&Left"), grp);
+    actionAlignLeft->setShortcut(Qt::CTRL + Qt::Key_L);
+    actionAlignLeft->setCheckable(true);
+    actionAlignCenter = new QAction(QIcon(":/images/textedit/textcenter.png"), tr("C&enter"), grp);
+    actionAlignCenter->setShortcut(Qt::CTRL + Qt::Key_E);
+    actionAlignCenter->setCheckable(true);
+    actionAlignRight = new QAction(QIcon(":/images/textedit/textright.png"), tr("&Right"), grp);
+    actionAlignRight->setShortcut(Qt::CTRL + Qt::Key_R);
+    actionAlignRight->setCheckable(true);
+    actionAlignJustify = new QAction(QIcon(":/images/textedit/textjustify.png"), tr("&Justify"), grp);
+    actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J);
+    actionAlignJustify->setCheckable(true);
+    
+    ui.comboStyle->addItem("Standard");
+    ui.comboStyle->addItem("Bullet List (Disc)");
+    ui.comboStyle->addItem("Bullet List (Circle)");
+    ui.comboStyle->addItem("Bullet List (Square)");
+    ui.comboStyle->addItem("Ordered List (Decimal)");
+    ui.comboStyle->addItem("Ordered List (Alpha lower)");
+    ui.comboStyle->addItem("Ordered List (Alpha upper)");
+    connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(textStyle(int)));
+    
+    connect(ui.comboFont, SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &)));
+    
+    ui.comboSize->setEditable(true);
+
+    QFontDatabase db;
+    foreach(int size, db.standardSizes())
+        ui.comboSize->addItem(QString::number(size));
+
+    connect(ui.comboSize, SIGNAL(activated(const QString &)),this, SLOT(textSize(const QString &)));
+    ui.comboSize->setCurrentIndex(ui.comboSize->findText(QString::number(QApplication::font().pointSize())));
+    
+    ui.boldbtn->setIcon(QIcon(QString(":/images/textedit/textbold.png")));
+    ui.underlinebtn->setIcon(QIcon(QString(":/images/textedit/textitalic.png")));
+    ui.italicbtn->setIcon(QIcon(QString(":/images/textedit/textunder.png")));
+    ui.textalignmentbtn->setIcon(QIcon(QString(":/images/textedit/textcenter.png")));
+    ui.actionContactsView->setIcon(QIcon(":/images/contacts24.png"));
+       
+    QMenu * alignmentmenu = new QMenu();
+    alignmentmenu->addAction(actionAlignLeft);
+    alignmentmenu->addAction(actionAlignCenter);
+    alignmentmenu->addAction(actionAlignRight);
+    alignmentmenu->addAction(actionAlignJustify);
+    ui.textalignmentbtn->setMenu(alignmentmenu);
+    
+	QPixmap pxm(24,24);
+	pxm.fill(Qt::black);
+	ui.colorbtn->setIcon(pxm);
 
   /* Hide platform specific features */
 #ifdef Q_WS_WIN
@@ -375,7 +443,8 @@ void  ChanMsgDialog::sendMessage()
 	MessageInfo mi;
 
 	mi.title = ui.titleEdit->text().toStdWString();
-	mi.msg =   ui.msgText->toPlainText().toStdWString();
+	mi.msg =   ui.msgText->toHtml().toStdWString();
+	
 
 	rsiface->lockData();   /* Lock Interface */
 
@@ -479,3 +548,171 @@ void ChanMsgDialog::toggleRecommendItem( QTreeWidgetItem *item, int col )
         return;
 }
 
+void ChanMsgDialog::textBold()
+{
+    QTextCharFormat fmt;
+    fmt.setFontWeight(ui.boldbtn->isChecked() ? QFont::Bold : QFont::Normal);
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void ChanMsgDialog::textUnderline()
+{
+    QTextCharFormat fmt;
+    fmt.setFontUnderline(ui.underlinebtn->isChecked());
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void ChanMsgDialog::textItalic()
+{
+    QTextCharFormat fmt;
+    fmt.setFontItalic(ui.italicbtn->isChecked());
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void ChanMsgDialog::textFamily(const QString &f)
+{
+    QTextCharFormat fmt;
+    fmt.setFontFamily(f);
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void ChanMsgDialog::textSize(const QString &p)
+{
+    QTextCharFormat fmt;
+    fmt.setFontPointSize(p.toFloat());
+    mergeFormatOnWordOrSelection(fmt);
+}
+
+void ChanMsgDialog::textStyle(int styleIndex)
+{
+    QTextCursor cursor = ui.msgText->textCursor();
+
+    if (styleIndex != 0) {
+        QTextListFormat::Style style = QTextListFormat::ListDisc;
+
+        switch (styleIndex) {
+            default:
+            case 1:
+                style = QTextListFormat::ListDisc;
+                break;
+            case 2:
+                style = QTextListFormat::ListCircle;
+                break;
+            case 3:
+                style = QTextListFormat::ListSquare;
+                break;
+            case 4:
+                style = QTextListFormat::ListDecimal;
+                break;
+            case 5:
+                style = QTextListFormat::ListLowerAlpha;
+                break;
+            case 6:
+                style = QTextListFormat::ListUpperAlpha;
+                break;
+        }
+
+        cursor.beginEditBlock();
+
+        QTextBlockFormat blockFmt = cursor.blockFormat();
+
+        QTextListFormat listFmt;
+
+        if (cursor.currentList()) {
+            listFmt = cursor.currentList()->format();
+        } else {
+            listFmt.setIndent(blockFmt.indent() + 1);
+            blockFmt.setIndent(0);
+            cursor.setBlockFormat(blockFmt);
+        }
+
+        listFmt.setStyle(style);
+
+        cursor.createList(listFmt);
+
+        cursor.endEditBlock();
+    } else {
+        // ####
+        QTextBlockFormat bfmt;
+        bfmt.setObjectIndex(-1);
+        cursor.mergeBlockFormat(bfmt);
+    }
+}
+
+void ChanMsgDialog::textColor()
+{
+    QColor col = QColorDialog::getColor(ui.msgText->textColor(), this);
+    if (!col.isValid())
+        return;
+    QTextCharFormat fmt;
+    fmt.setForeground(col);
+    mergeFormatOnWordOrSelection(fmt);
+    colorChanged(col);
+}
+
+void ChanMsgDialog::textAlign(QAction *a)
+{
+    if (a == actionAlignLeft)
+        ui.msgText->setAlignment(Qt::AlignLeft);
+    else if (a == actionAlignCenter)
+        ui.msgText->setAlignment(Qt::AlignHCenter);
+    else if (a == actionAlignRight)
+        ui.msgText->setAlignment(Qt::AlignRight);
+    else if (a == actionAlignJustify)
+        ui.msgText->setAlignment(Qt::AlignJustify);
+}
+
+void ChanMsgDialog::currentCharFormatChanged(const QTextCharFormat &format)
+{
+    fontChanged(format.font());
+    colorChanged(format.foreground().color());
+}
+
+void ChanMsgDialog::cursorPositionChanged()
+{
+    alignmentChanged(ui.msgText->alignment());
+}
+
+void ChanMsgDialog::mergeFormatOnWordOrSelection(const QTextCharFormat &format)
+{
+    QTextCursor cursor = ui.msgText->textCursor();
+    if (!cursor.hasSelection())
+        cursor.select(QTextCursor::WordUnderCursor);
+    cursor.mergeCharFormat(format);
+    ui.msgText->mergeCurrentCharFormat(format);
+}
+
+void ChanMsgDialog::fontChanged(const QFont &f)
+{
+    ui.comboFont->setCurrentIndex(ui.comboFont->findText(QFontInfo(f).family()));
+    ui.comboSize->setCurrentIndex(ui.comboSize->findText(QString::number(f.pointSize())));
+    ui.boldbtn->setChecked(f.bold());
+    ui.italicbtn->setChecked(f.italic());
+    ui.underlinebtn->setChecked(f.underline());
+}
+
+void ChanMsgDialog::colorChanged(const QColor &c)
+{
+    QPixmap pix(16, 16);
+    pix.fill(c);
+    ui.colorbtn->setIcon(pix);
+}
+
+void ChanMsgDialog::alignmentChanged(Qt::Alignment a)
+{
+    if (a & Qt::AlignLeft) {
+        actionAlignLeft->setChecked(true);
+    } else if (a & Qt::AlignHCenter) {
+        actionAlignCenter->setChecked(true);
+    } else if (a & Qt::AlignRight) {
+        actionAlignRight->setChecked(true);
+    } else if (a & Qt::AlignJustify) {
+        actionAlignJustify->setChecked(true);
+    }
+}
+
+void ChanMsgDialog::toggleContacts()
+{
+	ui.contactsdockWidget->setVisible(!ui.contactsdockWidget->isVisible());
+}
+

retroshare-gui/src/gui/msgs/ChanMsgDialog.h

@@ -24,10 +24,18 @@
 #define _CHAN_MSG_DIALOG_H
 
 #include <QMainWindow>
+#include <QMap>
+#include <QPointer>
 #include <config/rsharesettings.h>
 
 
-#include "ui_ChanMsgDialog.h"
+#include "ui_ChanMsgDialog.h"
+
+class QAction;
+class QComboBox;
+class QFontComboBox;
+class QTextEdit;
+class QTextCharFormat;
 
 class ChanMsgDialog : public QMainWindow 
 {
@@ -65,15 +73,34 @@ private slots:
   /** Defines the context menu functions*/
   void deletechannel();
   void createchannelmsg();
-
+  
+  /* toggle Contacts DockWidget */
+  void toggleContacts();
 
 	/* for toggling flags */
   void togglePersonItem( QTreeWidgetItem *item, int col );
   void toggleChannelItem( QTreeWidgetItem *item, int col );
   void toggleRecommendItem( QTreeWidgetItem *item, int col );
+  
+  void textBold();
+  void textUnderline();
+  void textItalic();
+  void textFamily(const QString &f);
+  void textSize(const QString &p);
+  void textStyle(int styleIndex);
+  void textColor();
+  void textAlign(QAction *a);
+
+  void currentCharFormatChanged(const QTextCharFormat &format);
+  void cursorPositionChanged();
 
  
 private:
+
+    void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
+    void fontChanged(const QFont &f);
+    void colorChanged(const QColor &c);
+    void alignmentChanged(Qt::Alignment a);
 
    /** Define the popup menus for the Context menu */
   QMenu* contextMnu;
@@ -81,6 +108,11 @@ private:
    /** Defines the actions for the context menu */
   QAction* deletechannelAct;
   QAction* createchannelmsgAct;
+  
+  QAction *actionAlignLeft,
+        *actionAlignCenter,
+        *actionAlignRight,
+        *actionAlignJustify;
 
   QTreeView *channelstreeView;
 

retroshare-gui/src/gui/msgs/ChanMsgDialog.ui

@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>580</width>
-    <height>430</height>
+    <width>770</width>
+    <height>528</height>
    </rect>
   </property>
   <property name="contextMenuPolicy" >
@@ -20,173 +20,355 @@
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QGridLayout" >
-    <property name="margin" >
-     <number>9</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
     <item row="0" column="0" >
-     <widget class="QSplitter" name="splitter_2" >
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
+     <widget class="QDockWidget" name="contactsdockWidget" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
       </property>
-      <widget class="QTreeWidget" name="msgSendList" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>7</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>4</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>20</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize" >
-        <size>
-         <width>160</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="sortingEnabled" >
-        <bool>true</bool>
-       </property>
-       <column>
-        <property name="text" >
-         <string>Send To:</string>
+      <property name="maximumSize" >
+       <size>
+        <width>16777215</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="windowTitle" >
+       <string>Contacts</string>
+      </property>
+      <widget class="QWidget" name="dockWidgetContents" >
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>0</number>
         </property>
-       </column>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>0</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>0</number>
+        </property>
+        <item row="0" column="0" >
+         <widget class="QTreeWidget" name="msgSendList" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>4</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize" >
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize" >
+           <size>
+            <width>160</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="sortingEnabled" >
+           <bool>true</bool>
+          </property>
+          <column>
+           <property name="text" >
+            <string>Send To:</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
       </widget>
-      <widget class="QSplitter" name="splitter" >
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <widget class="QWidget" name="layoutWidget" >
-        <layout class="QGridLayout" >
-         <property name="margin" >
-          <number>0</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item row="0" column="0" >
-          <layout class="QHBoxLayout" >
-           <property name="margin" >
-            <number>0</number>
-           </property>
-           <property name="spacing" >
-            <number>6</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="label" >
-             <property name="font" >
-              <font>
-               <pointsize>10</pointsize>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text" >
-              <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+     </widget>
+    </item>
+    <item row="0" column="1" >
+     <widget class="QSplitter" name="splitter" >
+      <property name="orientation" >
+       <enum>Qt::Vertical</enum>
+      </property>
+      <widget class="QWidget" name="layoutWidget" >
+       <layout class="QGridLayout" >
+        <item row="0" column="0" >
+         <layout class="QHBoxLayout" >
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <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>
+           <widget class="QLabel" name="label" >
+            <property name="font" >
+             <font>
+              <pointsize>10</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text" >
+             <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
 &lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600; font-style:normal; text-decoration:none;">
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-weight:400;">&lt;span style=" font-weight:600;">Subject:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="titleEdit" />
-           </item>
-          </layout>
-         </item>
-         <item row="1" column="0" >
-          <widget class="QTextEdit" name="msgText" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>7</hsizetype>
-             <vsizetype>3</vsizetype>
-             <horstretch>4</horstretch>
-             <verstretch>4</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="textInteractionFlags" >
-            <enum>Qt::TextEditorInteraction</enum>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="layoutWidget" >
-        <layout class="QGridLayout" >
-         <property name="margin" >
-          <number>0</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item row="0" column="0" >
-          <widget class="QLabel" name="label_13" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>0</hsizetype>
-             <vsizetype>0</vsizetype>
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="font" >
-            <font>
-             <pointsize>10</pointsize>
-             <weight>75</weight>
-             <bold>true</bold>
-            </font>
-           </property>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="titleEdit" />
+          </item>
+         </layout>
+        </item>
+        <item row="1" column="0" >
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QComboBox" name="comboStyle" />
+          </item>
+          <item row="0" column="1" >
+           <widget class="QFontComboBox" name="comboFont" />
+          </item>
+          <item row="0" column="2" >
+           <widget class="QComboBox" name="comboSize" >
+            <property name="toolTip" >
+             <string>Font size</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="3" >
+           <widget class="QPushButton" name="boldbtn" >
+            <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="toolTip" >
+             <string>Bold</string>
+            </property>
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="checkable" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="4" >
+           <widget class="QPushButton" name="underlinebtn" >
+            <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="toolTip" >
+             <string>Underline</string>
+            </property>
+            <property name="text" >
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="5" >
+           <widget class="QPushButton" name="italicbtn" >
+            <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="toolTip" >
+             <string>Italic</string>
+            </property>
+            <property name="text" >
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="6" >
+           <widget class="QPushButton" name="colorbtn" >
+            <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="toolTip" >
+             <string>Color</string>
+            </property>
+            <property name="text" >
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="7" >
+           <widget class="QPushButton" name="textalignmentbtn" >
+            <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="toolTip" >
+             <string>Alignment</string>
+            </property>
+            <property name="text" >
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="11" >
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>20</width>
+              <height>24</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item row="2" column="0" >
+         <widget class="QTextEdit" name="msgText" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+            <horstretch>4</horstretch>
+            <verstretch>4</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="textInteractionFlags" >
+           <set>Qt::TextEditorInteraction</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="layoutWidget" >
+       <layout class="QGridLayout" >
+        <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="horizontalSpacing" >
+         <number>6</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>6</number>
+        </property>
+        <item row="0" column="0" >
+         <widget class="QLabel" name="label_13" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font" >
+           <font>
+            <pointsize>10</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text" >
+           <string>Recommended Files</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QTreeWidget" name="msgFileList" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="sortingEnabled" >
+           <bool>true</bool>
+          </property>
+          <column>
            <property name="text" >
-            <string>Recommended Files</string>
+            <string>File Name</string>
            </property>
-          </widget>
-         </item>
-         <item row="1" column="0" >
-          <widget class="QTreeWidget" name="msgFileList" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>7</hsizetype>
-             <vsizetype>7</vsizetype>
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
+          </column>
+          <column>
+           <property name="text" >
+            <string>Size</string>
            </property>
-           <property name="sortingEnabled" >
-            <bool>true</bool>
+          </column>
+          <column>
+           <property name="text" >
+            <string>Sources</string>
            </property>
-           <column>
-            <property name="text" >
-             <string>File Name</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>Size</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>Sources</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>Hash</string>
-            </property>
-           </column>
-          </widget>
-         </item>
-        </layout>
-       </widget>
+          </column>
+          <column>
+           <property name="text" >
+            <string>Hash</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </widget>
     </item>
@@ -197,7 +379,7 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>580</width>
+     <width>770</width>
      <height>24</height>
     </rect>
    </property>
@@ -217,9 +399,13 @@ p, li { white-space: pre-wrap; }
     <enum>Qt::ToolButtonTextUnderIcon</enum>
    </property>
    <attribute name="toolBarArea" >
-    <number>4</number>
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
    </attribute>
    <addaction name="actionSend" />
+   <addaction name="actionContactsView" />
   </widget>
   <action name="actionSend" >
    <property name="icon" >
@@ -237,6 +423,11 @@ p, li { white-space: pre-wrap; }
     <string>Reply</string>
    </property>
   </action>
+  <action name="actionContactsView" >
+   <property name="text" >
+    <string>Contacts</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>msgSendList</tabstop>