Added new option for GxsForums and FeedReader - Open all forums/feeds in new tab.

Option=on (standard)
- no standard tab
- new tab by single click
- no menu entry "Open in new tab"

Option=off:
- standard tab (not closeable)
- open in standard tab by single click
- menu entry "Open in new tab"
- open new tab with middle mouse button


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

plugins/FeedReader/gui/FeedReaderConfig.cpp

@@ -50,7 +50,8 @@ void FeedReaderConfig::load()
 {
 	ui->updateIntervalSpinBox->setValue(rsFeedReader->getStandardUpdateInterval() / 60);
 	ui->storageTimeSpinBox->setValue(rsFeedReader->getStandardStorageTime() / (60 * 60 *24));
-	ui->setMsgToReadOnActivate->setChecked(Settings->valueFromGroup("FeedReaderDialog", "SetMsgToReadOnActivate", true).toBool());
+	ui->setMsgToReadOnActivate->setChecked(FeedReaderSetting_SetMsgToReadOnActivate());
+	ui->openAllInNewTabCheckBox->setChecked(FeedReaderSetting_OpenAllInNewTab());
 
 	std::string proxyAddress;
 	uint16_t proxyPort;
@@ -67,6 +68,7 @@ bool FeedReaderConfig::save(QString &/*errmsg*/)
 	rsFeedReader->setStandardStorageTime(ui->storageTimeSpinBox->value() * 60 *60 * 24);
 	rsFeedReader->setStandardProxy(ui->useProxyCheckBox->isChecked(), ui->proxyAddressLineEdit->text().toUtf8().constData(), ui->proxyPortSpinBox->value());
 	Settings->setValueToGroup("FeedReaderDialog", "SetMsgToReadOnActivate", ui->setMsgToReadOnActivate->isChecked());
+	Settings->setValueToGroup("FeedReaderDialog", "OpenAllInNewTab", ui->openAllInNewTabCheckBox->isChecked());
 
 	return true;
 }

plugins/FeedReader/gui/FeedReaderConfig.h

@@ -28,6 +28,9 @@ namespace Ui {
 class FeedReaderConfig;
 }
 
+#define FeedReaderSetting_SetMsgToReadOnActivate() Settings->valueFromGroup("FeedReaderDialog", "SetMsgToReadOnActivate", true).toBool()
+#define FeedReaderSetting_OpenAllInNewTab() Settings->valueFromGroup("FeedReaderDialog", "OpenAllInNewTab", true).toBool()
+
 class FeedReaderConfig : public ConfigPage 
 {
 	Q_OBJECT

plugins/FeedReader/gui/FeedReaderConfig.ui

@@ -125,6 +125,13 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="openAllInNewTabCheckBox">
+        <property name="text">
+         <string>Open all feeds in new tab</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

plugins/FeedReader/gui/FeedReaderDialog.cpp

@@ -29,10 +29,12 @@
 #include "FeedReaderMessageWidget.h"
 #include "ui_FeedReaderDialog.h"
 #include "FeedReaderNotify.h"
+#include "FeedReaderConfig.h"
 #include "AddFeedDialog.h"
 #include "FeedReaderStringDefs.h"
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/settings/rsharesettings.h"
+#include "gui/notifyqt.h"
 #include "FeedReaderUserNotify.h"
 
 #include "interface/rsFeedReader.h"
@@ -61,11 +63,14 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
 
 	mProcessSettings = false;
 	mOpenFeedIds = NULL;
+	mMessageWidget = NULL;
 
 	mNotify = new FeedReaderNotify();
 	mFeedReader->setNotify(mNotify);
-	connect(mNotify, SIGNAL(notifyFeedChanged(QString,int)), this, SLOT(feedChanged(QString,int)));
-	connect(mNotify, SIGNAL(notifyMsgChanged(QString,QString,int)), this, SLOT(msgChanged(QString,QString,int)));
+	connect(mNotify, SIGNAL(feedChanged(QString,int)), this, SLOT(feedChanged(QString,int)));
+	connect(mNotify, SIGNAL(msgChanged(QString,QString,int)), this, SLOT(msgChanged(QString,QString,int)));
+
+	connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
 
 	/* connect signals */
 	connect(ui->feedTreeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(feedTreeItemActivated(QTreeWidgetItem*)));
@@ -74,6 +79,7 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
 		connect(ui->feedTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(feedTreeItemActivated(QTreeWidgetItem*)));
 	}
 	connect(ui->feedTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(feedTreeCustomPopupMenu(QPoint)));
+	connect(ui->feedTreeWidget, SIGNAL(signalMouseMiddleButtonClicked(QTreeWidgetItem*)), this, SLOT(feedTreeMiddleButtonClicked(QTreeWidgetItem*)));
 
 	connect(ui->messageTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(messageTabCloseRequested(int)));
 	connect(ui->messageTabWidget, SIGNAL(currentChanged(int)), this, SLOT(messageTabChanged(int)));
@@ -94,10 +100,10 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
 	mRootItem->setData(COLUMN_FEED_DATA, ROLE_FEED_ICON, QIcon(":/images/Root.png"));
 	mRootItem->setExpanded(true);
 
-    /* set initial size the splitter */
-    QList<int> sizes;
-    sizes << 300 << width(); // Qt calculates the right sizes
-    ui->splitter->setSizes(sizes);
+	/* set initial size the splitter */
+	QList<int> sizes;
+	sizes << 300 << width(); // Qt calculates the right sizes
+	ui->splitter->setSizes(sizes);
 
 	/* load settings */
 	processSettings(true);
@@ -107,9 +113,7 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
 
 	ui->feedTreeWidget->installEventFilter(this);
 
-	mMessageWidget = createMessageWidget("");
-	// remove close button of the the first tab
-	ui->messageTabWidget->hideCloseButton(ui->messageTabWidget->indexOf(mMessageWidget));
+	settingsChanged();
 
 	feedTreeItemActivated(NULL);
 }
@@ -176,6 +180,22 @@ void FeedReaderDialog::processSettings(bool load)
 	mProcessSettings = false;
 }
 
