Removed not used base class GxsIdTreeWidget.

Used QPixmap instead of QIcon to draw the gxs image in GxsIdTreeWidgetItem.
Fixed use of transparent background in GxsIdDetails::GenerateCombinedPixmap (formerly GxsIdDetails::GenerateCombinedIcon).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-02-22 11:52:33 +00:00
parent 7178285d60
commit 41750b0d27
8 changed files with 17 additions and 291 deletions

View file

@ -191,7 +191,6 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
ui->progressText->hide();
mFillThread = NULL;
ui->threadTreeWidget->setGxsIdColumn(COLUMN_THREAD_AUTHOR);
setGroupId(forumId);
@ -850,7 +849,6 @@ QTreeWidgetItem *GxsForumThreadWidget::convertMsgToThreadWidget(const RsGxsForum
item->setText(COLUMN_THREAD_DATE, text);
item->setData(COLUMN_THREAD_DATE, ROLE_THREAD_SORT, sort);
//item->setText(COLUMN_THREAD_AUTHOR, QString::fromStdString(msg.mMeta.mAuthorId.toStdString()));
item->setId(msg.mMeta.mAuthorId, COLUMN_THREAD_AUTHOR);
//#TODO
#if 0

View file

@ -210,7 +210,7 @@
</layout>
</item>
<item>
<widget class="GxsIdRSTreeWidget" name="threadTreeWidget">
<widget class="RSTreeWidget" name="threadTreeWidget">
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
@ -521,9 +521,9 @@
<header>gui/common/RSTextBrowser.h</header>
</customwidget>
<customwidget>
<class>GxsIdRSTreeWidget</class>
<class>RSTreeWidget</class>
<extends>QTreeWidget</extends>
<header>gui/gxs/GxsIdTreeWidget.h</header>
<header>gui/common/RSTreeWidget.h</header>
</customwidget>
</customwidgets>
<resources>