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

Moved the chat lobby tabs to the FriendsDialog.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-01-18 20:02:19 +00:00
parent 1ec716175b
commit 912e5339ca
12 changed files with 73 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

27
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View file

@ -29,25 +29,18 @@
#define IMAGE_SUBSCRIBE ""
#define IMAGE_UNSUBSCRIBE ""
static ChatLobbyWidget *instance = NULL;
ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags)
: RsAutoUpdatePage(5000,parent)
{
setupUi(this);
if (instance == NULL) {
instance = this;
}
QObject::connect(NotifyQt::getInstance(), SIGNAL(lobbyListChanged()), SLOT(lobbyChanged()));
QObject::connect(NotifyQt::getInstance(), SIGNAL(chatLobbyEvent(qulonglong,int,const QString&,const QString&)), this, SLOT(displayChatLobbyEvent(qulonglong,int,const QString&,const QString&)));
QObject::connect(NotifyQt::getInstance(), SIGNAL(chatLobbyInviteReceived()), this, SLOT(readChatLobbyInvites()));
QObject::connect(lobbyTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(lobbyTreeWidgetCostumPopupMenu()));
QObject::connect(lobbyTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(itemDoubleClicked(QTreeWidgetItem*,int)));
QObject::connect(lobbyTabWidget, SIGNAL(infoChanged()), this, SLOT(tabInfoChanged()));
QObject::connect(newlobbypushButton, SIGNAL(clicked()), this, SLOT(createChatLobby()));
compareRole = new RSTreeWidgetItemCompareRole;
@ -86,14 +79,6 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags)
ChatLobbyWidget::~ChatLobbyWidget()
{
if (this == instance) {
instance = NULL;
}
}
/*static*/ ChatTabWidget *ChatLobbyWidget::getTabWidget()
{
return instance ? instance->lobbyTabWidget : NULL;
}
void ChatLobbyWidget::lobbyTreeWidgetCostumPopupMenu()
@ -367,13 +352,3 @@ void ChatLobbyWidget::readChatLobbyInvites()
}
}
}
void ChatLobbyWidget::tabInfoChanged()
{
emit infoChanged();
}
void ChatLobbyWidget::getInfo(bool &isTyping, bool &hasNewMessage, QIcon *icon)
{
lobbyTabWidget->getInfo(isTyping, hasNewMessage, icon);
}