+void FeedReaderDialog::settingsChanged()
+{
+	if (FeedReaderSetting_OpenAllInNewTab()) {
+		if (mMessageWidget) {
+			delete(mMessageWidget);
+			mMessageWidget = NULL;
+		}
+	} else {
+		if (!mMessageWidget) {
+			mMessageWidget = createMessageWidget("");
+			// remove close button of the the first tab
+			ui->messageTabWidget->hideCloseButton(ui->messageTabWidget->indexOf(mMessageWidget));
+		}
+	}
+}
+
 void FeedReaderDialog::addFeedToExpand(const std::string &feedId)
 {
 	if (mOpenFeedIds == NULL) {
@@ -279,11 +299,13 @@ void FeedReaderDialog::feedTreeCustomPopupMenu(QPoint /*point*/)
 		action->setEnabled(false);
 	}
 
-	contextMnu.addSeparator();
+	if (!FeedReaderSetting_OpenAllInNewTab()) {
+		contextMnu.addSeparator();
 
-	action = contextMnu.addAction(QIcon(""), tr("Open in new tab"), this, SLOT(openInNewTab()));
-	if (!item || folder || feedMessageWidget(feedId)) {
-		action->setEnabled(false);
+		action = contextMnu.addAction(QIcon(""), tr("Open in new tab"), this, SLOT(openInNewTab()));
+		if (!item || folder || feedMessageWidget(feedId)) {
+			action->setEnabled(false);
+		}
 	}
 
 	contextMnu.addSeparator();
@@ -565,7 +587,7 @@ FeedReaderMessageWidget *FeedReaderDialog::feedMessageWidget(const std::string &
 	int tabCount = ui->messageTabWidget->count();
 	for (int index = 0; index < tabCount; ++index) {
 		FeedReaderMessageWidget *childWidget = dynamic_cast<FeedReaderMessageWidget*>(ui->messageTabWidget->widget(index));
-		if (childWidget == mMessageWidget) {
+		if (mMessageWidget && childWidget == mMessageWidget) {
 			continue;
 		}
 		if (childWidget && childWidget->feedId() == id) {
@@ -607,17 +629,35 @@ void FeedReaderDialog::feedTreeItemActivated(QTreeWidgetItem *item)
 	/* search exisiting tab */
 	FeedReaderMessageWidget *messageWidget = feedMessageWidget(feedId);
 	if (!messageWidget) {
-		/* not found, use standard tab */
-		messageWidget = mMessageWidget;
-		messageWidget->setFeedId(feedId);
+		if (mMessageWidget) {
+			/* not found, use standard tab */
+			messageWidget = mMessageWidget;
+			messageWidget->setFeedId(feedId);
+		} else {
+			/* create new tab */
+			messageWidget = createMessageWidget(feedId);
+		}
 	}
 
 	ui->messageTabWidget->setCurrentWidget(messageWidget);
 }
 
+void FeedReaderDialog::feedTreeMiddleButtonClicked(QTreeWidgetItem *item)
+{
+	if (!item) {
+		return;
+	}
+
+	openFeedInNewTab(item->data(COLUMN_FEED_DATA, ROLE_FEED_ID).toString().toStdString());
+}
+
 void FeedReaderDialog::openInNewTab()
 {
-	std::string feedId = currentFeedId();
+	openFeedInNewTab(currentFeedId());
+}
+
+void FeedReaderDialog::openFeedInNewTab(const std::string &feedId)
+{
 	if (feedId.empty()) {
 		return;
 	}

plugins/FeedReader/gui/FeedReaderDialog.h

@@ -50,8 +50,10 @@ protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
 
 private slots:
+	void settingsChanged();
 	void feedTreeCustomPopupMenu(QPoint point);
 	void feedTreeItemActivated(QTreeWidgetItem *item);
+	void feedTreeMiddleButtonClicked(QTreeWidgetItem *item);
 	void openInNewTab();
 	void newFolder();
 	void newFeed();
@@ -75,6 +77,7 @@ private:
 	void getExpandedFeedIds(QList<std::string> &feedIds);
 	void updateFeeds(const std::string &parentId, QTreeWidgetItem *parentItem);
 	void updateFeedItem(QTreeWidgetItem *item, FeedInfo &info);
+	void openFeedInNewTab(const std::string &feedId);
 
 	void calculateFeedItems();
 	void calculateFeedItem(QTreeWidgetItem *item, uint32_t &unreadCount, bool &loading);

plugins/FeedReader/gui/FeedReaderMessageWidget.cpp

@@ -8,6 +8,7 @@
 #include "FeedReaderMessageWidget.h"
 #include "ui_FeedReaderMessageWidget.h"
 #include "FeedReaderNotify.h"
+#include "FeedReaderConfig.h"
 
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/settings/rsharesettings.h"
@@ -38,8 +39,8 @@ FeedReaderMessageWidget::FeedReaderMessageWidget(const std::string &feedId, RsFe
 	mUnreadCount = 0;
 
 	/* connect signals */
-	connect(mNotify, SIGNAL(notifyFeedChanged(QString,int)), this, SLOT(feedChanged(QString,int)));
-	connect(mNotify, SIGNAL(notifyMsgChanged(QString,QString,int)), this, SLOT(msgChanged(QString,QString,int)));
+	connect(mNotify, SIGNAL(feedChanged(QString,int)), this, SLOT(feedChanged(QString,int)));
+	connect(mNotify, SIGNAL(msgChanged(QString,QString,int)), this, SLOT(msgChanged(QString,QString,int)));
 
 	connect(ui->msgTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(msgItemChanged()));
 	connect(ui->msgTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(msgItemClicked(QTreeWidgetItem*,int)));
@@ -554,7 +555,7 @@ void FeedReaderMessageWidget::updateCurrentMessage()
 		return;
 	}
 
-	bool setToReadOnActive = Settings->valueFromGroup("FeedReaderDialog", "SetMsgToReadOnActivate", true).toBool();
+	bool setToReadOnActive = FeedReaderSetting_SetMsgToReadOnActivate();
 	bool isnew = item->data(COLUMN_MSG_DATA, ROLE_MSG_NEW).toBool();
 	bool read = item->data(COLUMN_MSG_DATA, ROLE_MSG_READ).toBool();
 

plugins/FeedReader/gui/FeedReaderNotify.cpp

@@ -25,12 +25,12 @@ FeedReaderNotify::FeedReaderNotify() : QObject()
 {
 }
 
-void FeedReaderNotify::feedChanged(const std::string &feedId, int type)
+void FeedReaderNotify::notifyFeedChanged(const std::string &feedId, int type)
 {
-    emit notifyFeedChanged(QString::fromStdString(feedId), type);
+	emit feedChanged(QString::fromStdString(feedId), type);
 }
 
-void FeedReaderNotify::msgChanged(const std::string &feedId, const std::string &msgId, int type)
+void FeedReaderNotify::notifyMsgChanged(const std::string &feedId, const std::string &msgId, int type)
 {
-    emit notifyMsgChanged(QString::fromStdString(feedId), QString::fromStdString(msgId), type);
+	emit msgChanged(QString::fromStdString(feedId), QString::fromStdString(msgId), type);
 }

plugins/FeedReader/gui/FeedReaderNotify.h

@@ -33,12 +33,12 @@ public:
 	FeedReaderNotify();
 
 	/* RsFeedReaderNotify */
-	virtual void feedChanged(const std::string &feedId, int type);
-	virtual void msgChanged(const std::string &feedId, const std::string &msgId, int type);
+	virtual void notifyFeedChanged(const std::string &feedId, int type);
+	virtual void notifyMsgChanged(const std::string &feedId, const std::string &msgId, int type);
 
 signals:
-	void notifyFeedChanged(const QString &feedId, int type);
-	void notifyMsgChanged(const QString &feedId, const QString &msgId, int type);
+	void feedChanged(const QString &feedId, int type);
+	void msgChanged(const QString &feedId, const QString &msgId, int type);
 };
 
 #endif

plugins/FeedReader/gui/FeedReaderUserNotify.cpp

@@ -30,7 +30,7 @@
 FeedReaderUserNotify::FeedReaderUserNotify(FeedReaderDialog *feedReaderDialog, RsFeedReader *feedReader, FeedReaderNotify *notify, QObject *parent) :
 	UserNotify(parent), mFeedReaderDialog(feedReaderDialog), mFeedReader(feedReader), mNotify(notify)
 {
-	connect(mNotify, SIGNAL(notifyMsgChanged(QString,QString,int)), this, SLOT(updateIcon()), Qt::QueuedConnection);
+	connect(mNotify, SIGNAL(msgChanged(QString,QString,int)), this, SLOT(updateIcon()), Qt::QueuedConnection);
 }
 
 bool FeedReaderUserNotify::hasSetting(QString &name)

plugins/FeedReader/gui/PreviewFeedDialog.cpp

@@ -160,8 +160,8 @@ PreviewFeedDialog::PreviewFeedDialog(RsFeedReader *feedReader, FeedReaderNotify
 	connect(ui->xpathUseListWidget->itemDelegate(), SIGNAL(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)), this, SLOT(xpathCloseEditor(QWidget*,QAbstractItemDelegate::EndEditHint)));
 	connect(ui->xpathRemoveListWidget->itemDelegate(), SIGNAL(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)), this, SLOT(xpathCloseEditor(QWidget*,QAbstractItemDelegate::EndEditHint)));
 
-	connect(mNotify, SIGNAL(notifyFeedChanged(QString,int)), this, SLOT(feedChanged(QString,int)));
-	connect(mNotify, SIGNAL(notifyMsgChanged(QString,QString,int)), this, SLOT(msgChanged(QString,QString,int)));
+	connect(mNotify, SIGNAL(feedChanged(QString,int)), this, SLOT(feedChanged(QString,int)));
+	connect(mNotify, SIGNAL(msgChanged(QString,QString,int)), this, SLOT(msgChanged(QString,QString,int)));
 
 //	ui->documentTreeWidget->setItemDelegate(new PreviewItemDelegate(ui->documentTreeWidget));
 	ui->structureFrame->hide();

plugins/FeedReader/interface/rsFeedReader.h

@@ -164,8 +164,8 @@ class RsFeedReaderNotify
 public:
 	RsFeedReaderNotify() {}
 
-	virtual void feedChanged(const std::string &/*feedId*/, int /*type*/) {}
-	virtual void msgChanged(const std::string &/*feedId*/, const std::string &/*msgId*/, int /*type*/) {}
+	virtual void notifyFeedChanged(const std::string &/*feedId*/, int /*type*/) {}
+	virtual void notifyMsgChanged(const std::string &/*feedId*/, const std::string &/*msgId*/, int /*type*/) {}
 };
 
 class RsFeedReader

plugins/FeedReader/lang/FeedReader_en.ts

@@ -9,147 +9,147 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="49"/>
+        <location filename="../gui/AddFeedDialog.ui" line="42"/>
         <source>Authentication (not yet supported)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="55"/>
+        <location filename="../gui/AddFeedDialog.ui" line="48"/>
         <source>Feed needs authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="62"/>
+        <location filename="../gui/AddFeedDialog.ui" line="55"/>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="69"/>
+        <location filename="../gui/AddFeedDialog.ui" line="62"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="89"/>
+        <location filename="../gui/AddFeedDialog.ui" line="82"/>
         <source>Update interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="95"/>
+        <location filename="../gui/AddFeedDialog.ui" line="88"/>
         <source>Use standard update interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="102"/>
+        <location filename="../gui/AddFeedDialog.ui" line="95"/>
         <source>Interval in minutes (0 = manual)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="121"/>
+        <location filename="../gui/AddFeedDialog.ui" line="114"/>
         <source>Last update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="134"/>
+        <location filename="../gui/AddFeedDialog.ui" line="127"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="146"/>
+        <location filename="../gui/AddFeedDialog.ui" line="139"/>
         <source>Storage time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="152"/>
+        <location filename="../gui/AddFeedDialog.ui" line="145"/>
         <source>Use standard storage time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="159"/>
+        <location filename="../gui/AddFeedDialog.ui" line="152"/>
         <source>Days (0 = off)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="182"/>
+        <location filename="../gui/AddFeedDialog.ui" line="175"/>
         <source>Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="188"/>
+        <location filename="../gui/AddFeedDialog.ui" line="181"/>
         <source>Use standard proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="195"/>
+        <location filename="../gui/AddFeedDialog.ui" line="188"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="205"/>
+        <location filename="../gui/AddFeedDialog.ui" line="198"/>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="231"/>
+        <location filename="../gui/AddFeedDialog.ui" line="224"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="240"/>
+        <location filename="../gui/AddFeedDialog.ui" line="233"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="251"/>
+        <location filename="../gui/AddFeedDialog.ui" line="244"/>
         <source>Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="276"/>
+        <location filename="../gui/AddFeedDialog.ui" line="269"/>
         <source>Local Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="299"/>
+        <location filename="../gui/AddFeedDialog.ui" line="292"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="305"/>
+        <location filename="../gui/AddFeedDialog.ui" line="298"/>
         <source>Activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="312"/>
+        <location filename="../gui/AddFeedDialog.ui" line="305"/>
         <source>Use name and description from feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="319"/>
+        <location filename="../gui/AddFeedDialog.ui" line="312"/>
         <source>Update forum information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="326"/>
+        <location filename="../gui/AddFeedDialog.ui" line="319"/>
         <source>Embed images (experimental for local feeds)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="333"/>
+        <location filename="../gui/AddFeedDialog.ui" line="326"/>
         <source>Save complete web page (experimental for local feeds)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="345"/>
+        <location filename="../gui/AddFeedDialog.ui" line="338"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="359"/>
+        <location filename="../gui/AddFeedDialog.ui" line="352"/>
         <source>RSS-Feed-URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.ui" line="369"/>
+        <location filename="../gui/AddFeedDialog.ui" line="362"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -259,7 +259,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderConfig.h" line="47"/>
+        <location filename="../gui/FeedReaderConfig.ui" line="131"/>
+        <source>Open all feeds in new tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderConfig.h" line="50"/>
         <source>FeedReader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -272,104 +277,119 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="81"/>
+        <location filename="../gui/FeedReaderDialog.ui" line="91"/>
+        <source>Add new feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderDialog.ui" line="108"/>
+        <source>Update feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderDialog.cpp" line="95"/>
         <source>Message Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="239"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="292"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="240"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="293"/>
         <source>Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="244"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="297"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="251"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="305"/>
+        <source>Open in new tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderDialog.cpp" line="313"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="256"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="318"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="268"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="330"/>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="271"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="333"/>
         <source>Activate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="271"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="333"/>
         <source>Deactivate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="451"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="513"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="588"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="723"/>
         <source>Add new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="589"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="724"/>
         <source>Please enter a name for the folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="595"/>
-        <location filename="../gui/FeedReaderDialog.cpp" line="648"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="730"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="783"/>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="595"/>
-        <location filename="../gui/FeedReaderDialog.cpp" line="648"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="730"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="783"/>
         <source>Cannot create folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="621"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="756"/>
         <source>Remove folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="621"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="756"/>
         <source>Remove feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="621"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="756"/>
         <source>Do you want to remove the folder %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="621"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="756"/>
         <source>Do you want to remove the feed %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="641"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="776"/>
         <source>Edit folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="642"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="777"/>
         <source>Please enter a new name for the folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -382,90 +402,120 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.ui" line="45"/>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="48"/>
+        <source>Mark messages as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="51"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="68"/>
+        <source>Mark messages as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="85"/>
+        <source>Mark all messages as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="102"/>
+        <source>Remove messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="119"/>
+        <source>Update feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="133"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.ui" line="76"/>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="75"/>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="164"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="89"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.ui" line="90"/>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="76"/>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="178"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="90"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.ui" line="95"/>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="77"/>
+        <location filename="../gui/FeedReaderMessageWidget.ui" line="183"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="91"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="75"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="89"/>
         <source>Search Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="76"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="90"/>
         <source>Search Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="77"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="91"/>
         <source>Search Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="89"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="103"/>
         <source>Open link in browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="90"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="104"/>
         <source>Copy link to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="190"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="230"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="228"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="268"/>
         <source>Mark as read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="231"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="271"/>
         <source>Mark as unread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="234"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="274"/>
         <source>Mark all as read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="238"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="279"/>
         <source>Copy link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="241"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="282"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="588"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="655"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="592"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="659"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>

plugins/FeedReader/services/p3FeedReader.cc

@@ -340,7 +340,7 @@ RsFeedAddResult p3FeedReader::addFolder(const std::string parentId, const std::s
 	IndicateConfigChanged();
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_ADD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_ADD);
 	}
 
 	return RS_FEED_ADD_RESULT_SUCCESS;
@@ -380,7 +380,7 @@ RsFeedAddResult p3FeedReader::setFolder(const std::string &feedId, const std::st
 	IndicateConfigChanged();
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 	}
 
 	return RS_FEED_ADD_RESULT_SUCCESS;
@@ -427,7 +427,7 @@ RsFeedAddResult p3FeedReader::addFeed(const FeedInfo &feedInfo, std::string &fee
 	IndicateConfigChanged();
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_ADD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_ADD);
 	}
 
 	return RS_FEED_ADD_RESULT_SUCCESS;
@@ -496,7 +496,7 @@ RsFeedAddResult p3FeedReader::setFeed(const std::string &feedId, const FeedInfo
 	IndicateConfigChanged();
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 	}
 
 	if (!forumId.empty()) {
@@ -602,7 +602,7 @@ bool p3FeedReader::removeFeed(const std::string &feedId)
 		/* only notify remove of feed */
 		std::list<std::string>::iterator it;
 		for (it = removedFeedIds.begin(); it != removedFeedIds.end(); ++it) {
-			mNotify->feedChanged(*it, NOTIFY_TYPE_DEL);
+			mNotify->notifyFeedChanged(*it, NOTIFY_TYPE_DEL);
 		}
 	}
 
@@ -648,7 +648,7 @@ bool p3FeedReader::addPreviewFeed(const FeedInfo &feedInfo, std::string &feedId)
 	}
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_ADD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_ADD);
 	}
 
 	{
@@ -766,8 +766,8 @@ bool p3FeedReader::removeMsg(const std::string &feedId, const std::string &msgId
 	}
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
-		mNotify->msgChanged(feedId, msgId, NOTIFY_TYPE_DEL);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyMsgChanged(feedId, msgId, NOTIFY_TYPE_DEL);
 	}
 
 	return true;
