StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

feat(identicon): use Identicons instead of empty avatars

Browse Source 
fixes #711
This commit is contained in:
sudden6 2017-09-29 11:22:59 +02:00
parent f82f57ec91
commit 003fc6b0b0
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/persistence/profile.cpp
View File

@ -17,7 +17,7 @@
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QBuffer>
#include <QDebug>
#include <QDir>
#include <QFileInfo>
@ -35,6 +35,7 @@
#include "src/net/avatarbroadcaster.h"
#include "src/nexus.h"
#include "src/widget/gui.h"
#include "src/widget/tool/identicon.h"
#include "src/widget/widget.h"
/**
@ -69,7 +70,7 @@ Profile::Profile(QString name, const QString& password, bool isNewProfile, const
QObject::connect(coreThread, &QThread::started, core, [=]() {
core->start(toxsave);
const ToxPk selfPk= core->getSelfPublicKey();
const ToxPk selfPk = core->getSelfPublicKey();
QByteArray data = loadAvatarData(selfPk);
if (data.isEmpty()) {
qDebug() << "Self avatar not found, will broadcast empty avatar to friends";
@ -357,7 +358,7 @@ void Profile::saveToxSave(QByteArray data)
*/
QString Profile::avatarPath(const ToxPk& owner, bool forceUnencrypted)
{
QString ownerStr = owner.toString();
const QString ownerStr = owner.toString();
if (!encrypted || forceUnencrypted) {
return Settings::getInstance().getSettingsDirPath() + "avatars/" + ownerStr + ".png";
}
@ -391,10 +392,16 @@ QPixmap Profile::loadAvatar()
* @param owner Friend PK to load avatar.
* @return Avatar as QPixmap.
*/
QPixmap Profile::loadAvatar(const ToxPk &owner)
QPixmap Profile::loadAvatar(const ToxPk& owner)
{
QPixmap pic;
pic.loadFromData(loadAvatarData(owner));
const QByteArray avataData = loadAvatarData(owner);
if(avataData.isEmpty()) {
pic = QPixmap::fromImage(Identicon(owner.getKey()).toImage(16));
} else {
pic.loadFromData(avataData);
}
return pic;
}
@ -455,16 +462,23 @@ void Profile::loadDatabase(const ToxId& id, QString password)
void Profile::setAvatar(QByteArray pic, const ToxPk& owner)
{
QPixmap pixmap;
QByteArray avatarData;
if (!pic.isEmpty()) {
pixmap.loadFromData(pic);
avatarData = pic;
} else {
pixmap.load(":/img/contact_dark.svg");
// with IDENTICON_ROWS=5 this gives a 160x160 image file
const QImage identicon = Identicon(owner.getKey()).toImage(32);
pixmap = QPixmap::fromImage(identicon);
QBuffer buf(&avatarData);
buf.open(QIODevice::WriteOnly);
identicon.save(&buf, "png");
}
saveAvatar(pic, owner);
saveAvatar(avatarData, owner);
emit selfAvatarChanged(pixmap);
AvatarBroadcaster::setAvatar(pic);
AvatarBroadcaster::setAvatar(avatarData);
AvatarBroadcaster::enableAutoBroadcast();
}
@ -491,7 +505,7 @@ void Profile::onRequestSent(const ToxPk& friendPk, const QString& message)
* @param pic Picture to save.
* @param owner PK of avatar owner.
*/
void Profile::saveAvatar(QByteArray pic, const ToxPk &owner)
void Profile::saveAvatar(QByteArray pic, const ToxPk& owner)
{
if (encrypted && !pic.isEmpty()) {
pic = passkey->encrypt(pic);