Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-20 21:29:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ef886b9d5b into 8c26fa879d

Browse source
This commit is contained in:
defnax 2025-07-13 15:06:55 +02:00 • committed by GitHub
commit 2b2899e0cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -236,7 +236,7 @@ void BoardPostDisplayWidgetBase::baseSetup()
{ {
QString siteurl = url.toEncoded(); QString siteurl = url.toEncoded();
label->setStyleSheet("text-decoration: underline; color:#2255AA;"); label->setStyleSheet("text-decoration: underline; color:#039bc6;");
label->setCursor(QCursor(Qt::PointingHandCursor)); label->setCursor(QCursor(Qt::PointingHandCursor));
label->setToolTip(siteurl); label->setToolTip(siteurl);

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

@ -231,12 +231,12 @@ void PostedCardView::fill()
{ {
QString urlstr = QString("<a href=\""); QString urlstr = QString("<a href=\"");
urlstr += QString(url.toEncoded()); urlstr += QString(url.toEncoded());
urlstr += QString("\" ><span style=\" text-decoration: underline; color:#2255AA;\"> "); urlstr += QString("\" ><span style=\" text-decoration: underline; color:#039bc6;\"> ");
urlstr += messageName(); urlstr += messageName();
urlstr += QString(" </span></a>"); urlstr += QString(" </span></a>");
QString siteurl = url.toEncoded(); QString siteurl = url.toEncoded();
sitestr = QString("<a href=\"%1\" ><span style=\" text-decoration: underline; color:#0079d3;\"> %2 </span></a>").arg(siteurl).arg(siteurl); sitestr = QString("<a href=\"%1\" ><span style=\" text-decoration: underline; color:#039bc6;\"> %2 </span></a>").arg(siteurl).arg(siteurl);
ui->titleLabel->setText(urlstr); ui->titleLabel->setText(urlstr);
}else }else

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

@ -548,12 +548,12 @@ void PostedItem::fill()
{ {
urlstr = QString("<a href=\""); urlstr = QString("<a href=\"");
urlstr += QString(url.toEncoded()); urlstr += QString(url.toEncoded());
urlstr += QString("\" ><span style=\" text-decoration: underline; color:#2255AA;\"> "); urlstr += QString("\" ><span style=\" text-decoration: underline; color:#039bc6;\"> ");
urlstr += messageName(); urlstr += messageName();
urlstr += QString(" </span></a>"); urlstr += QString(" </span></a>");
QString siteurl = url.toEncoded(); QString siteurl = url.toEncoded();
sitestr = QString("<a href=\"%1\" ><span style=\" text-decoration: underline; color:#0079d3;\"> %2 </span></a>").arg(siteurl).arg(siteurl); sitestr = QString("<a href=\"%1\" ><span style=\" text-decoration: underline; color:#039bc6;\"> %2 </span></a>").arg(siteurl).arg(siteurl);
ui->titleLabel->setText(urlstr); ui->titleLabel->setText(urlstr);
}else }else

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

@ -46,7 +46,7 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="0"> <item row="2" column="0">
<widget class="QTextBrowser" name="trans_Description"> <widget class="RSTextBrowser" name="trans_Description">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
@ -619,6 +619,11 @@ p, li { white-space: pre-wrap; }
<header>gui/common/RSTabWidget.h</header> <header>gui/common/RSTabWidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>
<header>gui/common/RSTextBrowser.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../icons.qrc"/> <include location="../icons.qrc"/>

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

@ -1127,14 +1127,14 @@ QString RetroShareLink::toHtml() const
if (!linkTitle.isEmpty()) { if (!linkTitle.isEmpty()) {
html += " title=\"" + linkTitle + "\""; html += " title=\"" + linkTitle + "\"";
} }
html += ">" + niceName() + "</a>" ; html += "style=\"color:#039bc6;\">" + niceName() + "</a>" ;
return html; return html;
} }
QString RetroShareLink::toHtmlFull() const QString RetroShareLink::toHtmlFull() const
{ {
return QString("<a href=\"") + toString() + "\">" + toString() + "</a>" ; return QString("<a href=\"") + toString() + "style=\"color:039bc6;\">" + toString() + "</a>" ;
} }
QString RetroShareLink::toHtmlSize() const QString RetroShareLink::toHtmlSize() const
@ -1152,7 +1152,8 @@ QString RetroShareLink::toHtmlSize() const
size += QString(" [%1]").arg(misc::friendlyUnit(collection.size())); size += QString(" [%1]").arg(misc::friendlyUnit(collection.size()));
} }
} }
QString link = QString("<a href=\"%1\">%2</a> <font color=\"blue\">%3</font>").arg(toString()).arg(name()).arg(size); QString link = QString("<a href=\"%1\">%2</a> <font color=\"#039bc6\">%3</font>").arg(toString()).arg(name()).arg(size);
return link; return link;
} }

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

@ -44,6 +44,10 @@ MimeTextEdit::MimeTextEdit(QWidget *parent)
mForceCompleterShowNextKeyEvent = false; mForceCompleterShowNextKeyEvent = false;
highliter = new RsSyntaxHighlighter(this); highliter = new RsSyntaxHighlighter(this);
mOnlyPlainText = false; mOnlyPlainText = false;
QColor linkColor = QColor(3, 155, 198);
QString sheet = QString::fromLatin1("a { text-decoration: underline; color: %1 }").arg(linkColor.name());
document()->setDefaultStyleSheet(sheet);
} }
bool MimeTextEdit::canInsertFromMimeData(const QMimeData* source) const bool MimeTextEdit::canInsertFromMimeData(const QMimeData* source) const

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

@ -50,6 +50,10 @@ RSTextBrowser::RSTextBrowser(QWidget *parent) :
highlighter = new RsSyntaxHighlighter(this); highlighter = new RsSyntaxHighlighter(this);
QColor linkColor = QColor(3, 155, 198);
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))); connect(this, SIGNAL(anchorClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
} }

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

@ -397,7 +397,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QTextBrowser" name="infoDescription"> <widget class="RSTextBrowser" name="infoDescription">
<property name="html"> <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; <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; &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;
@ -548,7 +548,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTextBrowser" name="postDetails_TE"> <widget class="RSTextBrowser" name="postDetails_TE">
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -685,6 +685,11 @@ p, li { white-space: pre-wrap; }
<header>gui/gxs/GxsCommentDialog.h</header> <header>gui/gxs/GxsCommentDialog.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>
<header>gui/common/RSTextBrowser.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../icons.qrc"/> <include location="../icons.qrc"/>