@@ -814,11 +814,11 @@ bool p3FeedReader::removeMsgs(const std::string &feedId, const std::list<std::st
 	}
 
 	if (mNotify && !removedMsgs.empty()) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 
 		std::list<std::string>::iterator it;
 		for (it = removedMsgs.begin(); it != removedMsgs.end(); ++it) {
-			mNotify->msgChanged(feedId, *it, NOTIFY_TYPE_DEL);
+			mNotify->notifyMsgChanged(feedId, *it, NOTIFY_TYPE_DEL);
 		}
 	}
 
@@ -1061,7 +1061,7 @@ bool p3FeedReader::processFeed(const std::string &feedId)
 
 	if (mNotify) {
 		for (it = notifyIds.begin(); it != notifyIds.end(); ++it) {
-			mNotify->feedChanged(*it, NOTIFY_TYPE_MOD);
+			mNotify->notifyFeedChanged(*it, NOTIFY_TYPE_MOD);
 		}
 	}
 
@@ -1110,8 +1110,8 @@ bool p3FeedReader::setMessageRead(const std::string &feedId, const std::string &
 	if (changed) {
 		IndicateConfigChanged();
 		if (mNotify) {
-			mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
-			mNotify->msgChanged(feedId, msgId, NOTIFY_TYPE_MOD);
+			mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
+			mNotify->notifyMsgChanged(feedId, msgId, NOTIFY_TYPE_MOD);
 		}
 	}
 
@@ -1187,7 +1187,7 @@ int p3FeedReader::tick()
 
 	if (mNotify) {
 		for (it = notifyIds.begin(); it != notifyIds.end(); ++it) {
-			mNotify->feedChanged(*it, NOTIFY_TYPE_MOD);
+			mNotify->notifyFeedChanged(*it, NOTIFY_TYPE_MOD);
 		}
 	}
 
@@ -1244,7 +1244,7 @@ void p3FeedReader::cleanFeeds()
 			if (mNotify) {
 				std::list<std::pair<std::string, std::string> >::iterator it;
 				for (it = removedMsgIds.begin(); it != removedMsgIds.end(); ++it) {
-					mNotify->msgChanged(it->first, it->second, NOTIFY_TYPE_DEL);
+					mNotify->notifyMsgChanged(it->first, it->second, NOTIFY_TYPE_DEL);
 				}
 			}
 		}
