Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed display of icons in chat lobby tree.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6624 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-08-26 23:37:13 +00:00
parent 21eabaa5d9
commit 68a1e46b0d
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View File

@ -231,9 +231,19 @@ void ChatLobbyWidget::addChatPage(ChatLobbyDialog *d)
connect(d,SIGNAL(peerJoined(ChatLobbyId)),this,SLOT(updatePeerEntering(ChatLobbyId))) ; connect(d,SIGNAL(peerJoined(ChatLobbyId)),this,SLOT(updatePeerEntering(ChatLobbyId))) ;
connect(d,SIGNAL(peerLeft(ChatLobbyId)),this,SLOT(updatePeerLeaving(ChatLobbyId))) ; connect(d,SIGNAL(peerLeft(ChatLobbyId)),this,SLOT(updatePeerLeaving(ChatLobbyId))) ;
_lobby_infos[d->id()].dialog = d ; ChatLobbyId id = d->id();
_lobby_infos[d->id()].default_icon = QIcon() ; _lobby_infos[id].dialog = d ;
_lobby_infos[d->id()].last_typing_event = time(NULL) ; _lobby_infos[id].default_icon = QIcon() ;
_lobby_infos[id].last_typing_event = time(NULL) ;
std::list<ChatLobbyInfo> lobbies;
rsMsgs->getChatLobbyList(lobbies);
for (std::list<ChatLobbyInfo>::const_iterator it = lobbies.begin(); it != lobbies.end();++it) {
if (it->lobby_id == id) {
_lobby_infos[id].default_icon = (it->lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE) ? QIcon(IMAGE_PRIVATE) : QIcon(IMAGE_PUBLIC);
}
}
} }
} }
@ -313,7 +323,7 @@ void ChatLobbyWidget::updateDisplay()
#endif #endif
QTreeWidgetItem *item = NULL; QTreeWidgetItem *item = NULL;
QTreeWidgetItem *lobby_item = (visibleLobbies[i].lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC)?publicLobbyItem:privateLobbyItem ; QTreeWidgetItem *lobby_item = (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC)?publicLobbyItem:privateLobbyItem ;
// Search existing item // Search existing item
// //
@ -329,14 +339,10 @@ void ChatLobbyWidget::updateDisplay()
if (item == NULL) { if (item == NULL) {
item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY); item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY);
item->setIcon(COLUMN_NAME, (lobby_item == publicLobbyItem) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE));
lobby_item->addChild(item); lobby_item->addChild(item);
} }
// if(lobby_item == publicLobbyItem)
// item->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
// else
// item->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
bool subscribed = false; bool subscribed = false;
if (rsMsgs->getVirtualPeerId(lobby.lobby_id, vpid)) { if (rsMsgs->getVirtualPeerId(lobby.lobby_id, vpid)) {
subscribed = true; subscribed = true;
@ -394,17 +400,10 @@ void ChatLobbyWidget::updateDisplay()
if (item == NULL) { if (item == NULL) {
item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY); item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY);
item->setIcon(COLUMN_NAME, (itemParent == publicLobbyItem) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE));
itemParent->addChild(item); itemParent->addChild(item);
} }
// if(_icon_changed_map.find(*lobbyIt) != _icon_changed_map.end())
// && _icon_changed_map[*lobbyIt]+5 < now
// if (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC) {
// item->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
// } else {
// item->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
// }
bool autoSubscribe = rsMsgs->getLobbyAutoSubscribe(lobby.lobby_id); bool autoSubscribe = rsMsgs->getLobbyAutoSubscribe(lobby.lobby_id);
updateItem(lobbyTreeWidget, item, lobby.lobby_id, lobby.lobby_name,lobby.lobby_topic, lobby.nick_names.size(), true, autoSubscribe); updateItem(lobbyTreeWidget, item, lobby.lobby_id, lobby.lobby_name,lobby.lobby_topic, lobby.nick_names.size(), true, autoSubscribe);
@ -531,7 +530,7 @@ void ChatLobbyWidget::updateTypingStatus(ChatLobbyId id)
if(item != NULL) if(item != NULL)
{ {
item->setIcon(0,QIcon(IMAGE_TYPING)) ; item->setIcon(COLUMN_NAME,QIcon(IMAGE_TYPING)) ;
_lobby_infos[id].last_typing_event = time(NULL) ; _lobby_infos[id].last_typing_event = time(NULL) ;
QTimer::singleShot(5000,this,SLOT(resetLobbyTreeIcons())) ; QTimer::singleShot(5000,this,SLOT(resetLobbyTreeIcons())) ;
@ -543,7 +542,7 @@ void ChatLobbyWidget::updatePeerLeaving(ChatLobbyId id)
if(item != NULL) if(item != NULL)
{ {
item->setIcon(0,QIcon(IMAGE_PEER_LEAVING)) ; item->setIcon(COLUMN_NAME,QIcon(IMAGE_PEER_LEAVING)) ;
_lobby_infos[id].last_typing_event = time(NULL) ; _lobby_infos[id].last_typing_event = time(NULL) ;
QTimer::singleShot(5000,this,SLOT(resetLobbyTreeIcons())) ; QTimer::singleShot(5000,this,SLOT(resetLobbyTreeIcons())) ;
@ -555,7 +554,7 @@ void ChatLobbyWidget::updatePeerEntering(ChatLobbyId id)
if(item != NULL) if(item != NULL)
{ {
item->setIcon(0,QIcon(IMAGE_PEER_ENTERING)) ; item->setIcon(COLUMN_NAME,QIcon(IMAGE_PEER_ENTERING)) ;
_lobby_infos[id].last_typing_event = time(NULL) ; _lobby_infos[id].last_typing_event = time(NULL) ;
QTimer::singleShot(5000,this,SLOT(resetLobbyTreeIcons())) ; QTimer::singleShot(5000,this,SLOT(resetLobbyTreeIcons())) ;
@ -568,7 +567,7 @@ void ChatLobbyWidget::resetLobbyTreeIcons()
for(std::map<ChatLobbyId,ChatLobbyInfoStruct>::iterator it(_lobby_infos.begin());it!=_lobby_infos.end();++it) for(std::map<ChatLobbyId,ChatLobbyInfoStruct>::iterator it(_lobby_infos.begin());it!=_lobby_infos.end();++it)
if(it->second.last_typing_event + 5 <= now) if(it->second.last_typing_event + 5 <= now)
{ {
getTreeWidgetItem(it->first)->setIcon(0,it->second.default_icon) ; getTreeWidgetItem(it->first)->setIcon(COLUMN_NAME,it->second.default_icon) ;
// std::cerr << "Reseted 1 lobby icon." << std::endl; // std::cerr << "Reseted 1 lobby icon." << std::endl;
} }
} }
@ -618,13 +617,16 @@ void ChatLobbyWidget::updateCurrentLobby()
showLobby(0) ; showLobby(0) ;
else else
{ {
showLobby(items.front()); QTreeWidgetItem *item = items.front();
items.front()->setIcon(0,QIcon()) ; showLobby(item);
ChatLobbyId id = items.front()->data(COLUMN_DATA, ROLE_ID).toULongLong(); ChatLobbyId id = item->data(COLUMN_DATA, ROLE_ID).toULongLong();
if(_lobby_infos.find(id) != _lobby_infos.end()) if(_lobby_infos.find(id) != _lobby_infos.end()) {
_lobby_infos[id].default_icon = QIcon() ; QIcon icon = (item->parent() == publicLobbyItem) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE);
_lobby_infos[id].default_icon = icon ;
item->setIcon(COLUMN_NAME, icon) ;
}
} }
} }
void ChatLobbyWidget::updateMessageChanged(ChatLobbyId id) void ChatLobbyWidget::updateMessageChanged(ChatLobbyId id)
@ -643,7 +645,7 @@ void ChatLobbyWidget::updateMessageChanged(ChatLobbyId id)
if(item == NULL) if(item == NULL)
return ; return ;
item->setIcon(0,_lobby_infos[id].default_icon) ; item->setIcon(COLUMN_NAME,_lobby_infos[id].default_icon) ;
} }
void ChatLobbyWidget::itemDoubleClicked(QTreeWidgetItem *item, int /*column*/) void ChatLobbyWidget::itemDoubleClicked(QTreeWidgetItem *item, int /*column*/)

4
retroshare-gui/src/gui/ChatLobbyWidget.ui
View File

@ -114,8 +114,8 @@
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
<width>24</width> <width>16</width>
<height>24</height> <height>16</height>
</size> </size>
</property> </property>
<column> <column>