Merge af6ce15ba7 into 6a5e116725

retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp

@@ -34,6 +34,7 @@
 #include "util/qtthreadsutils.h"
 #include "util/HandleRichText.h"
 #include "gui/Identity/IdDialog.h"
+#include "gui/settings/rsharesettings.h"
 #include "gui/MainWindow.h"
 #include "util/DateTime.h"
 
@@ -234,8 +235,10 @@ void BoardPostDisplayWidgetBase::baseSetup()
         if (urlOkay)
         {
             QString siteurl = url.toEncoded();
+            linkColor = Settings->getLinkColor();
 
-            label->setStyleSheet("text-decoration: underline; color:#2255AA;");
+            QString colorstring = QString("%1;").arg(linkColor.name());
+            label->setStyleSheet("text-decoration: underline; color:" + colorstring );
             label->setCursor(QCursor(Qt::PointingHandCursor));
             label->setToolTip(siteurl);
 

retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h

@@ -107,6 +107,8 @@ signals:
 protected:
 	RsPostedPost mPost;
     uint8_t      mDisplayFlags;
+private:
+	QColor linkColor;
 };
 
 class BoardPostDisplayWidget_compact : public BoardPostDisplayWidgetBase
@@ -146,6 +148,8 @@ protected:
     void setup() override;    // to be overloaded by the different views
 
 private:
+	QColor linkColor;
+
     /** Qt Designer generated object */
     Ui::BoardPostDisplayWidget_compact *ui;
 };

retroshare-gui/src/gui/Posted/PostedCardView.cpp

@@ -228,9 +228,14 @@ void PostedCardView::fill()
 		
 		if (urlOkay)
 		{
+			linkColor = Settings->getLinkColor();
+			QString colorstring = QString("%1;").arg(linkColor.name());
+
 			QString urlstr =  QString("<a href=\"");
 			urlstr += QString(url.toEncoded());
-			urlstr += QString("\" ><span style=\" text-decoration: underline; color:#2255AA;\"> ");
+			urlstr += QString("\" ><span style=\" text-decoration: underline; color:");
+			urlstr += colorstring;
+			urlstr += QString("\"> ");
 			urlstr += messageName();
 			urlstr += QString(" </span></a>");
 

retroshare-gui/src/gui/Posted/PostedCardView.h

@@ -57,6 +57,8 @@ protected:
 	void toggleNotes() override;
 
 private:
+	QColor linkColor;
+
 	/** Qt Designer generated object */
 	Ui::PostedCardView *ui;
 };

retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp

@@ -911,7 +911,7 @@ void PostedListWidgetWithModel::insertBoardDetails(const RsPostedGroup& group)
 	ui->infoAdministrator->setId(group.mMeta.mAuthorId) ;
 
 	link = RetroShareLink::createMessage(group.mMeta.mAuthorId, "");
-	ui->infoAdministrator->setText(link.toHtml());
+	ui->infoAdministrator->setText(link.toHtmlColored());
 
 	ui->createdinfolabel->setText(DateTime::formatLongDateTime(group.mMeta.mPublishTs));
 

retroshare-gui/src/gui/RetroShareLink.cpp

@@ -36,6 +36,7 @@
 #include "msgs/MessageComposer.h"
 #include "Posted/PostedDialog.h"
 #include "util/misc.h"
+#include "gui/settings/rsharesettings.h"
 
 #include <retroshare/rsfiles.h>
 #include <retroshare/rsgxsforums.h>
@@ -430,6 +431,7 @@ void RetroShareLink::fromUrl(const QUrl& url)
 RetroShareLink::RetroShareLink()
 {
 	clear();
+	linkColor = Settings->getLinkColor();
 }
 
 RetroShareLink RetroShareLink::createFile(const QString& name, uint64_t size, const QString& hash)
@@ -1131,6 +1133,22 @@ QString RetroShareLink::toHtml() const
 	return html;
 }
 
