diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp index 8626da77e..9155d6761 100644 --- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp +++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp @@ -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 @@ -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); diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h index fc026f817..5c10af55d 100644 --- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h +++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h @@ -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; }; diff --git a/retroshare-gui/src/gui/Posted/PostedCardView.cpp b/retroshare-gui/src/gui/Posted/PostedCardView.cpp index 704db692e..1599197d9 100644 --- a/retroshare-gui/src/gui/Posted/PostedCardView.cpp +++ b/retroshare-gui/src/gui/Posted/PostedCardView.cpp @@ -230,14 +230,9 @@ void PostedCardView::fill() if (urlOkay) { - linkColor = Settings->getLinkColor(); - QString colorstring = QString("%1;").arg(linkColor.name()); - QString urlstr = QString(" "); + urlstr += QString("\" > "); urlstr += messageName(); urlstr += QString(" "); diff --git a/retroshare-gui/src/gui/Posted/PostedCardView.h b/retroshare-gui/src/gui/Posted/PostedCardView.h index aeb0f19b6..0f4f5f2ab 100644 --- a/retroshare-gui/src/gui/Posted/PostedCardView.h +++ b/retroshare-gui/src/gui/Posted/PostedCardView.h @@ -57,8 +57,6 @@ protected: void toggleNotes() override; private: - QColor linkColor; - /** Qt Designer generated object */ Ui::PostedCardView *ui; }; diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp index b4ce19448..2c0227cf1 100644 --- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp @@ -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()); } diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp index 80c98e4c5..c5ed31892 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp +++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp @@ -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)); diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp index c0aee2c01..35fc3d836 100644 --- a/retroshare-gui/src/gui/RetroShareLink.cpp +++ b/retroshare-gui/src/gui/RetroShareLink.cpp @@ -40,7 +40,6 @@ #include "msgs/MessageComposer.h" #include "Posted/PostedDialog.h" #include "util/misc.h" -#include "gui/settings/rsharesettings.h" #include #include @@ -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 = " " + niceName() + "" ; - - return html; -} - QString RetroShareLink::toHtmlFull() const { return QString("" + toString() + "" ; diff --git a/retroshare-gui/src/gui/RetroShareLink.h b/retroshare-gui/src/gui/RetroShareLink.h index 957b85161..2b25e2a2d 100644 --- a/retroshare-gui/src/gui/RetroShareLink.h +++ b/retroshare-gui/src/gui/RetroShareLink.h @@ -42,7 +42,6 @@ #include #include #include -#include #include @@ -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_...) }; diff --git a/retroshare-gui/src/gui/common/MimeTextEdit.cpp b/retroshare-gui/src/gui/common/MimeTextEdit.cpp index 5fc3a8cd1..78ddd00a6 100644 --- a/retroshare-gui/src/gui/common/MimeTextEdit.cpp +++ b/retroshare-gui/src/gui/common/MimeTextEdit.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -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 @@ -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; -} diff --git a/retroshare-gui/src/gui/common/MimeTextEdit.h b/retroshare-gui/src/gui/common/MimeTextEdit.h index d54cbe658..c0bf83892 100644 --- a/retroshare-gui/src/gui/common/MimeTextEdit.h +++ b/retroshare-gui/src/gui/common/MimeTextEdit.h @@ -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 diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.cpp b/retroshare-gui/src/gui/common/RSTextBrowser.cpp index b916fca7d..f43a57242 100644 --- a/retroshare-gui/src/gui/common/RSTextBrowser.cpp +++ b/retroshare-gui/src/gui/common/RSTextBrowser.cpp @@ -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 //To get RsAccounts @@ -35,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -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; -} diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.h b/retroshare-gui/src/gui/common/RSTextBrowser.h index 73627cba6..8ffa398c3 100644 --- a/retroshare-gui/src/gui/common/RSTextBrowser.h +++ b/retroshare-gui/src/gui/common/RSTextBrowser.h @@ -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 mContextMenuActions; #ifdef RSTEXTBROWSER_CHECKIMAGE_DEBUG QRect mCursorRectStart; diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp index 17ec3b911..bc2f5d960 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp @@ -729,7 +729,6 @@ void CreateGxsChannelMsg::sendMsg() QString text; text = RichTextEditWidget->toHtml(); - RsHtml::optimizeHtml(text); std::string msg = std::string(text.toUtf8()); std::list files; diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp index 62d8e1db1..69df1ce09 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp @@ -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]"); diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 3415ceb6c..176cbbd24 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -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); diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp index 81d99d71c..540196ab5 100644 --- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp +++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp @@ -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); } diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index 95295ad96..17748e05c 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -40,7 +40,6 @@ #include "util/DateTime.h" #include -#include #include #include #include @@ -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); -} diff --git a/retroshare-gui/src/gui/settings/AppearancePage.h b/retroshare-gui/src/gui/settings/AppearancePage.h index e25f41e51..5df91fac7 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.h +++ b/retroshare-gui/src/gui/settings/AppearancePage.h @@ -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; }; diff --git a/retroshare-gui/src/gui/settings/AppearancePage.ui b/retroshare-gui/src/gui/settings/AppearancePage.ui index 18ab8cc41..e4a1014f2 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.ui +++ b/retroshare-gui/src/gui/settings/AppearancePage.ui @@ -109,7 +109,7 @@ - + @@ -336,62 +336,7 @@ - - - - Link Color - - - - - - - 0 - 0 - - - - Color of the links - - - - - - - - 24 - 24 - - - - - 24 - 24 - - - - Set link color - - - - - - - - - - Reset to default color - - - - :/icons/textedit/undo.png:/icons/textedit/undo.png - - - - - - - + Status Bar @@ -500,7 +445,7 @@ - + Qt::Vertical @@ -607,8 +552,6 @@
gui/common/RSComboBox.h
- - - + diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index 6585982f7..d40f6db81 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -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() { diff --git a/retroshare-gui/src/gui/settings/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h index 4f2406bc4..77c7e625e 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.h +++ b/retroshare-gui/src/gui/settings/rsharesettings.h @@ -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);