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

Moved font size definitions from ui files to default qss.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-12-07 16:27:24 +00:00
parent 90c3c24412
commit ea53e41c9c
11 changed files with 78 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -268,6 +268,8 @@ void ChatWidget::init(const RsPeerId &peerId, const QString &title)
hist_chat_type = RS_HISTORY_TYPE_LOBBY;
messageCount = Settings->getLobbyChatHistoryCount();
ui->statusLabel->hide();
updateTitle();
} else {
hist_chat_type = RS_HISTORY_TYPE_PRIVATE ;
@ -1278,19 +1280,19 @@ void ChatWidget::updateStatus(const QString &peer_id, int status)
}
/* set font size for status */
if (RsPeerId(peer_id.toStdString()) == peerId) {
if (RsPeerId(peer_id.toStdString()) == peerId) {
// the peers status has changed
QString peerName ;
uint32_t stts ;
if(rsMsgs->getDistantChatStatus(RsGxsId(peerId),stts))
if(rsMsgs->getDistantChatStatus(RsGxsId(peerId),stts))
{
RsIdentityDetails details ;
if(rsIdentity->getIdDetails(RsGxsId(peerId),details))
if(rsIdentity->getIdDetails(RsGxsId(peerId),details))
peerName = QString::fromUtf8( details.mNickname.c_str() ) ;
else
peerName = QString::fromStdString(peerId.toStdString()) ;
peerName = QString::fromStdString(peerId.toStdString()) ;
}
else
peerName = QString::fromUtf8(rsPeers->getPeerName(peerId).c_str());