* Fixed Add Friend and Invite Frieds Dialogs

* Set  minimum size for Channels frame
* Set minimum size for Friends TreeWidget

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

retroshare-gui/src/gui/ChannelFeed.ui

@@ -204,6 +204,12 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="minimumSize" >
+      <size>
+       <width>220</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="maximumSize" >
       <size>
        <width>220</width>

retroshare-gui/src/gui/PeersDialog.ui

@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>825</width>
+    <width>721</width>
     <height>516</height>
    </rect>
   </property>
@@ -526,6 +526,18 @@ p, li { white-space: pre-wrap; }
      </item>
      <item row="1" column="0" colspan="2" >
       <widget class="QTreeWidget" name="peertreeWidget" >
+       <property name="minimumSize" >
+        <size>
+         <width>250</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>1677215</width>
+         <height>16777215</height>
+        </size>
+       </property>
        <property name="contextMenuPolicy" >
         <enum>Qt::CustomContextMenu</enum>
        </property>

retroshare-gui/src/gui/connect/AddFriendDialog.ui

@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>439</width>
+    <width>539</width>
-    <height>336</height>
+    <height>402</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -37,8 +37,10 @@
       <bool>false</bool>
      </property>
      <property name="html" >
-       <string>
+      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-       </string>
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
      </property>
      <property name="acceptRichText" >
       <bool>true</bool>
@@ -112,6 +114,12 @@
    </item>
    <item row="0" column="0" colspan="5" >
     <widget class="QLabel" name="addfriendLabel" >
+     <property name="maximumSize" >
+      <size>
+       <width>16777215</width>
+       <height>73</height>
+      </size>
+     </property>
      <property name="palette" >
       <palette>
        <active>
@@ -531,10 +539,13 @@
       <string>background-image: url(:/images/addfriendlabel.png)</string>
      </property>
      <property name="text" >
-      <string> Add a new Friend
+      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-To add a new Friend, cut and paste their email 
+p, li { white-space: pre-wrap; }
-invitation into the box below, and click done.
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-      </string>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:16pt; font-weight:600; color:#32cd32;">Add a new Friend&lt;/span>&lt;/p>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">To add a new Friend, cut and paste their email &lt;/p>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">invitation into the box below, and click done.&lt;/p>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">      &lt;/p>&lt;/body>&lt;/html></string>
      </property>
      <property name="alignment" >
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

retroshare-gui/src/gui/connect/AddFriendWizard.cpp

@@ -94,6 +94,29 @@ void AddFriendWizard::on_nextButton_clicked()
             if ( ui.keyradioButton->isChecked() )
             {
                 ui.textstackedWidget->setCurrentWidget(ui.keypage); 
+		/* something complicated ;) */
+
+		
+       		 std::string id;
+
+		/* get the text from the window */
+		/* load into string */
+		std::string certstr  = ui.keyText->toPlainText().toStdString();
+
+		/* ask retroshare to load */
+		if ((cDialog) && (rsPeers->LoadCertificateFromString(certstr, id)))
+		{
+			close();
+			cDialog->showpeerdetails(id);
+		}
+		else
+		{
+			/* error message */
+			int ret = QMessageBox::warning(this, tr("RetroShare"),
+                	   tr("Certificate Load Failed"),
+               		    QMessageBox::Ok, QMessageBox::Ok);
+		}
+		
 
             }
             if ( ui.pqipemradioButton->isChecked() )

retroshare-gui/src/gui/connect/InviteDialog.ui

@@ -52,7 +52,7 @@
      <property name="html" >
       <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:'Helvetica'; font-size:10pt; font-weight:400; font-style:normal;">
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
 &lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:8pt;">&lt;/p>&lt;/body>&lt;/html></string>
      </property>
      <property name="acceptRichText" >
@@ -62,6 +62,12 @@ p, li { white-space: pre-wrap; }
    </item>
    <item row="0" column="0" colspan="7" >
     <widget class="QLabel" name="invitefriendLabel" >
+     <property name="maximumSize" >
+      <size>
+       <width>16777215</width>
+       <height>93</height>
+      </size>
+     </property>
      <property name="palette" >
       <palette>
        <active>
@@ -478,13 +484,13 @@ p, li { white-space: pre-wrap; }
       </palette>
      </property>
      <property name="styleSheet" >
-      <string>background-image: url(:/images/invitefriendlabel.png)</string>
+      <string>background-image: url(:/images/invitefriendlabel.png);</string>
      </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:8.25pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&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-size:8pt;">&lt;span style=" font-size:16pt;">Invite a Friend&lt;/span>&lt;br />&lt;br />&lt;span style=" font-size:10pt;">To Invite your friends to join you with Retroshare: &lt;/span>&lt;/p>
+&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-size:8pt;">&lt;span style=" font-size:16pt; font-weight:600; color:#32cd32;">Invite a Friend&lt;/span>&lt;br />&lt;span style=" font-size:10pt;">To Invite your friends to join you with Retroshare: &lt;/span>&lt;/p>
 &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-size:10pt;">Cut and paste the text below into an email.&lt;/p>
 &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-size:10pt;">and send it to all your friends!&lt;/p>&lt;/body>&lt;/html></string>
      </property>

retroshare-gui/src/rsiface/RemoteDirModel.cpp

@@ -249,7 +249,16 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
 		switch(coln)
 		{
 			case 0:
+		QString ext = QFileInfo(QString::fromStdString(details.name)).suffix();
+		if (ext == "avi" || ext == "mpg" || ext == "movie")
+		{
+			QIcon icon(":/images/folder_video.png");
+		    	return icon;
+		}
+		else
+		{
 			return(QIcon(":/images/folder16.png"));	
+		}
 		break;
 		}
 	}