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

Added "Create new Chat lobby" menu Entry to Friends Dialog

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-01-12 16:24:36 +00:00
parent 4700a75557
commit 8d2eb8e09c
3 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -56,6 +56,7 @@
#include "RetroShareLink.h" #include "RetroShareLink.h"
#include "settings/rsharesettings.h" #include "settings/rsharesettings.h"
#include "util/misc.h" #include "util/misc.h"
#include "chat/CreateLobbyDialog.h"
#include "FriendsDialog.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_Avatar, SIGNAL(triggered()), this, SLOT(getAvatar()));
connect( ui.actionSet_your_Personal_Message, SIGNAL(triggered()), this, SLOT(statusmessage())); connect( ui.actionSet_your_Personal_Message, SIGNAL(triggered()), this, SLOT(statusmessage()));
connect( ui.addfileButton, SIGNAL(clicked() ), this , SLOT(addExtraFile())); 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->setFrameType(AvatarWidget::STATUS_FRAME);
ui.avatar->setOwnId(); ui.avatar->setOwnId();
@ -149,6 +151,7 @@ FriendsDialog::FriendsDialog(QWidget *parent)
QMenu *menu = new QMenu(); QMenu *menu = new QMenu();
menu->addAction(ui.actionAdd_Friend); menu->addAction(ui.actionAdd_Friend);
menu->addAction(ui.actionAdd_Group); menu->addAction(ui.actionAdd_Group);
menu->addAction(ui.actionCreate_new_Chat_lobby);
menu->addSeparator(); menu->addSeparator();
menu->addAction(ui.actionCreate_New_Forum); menu->addAction(ui.actionCreate_New_Forum);
@ -834,3 +837,9 @@ void FriendsDialog::lobbyInfoChanged()
ui.peertabWidget->setTabIcon(chatlobbyTabIndex, icon); ui.peertabWidget->setTabIcon(chatlobbyTabIndex, icon);
} }
void FriendsDialog::createChatLobby()
{
std::list<std::string> friends;
CreateLobbyDialog(friends).exec();
}

2
retroshare-gui/src/gui/FriendsDialog.h
View file

@ -113,6 +113,8 @@ private slots:
void newsFeedChanged(int count); void newsFeedChanged(int count);
void lobbyInfoChanged(); void lobbyInfoChanged();
void createChatLobby();
signals: signals:
void notifyGroupChat(const QString&,const QString&) ; void notifyGroupChat(const QString&,const QString&) ;

12
retroshare-gui/src/gui/FriendsDialog.ui
View file

@ -1427,6 +1427,18 @@ background: white;}</string>
<string>Deletes all stored and displayed chat history</string> <string>Deletes all stored and displayed chat history</string>
</property> </property>
</action> </action>
<action name="actionCreate_new_Chat_lobby">
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/user/agt_forum24.png</normaloff>:/images/user/agt_forum24.png</iconset>
</property>
<property name="text">
<string>Create new Chat lobby</string>
</property>
<property name="toolTip">
<string>Create new Chat lobby</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>