The_Great_Archive/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2026-09-12 19:50:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3261 from RetroShare/revert-3254-colored-links-v5

Browse Source 
Revert "Added colored links feature"
This commit is contained in:
csoler 2026-07-03 23:22:20 +02:00 committed by GitHub
commit af44d4c0e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 13 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,6 @@
#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"
#include <QMovie>
@ -237,10 +236,8 @@ void BoardPostDisplayWidgetBase::baseSetup()
if (urlOkay)
{
QString siteurl = url.toEncoded();
linkColor = Settings->getLinkColor();
QString colorstring = QString("%1;").arg(linkColor.name());
label->setStyleSheet("text-decoration: underline; color:" + colorstring );
label->setStyleSheet("text-decoration: underline; color:#2255AA;");
label->setCursor(QCursor(Qt::PointingHandCursor));
label->setToolTip(siteurl);

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

@ -109,8 +109,6 @@ signals:
protected:
RsPostedPost mPost;
uint8_t mDisplayFlags;
private:
QColor linkColor;
};
class BoardPostDisplayWidget_compact : public BoardPostDisplayWidgetBase
@ -153,8 +151,6 @@ 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

@ -230,14 +230,9 @@ 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:");
urlstr += colorstring;
urlstr += QString("\"> ");
urlstr += QString("\" ><span style=\" text-decoration: underline; color:#2255AA;\"> ");
urlstr += messageName();
urlstr += QString(" </span></a>");

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

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

2
retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
View File

@ -33,7 +33,6 @@
#include "util/misc.h"
#include "util/qtthreadsutils.h"
#include "util/RichTextEdit.h"
#include "util/HandleRichText.h"
#include "gui/feeds/SubFileItem.h"
#include "util/rsdir.h"
@ -168,7 +167,6 @@ void PostedCreatePostDialog::createPost()
if(!ui->RichTextEditWidget->toPlainText().trimmed().isEmpty()) {
QString text;
text = ui->RichTextEditWidget->toHtml();
RsHtml::optimizeHtml(text);
post.mNotes = std::string(text.toUtf8());
}

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

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

18
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -40,7 +40,6 @@
#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>
@ -468,7 +467,6 @@ void RetroShareLink::fromUrl(const QUrl& url)
RetroShareLink::RetroShareLink()
{
clear();
linkColor = Settings->getLinkColor();
}
RetroShareLink RetroShareLink::createFile(const QString& name, uint64_t size, const QString& hash)
@ -1231,22 +1229,6 @@ 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

@ -42,7 +42,6 @@
#include <QString>
#include <QUrl>
#include <QVector>
#include <QColor>
#include <stdint.h>
@ -143,8 +142,6 @@ class RetroShareLink
QString toHtmlSize() const ;
QString toHtmlColored() const;
QUrl toUrl() const ;
bool operator==(const RetroShareLink& l) const { return _type == l._type && _hash == l._hash ; }
@ -183,7 +180,6 @@ 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_...)
};

45
retroshare-gui/src/gui/common/MimeTextEdit.cpp
View File

@ -22,7 +22,6 @@
#include <QApplication>
#include <QClipboard>
#include <QMimeData>
#include <QTextDocument>
#include <QTextDocumentFragment>
#include <QCompleter>
#include <QAbstractItemView>
@ -34,8 +33,6 @@
#include "util/HandleRichText.h"
#include "gui/RetroShareLink.h"
#include "util/imageutil.h"
#include "gui/settings/rsharesettings.h"
#include "gui/RsGUIEventManager.h"
#include <retroshare/rspeers.h>
@ -47,9 +44,6 @@ MimeTextEdit::MimeTextEdit(QWidget *parent)
mForceCompleterShowNextKeyEvent = false;
highliter = new RsSyntaxHighlighter(this);
mOnlyPlainText = false;
updateLinkColor();
connect(RsGUIEventManager::getInstance(), SIGNAL(settingsChanged()), this, SLOT(updateLinkColor()));
}
bool MimeTextEdit::canInsertFromMimeData(const QMimeData* source) const
@ -335,42 +329,3 @@ void MimeTextEdit::copyImage()
QTextCursor cursor = cursorForPosition(point);
ImageUtil::copyImage(window(), cursor);
}
void MimeTextEdit::updateLinkColor()
{
linkColor = Settings->getLinkColor();
QPalette p = palette();
p.setColor(QPalette::Link, linkColor);
p.setColor(QPalette::LinkVisited, linkColor);
setPalette(p);
if (document()) {
document()->setDefaultStyleSheet(QString("a { color: %1; }").arg(linkColor.name()));
}
}
QString MimeTextEdit::toHtml(const QByteArray &encoding) const
{
QTextDocument *doc = document();
QString oldSheet;
if (doc) {
oldSheet = doc->defaultStyleSheet();
doc->setDefaultStyleSheet("");
}
QString html;
if (encoding.isEmpty()) {
html = QTextEdit::toHtml();
} else {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
// Qt 6: toHtml() takes no arguments
html = doc->toHtml();
#else
// Qt 5: toHtml() accepts encoding parameter
html = doc->toHtml(encoding);
#endif
}
if (doc) {
doc->setDefaultStyleSheet(oldSheet);
}
return html;
}

