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

Moved service permission matrix to the left toolbar

Browse source 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6678 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-09-02 21:48:23 +00:00
parent 3f66f9d338
commit 495cc17da3
11 changed files with 62 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -33,7 +33,6 @@
#include "gui/chat/ChatDialog.h"
//#include "gui/chat/CreateLobbyDialog.h"
#include "gui/common/AvatarDefs.h"
#include "gui/ServicePermissionDialog.h"
#include "gui/FriendRecommendDialog.h"
#include "gui/connect/ConfCertDialog.h"
@ -71,7 +70,6 @@
#define IMAGE_REMOVE ":/images/delete.png"
#define IMAGE_EXPAND ":/images/edit_add24.png"
#define IMAGE_COLLAPSE ":/images/edit_remove24.png"
#define IMAGE_PERMISSIONS ":/images/admin-16.png"
/* Images for Status icons */
#define IMAGE_AVAILABLE ":/images/user/identityavaiblecyan24.png"
#define IMAGE_CONNECT2 ":/images/reload24.png"
@ -532,7 +530,6 @@ void FriendList::peerTreeWidgetCostumPopupMenu()
contextMnu.addSeparator();
contextMnu.addAction(QIcon(IMAGE_EXPAND), tr("Recommend many friends to each others"), this, SLOT(recommendFriends()));
contextMnu.addAction(QIcon(IMAGE_PERMISSIONS), tr("Service permissions matrix"), this, SLOT(servicePermission()));
contextMnu.addSeparator();
@ -551,11 +548,6 @@ void FriendList::recommendFriends()
{
FriendRecommendDialog::showYourself();
}
void FriendList::servicePermission()
{
ServicePermissionDialog dlg;
dlg.exec();
}
void FriendList::updateDisplay()
{