+QString RetroShareLink::toHtmlColored() const
+{
+	//linkColor = Settings->getLinkColor();
+	QString colorstring = QString("%1;").arg(linkColor.name());
+
+	QString html = "<a href=\"" + toString() + "\"";
+
+	QString linkTitle = title();
+	if (!linkTitle.isEmpty()) {
+		html += " title=\"" + linkTitle + "\"";
+	}
+	html += "style=\"color:" + colorstring + "\"> " + niceName() + "</a>" ;
+
+	return html;
+}
+
 QString RetroShareLink::toHtmlFull() const
 {
 	return QString("<a href=\"") + toString() + "\">" + toString() + "</a>" ;

retroshare-gui/src/gui/RetroShareLink.h

@@ -41,6 +41,7 @@
 #include <QString>
 #include <QUrl>
 #include <QVector>
+#include <QColor>
 
 #include <stdint.h>
 
@@ -138,6 +139,8 @@ class RetroShareLink
 		
 		QString toHtmlSize() const ;
 
+		QString toHtmlColored() const;
+
 		QUrl toUrl() const ;
 
 		bool operator==(const RetroShareLink& l) const { return _type == l._type && _hash == l._hash ; }
@@ -176,6 +179,7 @@ class RetroShareLink
 		time_t   _time_stamp ; 				// time stamp at which the link will expire.
 		QString  _radix_group_data;
 		uint32_t _count ;
+		QColor linkColor;
 
 		unsigned int _subType; // for general use as sub type for _type (RSLINK_SUBTYPE_...)
 };

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

@@ -33,6 +33,7 @@
 #include "util/HandleRichText.h"
 #include "gui/RetroShareLink.h"
 #include "util/imageutil.h"
+#include "gui/settings/rsharesettings.h"
 
 #include <retroshare/rspeers.h>
 
@@ -44,6 +45,10 @@ MimeTextEdit::MimeTextEdit(QWidget *parent)
 	mForceCompleterShowNextKeyEvent = false;
 	highliter = new RsSyntaxHighlighter(this);
 	mOnlyPlainText = false;
+
+	linkColor = Settings->getLinkColor();
+	QString sheet = QString::fromLatin1("a { text-decoration: underline; color: %1 }").arg(linkColor.name());
+	document()->setDefaultStyleSheet(sheet);
 }
 
 bool MimeTextEdit::canInsertFromMimeData(const QMimeData* source) const

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

@@ -91,6 +91,7 @@ private:
 	RsSyntaxHighlighter *highliter;
 	bool mOnlyPlainText;
 	int mMaxBytes = -1;	//limit content size, for pasting images
+	QColor linkColor;
 };
 
 #endif // MIMETEXTEDIT_H

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

@@ -23,6 +23,7 @@
 #include "RSImageBlockWidget.h"
 #include "gui/common/FilesDefs.h"
 #include "util/imageutil.h"
+#include "gui/settings/rsharesettings.h"
 
 #include <retroshare/rsinit.h> //To get RsAccounts
 
@@ -51,6 +52,8 @@ RSTextBrowser::RSTextBrowser(QWidget *parent) :
 
 	highlighter = new RsSyntaxHighlighter(this);
 
+	updateLinkColor();
+
 	connect(this, SIGNAL(anchorClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
 }
 
@@ -360,3 +363,18 @@ void RSTextBrowser::copyImage()
 	QTextCursor cursor = cursorForPosition(point);
 	ImageUtil::copyImage(window(), cursor);
 }
+
+void RSTextBrowser::showEvent(QShowEvent *event)
+{
+	if (!event->spontaneous()) {
+		updateLinkColor();
+	}
+}
+
+void RSTextBrowser::updateLinkColor()
+{
+	linkColor = Settings->getLinkColor();
+	QString sheet = QString::fromLatin1("a { text-decoration: underline; color: %1 }").arg(linkColor.name());
+	document()->setDefaultStyleSheet(sheet);
+
+}

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

@@ -60,6 +60,8 @@ public:
 
 	QMenu *createStandardContextMenuFromPoint(const QPoint &widgetPos);
 
+	virtual void showEvent(QShowEvent *) ;
+
 Q_SIGNALS:
 	void calculateContextMenuActions();
 