3
retroshare-gui/src/gui/common/MimeTextEdit.h
View File

@ -53,7 +53,6 @@ public:
bool onlyPlainText() const {return mOnlyPlainText;}
void setMaxBytes(int limit) {mMaxBytes = limit;}
QString toHtml(const QByteArray &encoding = QByteArray()) const;
public slots:
void setTextColorQuote(QColor textColorQuote) { highliter->setTextColorQuote(textColorQuote);}
@ -78,7 +77,6 @@ private slots:
void spoiler();
void saveImage();
void copyImage();
void updateLinkColor();
private:
QString textUnderCursor() const;
@ -93,7 +91,6 @@ private:
RsSyntaxHighlighter *highliter;
bool mOnlyPlainText;
int mMaxBytes = -1; //limit content size, for pasting images
QColor linkColor;
};
#endif // MIMETEXTEDIT_H

56
retroshare-gui/src/gui/common/RSTextBrowser.cpp
View File

@ -23,8 +23,6 @@
#include "RSImageBlockWidget.h"
#include "gui/common/FilesDefs.h"
#include "util/imageutil.h"
#include "gui/settings/rsharesettings.h"
#include "gui/RsGUIEventManager.h"
#include <retroshare/rsinit.h> //To get RsAccounts
@ -35,7 +33,6 @@
#include <QMenu>
#include <QPainter>
#include <QPlainTextEdit>
#include <QTextDocument>
#include <QTextDocumentFragment>
#include <QScrollBar>
#include <QRegExp>
@ -54,10 +51,7 @@ RSTextBrowser::RSTextBrowser(QWidget *parent) :
highlighter = new RsSyntaxHighlighter(this);
updateLinkColor();
connect(this, SIGNAL(anchorClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
connect(RsGUIEventManager::getInstance(), SIGNAL(settingsChanged()), this, SLOT(updateLinkColor()));
}
void RSTextBrowser::append(const QString &text)
@ -366,53 +360,3 @@ 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();
QPalette p = palette();
p.setColor(QPalette::Link, linkColor);
p.setColor(QPalette::LinkVisited, linkColor);
setPalette(p);
if (document()) {
document()->setDefaultStyleSheet(QString("a { color: %1; }").arg(linkColor.name()));
if (!document()->isEmpty()) {
QString html = document()->toHtml();
document()->setHtml(html);
}
}
}
QString RSTextBrowser::toHtml(const QByteArray &encoding) const
{
QTextDocument *doc = document();
QString oldSheet;
if (doc) {
oldSheet = doc->defaultStyleSheet();
doc->setDefaultStyleSheet("");
}
QString html;
if (encoding.isEmpty()) {
html = QTextBrowser::toHtml();
} else {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
// Qt 6: toHtml() takes no arguments
html = doc->toHtml();
#else
// Qt 5: toHtml() accepts encoding parameter
html = doc->toHtml(encoding);
#endif
}
if (doc) {
doc->setDefaultStyleSheet(oldSheet);
}
return html;
}

6
retroshare-gui/src/gui/common/RSTextBrowser.h
View File