@@ -1474,7 +1474,7 @@ bool p3FeedReader::getFeedToDownload(RsFeedReaderFeed &feed, const std::string &
 	}
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 	}
 
 	return true;
@@ -1525,7 +1525,7 @@ void p3FeedReader::onDownloadSuccess(const std::string &feedId, const std::strin
 	}
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 	}
 }
 
@@ -1562,7 +1562,7 @@ void p3FeedReader::onDownloadError(const std::string &feedId, RsFeedReaderErrorS
 	}
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 	}
 }
 
@@ -1617,7 +1617,7 @@ bool p3FeedReader::getFeedToProcess(RsFeedReaderFeed &feed, const std::string &n
 	}
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 	}
 
 	return true;
@@ -1832,11 +1832,11 @@ void p3FeedReader::onProcessSuccess_addMsgs(const std::string &feedId, std::list
 	}
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 
 		std::list<std::string>::iterator it;
 		for (it = addedMsgs.begin(); it != addedMsgs.end(); ++it) {
-			mNotify->msgChanged(feedId, *it, NOTIFY_TYPE_ADD);
+			mNotify->notifyMsgChanged(feedId, *it, NOTIFY_TYPE_ADD);
 		}
 	}
 }
@@ -1874,7 +1874,7 @@ void p3FeedReader::onProcessError(const std::string &feedId, RsFeedReaderErrorSt
 	}
 
 	if (mNotify) {
-		mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 	}
 }
 
