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

@ -61,6 +61,7 @@
#include "SoundManager.h"
#include "notifyqt.h"
#include "common/UserNotify.h"
#include "gui/ServicePermissionDialog.h"
#ifdef UNFINISHED
#include "unfinished/ApplicationWindow.h"
@ -225,6 +226,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
connect(ui->actionAdd_Share, SIGNAL(triggered() ), this , SLOT( openShareManager() ) );
connect(ui->actionOptions, SIGNAL(triggered()), this, SLOT( showSettings()) );
// connect(ui->actionMessenger, SIGNAL(triggered()), this, SLOT( showMessengerWindow()) );
connect(ui->actionServicePermissions, SIGNAL(triggered()), this, SLOT(servicePermission()));
ui->actionMessenger->setVisible(false);
@ -1322,3 +1324,8 @@ void MainWindow::retroshareLinkActivated(const QUrl &url)
links.append(link);
RetroShareLink::process(links);
}
void MainWindow::servicePermission()
{
ServicePermissionDialog::showYourself();
}