diff --git a/retroshare-gui/src/gui/ServicePermissionDialog.cpp b/retroshare-gui/src/gui/ServicePermissionDialog.cpp index 55b33e4e6..22847cf29 100644 --- a/retroshare-gui/src/gui/ServicePermissionDialog.cpp +++ b/retroshare-gui/src/gui/ServicePermissionDialog.cpp @@ -32,6 +32,9 @@ ServicePermissionDialog::ServicePermissionDialog() : ui->setupUi(this); Settings->loadWidgetInformation(this); + + ui->headerFrame->setHeaderImage(QPixmap(":/images/user/servicepermissions64.png")); + ui->headerFrame->setHeaderText(tr("Service Permissions")); connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(setPermissions())); connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject())); diff --git a/retroshare-gui/src/gui/ServicePermissionDialog.ui b/retroshare-gui/src/gui/ServicePermissionDialog.ui index f21d979b8..2b4494a5a 100644 --- a/retroshare-gui/src/gui/ServicePermissionDialog.ui +++ b/retroshare-gui/src/gui/ServicePermissionDialog.ui @@ -6,8 +6,8 @@ 0 0 - 493 - 362 + 504 + 354 @@ -20,28 +20,61 @@ true - - - - - - 0 - 0 - + + + 0 + + + 0 + + + + + QFrame::NoFrame + + + QFrame::Raised + + + 1 - - - - Qt::Horizontal + + + + QFrame::StyledPanel - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + QFrame::Raised + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + frame + headerFrame @@ -50,6 +83,12 @@
gui/common/FriendSelectionWidget.h
1
+ + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 +
diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp index a5dc7b68e..0e6a0bd68 100644 --- a/retroshare-gui/src/gui/common/FriendList.cpp +++ b/retroshare-gui/src/gui/common/FriendList.cpp @@ -69,6 +69,7 @@ #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" @@ -507,7 +508,7 @@ void FriendList::peerTreeWidgetCostumPopupMenu() contextMnu.addSeparator(); contextMnu.addAction(QIcon(IMAGE_EXPAND), tr("Recommend many friends to each others"), this, SLOT(recommendFriends())); - contextMnu.addAction(QIcon(IMAGE_EXPAND), tr("Service permissions matrix"), this, SLOT(servicePermission())); + contextMnu.addAction(QIcon(IMAGE_PERMISSIONS), tr("Service permissions matrix"), this, SLOT(servicePermission())); contextMnu.addSeparator(); diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 070dad3a7..214204e30 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -494,6 +494,7 @@ images/user/agt_forum128.png images/user/group16.png images/user/group24.png + images/user/servicepermissions64.png images/user/user_request16.png images/user/user_request48.png images/user/user_request_unknown48.png diff --git a/retroshare-gui/src/gui/images/user/servicepermissions64.png b/retroshare-gui/src/gui/images/user/servicepermissions64.png new file mode 100644 index 000000000..4f07818ae Binary files /dev/null and b/retroshare-gui/src/gui/images/user/servicepermissions64.png differ