Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-24 23:15:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

98
retroshare-gui/src/gui/common/AvatarWidget.cpp
View file

@ -39,7 +39,7 @@ AvatarWidget::AvatarWidget(QWidget *parent) :
ui->setupUi(this);
mFlag.isOwnId = false;
mFlag.isGpg = false;
// mFlag.isGpg = false;
defaultAvatar = ":/images/no_avatar_background.png";
setFrameType(NO_FRAME);
@ -107,39 +107,39 @@ void AvatarWidget::setFrameType(FrameType type)
}
refreshStatus();
updateAvatar(QString::fromStdString(mId));
updateAvatar(QString::fromStdString(mId.toStdString()));
Rshare::refreshStyleSheet(this, false);
}
void AvatarWidget::setId(const std::string &id, bool isGpg)
void AvatarWidget::setId(const RsPeerId &id)
{
mId = id;
mFlag.isGpg = isGpg;
mId = id;
// mPgpId = rsPeers->getGPGId(id) ;
// mFlag.isGpg = false ;
if (mId == rsPeers->getOwnId()) {
mFlag.isOwnId = true;
setToolTip(tr("Click to change your avatar"));
}
if (mId == rsPeers->getOwnId()) {
mFlag.isOwnId = true;
setToolTip(tr("Click to change your avatar"));
}
setPixmap(QPixmap());
setPixmap(QPixmap());
if (mId.empty()) {
setEnabled(false);
}
if (id.isNull()) {
setEnabled(false);
}
refreshStatus();
updateAvatar(QString::fromStdString(mId));
refreshStatus();
updateAvatar(QString::fromStdString(mId.toStdString()));
}
void AvatarWidget::setOwnId()
{
setId(rsPeers->getOwnId(), false);
setId(rsPeers->getOwnId());
}
void AvatarWidget::setDefaultAvatar(const QString &avatar)
{
defaultAvatar = avatar;
updateAvatar(QString::fromStdString(mId));
updateAvatar(QString::fromStdString(mId.toStdString()));
}
void AvatarWidget::refreshStatus()
@ -161,7 +161,7 @@ void AvatarWidget::refreshStatus()
// No check of return value. Non existing status info is handled as offline.
rsStatus->getStatus(mId, statusInfo);
}
updateStatus(QString::fromStdString(statusInfo.id), statusInfo.status);
updateStatus(QString::fromStdString(statusInfo.id.toStdString()), statusInfo.status);
break;
}
}
@ -173,12 +173,12 @@ void AvatarWidget::updateStatus(const QString peerId, int status)
return;
}
if (mId.empty()) {
if (mId.isNull()) {
mPeerState = status;
Rshare::refreshStyleSheet(this, false);
} else {
/* set style for status */
if (mId == peerId.toStdString()) {
if (mId.toStdString() == peerId.toStdString()) {
// the peers status has changed
mPeerState = status;
setEnabled(((uint32_t) status == RS_STATUS_OFFLINE) ? false : true);
@ -189,7 +189,7 @@ void AvatarWidget::updateStatus(const QString peerId, int status)
void AvatarWidget::updateAvatar(const QString &peerId)
{
if (mId.empty()) {
if (mId.isNull()) {
QPixmap avatar(defaultAvatar);
setPixmap(avatar);
return;
@ -202,34 +202,34 @@ void AvatarWidget::updateAvatar(const QString &peerId)
return;
}
if (mFlag.isGpg) {
if (mId == peerId.toStdString()) {
/* called from AvatarWidget with gpg id */
QPixmap avatar;
AvatarDefs::getAvatarFromGpgId(mId, avatar, defaultAvatar);
setPixmap(avatar);
return;
}
//if (mFlag.isGpg) {
// if (mId == peerId.toStdString()) {
// /* called from AvatarWidget with gpg id */
// QPixmap avatar;
// AvatarDefs::getAvatarFromGpgId(mId, avatar, defaultAvatar);
// setPixmap(avatar);
// return;
// }
//
// /* Is this one of the ssl ids of the gpg id ? */
// std::list<std::string> sslIds;
// if (rsPeers->getAssociatedSSLIds(mId, sslIds) == false) {
// return;
// }
//
// if (std::find(sslIds.begin(), sslIds.end(), peerId.toStdString()) != sslIds.end()) {
// /* One of the ssl ids of the gpg id */
// QPixmap avatar;
// AvatarDefs::getAvatarFromGpgId(mId, avatar, defaultAvatar);
// setPixmap(avatar);
// }
//
// return;
//}
/* Is this one of the ssl ids of the gpg id ? */
std::list<std::string> sslIds;
if (rsPeers->getAssociatedSSLIds(mId, sslIds) == false) {
return;
}
if (std::find(sslIds.begin(), sslIds.end(), peerId.toStdString()) != sslIds.end()) {
/* One of the ssl ids of the gpg id */
QPixmap avatar;
AvatarDefs::getAvatarFromGpgId(mId, avatar, defaultAvatar);
setPixmap(avatar);
}
return;
}
if (mId == peerId.toStdString()) {
if (mId.toStdString() == peerId.toStdString()) {
QPixmap avatar;
AvatarDefs::getAvatarFromSslId(mId, avatar, defaultAvatar);
AvatarDefs::getAvatarFromSslId(mId.toStdString(), avatar, defaultAvatar);
setPixmap(avatar);
return;
}
@ -238,6 +238,6 @@ void AvatarWidget::updateAvatar(const QString &peerId)
void AvatarWidget::updateOwnAvatar()
{
if (mFlag.isOwnId) {
updateAvatar(QString::fromStdString(mId));
updateAvatar(QString::fromStdString(mId.toStdString()));
}
}