mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-12-15 00:28:58 -05:00
Merge pull request #2703 from defnax/wireaccountbox
Display on account selection box the headShot image
This commit is contained in:
commit
7911622d17
1 changed files with 16 additions and 2 deletions
|
|
@ -23,6 +23,8 @@
|
||||||
#include "WireGroupDialog.h"
|
#include "WireGroupDialog.h"
|
||||||
#include "WireGroupItem.h"
|
#include "WireGroupItem.h"
|
||||||
#include "gui/settings/rsharesettings.h"
|
#include "gui/settings/rsharesettings.h"
|
||||||
|
#include "gui/gxs/GxsIdDetails.h"
|
||||||
|
#include "gui/common/FilesDefs.h"
|
||||||
|
|
||||||
#include "PulseViewGroup.h"
|
#include "PulseViewGroup.h"
|
||||||
#include "PulseReplySeperator.h"
|
#include "PulseReplySeperator.h"
|
||||||
|
|
@ -308,7 +310,19 @@ void WireDialog::updateGroups(std::vector<RsWireGroup>& groups)
|
||||||
// grab own groups.
|
// grab own groups.
|
||||||
// setup Chooser too.
|
// setup Chooser too.
|
||||||
mOwnGroups.push_back(it);
|
mOwnGroups.push_back(it);
|
||||||
ui.groupChooser->addItem(QString::fromStdString(it.mMeta.mGroupName));
|
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…
Add table
Add a link
Reference in a new issue