@ -57,12 +57,9 @@ public:
QColor textColorQuote() const { return highlighter->textColorQuote();}
QVariant textColorQuotes() const { return highlighter->textColorQuotes();}
bool getShowImages() const { return mShowImages; }
QString toHtml(const QByteArray &encoding = QByteArray()) const;
QMenu *createStandardContextMenuFromPoint(const QPoint &widgetPos);
virtual void showEvent(QShowEvent *) ;
Q_SIGNALS:
void calculateContextMenuActions();
@ -77,7 +74,6 @@ private slots:
void viewSource();
void saveImage();
void copyImage();
void updateLinkColor();
protected:
void paintEvent(QPaintEvent *event);
@ -93,8 +89,6 @@ private:
RSImageBlockWidget *mImageBlockWidget;
bool mLinkClickActive;
RsSyntaxHighlighter *highlighter;
QColor linkColor;
QList<QAction*> mContextMenuActions;
#ifdef RSTEXTBROWSER_CHECKIMAGE_DEBUG
QRect mCursorRectStart;

1
retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
View File

@ -729,7 +729,6 @@ void CreateGxsChannelMsg::sendMsg()
QString text;
text = RichTextEditWidget->toHtml();
RsHtml::optimizeHtml(text);
std::string msg = std::string(text.toUtf8());
std::list<RsGxsFile> files;

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

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

4
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View File

@ -2422,10 +2422,10 @@ bool MessageComposer::fileSave()
QTextStream ts(&file);
#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
ts.setEncoding(QStringConverter::Utf8);
ts << ui.msgText->toHtml();
ts << ui.msgText->document()->toHtml();
#else
ts.setCodec(QTextCodec::codecForName("UTF-8"));
ts << ui.msgText->toHtml("UTF-8");
ts << ui.msgText->document()->toHtml("UTF-8");
#endif
std::cerr << "Setting modified 002 = false" << std::endl;
ui.msgText->document()->setModified(false);

6
retroshare-gui/src/gui/msgs/MessageWidget.cpp
View File

@ -707,7 +707,7 @@ void MessageWidget::fill(const std::string &msgId)
}
else
{
ui.fromText->setText(link.toHtmlColored());
ui.fromText->setText(link.toHtml());
ui.fromText->setToolTip(tooltip_string) ;
if (toolButtonReply) toolButtonReply->setEnabled(true);
}
@ -807,10 +807,10 @@ void MessageWidget::saveAs()
QTextStream ts(&file);
#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
ts.setEncoding(QStringConverter::Utf8);
ts << ui.msgText->toHtml();
ts << ui.msgText->document()->toHtml();
#else
ts.setCodec(QTextCodec::codecForName("UTF-8"));
ts << ui.msgText->toHtml("UTF-8");
ts << ui.msgText->document()->toHtml("UTF-8");
#endif
ui.msgText->document()->setModified(false);
}

28
retroshare-gui/src/gui/settings/AppearancePage.cpp
View File

@ -40,7 +40,6 @@
#include "util/DateTime.h"
#include <QAbstractItemView>
#include <QColorDialog>
#include <QComboBox>
#include <QCheckBox>
#include <QDir>
@ -399,11 +398,6 @@ 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()
@ -421,25 +415,3 @@ void AppearancePage::updateDateFormat()
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(118, 118, 255).rgba()).toUInt();
defaultColor = color;
rgbLinkColor = color;
QPixmap pix(24, 24);
pix.fill(color);
ui.linkColorButton->setIcon(pix);
Settings->setLinkColor(defaultColor);
}

6
retroshare-gui/src/gui/settings/AppearancePage.h
View File

@ -74,15 +74,9 @@ 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;
};

65
retroshare-gui/src/gui/settings/AppearancePage.ui
View File

@ -109,7 +109,7 @@
</widget>
</item>
<item row="3" column="0" rowspan="2">
<item row="3" column="0">
<widget class="QGroupBox" name="grpToolBar">
<property name="minimumSize">
<size>
@ -336,62 +336,7 @@
</layout>
</widget>
</item>
<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">
<item row="4" column="0" colspan="2">
<widget class="QGroupBox" name="grpStatus">
<property name="title">
<string>Status Bar</string>
@ -500,7 +445,7 @@
</layout>
</widget>
</item>
<item row="6" column="0" colspan="2">
<item row="5" column="0" colspan="2">
<spacer name="AppearancePageVSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -607,8 +552,6 @@
<header>gui/common/RSComboBox.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

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

@ -1243,15 +1243,6 @@ 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(118, 118, 255).rgba())).toUInt();
}
#ifdef RS_JSONAPI
bool RshareSettings::getJsonApiEnabled()
{

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

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