From d8a8f041cec6eb51f0c56811a91e309265b7c220 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Mon, 25 Jan 2010 23:58:48 +0000
Subject: [PATCH] changed Column order ,set Subject Label bold

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/MessagesDialog.cpp | 22 +++++++++++++---------
 retroshare-gui/src/gui/MessagesDialog.h   |  2 ++
 retroshare-gui/src/gui/MessagesDialog.ui  | 10 +++++-----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 15e22a9f8..57a50679a 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -105,7 +105,8 @@ MessagesDialog::MessagesDialog(QWidget *parent)
   msgwheader->setResizeMode (3, QHeaderView::Interactive);
     
   msgwheader->resizeSection ( 0, 24 );
-  msgwheader->resizeSection ( 2, 250 );
+  msgwheader->resizeSection ( 1, 250 );
+  msgwheader->resizeSection ( 2, 140 );
   msgwheader->resizeSection ( 3, 140 );
   
     /* Set header resize modes and initial section sizes */
@@ -138,6 +139,9 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 	 ui.msgWidget->sortItems( 3, Qt::DescendingOrder );
 	 
 	 loadToolButtonsettings();
+	 
+	 mFont = QFont("Times", 11, QFont::Bold);
+   ui.subjectText->setFont(mFont);
 
 
   /* Hide platform specific features */
@@ -624,26 +628,26 @@ void MessagesDialog::insertMessages()
 
 		//  From ....
 		{
-			item -> setText(1, QString::fromStdString(rsPeers->getPeerName(it->srcId)));
+			item -> setText(2, QString::fromStdString(rsPeers->getPeerName(it->srcId)));
 		}
 
 		// Subject
-		item -> setText(2, QString::fromStdWString(it->title));
+		item -> setText(1, QString::fromStdWString(it->title));
 		
 		// Change Message icon when Subject is Re: or Fwd:
 		QString text = QString::fromStdWString(it->title);
 			
     if (text.startsWith("Re:", Qt::CaseInsensitive))
     {
-		item -> setIcon(2, (QIcon(":/images/message-mail-replied-read.png")));
+		item -> setIcon(1, (QIcon(":/images/message-mail-replied-read.png")));
     }
     else if (text.startsWith("Fwd:", Qt::CaseInsensitive))
     {
-		item -> setIcon(2, (QIcon(":/images/message-mail-forwarded-read.png")));
+		item -> setIcon(1, (QIcon(":/images/message-mail-forwarded-read.png")));
     }
     else
 		{
-    item -> setIcon(2, (QIcon(":/images/message-mail-read.png")));
+    item -> setIcon(1, (QIcon(":/images/message-mail-read.png")));
 		}
 		
 		if (it -> msgflags & RS_MSG_NEW)
@@ -658,15 +662,15 @@ void MessagesDialog::insertMessages()
 			
       if (text.startsWith("Re:", Qt::CaseInsensitive))
       {
-      item -> setIcon(2, (QIcon(":/images/message-mail-replied.png")));
+      item -> setIcon(1, (QIcon(":/images/message-mail-replied.png")));
       }
       else if (text.startsWith("Fwd:", Qt::CaseInsensitive))
       {
-      item -> setIcon(2, (QIcon(":/images/message-mail-forwarded.png")));
+      item -> setIcon(1, (QIcon(":/images/message-mail-forwarded.png")));
       }
       else
       {
-      item -> setIcon(2, (QIcon(":/images/message-mail.png")));
+      item -> setIcon(1, (QIcon(":/images/message-mail.png")));
       }
 		}
 
diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h
index accb2fb82..d00ba6417 100644
--- a/retroshare-gui/src/gui/MessagesDialog.h
+++ b/retroshare-gui/src/gui/MessagesDialog.h
@@ -106,6 +106,8 @@ private:
   QAction* getAllRecAct;
      
   QString fileName;
+  
+  QFont mFont;
 
   
   /** Qt Designer generated object */
diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui
index e789ef19f..b68573788 100644
--- a/retroshare-gui/src/gui/MessagesDialog.ui
+++ b/retroshare-gui/src/gui/MessagesDialog.ui
@@ -971,12 +971,12 @@ p, li { white-space: pre-wrap; }
        </column>
        <column>
         <property name="text">
-         <string>From</string>
+         <string>Subject</string>
         </property>
        </column>
        <column>
         <property name="text">
-         <string>Subject</string>
+         <string>From</string>
         </property>
        </column>
        <column>
@@ -1078,7 +1078,7 @@ p, li { white-space: pre-wrap; }
               <property name="maximumSize">
                <size>
                 <width>16777215</width>
-                <height>10</height>
+                <height>12</height>
                </size>
               </property>
               <property name="text">
@@ -1135,7 +1135,7 @@ p, li { white-space: pre-wrap; }
               <property name="maximumSize">
                <size>
                 <width>16777215</width>
-                <height>10</height>
+                <height>12</height>
                </size>
               </property>
               <property name="text">
@@ -1192,7 +1192,7 @@ p, li { white-space: pre-wrap; }
               <property name="maximumSize">
                <size>
                 <width>16777215</width>
-                <height>10</height>
+                <height>12</height>
                </size>
               </property>
               <property name="text">