Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-29 09:18:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated v0.6-Circles with latest trunk

Browse source
This commit is contained in:
csoler 2016-01-01 22:18:43 -05:00
commit 8ec0e10019
10 changed files with 142 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/Identity/IdDialog.h
View file

@ -61,6 +61,7 @@ protected:
private slots:
void createExternalCircle();
void editExistingCircle();
void filterComboBoxChanged();
void filterChanged(const QString &text);
@ -77,6 +78,7 @@ private slots:
/** Create the context popup menu and it's submenus */
void IdListCustomPopupMenu( QPoint point );
void CircleListCustomPopupMenu(QPoint point) ;
void circle_selected() ;
@ -110,6 +112,7 @@ private:
private:
TokenQueue *mIdQueue;
TokenQueue *mCircleQueue;
UIStateHelper *mStateHelper;
QTreeWidgetItem *contactsItem;

2
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View file

@ -100,6 +100,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
mTokenTypeMessageData = nextTokenType();
mTokenTypeReplyMessage = nextTokenType();
mTokenTypeReplyForumMessage = nextTokenType();
mTokenTypeBanAuthor = nextTokenType();
setUpdateWhenInvisible(true);
@ -127,6 +128,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
//mStateHelper->addLoadPlaceholder(mTokenTypeMessageData, ui->threadTitle);
mSubscribeFlags = 0;
mSignFlags = 0;
mInProcessSettings = false;
mUnreadCount = 0;
mNewCount = 0;

4
retroshare-gui/src/util/HandleRichText.cpp
View file

@ -587,9 +587,9 @@ static void optimizeHtml(QDomDocument& doc
if (pair.length()!=2) return; //Malformed style list so a bad message or last item.
QString keyvalue = pair.at(1);
keyvalue.replace(";","");
QStringList* classUsingIt = new QStringList(pair.at(0).split(','));
QStringList classUsingIt(pair.at(0).split(','));
QStringList* exported = new QStringList();
foreach (QString keyVal, *classUsingIt) {
foreach (QString keyVal, classUsingIt) {
if(!keyVal.trimmed().isEmpty()) {
exported->append(keyVal.trimmed().replace(".",""));
}