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

Don't add a ChatMsgItem as feed on own public chat message.

Browse source 
Moved the handling of the avatar from PeerItem::updateItem and ChatMsgItem::updateItem called with QTimer to connect to the signal peerHasNewAvatar.
Fixed compiler warning.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3419 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-08-31 22:42:40 +00:00
parent b01c6bf3d1
commit af4667232b
6 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

49
retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
View file

@ -27,6 +27,8 @@
#include "../RsAutoUpdatePage.h"
#include "gui/msgs/MessageComposer.h"
#include "gui/notifyqt.h"
#include <retroshare/rsmsgs.h>
#include <retroshare/rspeers.h>
@ -51,8 +53,11 @@ ChatMsgItem::ChatMsgItem(FeedHolder *parent, uint32_t feedId, std::string peerId
connect( chatButton, SIGNAL( clicked( void ) ), this, SLOT( openChat ( void ) ) );
connect( msgButton, SIGNAL( clicked( void ) ), this, SLOT( sendMsg ( void ) ) );
connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(const QString&)), this, SLOT(updateAvatar(const QString&)));
updateItemStatic();
updateItem();
updateAvatar(QString::fromStdString(mPeerId));
insertChat(message);
}
@ -84,8 +89,6 @@ void ChatMsgItem::updateItemStatic()
std::cerr << "ChatMsgItem::updateItemStatic()";
std::cerr << std::endl;
#endif
}
void ChatMsgItem::updateItem()
@ -121,8 +124,6 @@ void ChatMsgItem::updateItem()
/* slow Tick */
int msec_rate = 10129;
loadAvatar();
QTimer::singleShot( msec_rate, this, SLOT(updateItem( void ) ));
return;
}
@ -152,7 +153,6 @@ void ChatMsgItem::removeItem()
}
}
void ChatMsgItem::gotoHome()
{
#ifdef DEBUG_ITEM
@ -198,28 +198,29 @@ void ChatMsgItem::openChat()
}
}
void ChatMsgItem::loadAvatar()
void ChatMsgItem::updateAvatar(const QString &peer_id)
{
if (peer_id.toStdString() != mPeerId) {
/* it 's not me */
return;
}
unsigned char *data = NULL;
int size = 0 ;
unsigned char *data = NULL;
int size = 0 ;
rsMsgs->getAvatarData(mPeerId,data,size);
rsMsgs->getAvatarData(mPeerId,data,size);
if(size != 0)
{
// set the image
QPixmap pix ;
pix.loadFromData(data,size,"PNG") ;
avatar_label->setPixmap(pix);
delete[] data ;
if(size != 0)
{
// set the image
QPixmap pix ;
pix.loadFromData(data,size,"PNG") ;
avatar_label->setPixmap(pix);
delete[] data ;
}
else
{
avatar_label->setPixmap(QPixmap(":/images/user/personal64.png"));
}
}
else
{
avatar_label->setPixmap(QPixmap(":/images/user/personal64.png"));
}
}