From ebbf6d9e26b3073e091f87ed9e6e3d96015e0d1c Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 21 Aug 2013 16:26:34 +0000 Subject: [PATCH] Added a headerFrame to Service Permissions Dialog git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6583 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/ServicePermissionDialog.cpp | 3 + .../src/gui/ServicePermissionDialog.ui | 71 ++++++++++++++---- retroshare-gui/src/gui/common/FriendList.cpp | 3 +- retroshare-gui/src/gui/images.qrc | 1 + .../gui/images/user/servicepermissions64.png | Bin 0 -> 7314 bytes 5 files changed, 61 insertions(+), 17 deletions(-) create mode 100644 retroshare-gui/src/gui/images/user/servicepermissions64.png 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 0000000000000000000000000000000000000000..4f07818ae5a50db7fd3a62d6512f44a1a00acd9b GIT binary patch literal 7314 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 literal 0 HcmV?d00001