* fixed layout of News Feed

* changend some icons
* fixed config.html

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

retroshare-gui/src/gui/ForumsDialog.cpp

@@ -51,6 +51,9 @@
 
 /* Images for TreeWidget */
 #define IMAGE_FOLDER         ":/images/folder16.png"
+#define IMAGE_FOLDERGREEN    ":/images/folder_green.png"
+#define IMAGE_FOLDERRED      ":/images/folder_red.png"
+#define IMAGE_FOLDERYELLOW   ":/images/folder_yellow.png"
 #define IMAGE_FORUM          ":/images/konversation16.png"
 #define IMAGE_SUBSCRIBE      ":/images/accepted16.png"
 #define IMAGE_UNSUBSCRIBE    ":/images/cancel.png"
@@ -503,19 +506,19 @@ void ForumsDialog::insertForums()
 
         item = new QTreeWidgetItem((QTreeWidget*)0);
 	item -> setText(0, tr("Subscribed Forums"));
-	item -> setIcon(0,(QIcon(IMAGE_FOLDER)));
+	item -> setIcon(0,(QIcon(IMAGE_FOLDERRED)));
 	item -> addChildren(SubList);
 	TopList.append(item);
 
         item = new QTreeWidgetItem((QTreeWidget*)0);
 	item -> setText(0, tr("Popular Forums"));
-	item -> setIcon(0,(QIcon(IMAGE_FOLDER)));
+	item -> setIcon(0,(QIcon(IMAGE_FOLDERGREEN)));
 	item -> addChildren(PopList);
 	TopList.append(item);
 
         item = new QTreeWidgetItem((QTreeWidget*)0);
 	item -> setText(0, tr("Other Forums"));
-	item -> setIcon(0,(QIcon(IMAGE_FOLDER)));
+	item -> setIcon(0,(QIcon(IMAGE_FOLDERYELLOW)));
 	item -> addChildren(OtherList);
 	TopList.append(item);
 

retroshare-gui/src/gui/NewsFeed.cpp

@@ -59,6 +59,8 @@ NewsFeed::NewsFeed(QWidget *parent)
 
 	/* mLayout -> to add widgets to */
 	mLayout = new QVBoxLayout;
+	mLayout->setSpacing(0);
+	mLayout->setMargin(0);
 
 	QWidget *middleWidget = new QWidget();
 	//middleWidget->setSizePolicy( QSizePolicy::Policy::Maximum, QSizePolicy::Policy::Minimum);

retroshare-gui/src/gui/help/content/en/config.html

@@ -63,7 +63,7 @@ The <i>Directories</i> settings page lets you add and remove Shared Directories
 </p>
 
 <a name="appearance"/>
-<h3>Appeartance Settings</h3>
+<h3>Appearance Settings</h3>
 <p>
 The settings on the <i>Appearance</i> page allow you to customize the
 look and feel of RetroShare.

retroshare-gui/src/gui/help/content/en/contents.xml

@@ -1,13 +1,24 @@
-<!--
-**  $Id: contents.xml 2682 2008-06-10 04:32:48Z edmanm $
-** 
-**  This file is part of Vidalia, and is subject to the license terms in the
-**  LICENSE file, found in the top level directory of this distribution. If 
-**  you did not receive the LICENSE file with this file, you may obtain it
-**  from the Vidalia source package distributed by the Vidalia Project at
-**  http://www.vidalia-project.net/. No part of Vidalia, including this file,
-**  may be copied, modified, propagated, or distributed except according to
-**  the terms described in the LICENSE file.
+<!--/****************************************************************
+ * This file is distributed under the following license:
+ *
+ * Copyright (c) 2008, defnax
+ * Copyright (c) 2008, edmanm
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************
 -->
 
 <Contents name="RetroShare Help" html="index.html">
@@ -15,6 +26,7 @@
     <Topic id="general" name="General Settings" html="config.html" section="general"/>
     <Topic id="server" name="Server Settings" html="config.html" section="server"/>
     <Topic id="directories" name="Directories Settings" html="config.html" section="directories"/>
+    <Topic id="appearance" name="Appearance Settings" html="config.html" section="appearance"/>
   </Topic>
   <Topic id="links" name="Helpful Links" html="links.html"/>
 </Contents>

retroshare-gui/src/gui/images.qrc

@@ -141,7 +141,11 @@
         <file>images/folder-sent.png</file>
         <file>images/folder_doments.png</file>
         <file>images/folder_green.png</file>
+        <file>images/folder_red.png</file>
+        <file>images/folder_grey.png</file>
+        <file>images/folder_yellow.png</file>
         <file>images/folder_green16.png</file>
+        <file>images/folder_open.png</file>
         <file>images/forward.png</file>
         <file>images/friendsfolder24.png</file>
         <file>images/kgames.png</file>