Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-23 08:11:24 -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

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

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

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

@ -128,7 +128,6 @@ private slots:
//void newsFeedChanged(int count); //void newsFeedChanged(int count);
// void recommendFriends(); // void recommendFriends();
// void servicePermission();
signals: signals:
void notifyGroupChat(const QString&,const QString&) ; void notifyGroupChat(const QString&,const QString&) ;

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

@ -843,11 +843,6 @@
<string>Reset font to default</string> <string>Reset font to default</string>
</property> </property>
</action> </action>
<action name="actionServicePermission">
<property name="text">
<string>Service permissions</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>

7
retroshare-gui/src/gui/MainWindow.cpp
View file

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

1
retroshare-gui/src/gui/MainWindow.h
View file

@ -187,6 +187,7 @@ private slots:
void showMessengerWindow(); void showMessengerWindow();
void showDhtWindow(); void showDhtWindow();
void showBwCtrlWindow(); void showBwCtrlWindow();
void servicePermission();
#ifdef UNFINISHED #ifdef UNFINISHED
void showApplWindow(); void showApplWindow();

13
retroshare-gui/src/gui/MainWindow.ui
View file

@ -50,6 +50,7 @@
</attribute> </attribute>
<addaction name="actionAdd_Friend"/> <addaction name="actionAdd_Friend"/>
<addaction name="actionAdd_Share"/> <addaction name="actionAdd_Share"/>
<addaction name="actionServicePermissions"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionMessenger"/> <addaction name="actionMessenger"/>
<addaction name="actionAbout"/> <addaction name="actionAbout"/>
@ -134,6 +135,18 @@
<string>Quick Start Wizard</string> <string>Quick Start Wizard</string>
</property> </property>
</action> </action>
<action name="actionServicePermissions">
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/admin-24.png</normaloff>:/images/admin-24.png</iconset>
</property>
<property name="text">
<string>ServicePermissions</string>
</property>
<property name="toolTip">
<string>Service permissions matrix</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>

16
retroshare-gui/src/gui/ServicePermissionDialog.cpp
View file

@ -25,12 +25,16 @@
#include "ui_ServicePermissionDialog.h" #include "ui_ServicePermissionDialog.h"
#include "settings/rsharesettings.h" #include "settings/rsharesettings.h"
static ServicePermissionDialog *servicePermissionDialog = NULL;
ServicePermissionDialog::ServicePermissionDialog() : ServicePermissionDialog::ServicePermissionDialog() :
QDialog(NULL, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint), QDialog(NULL, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),
ui(new Ui::ServicePermissionDialog) ui(new Ui::ServicePermissionDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
Settings->loadWidgetInformation(this); Settings->loadWidgetInformation(this);
ui->headerFrame->setHeaderImage(QPixmap(":/images/user/servicepermissions64.png")); ui->headerFrame->setHeaderImage(QPixmap(":/images/user/servicepermissions64.png"));
@ -63,6 +67,18 @@ ServicePermissionDialog::~ServicePermissionDialog()
Settings->saveWidgetInformation(this); Settings->saveWidgetInformation(this);
delete ui; delete ui;
servicePermissionDialog = NULL;
}
void ServicePermissionDialog::showYourself()
{
if (!servicePermissionDialog) {
servicePermissionDialog = new ServicePermissionDialog();
}
servicePermissionDialog->show();
servicePermissionDialog->activateWindow();
} }
void ServicePermissionDialog::itemAdded(int idType, const QString &id, QTreeWidgetItem *item) void ServicePermissionDialog::itemAdded(int idType, const QString &id, QTreeWidgetItem *item)

3
retroshare-gui/src/gui/ServicePermissionDialog.h
View file

@ -38,6 +38,9 @@ class ServicePermissionDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
static void showYourself();
private:
ServicePermissionDialog(); ServicePermissionDialog();
~ServicePermissionDialog(); ~ServicePermissionDialog();

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

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

1
retroshare-gui/src/gui/common/FriendList.h
View file

@ -150,7 +150,6 @@ private slots:
#ifdef UNFINISHED_FD #ifdef UNFINISHED_FD
void viewprofile(); void viewprofile();
#endif #endif
void servicePermission() ;
void recommendFriends() ; void recommendFriends() ;
void createNewGroup() ; void createNewGroup() ;

28
retroshare-gui/src/lang/retroshare_en.ts
View file

@ -5546,10 +5546,6 @@ p, li { white-space: pre-wrap; }
<source>Recommend many friends to each others</source> <source>Recommend many friends to each others</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Service permissions matrix</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Display</source> <source>Display</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -5730,10 +5726,6 @@ p, li { white-space: pre-wrap; }
<source>Reset font to default</source> <source>Reset font to default</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Service permissions</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Local network</source> <source>Local network</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -7778,6 +7770,14 @@ p, li { white-space: pre-wrap; }
<source>Anonymous Id</source> <source>Anonymous Id</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Create new Identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Identity</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>IdEditDialog</name> <name>IdEditDialog</name>
@ -7841,6 +7841,10 @@ p, li { white-space: pre-wrap; }
<source>Unknown real name</source> <source>Unknown real name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Create New Identity</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ImHistoryBrowser</name> <name>ImHistoryBrowser</name>
@ -8134,6 +8138,14 @@ p, li { white-space: pre-wrap; }
<source>The file link is malformed.</source> <source>The file link is malformed.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>ServicePermissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Service permissions matrix</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MessageComposer</name> <name>MessageComposer</name>