@@ -74,6 +76,7 @@ private slots:
 	void viewSource();
 	void saveImage();
 	void copyImage();
+	void updateLinkColor();
 
 protected:
 	void paintEvent(QPaintEvent *event);
@@ -89,6 +92,8 @@ private:
 	RSImageBlockWidget *mImageBlockWidget;
 	bool mLinkClickActive;
 	RsSyntaxHighlighter *highlighter;
+	QColor linkColor;
+
 	QList<QAction*> mContextMenuActions;
 #ifdef RSTEXTBROWSER_CHECKIMAGE_DEBUG
 	QRect mCursorRectStart;

retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp

@@ -1330,7 +1330,7 @@ void GxsChannelPostsWidgetWithModel::insertChannelDetails(const RsGxsChannelGrou
     if(!group.mMeta.mAuthorId.isNull())
     {
         RetroShareLink link = RetroShareLink::createMessage(group.mMeta.mAuthorId, "");
-        ui->infoAdministrator->setText(link.toHtml());
+        ui->infoAdministrator->setText(link.toHtmlColored());
     }
     else
         ui->infoAdministrator->setText("[No contact author]");

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

@@ -705,7 +705,7 @@ void MessageWidget::fill(const std::string &msgId)
     }
     else
     {
-		ui.fromText->setText(link.toHtml());
+		ui.fromText->setText(link.toHtmlColored());
 		ui.fromText->setToolTip(tooltip_string) ;
 		if (toolButtonReply) toolButtonReply->setEnabled(true);
 	}

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

@@ -39,6 +39,7 @@
 #include "util/misc.h"
 
 #include <QAbstractItemView>
+#include <QColorDialog>
 #include <QComboBox>
 #include <QCheckBox>
 #include <QDir>
@@ -363,6 +364,11 @@ void AppearancePage::load()
 	whileBlocking(ui.checkBoxShowSystrayOnStatus)->setChecked(Settings->valueFromGroup("StatusBar", "ShowSysTrayOnStatusBar", QVariant(false)).toBool());
 
 	whileBlocking(ui.minimumFontSize_SB)->setValue(Settings->getFontSize());
+	
+	rgbLinkColor=Settings->getLinkColor();
+	QPixmap colorpix(24, 24);
+	colorpix.fill(rgbLinkColor);
+	ui.linkColorButton->setIcon(colorpix);
 }
 
 void AppearancePage::updateFontSize()
@@ -371,3 +377,25 @@ void AppearancePage::updateFontSize()
 
 	RsGUIEventManager::getInstance()->notifySettingsChanged();
 }
+
+void AppearancePage::on_linkColorButton_clicked()
+{
+	QColor color = QColorDialog::getColor(QColor::fromRgba(rgbLinkColor), window(), "", QColorDialog::ShowAlphaChannel);
+	if (color.isValid()) {
+		rgbLinkColor = color.rgba();
+		QPixmap pix(24, 24);
+		pix.fill(color);
+		ui.linkColorButton->setIcon(pix);
+		Settings->setLinkColor(rgbLinkColor);
+	}
+}
+
+void AppearancePage::on_resetButton_clicked()
+{
+	QRgb color  = QString::number(QColor(3, 155, 198).rgba()).toUInt();
+	defaultColor = color;
+	QPixmap pix(24, 24);
+	pix.fill(color);
+	ui.linkColorButton->setIcon(pix);
+	Settings->setLinkColor(defaultColor);
+}

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

@@ -73,9 +73,15 @@ private slots:
 	void updateStyle() ;
 	void updateFontSize();
 
+	void on_linkColorButton_clicked();
+	void on_resetButton_clicked();
+
 private:
 	void switch_status(MainWindow::StatusElement s,const QString& key,bool b);
 
+	QRgb rgbLinkColor;
+	QRgb defaultColor;
+
 	/** Qt Designer generated object */
 	Ui::AppearancePage ui;
 };

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