@@ -1930,7 +1930,7 @@ void p3FeedReader::setFeedInfo(const std::string &feedId, const std::string &nam
 		}
 
 		if (mNotify) {
-			mNotify->feedChanged(feedId, NOTIFY_TYPE_MOD);
+			mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 		}
 	}
 

retroshare-gui/src/gui/ForumsDialog.cpp

@@ -1765,7 +1765,7 @@ ForumsFillThread::ForumsFillThread(ForumsDialog *parent)
     stopped = false;
     compareRole = NULL;
 
-    expandNewMessages = Settings->getExpandNewMessages();
+    expandNewMessages = Settings->getForumExpandNewMessages();
     fillComplete = false;
 
     filterColumn = 0;

retroshare-gui/src/gui/GxsForumsDialog.cpp

@@ -29,6 +29,7 @@
 #include "settings/rsharesettings.h"
 #include "RetroShareLink.h"
 #include "channels/ShareKey.h"
+#include "common/RSTreeWidget.h"
 #include "notifyqt.h"
 
 // These should be in retroshare/ folder.
@@ -69,13 +70,16 @@ GxsForumsDialog::GxsForumsDialog(QWidget *parent)
 
 		/* Setup Queue */
 	mForumQueue = new TokenQueue(rsGxsForums->getTokenService(), this);
+	mThreadWidget = NULL;
 
 	connect(ui.forumTreeWidget, SIGNAL(treeCustomContextMenuRequested(QPoint)), this, SLOT(forumListCustomPopupMenu(QPoint)));
 	connect(ui.newForumButton, SIGNAL(clicked()), this, SLOT(newforum()));
 	connect(ui.forumTreeWidget, SIGNAL(treeItemActivated(QString)), this, SLOT(changedForum(QString)));
+	connect(ui.forumTreeWidget->treeWidget(), SIGNAL(signalMouseMiddleButtonClicked(QTreeWidgetItem*)), this, SLOT(forumTreeMiddleButtonClicked(QTreeWidgetItem*)));
 	connect(ui.threadTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(threadTabCloseRequested(int)));
 	connect(ui.threadTabWidget, SIGNAL(currentChanged(int)), this, SLOT(threadTabChanged(int)));
 	connect(NotifyQt::getInstance(), SIGNAL(forumMsgReadSatusChanged(QString,QString,int)), this, SLOT(forumMsgReadSatusChanged(QString,QString,int)));
+	connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
 
 	// HACK - TEMPORARY HIJACKING THIS BUTTON FOR REFRESH.
 	connect(ui.refreshButton, SIGNAL(clicked()), this, SLOT(forceUpdateDisplay()));
@@ -97,9 +101,7 @@ GxsForumsDialog::GxsForumsDialog(QWidget *parent)
 	// load settings
 	processSettings(true);
 
-	mThreadWidget = createThreadWidget("");
-	// remove close button of the the first tab
-	ui.threadTabWidget->hideCloseButton(ui.threadTabWidget->indexOf(mThreadWidget));
+	settingsChanged();
 
 /* Hide platform specific features */
 #ifdef Q_WS_WIN
@@ -120,11 +122,11 @@ GxsForumsDialog::~GxsForumsDialog()
 //	return new GxsForumUserNotify(parent);
 //}
 
