Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 13:24:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added proper display of reputation as an icon in IDDialog

Browse Source
This commit is contained in:
csoler 2016-12-23 22:53:57 +01:00
parent 72fb8f17a9
commit e5e59098ac
6 changed files with 287 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -26,6 +26,8 @@
#include <QMessageBox>
#include <QMenu>
#include <QWidgetAction>
#include <QStyledItemDelegate>
#include <QPainter>
#include "IdDialog.h"
#include "ui_IdDialog.h"
@ -104,6 +106,12 @@
#define IMAGE_ADMIN ":/icons/bullet_blue_128.png"
#define IMAGE_INFO ":/images/info16.png"
#define REPUTATION_LOCALLY_POSITIVE_ICON ":/icons/bullet_green_yellow_star_128.png"
#define REPUTATION_REMOTELY_POSITIVE_ICON ":/icons/bullet_green_128.png"
#define REPUTATION_NEUTRAL_ICON ":/icons/bullet_grey_128.png"
#define REPUTATION_REMOTELY_NEGATIVE_ICON ":/icons/yellow_biohazard64.png"
#define REPUTATION_LOCALLY_NEGATIVE_ICON ":/icons/red_biohazard64.png"
// comment this out in order to remove the sorting of circles into "belong to" and "other visible circles"
#define CIRCLE_MEMBERSHIP_CATEGORIES 1
@ -127,6 +135,54 @@ class TreeWidgetItem : public QTreeWidgetItem {
}
}
};
// This class allows to draw the item in the share flags column using an appropriate size
class ReputationItemDelegate: public QStyledItemDelegate
{
public:
ReputationItemDelegate() {}
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
Q_ASSERT(index.isValid());
QStyleOptionViewItemV4 opt = option;
initStyleOption(&opt, index);
// disable default icon
opt.icon = QIcon();
// draw default item
QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &opt, painter, 0);
const QRect r = option.rect;
// get pixmap
unsigned int icon_index = qvariant_cast<unsigned int>(index.data(Qt::DecorationRole));
if(icon_index > 4)
return ;
QIcon icon ;
switch(icon_index)
{
case RsReputations::REPUTATION_LOCALLY_NEGATIVE: icon = QIcon(REPUTATION_LOCALLY_NEGATIVE_ICON) ; break ;
case RsReputations::REPUTATION_LOCALLY_POSITIVE: icon = QIcon(REPUTATION_LOCALLY_POSITIVE_ICON) ; break ;
case RsReputations::REPUTATION_REMOTELY_POSITIVE: icon = QIcon(REPUTATION_REMOTELY_POSITIVE_ICON) ; break ;
case RsReputations::REPUTATION_REMOTELY_NEGATIVE: icon = QIcon(REPUTATION_REMOTELY_NEGATIVE_ICON) ; break ;
case RsReputations::REPUTATION_NEUTRAL: icon = QIcon(REPUTATION_NEUTRAL_ICON) ; break ;
default:
return ; // dont draw anything
}
QPixmap pix = icon.pixmap(r.size());
// draw pixmap at center of item
const QPoint p = QPoint((r.width() - pix.width())/2, (r.height() - pix.height())/2);
painter->drawPixmap(r.topLeft() + p, pix);
}
};
/** Constructor */
IdDialog::IdDialog(QWidget *parent) :
RsGxsUpdateBroadcastPage(rsIdentity, parent),
@ -142,12 +198,15 @@ IdDialog::IdDialog(QWidget *parent) :
ownItem = new QTreeWidgetItem();
ownItem->setText(0, tr("My own identities"));
ownItem->setData(RSID_COL_VOTES, Qt::DecorationRole,0xff);
allItem = new QTreeWidgetItem();
allItem->setText(0, tr("All"));
allItem->setData(RSID_COL_VOTES, Qt::DecorationRole,0xff);
contactsItem = new QTreeWidgetItem();
contactsItem->setText(0, tr("My contacts"));
contactsItem->setData(RSID_COL_VOTES, Qt::DecorationRole,0xff);
ui->treeWidget_membership->clear();
@ -318,6 +377,8 @@ IdDialog::IdDialog(QWidget *parent) :
ui->idTreeWidget->setColumnWidth(RSID_COL_IDTYPE, 18 * fontWidth);
ui->idTreeWidget->setColumnWidth(RSID_COL_VOTES, 7 * fontWidth);
ui->idTreeWidget->setItemDelegateForColumn(RSID_COL_VOTES,new ReputationItemDelegate()) ;
//QHeaderView_setSectionResizeMode(ui->idTreeWidget->header(), QHeaderView::ResizeToContents);
mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this);
@ -1463,7 +1524,7 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item,
item->setData(RSID_COL_KEYID, Qt::UserRole,QVariant(item_flags)) ;
item->setTextAlignment(RSID_COL_VOTES, Qt::AlignRight | Qt::AlignVCenter);
item->setData(RSID_COL_VOTES,Qt::DisplayRole, idd.mReputation.mOverallReputationLevel);
item->setData(RSID_COL_VOTES,Qt::DecorationRole, idd.mReputation.mOverallReputationLevel);
if(isOwnId)
{
@ -1838,11 +1899,11 @@ void IdDialog::insertIdDetails(uint32_t token)
rsReputations->getReputationInfo(RsGxsId(data.mMeta.mGroupId),data.mPgpId,info) ;
QString frep_string ;
if(info.mFriendsPositiveVotes > 0) frep_string += QString::number(info.mFriendsPositiveVotes) + tr(" positive, ") ;
if(info.mFriendsNegativeVotes > 0) frep_string += QString::number(info.mFriendsNegativeVotes) + tr(" negative, ") ;
if(info.mFriendsPositiveVotes > 0) frep_string += QString::number(info.mFriendsPositiveVotes) + tr(" positive ") ;
if(info.mFriendsNegativeVotes > 0) frep_string += QString::number(info.mFriendsNegativeVotes) + tr(" negative ") ;
if(info.mFriendsPositiveVotes==0 && info.mFriendsNegativeVotes==0)
frep_string = tr("No votes from friends, ") ;
frep_string = tr("No votes from friends") ;
ui->neighborNodesOpinion_TF->setText(frep_string) ;

2
retroshare-gui/src/gui/Identity/IdDialog.ui
View File

@ -492,7 +492,7 @@
<item row="9" column="0">
<widget class="QLabel" name="neighborNodesOpinion_LB">
<property name="text">
<string>Neighbor nodes:</string>
<string>Friend votes:</string>
</property>
</widget>
</item>

366
retroshare-gui/src/gui/icons.qrc
View File

@ -1,147 +1,223 @@
<RCC>
<qresource prefix="/">
<file>icons/svg/profile.svg</file>
<file>icons/svg/download.svg</file>
<file>icons/svg/folders.svg</file>
<file>icons/svg/folders1.svg</file>
<file>icons/svg/magnifying-glass.svg</file>
<file>icons/svg/upload.svg</file>
<file>icons/settings/appearance.svg</file>
<file>icons/settings/channels.svg</file>
<file>icons/settings/chat.svg</file>
<file>icons/settings/directories.svg</file>
<file>icons/settings/filesharing.svg</file>
<file>icons/settings/forums.svg</file>
<file>icons/settings/general.svg</file>
<file>icons/settings/messages.svg</file>
<file>icons/settings/network.svg</file>
<file>icons/settings/notify.svg</file>
<file>icons/settings/people.svg</file>
<file>icons/settings/permissions.svg</file>
<file>icons/settings/plugins.svg</file>
<file>icons/settings/posted.svg</file>
<file>icons/settings/profile.svg</file>
<file>icons/settings/server.svg</file>
<file>icons/settings/sound.svg</file>
<file>icons/settings/webinterface.svg</file>
<file>icons/add_user_256.png</file>
<file>icons/aol.png</file>
<file>icons/avatar_128.png</file>
<file>icons/avatar_grey_128.png</file>
<file>icons/blank_red_128.png</file>
<file>icons/void_128.png</file>
<file>icons/blank_green_128.png</file>
<file>icons/blank_blue_128.png</file>
<file>icons/browsable_green_128.png</file>
<file>icons/search_red_128.png</file>
<file>icons/anonymous_blue_128.png</file>
<file>icons/bullet_blue_128.png</file>
<file>icons/bullet_green_128.png</file>
<file>icons/bullet_grey_128.png</file>
<file>icons/bullet_red_128.png</file>
<file>icons/bullet_yellow_128.png</file>
<file>icons/channels_128.png</file>
<file>icons/channels_red_128.png</file>
<file>icons/chat_128.png</file>
<file>icons/chat_red_128.png</file>
<file>icons/circles_128.png</file>
<file>icons/circles_new_128.png</file>
<file>icons/friends_128.png</file>
<file>icons/global_switch_off_128.png</file>
<file>icons/global_switch_on_128.png</file>
<file>icons/gmail.png</file>
<file>icons/help_128.png</file>
<file>icons/help_64.png</file>
<file>icons/information_128.png</file>
<file>icons/internet_128.png</file>
<file>icons/invite64.png</file>
<file>icons/knews_128.png</file>
<file>icons/knews_red_128.png</file>
<file>icons/konversation_128.png</file>
<file>icons/konversation128.png</file>
<file>icons/konversation_red_128.png</file>
<file>icons/ktorrent_128.png</file>
<file>icons/ktorrent_red_128.png</file>
<file>icons/logo_0_connected_128.png</file>
<file>icons/logo_128.png</file>
<file>icons/logo_1_connected_128.png</file>
<file>icons/logo_2_connected_128.png</file>
<file>icons/mail_128.png</file>
<file>icons/mail_old_128.png</file>
<file>icons/mail_red_128.png</file>
<file>icons/newsfeed128.png</file>
<file>icons/outlook.png</file>
<file>icons/plugins_128.png</file>
<file>icons/posted_128.png</file>
<file>icons/posted_red_128.png</file>
<file>icons/quit_128.png</file>
<file>icons/security_high_128.png</file>
<file>icons/security_low_128.png</file>
<file>icons/security_medium_128.png</file>
<file>icons/star_overlay_128.png</file>
<file>icons/switch00_128.png</file>
<file>icons/switch01_128.png</file>
<file>icons/switch10_128.png</file>
<file>icons/switch11_128.png</file>
<file>icons/system_128.png</file>
<file>icons/tile_checking_48.png</file>
<file>icons/tile_downloaded_48.png</file>
<file>icons/tile_downloading_48.png</file>
<file>icons/tile_inactive_48.png</file>
<file>icons/tor-logo.png</file>
<file>icons/tor-off.png</file>
<file>icons/tor-on.png</file>
<file>icons/tor-starting.png</file>
<file>icons/tor-stopping.png</file>
<file>icons/user-away_64.png</file>
<file>icons/user-away-extended_64.png</file>
<file>icons/user-busy_64.png</file>
<file>icons/user-offline_64.png</file>
<file>icons/user-online_64.png</file>
<file>icons/yahoo.png</file>
<file>icons/yandex.png</file>
<file>icons/yellow_biohazard64.png</file>
<file>icons/png/attach.png</file>
<file>icons/png/attach-image.png</file>
<file>icons/png/highlight.png</file>
<file>icons/png/invite.png</file>
<file>icons/png/leave.png</file>
<file>icons/png/search.png</file>
<file>icons/png/send-message.png</file>
<file>icons/png/settings.png</file>
<file>icons/png/smiley.png</file>
<file>icons/png/font.png</file>
<file>icons/png/send-message-blocked.png</file>
<file>icons/png/chat-bubble-notify.png</file>
<file>icons/png/channels.png</file>
<file>icons/png/chat-lobbies.png</file>
<file>icons/png/forums.png</file>
<file>icons/png/info.png</file>
<file>icons/png/messages.png</file>
<file>icons/png/network.png</file>
<file>icons/png/newsfeed.png</file>
<file>icons/png/people.png</file>
<file>icons/png/posted.png</file>
<file>icons/png/exit.png</file>
<file>icons/png/options.png</file>
<file>icons/png/filesharing.png</file>
<file>icons/png/channels-notify.png</file>
<file>icons/png/chat-lobbies-notify.png</file>
<file>icons/png/forums-notify.png</file>
<file>icons/png/messages-notify.png</file>
<file>icons/png/network-notify.png</file>
<file>icons/png/newsfeed-notify.png</file>
<file>icons/png/people-notify.png</file>
<file>icons/png/posted-notify.png</file>
<file>icons/png/filesharing-notify.png</file>
<file>icons/png/thumbs-up.png</file>
<file>icons/png/thumbs-down.png</file>
<file>icons/png/thumbs-neutral.png</file>
<file>icons/png/add.png</file>
<file>icons/png/netgraph.png</file>
<file>icons/png/network-puplic.png</file>
<file>icons/png/circles.png</file>
<file>icons/png/person.png</file>
<file>icons/png/keyring.png</file>
</qresource>
<qresource prefix="/">
<file>icons/add_user_256.png</file>
<file>icons/anonymous_blue_128.png</file>
<file>icons/anonymous_green_128.png</file>
<file>icons/aol.png</file>
<file>icons/avatar_128.png</file>
<file>icons/avatar_grey_128.png</file>
<file>icons/blank_blue_128.png</file>
<file>icons/blank_green_128.png</file>
<file>icons/blank_red_128.png</file>
<file>icons/browsable_blue_128.png</file>
<file>icons/browsable_green_128.png</file>
<file>icons/bullet_blue_128.png</file>
<file>icons/bullet_green_128.png</file>
<file>icons/bullet_green_yellow_star_128.png</file>
<file>icons/bullet_grey_128.png</file>
<file>icons/bullet_red_128.png</file>
<file>icons/bullet_yellow_128.png</file>
<file>icons/channels_128.png</file>
<file>icons/channels_red_128.png</file>
<file>icons/chat_128.png</file>
<file>icons/chat_red_128.png</file>
<file>icons/circles_128.png</file>
<file>icons/circles_new_128.png</file>
<file>icons/friends_128.png</file>
<file>icons/global_switch_off_128.png</file>
<file>icons/global_switch_on_128.png</file>
<file>icons/gmail.png</file>
<file>icons/help_128.png</file>
<file>icons/help_64.png</file>
<file>icons/information_128.png</file>
<file>icons/internet_128.png</file>
<file>icons/invite64.png</file>
<file>icons/knews_128.png</file>
<file>icons/knews_red_128.png</file>
<file>icons/konversation_128.png</file>
<file>icons/konversation128.png</file>
<file>icons/konversation_red_128.png</file>
<file>icons/ktorrent_128.png</file>
<file>icons/ktorrent_red_128.png</file>
<file>icons/logo_0_connected_128.png</file>
<file>icons/logo_128.png</file>
<file>icons/logo_1_connected_128.png</file>
<file>icons/logo_2_connected_128.png</file>
<file>icons/mail_128.png</file>
<file>icons/mail_old_128.png</file>
<file>icons/mail_red_128.png</file>
<file>icons/newsfeed128.png</file>
<file>icons/outlook.png</file>
<file>icons/plugins_128.png</file>
<file>icons/png/add.png</file>
<file>icons/png/attach-image.png</file>
<file>icons/png/attach.png</file>
<file>icons/png/channels-notify.png</file>
<file>icons/png/channels.png</file>
<file>icons/png/chat-bubble-notify.png</file>
<file>icons/png/chat-bubble.png</file>
<file>icons/png/chat-lobbies-notify.png</file>
<file>icons/png/chat-lobbies.png</file>
<file>icons/png/circles.png</file>
<file>icons/png/empty-circle.png</file>
<file>icons/png/exit.png</file>
<file>icons/png/feedreader-notify.png</file>
<file>icons/png/feedreader.png</file>
<file>icons/png/filesharing-notify.png</file>
<file>icons/png/filesharing.png</file>
<file>icons/png/font.png</file>
<file>icons/png/forums-notify.png</file>
<file>icons/png/forums.png</file>
<file>icons/png/fullscreen_arrows.png</file>
<file>icons/png/highlight.png</file>
<file>icons/png/info.png</file>
<file>icons/png/invite.png</file>
<file>icons/png/keyring.png</file>
<file>icons/png/leave.png</file>
<file>icons/png/messages-notify.png</file>
<file>icons/png/messages.png</file>
<file>icons/png/microphone_mute.png</file>
<file>icons/png/microphone.png</file>
<file>icons/png/netgraph.png</file>
<file>icons/png/network-notify.png</file>
<file>icons/png/network.png</file>
<file>icons/png/network-puplic.png</file>
<file>icons/png/newsfeed-notify.png</file>
<file>icons/png/newsfeed.png</file>
<file>icons/png/options.png</file>
<file>icons/png/people-notify.png</file>
<file>icons/png/people.png</file>
<file>icons/png/person.png</file>
<file>icons/png/phone_hangup.png</file>
<file>icons/png/phone.png</file>
<file>icons/png/posted-notify.png</file>
<file>icons/png/posted.png</file>
<file>icons/png/search.png</file>
<file>icons/png/send-message-blocked.png</file>
<file>icons/png/send-message.png</file>
<file>icons/png/settings.png</file>
<file>icons/png/smiley.png</file>
<file>icons/png/speaker_mute.png</file>
<file>icons/png/speaker.png</file>
<file>icons/png/thumbs-down.png</file>
<file>icons/png/thumbs-neutral.png</file>
<file>icons/png/thumbs-up.png</file>
<file>icons/png/video.png</file>
<file>icons/posted_128.png</file>
<file>icons/posted_red_128.png</file>
<file>icons/quit_128.png</file>
<file>icons/red_biohazard64.png</file>
<file>icons/search_red_128.png</file>
<file>icons/security_high_128.png</file>
<file>icons/security_low_128.png</file>
<file>icons/security_medium_128.png</file>
<file>icons/settings/appearance.svg</file>
<file>icons/settings/channels.svg</file>
<file>icons/settings/chat.svg</file>
<file>icons/settings/directories.svg</file>
<file>icons/settings/filesharing.svg</file>
<file>icons/settings/forums.svg</file>
<file>icons/settings/general.svg</file>
<file>icons/settings/messages.svg</file>
<file>icons/settings/network.svg</file>
<file>icons/settings/notify.svg</file>
<file>icons/settings/people.svg</file>
<file>icons/settings/permissions.svg</file>
<file>icons/settings/plugins.svg</file>
<file>icons/settings/posted.svg</file>
<file>icons/settings/profile.svg</file>
<file>icons/settings/server.svg</file>
<file>icons/settings/sound.svg</file>
<file>icons/settings/webinterface.svg</file>
<file>icons/star_overlay_128.png</file>
<file>icons/svg/add.svg</file>
<file>icons/svg/attach-image.svg</file>
<file>icons/svg/attach.svg</file>
<file>icons/svg/channels-notify.svg</file>
<file>icons/svg/channels.svg</file>
<file>icons/svg/chat-bubble-notify.svg</file>
<file>icons/svg/chat-bubble.svg</file>
<file>icons/svg/chat-lobbies-notify.svg</file>
<file>icons/svg/chat-lobbies.svg</file>
<file>icons/svg/circles.svg</file>
<file>icons/svg/download.svg</file>
<file>icons/svg/empty-circle.svg</file>
<file>icons/svg/exit-red.svg</file>
<file>icons/svg/exit.svg</file>
<file>icons/svg/feedreader-notify.svg</file>
<file>icons/svg/feedreader.svg</file>
<file>icons/svg/filesharing-notify.svg</file>
<file>icons/svg/filesharing.svg</file>
<file>icons/svg/folders1.svg</file>
<file>icons/svg/folders.svg</file>
<file>icons/svg/font.svg</file>
<file>icons/svg/forums-notify.svg</file>
<file>icons/svg/forums.svg</file>
<file>icons/svg/fullscreen_arrows.svg</file>
<file>icons/svg/highlight.svg</file>
<file>icons/svg/info.svg</file>
<file>icons/svg/invite.svg</file>
<file>icons/svg/keyring.svg</file>
<file>icons/svg/leave.svg</file>
<file>icons/svg/magnifying-glass.svg</file>
<file>icons/svg/messages-notify.svg</file>
<file>icons/svg/messages.svg</file>
<file>icons/svg/microphone_mute.svg</file>
<file>icons/svg/microphone.svg</file>
<file>icons/svg/netgraph.svg</file>
<file>icons/svg/network-notify.svg</file>
<file>icons/svg/network-puplic.svg</file>
<file>icons/svg/network.svg</file>
<file>icons/svg/newsfeed-notify.svg</file>
<file>icons/svg/newsfeed.svg</file>
<file>icons/svg/options.svg</file>
<file>icons/svg/people-notify.svg</file>
<file>icons/svg/people.svg</file>
<file>icons/svg/person.svg</file>
<file>icons/svg/phone_hangup.svg</file>
<file>icons/svg/phone.svg</file>
<file>icons/svg/posted-notify.svg</file>
<file>icons/svg/posted.svg</file>
<file>icons/svg/profile.svg</file>
<file>icons/svg/retroshare-info.svg</file>
<file>icons/svg/retroshare-splash.svg</file>
<file>icons/svg/retroshare-symbol_black_bg.svg</file>
<file>icons/svg/retroshare-symbol_gradients.svg</file>
<file>icons/svg/retroshare-symbol-minimal.svg</file>
<file>icons/svg/search.svg</file>
<file>icons/svg/send-message-blocked.svg</file>
<file>icons/svg/send-message.svg</file>
<file>icons/svg/settings.svg</file>
<file>icons/svg/smiley.svg</file>
<file>icons/svg/speaker_mute.svg</file>
<file>icons/svg/speaker.svg</file>
<file>icons/svg/thumbs-down.svg</file>
<file>icons/svg/thumbs-neutral.svg</file>
<file>icons/svg/thumbs-up.svg</file>
<file>icons/svg/upload.svg</file>
<file>icons/svg/video.svg</file>
<file>icons/switch00_128.png</file>
<file>icons/switch01_128.png</file>
<file>icons/switch10_128.png</file>
<file>icons/switch11_128.png</file>
<file>icons/system_128.png</file>
<file>icons/tile_checking_48.png</file>
<file>icons/tile_downloaded_48.png</file>
<file>icons/tile_downloading_48.png</file>
<file>icons/tile_inactive_48.png</file>
<file>icons/tor-logo.png</file>
<file>icons/tor-off.png</file>
<file>icons/tor-on.png</file>
<file>icons/tor-starting.png</file>
<file>icons/tor-stopping.png</file>
<file>icons/user-away_64.png</file>
<file>icons/user-away-extended_64.png</file>
<file>icons/user-busy_64.png</file>
<file>icons/user-offline_64.png</file>
<file>icons/user-online_64.png</file>
<file>icons/void_128.png</file>
<file>icons/yahoo.png</file>
<file>icons/yandex.png</file>
<file>icons/yellow_biohazard64.png</file>
</qresource>
</RCC>

BIN
retroshare-gui/src/gui/icons/bullet_green_yellow_star_128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
retroshare-gui/src/gui/icons/red_biohazard64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
retroshare-gui/src/gui/icons/yellow_biohazard64.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB