Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-26 16:05:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added links colors with settings feature

Browse source
This commit is contained in:
defnax 2025-06-26 22:20:38 +02:00
parent 5361bed037
commit 5abefa4664
23 changed files with 170 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
View file

@ -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 "ui_BoardPostDisplayWidget_compact.h"
@ -235,8 +236,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);

4
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
View file

@ -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;
};

7
retroshare-gui/src/gui/Posted/PostedCardView.cpp
View file

@ -229,9 +229,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>");

2
retroshare-gui/src/gui/Posted/PostedCardView.h
View file

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

11
retroshare-gui/src/gui/Posted/PostedItem.cpp
View file

@ -34,6 +34,7 @@
#include "util/HandleRichText.h"
#include "gui/MainWindow.h"
#include "gui/Identity/IdDialog.h"
#include "gui/settings/rsharesettings.h"
#include "PhotoView.h"
#include "gui/Posted/PostedDialog.h"
#include "ui_PostedItem.h"
@ -527,7 +528,6 @@ void PostedItem::fill()
// The only combination that seems to work: load as EncodedUrl, extract toEncoded().
QByteArray urlarray(mPost.mLink.c_str());
QUrl url = QUrl::fromEncoded(urlarray.trimmed());
QString urlstr = "Invalid Link";
QString sitestr = "Invalid Link";
bool urlOkay = url.isValid();
@ -546,9 +546,14 @@ void PostedItem::fill()
if (urlOkay)
{
urlstr = QString("<a href=\"");
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>");

2
retroshare-gui/src/gui/Posted/PostedItem.h
View file

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

2
retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
View file

@ -908,7 +908,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));

9
retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
View file

@ -46,7 +46,7 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="0">
<widget class="QTextBrowser" name="trans_Description">
<widget class="RSTextBrowser" name="trans_Description">
<property name="styleSheet">
<string notr="true"/>
</property>
@ -54,7 +54,7 @@
<string notr="true">&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:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:13pt; 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-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textInteractionFlags">
@ -619,6 +619,11 @@ p, li { white-space: pre-wrap; }
<header>gui/common/RSTabWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>
<header>gui/common/RSTextBrowser.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../icons.qrc"/>

19
retroshare-gui/src/gui/RetroShareLink.cpp
View file

@ -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>
@ -431,6 +432,8 @@ void RetroShareLink::fromUrl(const QUrl& url)
RetroShareLink::RetroShareLink()
{
clear();
linkColor = Settings->getLinkColor();
}
RetroShareLink RetroShareLink::createFile(const QString& name, uint64_t size, const QString& hash)
@ -1132,6 +1135,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>" ;

4
retroshare-gui/src/gui/RetroShareLink.h
View file

@ -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_...)
};

5
retroshare-gui/src/gui/common/MimeTextEdit.cpp
View file

@ -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

1
retroshare-gui/src/gui/common/MimeTextEdit.h
View file

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

5
retroshare-gui/src/gui/common/RSTextBrowser.cpp
View file

@ -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
@ -50,6 +51,10 @@ RSTextBrowser::RSTextBrowser(QWidget *parent) :
highlighter = new RsSyntaxHighlighter(this);
linkColor = Settings->getLinkColor();
QString sheet = QString::fromLatin1("a { text-decoration: underline; color: %1 }").arg(linkColor.name());
document()->setDefaultStyleSheet(sheet);
connect(this, SIGNAL(anchorClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
}

2
retroshare-gui/src/gui/common/RSTextBrowser.h
View file

@ -89,6 +89,8 @@ private:
RSImageBlockWidget *mImageBlockWidget;
bool mLinkClickActive;
RsSyntaxHighlighter *highlighter;
QColor linkColor;
QList<QAction*> mContextMenuActions;
#ifdef RSTEXTBROWSER_CHECKIMAGE_DEBUG
QRect mCursorRectStart;

8
retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
View file

@ -328,7 +328,7 @@ void GxsForumMsgItem::fillParentMessage()
ui->parentFrame->hide();
RetroShareLink linkParent = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_FORUM, mParentMessage.mMeta.mGroupId, mParentMessage.mMeta.mMsgId, QString::fromUtf8(mParentMessage.mMeta.mMsgName.c_str()));
ui->parentSubLabel->setText(linkParent.toHtml());
ui->parentSubLabel->setText(linkParent.toHtmlColored());
ui->parentMsgLabel->setText(RsHtml().formatText(NULL, QString::fromUtf8(mParentMessage.mMsg.c_str()), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
ui->parentNameLabel->setId(mParentMessage.mMeta.mAuthorId);
@ -358,7 +358,7 @@ void GxsForumMsgItem::fillMessage()
QString title = tr("Forum Feed") + ": ";
RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_FORUM, mMessage.mMeta.mGroupId, groupName());
title += link.toHtml();
title += link.toHtmlColored();
ui->titleLabel->setText(title);
setReadStatus(IS_MSG_NEW(mMessage.mMeta.mMsgStatus), IS_MSG_UNREAD(mMessage.mMeta.mMsgStatus) || IS_MSG_NEW(mMessage.mMeta.mMsgStatus));
@ -379,14 +379,14 @@ void GxsForumMsgItem::fillMessage()
ui->currNameLabel->setId(mMessage.mMeta.mAuthorId);
RetroShareLink msgLink = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_FORUM, mMessage.mMeta.mGroupId, mMessage.mMeta.mMsgId, messageName());
ui->currSubLabel->setText(msgLink.toHtml());
ui->currSubLabel->setText(msgLink.toHtmlColored());
if (wasExpanded() || ui->expandFrame->isVisible())
fillExpandFrame();
ui->timestamplabel->setText(DateTime::formatLongDateTime(mMessage.mMeta.mPublishTs));
/* header stuff */
ui->subjectLabel->setText(msgLink.toHtml());
ui->subjectLabel->setText(msgLink.toHtmlColored());
if (mIsHome)
{

2
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
View file

@ -1327,7 +1327,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]");

