Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Click on a certificate in a message (MessageWidget) shows the add friend wizard only once.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8036 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-03-16 14:40:30 +00:00
parent a967405c84
commit a23e563c6b
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.txt
View File

@ -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 [ ] 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 [ ] 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 [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 [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 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 E [ ] some widgets in the GUI do not follow the system style => GUI looks bad on these systems

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

@ -12,12 +12,17 @@ RSTextBrowser::RSTextBrowser(QWidget *parent) :
mShowImages = true; mShowImages = true;
mImageBlockWidget = NULL; mImageBlockWidget = NULL;
mLinkClickActive = true;
connect(this, SIGNAL(anchorClicked(QUrl)), this, SLOT(linkClicked(QUrl))); connect(this, SIGNAL(anchorClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
} }
void RSTextBrowser::linkClicked(const QUrl &url) void RSTextBrowser::linkClicked(const QUrl &url)
{ {
if (!mLinkClickActive) {
return;
}
// some links are opened directly in the QTextBrowser with open external links set to true, // some links are opened directly in the QTextBrowser with open external links set to true,
// so we handle links by our own // so we handle links by our own
@ -124,3 +129,8 @@ void RSTextBrowser::resetImagesStatus(bool load)
} }
mShowImages = load; mShowImages = load;
} }
void RSTextBrowser::activateLinkClick(bool active)
{
mLinkClickActive = active;
}

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

@ -16,6 +16,8 @@ public:
void setImageBlockWidget(RSImageBlockWidget *widget); void setImageBlockWidget(RSImageBlockWidget *widget);
void resetImagesStatus(bool load); void resetImagesStatus(bool load);
void activateLinkClick(bool active);
virtual QVariant loadResource(int type, const QUrl &name); virtual QVariant loadResource(int type, const QUrl &name);
public slots: public slots:
@ -28,9 +30,11 @@ private slots:
protected: protected:
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event);
private:
QString mPlaceholderText; QString mPlaceholderText;
bool mShowImages; bool mShowImages;
RSImageBlockWidget *mImageBlockWidget; RSImageBlockWidget *mImageBlockWidget;
bool mLinkClickActive;
}; };
#endif // RSTEXTBROWSER_H #endif // RSTEXTBROWSER_H

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

@ -164,6 +164,8 @@ MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags f
ui.tagsLabel->setVisible(false); ui.tagsLabel->setVisible(false);
ui.msgText->activateLinkClick(false);
if (isControlled == false) { if (isControlled == false) {
processSettings("MessageWidget", true); processSettings("MessageWidget", true);
} }