Moved service permission matrix to the left toolbar

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

View file

@ -53,7 +53,6 @@
#include "util/DateTime.h"
//#include "FriendRecommendDialog.h"
#include "FriendsDialog.h"
//#include "ServicePermissionDialog.h"
#include "NetworkView.h"
#include "NetworkDialog.h"
@ -88,8 +87,7 @@ FriendsDialog::FriendsDialog(QWidget *parent)
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.actionFriendRecommendations, SIGNAL(triggered()), this, SLOT(recommendFriends()));
connect( ui.actionServicePermission, SIGNAL(triggered()), this, SLOT(servicePermission()));
connect( ui.actionFriendRecommendations, SIGNAL(triggered()), this, SLOT(recommendFriends()));
ui.avatar->setFrameType(AvatarWidget::STATUS_FRAME);
ui.avatar->setOwnId();
@ -171,7 +169,6 @@ FriendsDialog::FriendsDialog(QWidget *parent)
// menu->addAction(ui.actionAdd_Group);
// menu->addAction(ui.actionCreate_new_Chat_lobby);
// menu->addAction(ui.actionFriendRecommendations);
// menu->addAction(ui.actionServicePermission);
//
// menu->addSeparator();
// menu->addAction(ui.actionSet_your_Avatar);