Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-29 11:56:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

attempt to use a cache for user-defined avatars. Should reduce memory footprint. to be tested

Browse source
This commit is contained in:
csoler 2019-06-03 23:52:29 +02:00
parent 807bbedd5a
commit e66fb923fb
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
25 changed files with 163 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/common/AvatarDefs.cpp
View file

@ -41,7 +41,7 @@ void AvatarDefs::getOwnAvatar(QPixmap &avatar, const QString& defaultImage)
}
/* load image */
avatar.loadFromData(data, size, "PNG") ;
GxsIdDetails::loadPixmapFromData(data, size, avatar) ;
free(data);
}
@ -58,7 +58,7 @@ void AvatarDefs::getAvatarFromSslId(const RsPeerId& sslId, QPixmap &avatar, cons
}
/* load image */
avatar.loadFromData(data, size, "PNG") ;
GxsIdDetails::loadPixmapFromData(data, size, avatar) ;
free(data);
}
@ -77,8 +77,8 @@ void AvatarDefs::getAvatarFromGxsId(const RsGxsId& gxsId, QPixmap &avatar, const
/* load image */
if(details.mAvatar.mSize == 0 || !avatar.loadFromData(details.mAvatar.mData, details.mAvatar.mSize, "PNG"))
avatar = QPixmap::fromImage(GxsIdDetails::makeDefaultIcon(gxsId));
if(details.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(details.mAvatar.mData, details.mAvatar.mSize, avatar))
avatar = GxsIdDetails::makeDefaultIcon(gxsId);
}
void AvatarDefs::getAvatarFromGpgId(const RsPgpId& gpgId, QPixmap &avatar, const QString& defaultImage)
@ -109,7 +109,7 @@ void AvatarDefs::getAvatarFromGpgId(const RsPgpId& gpgId, QPixmap &avatar, const
}
/* load image */
avatar.loadFromData(data, size, "PNG") ;
GxsIdDetails::loadPixmapFromData(data, size, avatar);
free(data);
}

5
retroshare-gui/src/gui/common/AvatarDialog.cpp
View file

@ -45,6 +45,9 @@ AvatarDialog::AvatarDialog(QWidget *parent) :
updateInterface();
}
const int AvatarDialog::RS_AVATAR_IMAGE_W = 128;
const int AvatarDialog::RS_AVATAR_IMAGE_H = 128;
AvatarDialog::~AvatarDialog()
{
delete(ui);
@ -52,7 +55,7 @@ AvatarDialog::~AvatarDialog()
void AvatarDialog::changeAvatar()
{
QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load Avatar"), 128, 128);
QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load Avatar"), RS_AVATAR_IMAGE_W,RS_AVATAR_IMAGE_H);
if (img.isNull())
return;

3
retroshare-gui/src/gui/common/AvatarDialog.h
View file

@ -35,6 +35,9 @@ class AvatarDialog : public QDialog
Q_OBJECT
public:
static const int RS_AVATAR_IMAGE_W ;
static const int RS_AVATAR_IMAGE_H ;
AvatarDialog(QWidget *parent = 0);
~AvatarDialog();