From 8d2eb8e09c4fd00f6de48d8a4cf6f1957cb8836b Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 12 Jan 2012 16:24:36 +0000 Subject: [PATCH] Added "Create new Chat lobby" menu Entry to Friends Dialog git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4784 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/FriendsDialog.cpp | 11 ++++++++++- retroshare-gui/src/gui/FriendsDialog.h | 2 ++ retroshare-gui/src/gui/FriendsDialog.ui | 12 ++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 9399012d7..a49ed2433 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -56,6 +56,7 @@ #include "RetroShareLink.h" #include "settings/rsharesettings.h" #include "util/misc.h" +#include "chat/CreateLobbyDialog.h" #include "FriendsDialog.h" @@ -80,7 +81,8 @@ FriendsDialog::FriendsDialog(QWidget *parent) connect( ui.actionSet_your_Avatar, SIGNAL(triggered()), this, SLOT(getAvatar())); connect( ui.actionSet_your_Personal_Message, SIGNAL(triggered()), this, SLOT(statusmessage())); connect( ui.addfileButton, SIGNAL(clicked() ), this , SLOT(addExtraFile())); - connect(ui.actionAdd_Friend, SIGNAL(triggered()), this, SLOT(addFriend())); + connect( ui.actionAdd_Friend, SIGNAL(triggered()), this, SLOT(addFriend())); + connect( ui.actionCreate_new_Chat_lobby, SIGNAL(triggered()), this, SLOT(createChatLobby())); ui.avatar->setFrameType(AvatarWidget::STATUS_FRAME); ui.avatar->setOwnId(); @@ -149,6 +151,7 @@ FriendsDialog::FriendsDialog(QWidget *parent) QMenu *menu = new QMenu(); menu->addAction(ui.actionAdd_Friend); menu->addAction(ui.actionAdd_Group); + menu->addAction(ui.actionCreate_new_Chat_lobby); menu->addSeparator(); menu->addAction(ui.actionCreate_New_Forum); @@ -834,3 +837,9 @@ void FriendsDialog::lobbyInfoChanged() ui.peertabWidget->setTabIcon(chatlobbyTabIndex, icon); } + +void FriendsDialog::createChatLobby() +{ + std::list friends; + CreateLobbyDialog(friends).exec(); +} \ No newline at end of file diff --git a/retroshare-gui/src/gui/FriendsDialog.h b/retroshare-gui/src/gui/FriendsDialog.h index 424e5321f..2aeb8709b 100644 --- a/retroshare-gui/src/gui/FriendsDialog.h +++ b/retroshare-gui/src/gui/FriendsDialog.h @@ -113,6 +113,8 @@ private slots: void newsFeedChanged(int count); void lobbyInfoChanged(); + + void createChatLobby(); signals: void notifyGroupChat(const QString&,const QString&) ; diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index 0b0bbb222..a7196d36e 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -1427,6 +1427,18 @@ background: white;} Deletes all stored and displayed chat history + + + + :/images/user/agt_forum24.png:/images/user/agt_forum24.png + + + Create new Chat lobby + + + Create new Chat lobby + +