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

added new tree items for subscribed lobbies. Helps spoting them in the list (Patch from Phenom)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-10-11 20:46:25 +00:00
parent 9d73b1f4af
commit 5865c80a76
2 changed files with 95 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,11 +45,6 @@
#define IMAGE_MESSAGE ":images/chat.png" #define IMAGE_MESSAGE ":images/chat.png"
#define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png" #define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png"
#include <QModelIndex>
#include <QPainter>
#include <limits>
ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags) ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags)
: RsAutoUpdatePage(5000, parent, flags) : RsAutoUpdatePage(5000, parent, flags)
{ {
@ -93,19 +88,33 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags)
header->setResizeMode(COLUMN_TOPIC, QHeaderView::Interactive); header->setResizeMode(COLUMN_TOPIC, QHeaderView::Interactive);
header->setResizeMode(COLUMN_SUBSCRIBED, QHeaderView::Interactive); header->setResizeMode(COLUMN_SUBSCRIBED, QHeaderView::Interactive);
privateSubLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
privateSubLobbyItem->setText(COLUMN_NAME, tr("Private Subscribed Lobbies"));
privateSubLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "1");
// privateLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
privateSubLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, RS_CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE);
lobbyTreeWidget->insertTopLevelItem(0, privateSubLobbyItem);
publicSubLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed Lobbies"));
publicSubLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "2");
// publicLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
publicSubLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC);
lobbyTreeWidget->insertTopLevelItem(1, publicSubLobbyItem);
privateLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER); privateLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
privateLobbyItem->setText(COLUMN_NAME, tr("Private Lobbies")); privateLobbyItem->setText(COLUMN_NAME, tr("Private Lobbies"));
privateLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "1"); privateLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "3");
// privateLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE)); // privateLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
privateLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, RS_CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE); privateLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, RS_CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE);
lobbyTreeWidget->insertTopLevelItem(0, privateLobbyItem); lobbyTreeWidget->insertTopLevelItem(2, privateLobbyItem);
publicLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER); publicLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
publicLobbyItem->setText(COLUMN_NAME, tr("Public Lobbies")); publicLobbyItem->setText(COLUMN_NAME, tr("Public Lobbies"));
publicLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "2"); publicLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "4");
// publicLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC)); // publicLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
publicLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC); publicLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC);
lobbyTreeWidget->insertTopLevelItem(1, publicLobbyItem); lobbyTreeWidget->insertTopLevelItem(3, publicLobbyItem);
lobbyTreeWidget->expandAll(); lobbyTreeWidget->expandAll();
lobbyTreeWidget->setColumnHidden(COLUMN_NAME,false) ; lobbyTreeWidget->setColumnHidden(COLUMN_NAME,false) ;
@ -119,10 +128,6 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags)
lobbyTreeWidget->setColumnWidth(COLUMN_USER_COUNT, 50); lobbyTreeWidget->setColumnWidth(COLUMN_USER_COUNT, 50);
lobbyTreeWidget->setColumnWidth(COLUMN_TOPIC, 50); lobbyTreeWidget->setColumnWidth(COLUMN_TOPIC, 50);
QHeaderView *qhvLobbyList = lobbyTreeWidget->header();
qhvLobbyList->setContextMenuPolicy(Qt::CustomContextMenu);
connect(qhvLobbyList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(lobbyTreeWidgetHeaderCustomPopupMenu(QPoint)));
/** Setup the actions for the header context menu */ /** Setup the actions for the header context menu */
showUserCountAct= new QAction(headerItem->text(COLUMN_USER_COUNT),this); showUserCountAct= new QAction(headerItem->text(COLUMN_USER_COUNT),this);
showUserCountAct->setCheckable(true); showUserCountAct->setToolTip(tr("Show ")+showUserCountAct->text()+tr(" Column")); showUserCountAct->setCheckable(true); showUserCountAct->setToolTip(tr("Show ")+showUserCountAct->text()+tr(" Column"));
@ -205,18 +210,7 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint)
} }
} }
if (contextMnu.children().count() == 0) { contextMnu.addSeparator();//-------------------------------------------------------------------
return;
}
contextMnu.exec(QCursor::pos());
}
void ChatLobbyWidget::lobbyTreeWidgetHeaderCustomPopupMenu( QPoint /*point*/ )
{
std::cerr << "ChatLobbyWidget::lobbyTreeWidgetHeaderCustomPopupMenu()" << std::endl;
QMenu contextMnu( this );
showUserCountAct->setChecked(!lobbyTreeWidget->isColumnHidden(COLUMN_USER_COUNT)); showUserCountAct->setChecked(!lobbyTreeWidget->isColumnHidden(COLUMN_USER_COUNT));
showTopicAct->setChecked(!lobbyTreeWidget->isColumnHidden(COLUMN_TOPIC)); showTopicAct->setChecked(!lobbyTreeWidget->isColumnHidden(COLUMN_TOPIC));
@ -228,7 +222,6 @@ void ChatLobbyWidget::lobbyTreeWidgetHeaderCustomPopupMenu( QPoint /*point*/ )
menu->addAction(showSubscribeAct); menu->addAction(showSubscribeAct);
contextMnu.exec(QCursor::pos()); contextMnu.exec(QCursor::pos());
} }
void ChatLobbyWidget::lobbyChanged() void ChatLobbyWidget::lobbyChanged()
@ -253,7 +246,7 @@ static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobby
} }
//item->setText(COLUMN_USER_COUNT, QString::number(count)); //item->setText(COLUMN_USER_COUNT, QString::number(count));
item->setData(COLUMN_USER_COUNT, Qt::DisplayRole, count); item->setData(COLUMN_USER_COUNT, Qt::EditRole, count);
item->setText(COLUMN_SUBSCRIBED, subscribed?qApp->translate("ChatLobbyWidget", "Yes"):qApp->translate("ChatLobbyWidget", "No")); item->setText(COLUMN_SUBSCRIBED, subscribed?qApp->translate("ChatLobbyWidget", "Yes"):qApp->translate("ChatLobbyWidget", "No"));
@ -340,9 +333,17 @@ void ChatLobbyWidget::updateDisplay()
// remove not existing public lobbies // remove not existing public lobbies
for(int p=0;p<2;++p) for(int p=0;p<4;++p)
{ {
QTreeWidgetItem *lobby_item = (p==0)?publicLobbyItem:privateLobbyItem ; QTreeWidgetItem *lobby_item =NULL;
switch (p) {
case 0: lobby_item = privateSubLobbyItem; break;
case 1: lobby_item = publicSubLobbyItem; break;
case 2: lobby_item = privateLobbyItem; break;
case 4: lobby_item = publicLobbyItem; break;
default: lobby_item = publicLobbyItem;
}
//QTreeWidgetItem *lobby_item = (p==0)?publicLobbyItem:privateLobbyItem ;
int childCnt = lobby_item->childCount(); int childCnt = lobby_item->childCount();
int childIndex = 0; int childIndex = 0;
@ -386,12 +387,37 @@ void ChatLobbyWidget::updateDisplay()
std::cerr << "adding " << lobby.lobby_name << "topic " << lobby.lobby_topic << " #" << std::hex << lobby.lobby_id << std::dec << " public " << lobby.total_number_of_peers << " peers. Lobby type: " << lobby.lobby_privacy_level << std::endl; std::cerr << "adding " << lobby.lobby_name << "topic " << lobby.lobby_topic << " #" << std::hex << lobby.lobby_id << std::dec << " public " << lobby.total_number_of_peers << " peers. Lobby type: " << lobby.lobby_privacy_level << std::endl;
#endif #endif
bool subscribed = false;
if (rsMsgs->getVirtualPeerId(lobby.lobby_id, vpid)) {
subscribed = true;
}
QTreeWidgetItem *item = NULL; QTreeWidgetItem *item = NULL;
QTreeWidgetItem *lobby_item = (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC)?publicLobbyItem:privateLobbyItem ; QTreeWidgetItem *lobby_item =NULL;
QTreeWidgetItem *lobby_other_item =NULL;
if (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC){
if (subscribed) { lobby_item = publicSubLobbyItem; lobby_other_item = publicLobbyItem;
} else { lobby_item = publicLobbyItem; lobby_other_item = publicSubLobbyItem;}
} else {
if (subscribed) { lobby_item = privateSubLobbyItem; lobby_other_item = privateLobbyItem;
} else { lobby_item = privateLobbyItem; lobby_other_item = privateSubLobbyItem;}
}
//QTreeWidgetItem *lobby_item = (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC)?publicLobbyItem:privateLobbyItem ;
// Search existing item // Search existing item
// //
int childCnt = lobby_item->childCount(); int childCnt = lobby_other_item->childCount();
for (int childIndex = 0; childIndex < childCnt; childIndex++)
{
QTreeWidgetItem *itemLoop = lobby_other_item->child(childIndex);
if (itemLoop->type() == TYPE_LOBBY && itemLoop->data(COLUMN_DATA, ROLE_ID).toULongLong() == lobby.lobby_id) {
delete(lobby_other_item->takeChild(lobby_other_item->indexOfChild(itemLoop)));
childCnt = lobby_other_item->childCount();
break;
}
}
childCnt = lobby_item->childCount();
for (int childIndex = 0; childIndex < childCnt; childIndex++) for (int childIndex = 0; childIndex < childCnt; childIndex++)
{ {
QTreeWidgetItem *itemLoop = lobby_item->child(childIndex); QTreeWidgetItem *itemLoop = lobby_item->child(childIndex);
@ -401,20 +427,15 @@ void ChatLobbyWidget::updateDisplay()
} }
} }
bool subscribed = false;
if (rsMsgs->getVirtualPeerId(lobby.lobby_id, vpid)) {
subscribed = true;
}
QIcon icon; QIcon icon;
if (item == NULL) { if (item == NULL) {
item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY); item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY);
icon = (lobby_item == publicLobbyItem) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE); icon = (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE);
lobby_item->addChild(item); lobby_item->addChild(item);
} else { } else {
if (item->data(COLUMN_DATA, ROLE_SUBSCRIBED).toBool() != subscribed) { if (item->data(COLUMN_DATA, ROLE_SUBSCRIBED).toBool() != subscribed) {
// Replace icon // Replace icon
icon = (lobby_item == publicLobbyItem) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE); icon = (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE);
} }
} }
if (!icon.isNull()) { if (!icon.isNull()) {
@ -454,9 +475,9 @@ void ChatLobbyWidget::updateDisplay()
QTreeWidgetItem *itemParent; QTreeWidgetItem *itemParent;
if (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC) { if (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC) {
itemParent = publicLobbyItem; itemParent = publicSubLobbyItem;
} else { } else {
itemParent = privateLobbyItem; itemParent = privateSubLobbyItem;
} }
QTreeWidgetItem *item = NULL; QTreeWidgetItem *item = NULL;
@ -474,12 +495,12 @@ void ChatLobbyWidget::updateDisplay()
QIcon icon; QIcon icon;
if (item == NULL) { if (item == NULL) {
item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY); item = new RSTreeWidgetItem(compareRole, TYPE_LOBBY);
icon = (itemParent == publicLobbyItem) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE); icon = (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE);
itemParent->addChild(item); itemParent->addChild(item);
} else { } else {
if (!item->data(COLUMN_DATA, ROLE_SUBSCRIBED).toBool()) { if (!item->data(COLUMN_DATA, ROLE_SUBSCRIBED).toBool()) {
// Replace icon // Replace icon
icon = (itemParent == publicLobbyItem) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE); icon = (lobby.lobby_privacy_level == RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE);
} }
} }
if (!icon.isNull()) { if (!icon.isNull()) {
@ -490,6 +511,8 @@ void ChatLobbyWidget::updateDisplay()
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);
} }
publicSubLobbyItem->setHidden(publicSubLobbyItem->childCount()==0);
privateSubLobbyItem->setHidden(privateSubLobbyItem->childCount()==0);
} }
void ChatLobbyWidget::createChatLobby() void ChatLobbyWidget::createChatLobby()
@ -565,7 +588,6 @@ void ChatLobbyWidget::showBlankPage(ChatLobbyId id)
lobbypeers_lineEdit->setText( QString::number((*it).total_number_of_peers) ); lobbypeers_lineEdit->setText( QString::number((*it).total_number_of_peers) );
lobbyinfo_label->setText(tr("You're not subscribed to this lobby; Double click-it to enter and chat.") ); lobbyinfo_label->setText(tr("You're not subscribed to this lobby; Double click-it to enter and chat.") );
return ; return ;
} }
@ -591,9 +613,17 @@ void ChatLobbyWidget::autoSubscribeItem()
QTreeWidgetItem *ChatLobbyWidget::getTreeWidgetItem(ChatLobbyId id) QTreeWidgetItem *ChatLobbyWidget::getTreeWidgetItem(ChatLobbyId id)
{ {
for(int p=0;p<2;++p) for(int p=0;p<4;++p)
{ {
QTreeWidgetItem *lobby_item = (p==0)?publicLobbyItem:privateLobbyItem ; QTreeWidgetItem *lobby_item =NULL;
switch (p) {
case 0: lobby_item = privateSubLobbyItem; break;
case 1: lobby_item = publicSubLobbyItem; break;
case 2: lobby_item = privateLobbyItem; break;
case 4: lobby_item = publicLobbyItem; break;
default: lobby_item = publicLobbyItem;
}
//QTreeWidgetItem *lobby_item = (p==0)?publicLobbyItem:privateLobbyItem ;
int childCnt = lobby_item->childCount(); int childCnt = lobby_item->childCount();
int childIndex = 0; int childIndex = 0;
@ -720,7 +750,8 @@ void ChatLobbyWidget::updateCurrentLobby()
ChatLobbyId id = item->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()) {
QIcon icon = (item->parent() == publicLobbyItem) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE); int iPrivacyLevel= item->parent()->data(COLUMN_DATA, ROLE_PRIVACYLEVEL).toInt();
QIcon icon = (iPrivacyLevel==RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC) ? QIcon(IMAGE_PUBLIC) : QIcon(IMAGE_PRIVATE);
_lobby_infos[id].default_icon = icon ; _lobby_infos[id].default_icon = icon ;
item->setIcon(COLUMN_NAME, icon) ; item->setIcon(COLUMN_NAME, icon) ;
} }
@ -867,6 +898,7 @@ void ChatLobbyWidget::setShowUserCountColumn(bool show)
if (lobbyTreeWidget->isColumnHidden(COLUMN_USER_COUNT) == show) { if (lobbyTreeWidget->isColumnHidden(COLUMN_USER_COUNT) == show) {
lobbyTreeWidget->setColumnHidden(COLUMN_USER_COUNT, !show); lobbyTreeWidget->setColumnHidden(COLUMN_USER_COUNT, !show);
} }
lobbyTreeWidget->header()->setVisible(getNumColVisible()>1);
} }
void ChatLobbyWidget::setShowTopicColumn(bool show) void ChatLobbyWidget::setShowTopicColumn(bool show)
@ -874,6 +906,7 @@ void ChatLobbyWidget::setShowTopicColumn(bool show)
if (lobbyTreeWidget->isColumnHidden(COLUMN_TOPIC) == show) { if (lobbyTreeWidget->isColumnHidden(COLUMN_TOPIC) == show) {
lobbyTreeWidget->setColumnHidden(COLUMN_TOPIC, !show); lobbyTreeWidget->setColumnHidden(COLUMN_TOPIC, !show);
} }
lobbyTreeWidget->header()->setVisible(getNumColVisible()>1);
} }
void ChatLobbyWidget::setShowSubscribeColumn(bool show) void ChatLobbyWidget::setShowSubscribeColumn(bool show)
@ -881,4 +914,17 @@ void ChatLobbyWidget::setShowSubscribeColumn(bool show)
if (lobbyTreeWidget->isColumnHidden(COLUMN_SUBSCRIBED) == show) { if (lobbyTreeWidget->isColumnHidden(COLUMN_SUBSCRIBED) == show) {
lobbyTreeWidget->setColumnHidden(COLUMN_SUBSCRIBED, !show); lobbyTreeWidget->setColumnHidden(COLUMN_SUBSCRIBED, !show);
} }
lobbyTreeWidget->header()->setVisible(getNumColVisible()>1);
} }
int ChatLobbyWidget::getNumColVisible()
{
int iNumColVis=0;
for (int iColumn = 0; iColumn < COLUMN_COUNT; ++iColumn) {
if (!lobbyTreeWidget->isColumnHidden(iColumn)) {
++iNumColVis;
}
}
return iNumColVis;
}

