mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Click on a certificate in a message (MessageWidget) shows the add friend wizard only once.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8036 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
a967405c84
commit
a23e563c6b
2
TODO.txt
2
TODO.txt
@ -27,7 +27,7 @@ E [ ] it's not possible to create a Forum thread without a Owner.
|
||||
E [ ] do we keep "Getting Started" ? the look needs to be improved
|
||||
E [ ] Recommendation messages do not show complete links. Links show up in some buttons and the text is truncated
|
||||
E [X] Recommendation messages should not be signed by the retroshare team!!
|
||||
E [ ] when adding a friend through clicking on cert links, the add friend wizard is shown twice!
|
||||
E [X] when adding a friend through clicking on cert links, the add friend wizard is shown twice!
|
||||
M [X] add a flag in friends option to allow auto-download of recommended files
|
||||
M [ ] sound is not working for some users on linux. We also need a "test sound" button in config->sound
|
||||
E [ ] some widgets in the GUI do not follow the system style => GUI looks bad on these systems
|
||||
|
@ -12,12 +12,17 @@ RSTextBrowser::RSTextBrowser(QWidget *parent) :
|
||||
|
||||
mShowImages = true;
|
||||
mImageBlockWidget = NULL;
|
||||
mLinkClickActive = true;
|
||||
|
||||
connect(this, SIGNAL(anchorClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
|
||||
}
|
||||
|
||||
void RSTextBrowser::linkClicked(const QUrl &url)
|
||||
{
|
||||
if (!mLinkClickActive) {
|
||||
return;
|
||||
}
|
||||
|
||||
// some links are opened directly in the QTextBrowser with open external links set to true,
|
||||
// so we handle links by our own
|
||||
|
||||
@ -124,3 +129,8 @@ void RSTextBrowser::resetImagesStatus(bool load)
|
||||
}
|
||||
mShowImages = load;
|
||||
}
|
||||
|
||||
void RSTextBrowser::activateLinkClick(bool active)
|
||||
{
|
||||
mLinkClickActive = active;
|
||||
}
|
||||
|
@ -16,6 +16,8 @@ public:
|
||||
void setImageBlockWidget(RSImageBlockWidget *widget);
|
||||
void resetImagesStatus(bool load);
|
||||
|
||||
void activateLinkClick(bool active);
|
||||
|
||||
virtual QVariant loadResource(int type, const QUrl &name);
|
||||
|
||||
public slots:
|
||||
@ -28,9 +30,11 @@ private slots:
|
||||
protected:
|
||||
void paintEvent(QPaintEvent *event);
|
||||
|
||||
private:
|
||||
QString mPlaceholderText;
|
||||
bool mShowImages;
|
||||
RSImageBlockWidget *mImageBlockWidget;
|
||||
bool mLinkClickActive;
|
||||
};
|
||||
|
||||
#endif // RSTEXTBROWSER_H
|
||||
|
@ -164,6 +164,8 @@ MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags f
|
||||
|
||||
ui.tagsLabel->setVisible(false);
|
||||
|
||||
ui.msgText->activateLinkClick(false);
|
||||
|
||||
if (isControlled == false) {
|
||||
processSettings("MessageWidget", true);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user