11
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
View file

@ -397,12 +397,12 @@
</layout>
</item>
<item>
<widget class="QTextBrowser" name="infoDescription">
<widget class="RSTextBrowser" name="infoDescription">
<property name="html">
<string notr="true">&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:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:13pt; 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-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textInteractionFlags">
@ -548,7 +548,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QTextBrowser" name="postDetails_TE">
<widget class="RSTextBrowser" name="postDetails_TE">
<property name="openExternalLinks">
<bool>true</bool>
</property>
@ -679,6 +679,11 @@ p, li { white-space: pre-wrap; }
<extends>QToolButton</extends>
<header>gui/common/SubscribeToolButton.h</header>
</customwidget>
<customwidget>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>
<header>gui/common/RSTextBrowser.h</header>
</customwidget>
<customwidget>
<class>GxsCommentDialog</class>
<extends>QWidget</extends>

2
retroshare-gui/src/gui/msgs/MessageWidget.cpp
View file

@ -704,7 +704,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);
}

19
retroshare-gui/src/gui/settings/ChatPage.cpp
View file

@ -144,6 +144,7 @@ void ChatPage::updateChatSearchParams()
Settings->setChatSearchSearchWithoutLimit(ui.cbSearch_WithoutLimit->isChecked());
Settings->setChatSearchMaxSearchLimitColor(ui.sbSearch_MaxLimitColor->value());
Settings->setChatSearchFoundColor(rgbChatSearchFoundColor);
Settings->setLinkColor(rgbLinkColor);
}
void ChatPage::updateDefaultLobbyIdentity()
@ -435,6 +436,11 @@ ChatPage::load()
pix.fill(rgbChatSearchFoundColor);
ui.btSearch_FoundColor->setIcon(pix);
rgbLinkColor=Settings->getLinkColor();
QPixmap colorpix(24, 24);
colorpix.fill(rgbLinkColor);
ui.linkColorButton->setIcon(colorpix);
whileBlocking(ui.publicChatLoadCount)->setValue(Settings->getPublicChatHistoryCount());
whileBlocking(ui.privateChatLoadCount)->setValue(Settings->getPrivateChatHistoryCount());
whileBlocking(ui.lobbyChatLoadCount)->setValue(Settings->getLobbyChatHistoryCount());
@ -695,6 +701,19 @@ void ChatPage::on_btSearch_FoundColor_clicked()
}
}
void ChatPage::on_linkColorButton_clicked()
{
bool ok;
QRgb color = QColorDialog::getRgba(rgbLinkColor, &ok, window());
if (ok) {
rgbLinkColor=color;
QPixmap pix(24, 24);
pix.fill(color);
ui.linkColorButton->setIcon(pix);
Settings->setLinkColor(rgbLinkColor);
}
}
void ChatPage::distantChatComboBoxChanged(int i)
{
switch(i)

2
retroshare-gui/src/gui/settings/ChatPage.h
View file

@ -56,6 +56,7 @@ class ChatPage : public ConfigPage
void on_cbSearch_WithoutLimit_toggled(bool);
void on_btSearch_FoundColor_clicked();
void on_linkColorButton_clicked();
void distantChatComboBoxChanged(int);
@ -86,6 +87,7 @@ class ChatPage : public ConfigPage
QString historyStyleVariant;
QRgb rgbChatSearchFoundColor;
QRgb rgbLinkColor;
/** Qt Designer generated object */
Ui::ChatPage ui;

52
retroshare-gui/src/gui/settings/ChatPage.ui
View file

@ -266,6 +266,19 @@
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
@ -477,6 +490,45 @@
</item>
</layout>
</item>
<item>
<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="text">
<string>Color of the links</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="linkColorButton">
<property name="toolTip">
<string>Set link color</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>312</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="rightVSpacer">
<property name="orientation">

9
retroshare-gui/src/gui/settings/rsharesettings.cpp
View file

@ -1222,6 +1222,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()
{

3
retroshare-gui/src/gui/settings/rsharesettings.h
View file

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