@@ -71,7 +71,92 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="1" column="0" colspan="2">
+    <widget class="QGroupBox" name="grpStyle">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>64</height>
+      </size>
+     </property>
+     <property name="contextMenuPolicy">
+      <enum>Qt::NoContextMenu</enum>
+     </property>
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="title">
+      <string>Style</string>
+     </property>
+     <layout class="QGridLayout" name="grpStyleGLayout">
+      <item row="0" column="0">
+       <widget class="RSComboBox" name="cmboStyle">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Choose RetroShare's interface style</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <spacer name="grpStyleHSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>215</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QGroupBox" name="grpStyleSheet">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>64</height>
+      </size>
+     </property>
+     <property name="title">
+      <string>Style Sheet</string>
+     </property>
+     <layout class="QGridLayout" name="grpStyleSheetGLayout">
+      <item row="0" column="0">
+       <widget class="RSComboBox" name="cmboStyleSheet">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <spacer name="grpStyleSheetHSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>215</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0" rowspan="2">
     <widget class="QGroupBox" name="grpToolBar">
      <property name="minimumSize">
       <size>
@@ -289,8 +374,8 @@
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>188</width>
+          <width>20</width>
-          <height>96</height>
+          <height>40</height>
          </size>
         </property>
        </spacer>
@@ -298,7 +383,62 @@
      </layout>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="4" column="1">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Link Color</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_17">
+      <item>
+       <widget class="QLabel" name="label_10">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Color of the links</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="linkColorButton">
+        <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>Set link color</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="resetButton">
+        <property name="toolTip">
+         <string>Reset to default color</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../icons.qrc">
+          <normaloff>:/icons/textedit/undo.png</normaloff>:/icons/textedit/undo.png</iconset>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
     <widget class="QGroupBox" name="grpStatus">
      <property name="title">
       <string>Status Bar</string>
@@ -407,7 +547,7 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2">
+   <item row="6" column="0" colspan="2">
     <spacer name="AppearancePageVSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -420,91 +560,6 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QGroupBox" name="grpStyle">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>64</height>
-      </size>
-     </property>
-     <property name="contextMenuPolicy">
-      <enum>Qt::NoContextMenu</enum>
-     </property>
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="title">
-      <string>Style</string>
-     </property>
-     <layout class="QGridLayout" name="grpStyleGLayout">
-      <item row="0" column="0">
-       <widget class="RSComboBox" name="cmboStyle">
-        <property name="minimumSize">
-         <size>
-          <width>150</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Choose RetroShare's interface style</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <spacer name="grpStyleHSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>215</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QGroupBox" name="grpStyleSheet">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>64</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Style Sheet</string>
-     </property>
-     <layout class="QGridLayout" name="grpStyleSheetGLayout">
-      <item row="0" column="0">
-       <widget class="RSComboBox" name="cmboStyleSheet">
-        <property name="minimumSize">
-         <size>
-          <width>150</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <spacer name="grpStyleSheetHSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>215</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -514,6 +569,8 @@
    <header>gui/common/RSComboBox.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../icons.qrc"/>
+ </resources>
  <connections/>
 </ui>

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

@@ -1225,6 +1225,15 @@ void RshareSettings::setMessageFontSize(int value)
 	setValueToGroup("Message", "FontSize", value);
 }
 
+void RshareSettings::setLinkColor(QRgb rgbValue)
+{
+	setValueToGroup("Chat", "LinkColor", QString::number(rgbValue));
+}
+QRgb RshareSettings::getLinkColor()
+{
+	return valueFromGroup("Chat", "LinkColor", QString::number(QColor(3, 155, 198).rgba())).toUInt();
+}
+
 #ifdef RS_JSONAPI
 bool RshareSettings::getJsonApiEnabled()
 {

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

@@ -381,6 +381,9 @@ public:
     int getMessageFontSize();
     void setMessageFontSize(int value);
 
+    void setLinkColor(QRgb rgbValue);
+    QRgb getLinkColor();
+
 #ifdef RS_JSONAPI
 	bool getJsonApiEnabled();
 	void setJsonApiEnabled(bool enabled);