-void GxsForumsDialog::processSettings(bool bLoad)
+void GxsForumsDialog::processSettings(bool load)
 {
 	Settings->beginGroup(QString("GxsForumsDialog"));
 
-	if (bLoad) {
+	if (load) {
 		// load settings
 
 		// state of splitter
@@ -136,11 +138,27 @@ void GxsForumsDialog::processSettings(bool bLoad)
 		Settings->setValue("Splitter", ui.splitter->saveState());
 	}
 
-	ui.forumTreeWidget->processSettings(Settings, bLoad);
+	ui.forumTreeWidget->processSettings(Settings, load);
 
 	Settings->endGroup();
 }
 
+void GxsForumsDialog::settingsChanged()
+{
+	if (Settings->getForumOpenAllInNewTab()) {
+		if (mThreadWidget) {
+			delete(mThreadWidget);
+			mThreadWidget = NULL;
+		}
+	} else {
+		if (!mThreadWidget) {
+			mThreadWidget = createThreadWidget("");
+			// remove close button of the the first tab
+			ui.threadTabWidget->hideCloseButton(ui.threadTabWidget->indexOf(mThreadWidget));
+		}
+	}
+}
+
 void GxsForumsDialog::forumListCustomPopupMenu(QPoint /*point*/)
 {
 	int subscribeFlags = ui.forumTreeWidget->subscribeFlags(QString::fromStdString(mForumId));
@@ -153,9 +171,11 @@ void GxsForumsDialog::forumListCustomPopupMenu(QPoint /*point*/)
 	action = contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Unsubscribe to Forum"), this, SLOT(unsubscribeToForum()));
 	action->setEnabled (!mForumId.empty() && IS_GROUP_SUBSCRIBED(subscribeFlags));
 
-	action = contextMnu.addAction(QIcon(""), tr("Open in new tab"), this, SLOT(openInNewTab()));
-	if (mForumId.empty() || forumThreadWidget(mForumId)) {
-		action->setEnabled(false);
+	if (!Settings->getForumOpenAllInNewTab()) {
+		action = contextMnu.addAction(QIcon(""), tr("Open in new tab"), this, SLOT(openInNewTab()));
+		if (mForumId.empty() || forumThreadWidget(mForumId)) {
+			action->setEnabled(false);
+		}
 	}
 
 	contextMnu.addSeparator();
@@ -335,7 +355,7 @@ GxsForumThreadWidget *GxsForumsDialog::forumThreadWidget(const std::string &foru
 	int tabCount = ui.threadTabWidget->count();
 	for (int index = 0; index < tabCount; ++index) {
 		GxsForumThreadWidget *childWidget = dynamic_cast<GxsForumThreadWidget*>(ui.threadTabWidget->widget(index));
-		if (childWidget == mThreadWidget) {
+		if (mThreadWidget && childWidget == mThreadWidget) {
 			continue;
 		}
 		if (childWidget && childWidget->forumId() == forumId) {
@@ -370,25 +390,40 @@ void GxsForumsDialog::changedForum(const QString &forumId)
 	GxsForumThreadWidget *threadWidget = forumThreadWidget(mForumId);
 
 	if (!threadWidget) {
-		/* not found, use standard tab */
-		threadWidget = mThreadWidget;
-		threadWidget->setForumId(mForumId);
+		if (mThreadWidget) {
+			/* not found, use standard tab */
+			threadWidget = mThreadWidget;
+			threadWidget->setForumId(mForumId);
+		} else {
+			/* create new tab */
+			threadWidget = createThreadWidget(mForumId);
+		}
 	}
 
 	ui.threadTabWidget->setCurrentWidget(threadWidget);
 }
 
+void GxsForumsDialog::forumTreeMiddleButtonClicked(QTreeWidgetItem *item)
+{
+	openForumInNewTab(ui.forumTreeWidget->itemId(item).toStdString());
+}
+
 void GxsForumsDialog::openInNewTab()
 {
-	if (mForumId.empty()) {
+	openForumInNewTab(mForumId);
+}
+
+void GxsForumsDialog::openForumInNewTab(const std::string &forumId)
+{
+	if (forumId.empty()) {
 		return;
 	}
 
 	/* search exisiting tab */
-	GxsForumThreadWidget *threadWidget = forumThreadWidget(mForumId);
+	GxsForumThreadWidget *threadWidget = forumThreadWidget(forumId);
 	if (!threadWidget) {
 		/* not found, create new tab */
-		threadWidget = createThreadWidget(mForumId);
+		threadWidget = createThreadWidget(forumId);
 	}
 
 	ui.threadTabWidget->setCurrentWidget(threadWidget);

retroshare-gui/src/gui/GxsForumsDialog.h

@@ -57,6 +57,7 @@ public:
 	virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);
 
 private slots:
+	void settingsChanged();
 	void forceUpdateDisplay(); // TEMP HACK FN.
 
 	/** Create the context popup menu and it's submenus */
@@ -66,6 +67,7 @@ private slots:
 	void newforum();
 
 	void changedForum(const QString &forumId);
+	void forumTreeMiddleButtonClicked(QTreeWidgetItem *item);
 	void openInNewTab();
 	void threadTabCloseRequested(int index);
 	void threadTabChanged(int index);
@@ -93,6 +95,7 @@ private:
 //	void forumInfoToGroupItemInfo(const ForumInfo &forumInfo, GroupItemInfo &groupItemInfo);
 	void forumInfoToGroupItemInfo(const RsGroupMetaData &forumInfo, GroupItemInfo &groupItemInfo);
 
+	void openForumInNewTab(const std::string &forumId);
 	void forumSubscribe(bool subscribe);
 
 	void processSettings(bool load);

retroshare-gui/src/gui/common/GroupTreeWidget.cpp

@@ -434,6 +434,11 @@ QTreeWidgetItem *GroupTreeWidget::activateId(const QString &id, bool focus)
 	return item;
 }
 
+RSTreeWidget *GroupTreeWidget::treeWidget()
+{
+	return ui->treeWidget;
+}
+
 int GroupTreeWidget::subscribeFlags(const QString &id)
 {
 	QTreeWidgetItem *item = getItemFromId(id);

retroshare-gui/src/gui/common/GroupTreeWidget.h

@@ -30,6 +30,7 @@
 class QToolButton;
 class RshareSettings;
 class RSTreeWidgetItemCompareRole;
+class RSTreeWidget;
 
 #define GROUPTREEWIDGET_COLOR_STANDARD   -1
 #define GROUPTREEWIDGET_COLOR_CATEGORY   0
@@ -89,6 +90,8 @@ public:
 	QTreeWidgetItem *getItemFromId(const QString &id);
 	QTreeWidgetItem *activateId(const QString &id, bool focus);
 
+	RSTreeWidget *treeWidget();
+
 	QColor textColorCategory() const { return mTextColor[GROUPTREEWIDGET_COLOR_CATEGORY]; }
 	QColor textColorPrivateKey() const { return mTextColor[GROUPTREEWIDGET_COLOR_PRIVATEKEY]; }
 

retroshare-gui/src/gui/common/GroupTreeWidget.ui

@@ -21,7 +21,7 @@
     <widget class="LineEditClear" name="filterLineEdit"/>
    </item>
    <item>
-    <widget class="QTreeWidget" name="treeWidget">
+    <widget class="RSTreeWidget" name="treeWidget">
      <property name="enabled">
       <bool>true</bool>
      </property>
@@ -72,6 +72,11 @@
    <extends>QLineEdit</extends>
    <header location="global">gui/common/LineEditClear.h</header>
   </customwidget>
+  <customwidget>
+   <class>RSTreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>gui/common/RSTreeWidget.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

retroshare-gui/src/gui/common/RSTreeWidget.cpp

@@ -20,6 +20,7 @@
  ****************************************************************/
 
 #include <QPainter>
+#include <QMouseEvent>
 
 #include "RSTreeWidget.h"
 
@@ -29,7 +30,7 @@ RSTreeWidget::RSTreeWidget(QWidget *parent) : QTreeWidget(parent)
 
 void RSTreeWidget::setPlaceholderText(const QString &text)
 {
-	placeholderText = text;
+	mPlaceholderText = text;
 	viewport()->repaint();
 }
 
@@ -37,7 +38,7 @@ void RSTreeWidget::paintEvent(QPaintEvent *event)
 {
 	QTreeWidget::paintEvent(event);
 
-	if (placeholderText.isEmpty() == false && model() && model()->rowCount() == 0) {
+	if (mPlaceholderText.isEmpty() == false && model() && model()->rowCount() == 0) {
 		QWidget *vieportWidget = viewport();
 		QPainter painter(vieportWidget);
 
@@ -47,6 +48,22 @@ void RSTreeWidget::paintEvent(QPaintEvent *event)
 		pen.setColor(color);
 		painter.setPen(pen);
 
-		painter.drawText(QRect(QPoint(), vieportWidget->size()), Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextWordWrap, placeholderText);
+		painter.drawText(QRect(QPoint(), vieportWidget->size()), Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextWordWrap, mPlaceholderText);
 	}
 }
+
+void RSTreeWidget::mousePressEvent(QMouseEvent *event)
+{
+	if (event->buttons() & Qt::MiddleButton) {
+		if (receivers(SIGNAL(signalMouseMiddleButtonClicked(QTreeWidgetItem*))) > 0) {
+			QTreeWidgetItem *item = itemAt(event->pos());
+			if (item) {
+				setCurrentItem(item);
+				emit signalMouseMiddleButtonClicked(item);
+			}
+			return; // eat event
+		}
+	}
+
+	QTreeWidget::mousePressEvent(event);
+}

retroshare-gui/src/gui/common/RSTreeWidget.h

@@ -34,10 +34,14 @@ public:
 
 	void setPlaceholderText(const QString &text);
 
+signals:
+	void signalMouseMiddleButtonClicked(QTreeWidgetItem *item);
+
 protected:
 	void paintEvent(QPaintEvent *event);
+	virtual void mousePressEvent(QMouseEvent *event);
 
-	QString placeholderText;
+	QString mPlaceholderText;
 };
 
 #endif

retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp

@@ -958,7 +958,7 @@ void GxsForumThreadWidget::insertForumThreads(const RsGroupMetaData &fi)
 	mFillThread->mFilterColumn = ui->filterLineEdit->currentFilter();
 	mFillThread->mFilterColumn = COLUMN_THREAD_TITLE;
 	mFillThread->mSubscribeFlags = mSubscribeFlags;
-	mFillThread->mExpandNewMessages = Settings->getExpandNewMessages();
+	mFillThread->mExpandNewMessages = Settings->getForumExpandNewMessages();
 	mFillThread->mViewType = ui->viewBox->currentIndex();
 	if (mLastViewType != mFillThread->mViewType || mLastForumID != mForumId) {
 		mFillThread->mFillComplete = true;

retroshare-gui/src/gui/notifyqt.cpp

@@ -837,6 +837,11 @@ void NotifyQt::notifyChatStyleChanged(int /*ChatStyle::enumStyleType*/ styleType
 	emit chatStyleChanged(styleType);
 }
 
+void NotifyQt::notifySettingsChanged()
+{
+	emit settingsChanged();
+}
+
 void NotifyQt::startWaitingToasters()
 {
 	{

retroshare-gui/src/gui/notifyqt.h

@@ -66,6 +66,8 @@ class NotifyQt: public QObject, public NotifyBase
 
 		void testToaster(uint notifyFlags, /*RshareSettings::enumToasterPosition*/ int position, QPoint margin);
 
+		void notifySettingsChanged();
+
 	signals:
 		// It's beneficial to send info to the GUI using signals, because signals are thread-safe
 		// as they get queued by Qt.
@@ -107,6 +109,7 @@ class NotifyQt: public QObject, public NotifyBase
 
 		/* Notify from GUI */
 		void chatStyleChanged(int /*ChatStyle::enumStyleType*/ styleType);
+		void settingsChanged();
 
 	public slots:
 		void UpdateGUI(); /* called by timer */

retroshare-gui/src/gui/settings/ForumPage.cpp

@@ -42,7 +42,8 @@ bool
 ForumPage::save(QString &/*errmsg*/)
 {
     Settings->setForumMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked());
-    Settings->setExpandNewMessages(ui.expandNewMessages->isChecked());
+    Settings->setForumExpandNewMessages(ui.expandNewMessages->isChecked());
+    Settings->setForumOpenAllInNewTab(ui.openAllInNewTabCheckBox->isChecked());
 
     return true;
 }
@@ -52,5 +53,6 @@ void
 ForumPage::load()
 {
     ui.setMsgToReadOnActivate->setChecked(Settings->getForumMsgSetToReadOnActivate());
-    ui.expandNewMessages->setChecked(Settings->getExpandNewMessages());
+    ui.expandNewMessages->setChecked(Settings->getForumExpandNewMessages());
+    ui.openAllInNewTabCheckBox->setChecked(Settings->getForumOpenAllInNewTab());
 }

retroshare-gui/src/gui/settings/ForumPage.ui

@@ -34,7 +34,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="2" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -47,6 +47,22 @@
      </property>
     </spacer>
    </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="gxsGroupBox">
+     <property name="title">
+      <string>New forum</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QCheckBox" name="openAllInNewTabCheckBox">
+        <property name="text">
+         <string>Open all forums in new tab</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

retroshare-gui/src/gui/settings/rsettingswin.cpp

@@ -39,6 +39,7 @@
 #include "ForumPage.h"
 #include "PluginsPage.h"
 #include "rsharesettings.h"
+#include "gui/notifyqt.h"
 
 #define IMAGE_GENERAL       ":/images/kcmsystem24.png"
 
@@ -202,5 +203,9 @@ RSettingsWin::saveChanges()
 	/* call to RsIface save function.... */
 	//rsicontrol -> ConfigSave();
 
+	if (NotifyQt::getInstance()) {
+		NotifyQt::getInstance()->notifySettingsChanged();
+	}
+
     close();
 }

retroshare-gui/src/gui/settings/rsharesettings.cpp

@@ -698,9 +698,9 @@ bool RshareSettings::getMsgSetToReadOnActivate ()
     return valueFromGroup("MessageDialog", "SetMsgToReadOnActivate", true).toBool();
 }
 
-void RshareSettings::setMsgSetToReadOnActivate (bool bValue)
+void RshareSettings::setMsgSetToReadOnActivate (bool value)
 {
-    setValueToGroup("MessageDialog", "SetMsgToReadOnActivate", bValue);
+    setValueToGroup("MessageDialog", "SetMsgToReadOnActivate", value);
 }
 
 RshareSettings::enumMsgOpen RshareSettings::getMsgOpen()
@@ -735,19 +735,29 @@ bool RshareSettings::getForumMsgSetToReadOnActivate ()
     return valueFromGroup("ForumDialog", "SetMsgToReadOnActivate", true).toBool();
 }
 
-void RshareSettings::setForumMsgSetToReadOnActivate (bool bValue)
+void RshareSettings::setForumMsgSetToReadOnActivate(bool value)
 {
-    setValueToGroup("ForumDialog", "SetMsgToReadOnActivate", bValue);
+    setValueToGroup("ForumDialog", "SetMsgToReadOnActivate", value);
 }
 
-bool RshareSettings::getExpandNewMessages()
+bool RshareSettings::getForumExpandNewMessages()
 {
     return valueFromGroup("ForumDialog", "ExpandNewMessages", true).toBool();
 }
 
-void RshareSettings::setExpandNewMessages (bool bValue)
+void RshareSettings::setForumExpandNewMessages(bool value)
 {
-    setValueToGroup("ForumDialog", "ExpandNewMessages", bValue);
+    setValueToGroup("ForumDialog", "ExpandNewMessages", value);
+}
+
+bool RshareSettings::getForumOpenAllInNewTab()
+{
+    return valueFromGroup("ForumDialog", "OpenAllInNewTab", true).toBool();
+}
+
+bool RshareSettings::setForumOpenAllInNewTab(bool value)
+{
+    setValueToGroup("ForumDialog", "OpenAllInNewTab", value);
 }
 
 /* time before idle */

retroshare-gui/src/gui/settings/rsharesettings.h

@@ -236,21 +236,23 @@ public:
   void setStatusBarFlag(uint flag, bool enable);
 
   /* Messages */
-  bool getMsgSetToReadOnActivate ();
-  void setMsgSetToReadOnActivate (bool bValue);
+  bool getMsgSetToReadOnActivate();
+  void setMsgSetToReadOnActivate(bool value);
 
   enumMsgOpen getMsgOpen();
   void setMsgOpen(enumMsgOpen value);
 
   /* Forums */
-  bool getForumMsgSetToReadOnActivate ();
-  void setForumMsgSetToReadOnActivate (bool bValue);
-  bool getExpandNewMessages ();
-  void setExpandNewMessages (bool bValue);
+  bool getForumMsgSetToReadOnActivate();
+  void setForumMsgSetToReadOnActivate(bool value);
+  bool getForumExpandNewMessages();
+  void setForumExpandNewMessages(bool value);
+  bool getForumOpenAllInNewTab();
+  bool setForumOpenAllInNewTab(bool value);
 
   /* time before idle */
   uint getMaxTimeBeforeIdle();
-  void setMaxTimeBeforeIdle(uint nValue);
+  void setMaxTimeBeforeIdle(uint value);
 
 protected:
   /** Default constructor. */

retroshare-gui/src/lang/retroshare_en.ts

@@ -4172,6 +4172,14 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New forum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open all forums in new tab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ForumUserNotify</name>
@@ -5885,6 +5893,10 @@ p, li { white-space: pre-wrap; }
         <source>Search Content</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsForumsDialog</name>
@@ -5988,6 +6000,10 @@ p, li { white-space: pre-wrap; }
         <source>On %1, %2 wrote:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Open in new tab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsForumsFillThread</name>
@@ -6315,6 +6331,14 @@ p, li { white-space: pre-wrap; }
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; font-weight:600;&quot;&gt;About RetroShare&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;private and secure decentralized commmunication platform.	&lt;/span&gt;&lt;/p&gt;
@@ -6323,11 +6347,12 @@ p, li { white-space: pre-wrap; }
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Main_Page&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net/forum/&quot;&gt;RetroShare&apos;s Forum&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://sourceforge.net/projects/retroshare/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.lunamutt.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Lunamutt Homepage.&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;Retroshare Wiki&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;RetroShare&apos;s Forum&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;Retroshare Project Page&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;RetroShare Team Blog&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;RetroShare Dev Twiter&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6340,21 +6365,15 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;French&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;:Temet&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Jarek&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Serbian&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;: Kunalagon Umuhanik &amp;lt;kunalagon@gmail.com&amp;gt;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Spanish:  &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Courier New,courier&apos;;&quot;&gt;Manuel Montero &amp;lt;Senpai&amp;gt; &lt;/span&gt;&lt;a href=&quot;http://pagina.de/senpai&amp;amp;gt&quot;&gt;&lt;span style=&quot; font-family:&apos;Courier New,courier&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://pagina.de/senpai&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Swedish:&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; dnylander&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-weight:600;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; font-weight:600;&quot;&gt;About RetroShare&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Keller&lt;/span&gt; &amp;lt;&lt;span style=&quot; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&amp;gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;Maciej Mrug&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>