mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-12 11:02:30 -04:00
Added avatar image to ConfCertDialog (defnax).
Added new class AvatarDefs to get the avatar for a ssl id or gpg id. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0591ef0432
commit
b35d32ef15
19 changed files with 282 additions and 248 deletions
|
@ -53,6 +53,7 @@
|
|||
#include "util/misc.h"
|
||||
#include "settings/rsharesettings.h"
|
||||
#include "common/RSTreeWidgetItem.h"
|
||||
#include "common/AvatarDefs.h"
|
||||
|
||||
#include "RetroShareLink.h"
|
||||
|
||||
|
@ -681,20 +682,10 @@ void MessengerWindow::insertPeers()
|
|||
|
||||
gpg_item -> setText(COLUMN_STATE, StatusDefs::name(it->status));
|
||||
|
||||
unsigned char *data = NULL;
|
||||
int size = 0 ;
|
||||
rsMsgs->getAvatarData(it->id ,data,size);
|
||||
|
||||
if(size != 0){
|
||||
QPixmap avatar ;
|
||||
avatar.loadFromData(data,size,"PNG") ;
|
||||
QIcon avatar_icon(avatar);
|
||||
gpg_item-> setIcon(COLUMN_STATE, avatar_icon);
|
||||
delete[] data;
|
||||
|
||||
} else {
|
||||
gpg_item -> setIcon(COLUMN_STATE,(QIcon(":/images/no_avatar_70.png")));
|
||||
}
|
||||
QPixmap avatar;
|
||||
AvatarDefs::getAvatarFromSslId(it->id, avatar, ":/images/no_avatar_70.png");
|
||||
QIcon avatar_icon(avatar);
|
||||
gpg_item->setIcon(COLUMN_STATE, avatar_icon);
|
||||
|
||||
switch (it->status) {
|
||||
case RS_STATUS_INACTIVE:
|
||||
|
@ -1087,22 +1078,9 @@ void MessengerWindow::sendMessage()
|
|||
|
||||
void MessengerWindow::updateAvatar()
|
||||
{
|
||||
unsigned char *data = NULL;
|
||||
int size = 0 ;
|
||||
|
||||
rsMsgs->getOwnAvatarData(data,size);
|
||||
|
||||
std::cerr << "Image size = " << size << std::endl ;
|
||||
|
||||
if(size == 0)
|
||||
std::cerr << "Got no image" << std::endl ;
|
||||
|
||||
// set the image
|
||||
QPixmap pix ;
|
||||
pix.loadFromData(data,size,"PNG") ;
|
||||
ui.avatarButton->setIcon(pix); // writes image into ba in PNG format
|
||||
|
||||
delete[] data ;
|
||||
QPixmap avatar;
|
||||
AvatarDefs::getOwnAvatar(avatar);
|
||||
ui.avatarButton->setIcon(avatar);
|
||||
}
|
||||
|
||||
void MessengerWindow::getAvatar()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue