Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-16 02:19:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Added blocking of embedded images (+ settings) to forums and messages

Browse source 
- Added image support for forum messages
- Renamed LinkTextBrowser to RSTextBrowser
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-09-23 19:53:26 +00:00
parent 8ffc0e05de
commit 6b1613d8bb
31 changed files with 907 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

34
retroshare-gui/src/gui/common/UIStateHelper.cpp
View file

@ -25,7 +25,7 @@
#include "UIStateHelper.h"
#include "RSTreeWidget.h"
#include "LinkTextBrowser.h"
#include "RSTextBrowser.h"
class UIStateHelperObject
{
@ -45,10 +45,10 @@ public:
init();
mTreeWidget = widget;
}
UIStateHelperObject(LinkTextBrowser *widget)
UIStateHelperObject(RSTextBrowser *widget)
{
init();
mLinkTextBrowser = widget;
mRSTextBrowser = widget;
}
void setPlaceholder(bool loading, const QString &text, bool clear) const
@ -77,12 +77,12 @@ public:
mTreeWidget->setPlaceholderText(text);
}
if (mLinkTextBrowser) {
if (mRSTextBrowser) {
if (loading && clear) {
mLinkTextBrowser->clear();
mRSTextBrowser->clear();
}
mLinkTextBrowser->setPlaceholderText(text);
mRSTextBrowser->setPlaceholderText(text);
}
}
@ -100,8 +100,8 @@ public:
mTreeWidget->clear();
}
if (mLinkTextBrowser) {
mLinkTextBrowser->clear();
if (mRSTextBrowser) {
mRSTextBrowser->clear();
}
}
@ -119,8 +119,8 @@ public:
return mTreeWidget;
}
if (mLinkTextBrowser) {
return mLinkTextBrowser;
if (mRSTextBrowser) {
return mRSTextBrowser;
}
return NULL;
@ -140,7 +140,7 @@ public:
return true;
}
if (mLinkTextBrowser == widget) {
if (mRSTextBrowser == widget) {
return true;
}
@ -152,7 +152,7 @@ public:
if (mLabel == data.mLabel &&
mLineEdit == data.mLineEdit &&
mTreeWidget == data.mTreeWidget &&
mLinkTextBrowser == data.mLinkTextBrowser) {
mRSTextBrowser == data.mRSTextBrowser) {
return true;
}
@ -164,7 +164,7 @@ public:
if (mLabel < data.mLabel ||
mLineEdit < data.mLineEdit ||
mTreeWidget < data.mTreeWidget ||
mLinkTextBrowser < data.mLinkTextBrowser) {
mRSTextBrowser < data.mRSTextBrowser) {
return true;
}
@ -177,14 +177,14 @@ private:
mLabel = NULL;
mLineEdit = NULL;
mTreeWidget = NULL;
mLinkTextBrowser = NULL;
mRSTextBrowser = NULL;
}
private:
QLabel *mLabel;
QLineEdit *mLineEdit;
RSTreeWidget *mTreeWidget;
LinkTextBrowser *mLinkTextBrowser;
RSTextBrowser *mRSTextBrowser;
};
class UIStateHelperData
@ -258,7 +258,7 @@ void UIStateHelper::addLoadPlaceholder(int index, RSTreeWidget *widget, bool cle
data->mLoad.insert(UIStateHelperObject(widget), QPair<QString, bool>(text.isEmpty() ? tr("Loading") : text, clear));
}
void UIStateHelper::addLoadPlaceholder(int index, LinkTextBrowser *widget, bool clear, const QString &text)
void UIStateHelper::addLoadPlaceholder(int index, RSTextBrowser *widget, bool clear, const QString &text)
{
UIStateHelperData *data = findData(index, true);
data->mLoad.insert(UIStateHelperObject(widget), QPair<QString, bool>(text.isEmpty() ? tr("Loading") : text, clear));
@ -291,7 +291,7 @@ void UIStateHelper::addClear(int index, RSTreeWidget *widget)
data->mClear.push_back(UIStateHelperObject(widget));
}
void UIStateHelper::addClear(int index, LinkTextBrowser *widget)
void UIStateHelper::addClear(int index, RSTextBrowser *widget)
{
UIStateHelperData *data = findData(index, true);
if (data->mClear.contains(widget)) {