mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-03-25 16:18:22 -04:00
Merge pull request #2703 from defnax/wireaccountbox
Display on account selection box the headShot image
This commit is contained in:
commit
7911622d17
@ -23,6 +23,8 @@
|
||||
#include "WireGroupDialog.h"
|
||||
#include "WireGroupItem.h"
|
||||
#include "gui/settings/rsharesettings.h"
|
||||
#include "gui/gxs/GxsIdDetails.h"
|
||||
#include "gui/common/FilesDefs.h"
|
||||
|
||||
#include "PulseViewGroup.h"
|
||||
#include "PulseReplySeperator.h"
|
||||
@ -307,8 +309,20 @@ void WireDialog::updateGroups(std::vector<RsWireGroup>& groups)
|
||||
{
|
||||
// grab own groups.
|
||||
// setup Chooser too.
|
||||
mOwnGroups.push_back(it);
|
||||
ui.groupChooser->addItem(QString::fromStdString(it.mMeta.mGroupName));
|
||||
mOwnGroups.push_back(it);
|
||||
QPixmap pixmap;
|
||||
if (it.mHeadshot.mData)
|
||||
{
|
||||
if (GxsIdDetails::loadPixmapFromData( it.mHeadshot.mData,it.mHeadshot.mSize,pixmap,GxsIdDetails::ORIGINAL))
|
||||
pixmap = pixmap.scaled(32,32);
|
||||
}
|
||||
else
|
||||
{
|
||||
// default.
|
||||
pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(32,32);
|
||||
}
|
||||
|
||||
ui.groupChooser->addItem(QPixmap(pixmap),QString::fromStdString(it.mMeta.mGroupName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user