7
retroshare-gui/src/gui/ChatLobbyWidget.h
View File

@ -5,9 +5,6 @@
#include "ui_ChatLobbyWidget.h" #include "ui_ChatLobbyWidget.h"
#include "RsAutoUpdatePage.h" #include "RsAutoUpdatePage.h"
class QModelIndex;
class QPainter;
class RSTreeWidgetItemCompareRole; class RSTreeWidgetItemCompareRole;
class ChatTabWidget ; class ChatTabWidget ;
class ChatLobbyDialog ; class ChatLobbyDialog ;
@ -39,7 +36,6 @@ public:
protected slots: protected slots:
void lobbyChanged(); void lobbyChanged();
void lobbyTreeWidgetCustomPopupMenu(QPoint); void lobbyTreeWidgetCustomPopupMenu(QPoint);
void lobbyTreeWidgetHeaderCustomPopupMenu( QPoint point );
void createChatLobby(); void createChatLobby();
void subscribeItem(); void subscribeItem();
void unsubscribeItem(); void unsubscribeItem();
@ -74,6 +70,8 @@ private:
RSTreeWidgetItemCompareRole *compareRole; RSTreeWidgetItemCompareRole *compareRole;
QTreeWidgetItem *privateLobbyItem; QTreeWidgetItem *privateLobbyItem;
QTreeWidgetItem *publicLobbyItem; QTreeWidgetItem *publicLobbyItem;
QTreeWidgetItem *privateSubLobbyItem;
QTreeWidgetItem *publicSubLobbyItem;
QTreeWidgetItem *getTreeWidgetItem(ChatLobbyId); QTreeWidgetItem *getTreeWidgetItem(ChatLobbyId);
ChatTabWidget *tabWidget ; ChatTabWidget *tabWidget ;
@ -89,5 +87,6 @@ private:
QAction* showUserCountAct; QAction* showUserCountAct;
QAction* showTopicAct; QAction* showTopicAct;
QAction* showSubscribeAct; QAction* showSubscribeAct;
int getNumColVisible();
}; };