From b2c2b7fc85fef86bff04367f1211d8fed111789e Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Sun, 1 Feb 2015 14:38:19 +0000
Subject: [PATCH] implemented dedicated widget for service permission matrix.
 Permissions are not saved yet, and we also need a default switch

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7898 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/pqi/p3servicecontrol.cc     |  23 +
 .../src/retroshare/rsservicecontrol.h         |   5 +-
 retroshare-gui/src/gui/images.qrc             |   5 +
 retroshare-gui/src/gui/images/switch.png      | Bin 0 -> 3337 bytes
 retroshare-gui/src/gui/images/switch00.png    | Bin 0 -> 3328 bytes
 retroshare-gui/src/gui/images/switch01.png    | Bin 0 -> 3638 bytes
 retroshare-gui/src/gui/images/switch10.png    | Bin 0 -> 3650 bytes
 retroshare-gui/src/gui/images/switch11.png    | Bin 0 -> 3876 bytes
 .../gui/settings/RSPermissionMatrixWidget.cpp | 445 ++++++++++++++++++
 .../gui/settings/RSPermissionMatrixWidget.h   | 103 ++++
 .../gui/settings/ServicePermissionsPage.cpp   |  19 +-
 .../src/gui/settings/ServicePermissionsPage.h |  34 +-
 .../gui/settings/ServicePermissionsPage.ui    |  66 +--
 retroshare-gui/src/retroshare-gui.pro         |   2 +
 14 files changed, 625 insertions(+), 77 deletions(-)
 create mode 100644 retroshare-gui/src/gui/images/switch.png
 create mode 100644 retroshare-gui/src/gui/images/switch00.png
 create mode 100644 retroshare-gui/src/gui/images/switch01.png
 create mode 100644 retroshare-gui/src/gui/images/switch10.png
 create mode 100644 retroshare-gui/src/gui/images/switch11.png
 create mode 100644 retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
 create mode 100644 retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h

diff --git a/libretroshare/src/pqi/p3servicecontrol.cc b/libretroshare/src/pqi/p3servicecontrol.cc
index b7c6aef98..1df7ff8e8 100644
--- a/libretroshare/src/pqi/p3servicecontrol.cc
+++ b/libretroshare/src/pqi/p3servicecontrol.cc
@@ -1239,6 +1239,29 @@ bool RsServicePermissions::peerHasPermission(const RsPeerId &peerId) const
 	}
 }
 
+void RsServicePermissions::setPermission(const RsPeerId& peerId)
+{
+    std::set<RsPeerId>::const_iterator it;
+    if (mDefaultAllowed)
+    {
+        it = mPeersDenied.find(peerId);
+        mPeersDenied.erase(it) ;
+    }
+    else
+        mPeersAllowed.insert(peerId);
+}
+void RsServicePermissions::resetPermission(const RsPeerId& peerId)
+{
+    std::set<RsPeerId>::const_iterator it;
+    if (!mDefaultAllowed)
+    {
+        it = mPeersAllowed.find(peerId);
+        mPeersAllowed.erase(it) ;
+    }
+    else
+        mPeersDenied.insert(peerId);
+}
+
 RsServiceInfo::RsServiceInfo(
 		const uint16_t service_type, 
 		const std::string service_name, 
diff --git a/libretroshare/src/retroshare/rsservicecontrol.h b/libretroshare/src/retroshare/rsservicecontrol.h
index 3a7c468ad..49dbb0385 100644
--- a/libretroshare/src/retroshare/rsservicecontrol.h
+++ b/libretroshare/src/retroshare/rsservicecontrol.h
@@ -84,7 +84,10 @@ class RsServicePermissions
 	public:
 	RsServicePermissions();
 
-	bool peerHasPermission(const RsPeerId &peerId) const;
+    bool peerHasPermission(const RsPeerId &peerId) const;
+
+    void setPermission(const RsPeerId& peerId) ;
+    void resetPermission(const RsPeerId& peerId) ;
 
 	uint32_t mServiceId;
 	std::string mServiceName;
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index f259220f2..1d61d0e71 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -1,5 +1,10 @@
 <RCC>
     <qresource prefix="/">
+        <file>images/switch.png</file>
+        <file>images/switch00.png</file>
+        <file>images/switch01.png</file>
+        <file>images/switch10.png</file>
+        <file>images/switch11.png</file>
         <file>images/add_chat24.png</file>
         <file>images/RSS_004_32.png</file>
         <file>images/mail-encrypted-full.png</file>
diff --git a/retroshare-gui/src/gui/images/switch.png b/retroshare-gui/src/gui/images/switch.png
new file mode 100644
index 0000000000000000000000000000000000000000..46d1a765df7396b268fad845b3f57ac9e106e63b
GIT binary patch
literal 3337
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
TGsc{{00000NkvXXu0mjf1nF22

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/images/switch00.png b/retroshare-gui/src/gui/images/switch00.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d4af93e486c6afd7c19b970b14790705bcaeb67
GIT binary patch
literal 3328
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
KMNUMnLSTX+em^__

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/images/switch01.png b/retroshare-gui/src/gui/images/switch01.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8b3879deb1ff37b0b52d828a75b08d707d99b4d
GIT binary patch
literal 3638
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
IM6N<$f}KOy{{R30

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/images/switch10.png b/retroshare-gui/src/gui/images/switch10.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a67a3c6de9182d05040ca5084bfcd85924b6917
GIT binary patch
literal 3650
zcmV-I4!!Y-P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T7000V4X+uL$P-t&-
zZ*ypGa3D!TLm+T+Z)Rz1WdHzp+MQEpR8#2|J@?-9LQ9B%luK_?6$l_wLW_VDktQl3
z2@pz%A)(n7QNa;KMFbnjpojyGj)066Q7jCK3fKqaA)=0hqlk*i`{8?|Yu3E?=FR@K
z*FNX0^PRKL2fzpnmPj*EHGmAMLLL#|gU7_i;p8qrfeIvW01ybXWFd3?BLM*Temp!Y
zBESc}00DT@3kU$fO`E_l9Ebl8>Oz@Z0f2-7z;ux~O9+4z06=<<LZ$#fMgf4Gm?l#I
zpacM5%VT2W08lLeU?+d((*S^-_?deF09%wH6#<};03Z`(h(rKrI{>WDR*FRcSTFz-
zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8
z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc-
z5#WRK{dmp}uFlRjj<yb8E$Y7p{~}^y<NoE(t8hR70O53g(f%wivl@Uq27qn;q9yJG
zXkH7Tb@z*AvJXJD0HEpGSMzZAemp!yp^&-R+2!Qq*h<7gTVcvqeg0>{U%*%WZ25jX
z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq
zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S
z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG
z3;bX<ghC|5!a@*23S@vBa$qT}f<h>U&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU
zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3
zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q
zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF
zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}*
z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C
z$c5yc<iq4M<QwE6@>>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C
zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c
z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWw<V8OKyGH!<s&=a~<gZ&g?-wkmuTk;)2{N|h#+
z8!9hUsj8-`-l_{#^Hs}KkEvc$eXd4TGgITK3DlOWRjQp(>r)$3XQ?}=hpK0&Z&W{|
zep&sA23f;Q!%st`QJ}G3<GjWo3u76xcq}1n4XcKAfi=V?vCY|hb}GA={T;iDJ*ugp
zIYTo_Ggq@x^OR;k2jiG=_?&c33Fj!Mm-Bv#-W2aC;wc-ZG)%cMWn62jmY0@Tt4OO+
zt4Hg-Hm>cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP
zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By
zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>=<rYWX7
zOgl`+&CJcB&DNPUn>{htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2
zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd
zlf9FDx_yoPJqHbk*$%56S{;6Kv~m<WRyy9A&YbQ)eZ};a=`Uwk&k)bpGvl@s%PGWZ
zol~3BM`ssjxpRZ_h>M9!g3B(KJ}#RZ#@)!h<Vtk)ab4kh()FF2vzx;0sN1jZHtuQe
zhuojcG@mJ+Su=Cc!^lJ6QRUG;3!jxRYu~JXPeV_EXSL@eFJmu}SFP8ux21Qg_hIiB
zKK4FxpW{B`JU8Al-dSJFH^8^Zx64n%Z=PR;-$Q>R|78Dq|Iq-afF%KE1Brn_fm;Im
z_<DRHzm7jT+hz8$+3i7$pt(U6L63s1g5|-jA!x|#kgXy2=a|ls&S?&XP=4sv&<A1W
zVT;3l3@3$$g;$0@j&O)r8qqPAHFwe6Lv!Cm`b3sQ-kWDJPdTqGN;N7zsxE3g+Bdp1
zx<AG)W?9VDSe;l&Y)c$DE-J1zZfw5a{O$9H;+^6P<9ipFFUVbRd7;k2^o6GusV)*M
zI+j38h)y_^@IeqNs1}SR@)LI@jtY6g9l~cKFVQy9h}c71DjrVqNGeTwlI)SZHF+e(
zGo>u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x
zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote
z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA
zUct(O!L<Qv>kCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti
zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B
zJh;4Nr^(LEJ3myURP<E(R5tF?-L+xY_-@he8+*L=H0;&eTfF!EKFPk@RRL8^)n?UY
z`$_w=_dl+Qs_FQa`)ysVPHl1R#{<#>{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o
z4K@u`jhx2fBXC4{<mvYb-}fF3I@)%Od#vFH(;s#nXB{tULYnfLMw?Tb`&(jLx=+kL
z(bnqTdi+P*9}k=~JXv{4^Hj-c+UbJRlV|eJjGdL8eSR+a++f?HwtMGe&fjVeZ|}Mg
zbm7uP|BL54ygSZZ^0;*JvfJeoSGZT2uR33C>U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0
z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ?
z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd
z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P`
z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy000JJOGiWi{{a60
z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^Ra0Us3%7cVWra{vGXbV)=(
zR9M69nBPwvRTRfR=gu-qm+)h$n2Op&HnGt*YDHa*2{f@U1Tpv^Z$9V)|3?3gzS$=e
zUQDc*h$JR8iq(iQnkKw}q19EOvI`5$&Ye5Q2Uv>AF1xTSJaCemOeXi7`P}b0=g!Q9
zQ*P3TAbJDC<(*jXp$ICVCl07LNH9bSo9@E*+ws&8vq2Q(d9YTLF~SoA)UQb3+Roed
z_De>+epPu^(H2zh3wAcL!LP0Jg`9jq&~!ir;p@(>$h2O?cw?a?uS;vPR}mxD<_Wfb
zaKs;*sB|Z_{C7^qa18|<8XEc(7^&oBM7fYIF>s~8wO2RkdBVd_38><nVSOd!`=30%
znC)ia&lJ{q6#<-cpG-}C`92VU{%;|P3VtJ#lao~>4AJ7xM8Ds}*%^G#!sd2tPlUG4
z76xAH<=Q*r_>W!3_+1r44G#~$3-khi02{ReqFSX1V~558v0Voo1R?C1Z<0b7t>a30
zJZBL-u%Xky!@2;gLaLx7A<>QoF=}E6ce3LNaTpQnIaHIxD%BVJh-2S!Gu7ZK4h-t0
zA@v-wp2s?c7Qll@1Y7d4-ZQvFFGx$(ShbK>1+1uGA`NY?AX|SCt$l-I8P%95Zo|qY
zqK-F6rJe%g*96j7KmgOmz4?&YnKd?-11_YK7!$Kx0I%KWN`EIWUVI!8@Av@YIIiMq
z_<U-H{+Hh3^4lL$3RZE}q9)0`xd%+&`Gu>mkJOyX%1=2=4epF@XYTUC%Wtw4q<C2D
zV0A0aYB9x=7oX?5yFb<x=g<nqaeRP++h(n$SlnQJePj25BC;FfsCM`o+_Mnp9L~A=
z_R>bxU|EfW=Iy6e*?+IHs(N6|x)eM}g=&ER^)Fx7qwJAWoKC0lJdaYT)Z7%;+9cH$
zbF58Lj{+jHZ(W@V1w{m7491w|Dp(I-8S+%7SVTx95*54n#1+itax5+`QYaLft6(kL
zOeT|IZf=e+3|U!O*`1%y=gDL;C$HeZzyQ<J)6CD$|LcBVUmt^mgC}2u*=&|<Hhbi4
z>R8_-Wt*6o!1sMdM@JiaHglx!!M)@5?ax?P_>J!F?z;S%rr@nxAJNm(bL21RV*><O
zT3TxO@moc}@$vD~d_E{0z|%lylQ;^%ebBX90b77`Z2yio!z{1`YB{qrJG1)iAL>!A
Um!ls4CjbBd07*qoM6N<$f?F!%TmS$7

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/images/switch11.png b/retroshare-gui/src/gui/images/switch11.png
new file mode 100644
index 0000000000000000000000000000000000000000..625cc8a460923975621cbae0c8a2031f061f0911
GIT binary patch
literal 3876
zcmV+<58LpGP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T7000V4X+uL$P-t&-
zZ*ypGa3D!TLm+T+Z)Rz1WdHzp+MQEpR8#2|J@?-9LQ9B%luK_?6$l_wLW_VDktQl3
z2@pz%A)(n7QNa;KMFbnjpojyGj)066Q7jCK3fKqaA)=0hqlk*i`{8?|Yu3E?=FR@K
z*FNX0^PRKL2fzpnmPj*EHGmAMLLL#|gU7_i;p8qrfeIvW01ybXWFd3?BLM*Temp!Y
zBESc}00DT@3kU$fO`E_l9Ebl8>Oz@Z0f2-7z;ux~O9+4z06=<<LZ$#fMgf4Gm?l#I
zpacM5%VT2W08lLeU?+d((*S^-_?deF09%wH6#<};03Z`(h(rKrI{>WDR*FRcSTFz-
zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8
z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc-
z5#WRK{dmp}uFlRjj<yb8E$Y7p{~}^y<NoE(t8hR70O53g(f%wivl@Uq27qn;q9yJG
zXkH7Tb@z*AvJXJD0HEpGSMzZAemp!yp^&-R+2!Qq*h<7gTVcvqeg0>{U%*%WZ25jX
z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq
zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S
z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG
z3;bX<ghC|5!a@*23S@vBa$qT}f<h>U&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU
zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3
zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q
zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF
zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}*
z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C
z$c5yc<iq4M<QwE6@>>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C
zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c
z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWw<V8OKyGH!<s&=a~<gZ&g?-wkmuTk;)2{N|h#+
z8!9hUsj8-`-l_{#^Hs}KkEvc$eXd4TGgITK3DlOWRjQp(>r)$3XQ?}=hpK0&Z&W{|
zep&sA23f;Q!%st`QJ}G3<GjWo3u76xcq}1n4XcKAfi=V?vCY|hb}GA={T;iDJ*ugp
zIYTo_Ggq@x^OR;k2jiG=_?&c33Fj!Mm-Bv#-W2aC;wc-ZG)%cMWn62jmY0@Tt4OO+
zt4Hg-Hm>cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP
zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By
zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>=<rYWX7
zOgl`+&CJcB&DNPUn>{htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2
zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd
zlf9FDx_yoPJqHbk*$%56S{;6Kv~m<WRyy9A&YbQ)eZ};a=`Uwk&k)bpGvl@s%PGWZ
zol~3BM`ssjxpRZ_h>M9!g3B(KJ}#RZ#@)!h<Vtk)ab4kh()FF2vzx;0sN1jZHtuQe
zhuojcG@mJ+Su=Cc!^lJ6QRUG;3!jxRYu~JXPeV_EXSL@eFJmu}SFP8ux21Qg_hIiB
zKK4FxpW{B`JU8Al-dSJFH^8^Zx64n%Z=PR;-$Q>R|78Dq|Iq-afF%KE1Brn_fm;Im
z_<DRHzm7jT+hz8$+3i7$pt(U6L63s1g5|-jA!x|#kgXy2=a|ls&S?&XP=4sv&<A1W
zVT;3l3@3$$g;$0@j&O)r8qqPAHFwe6Lv!Cm`b3sQ-kWDJPdTqGN;N7zsxE3g+Bdp1
zx<AG)W?9VDSe;l&Y)c$DE-J1zZfw5a{O$9H;+^6P<9ipFFUVbRd7;k2^o6GusV)*M
zI+j38h)y_^@IeqNs1}SR@)LI@jtY6g9l~cKFVQy9h}c71DjrVqNGeTwlI)SZHF+e(
zGo>u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x
zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote
z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA
zUct(O!L<Qv>kCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti
zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B
zJh;4Nr^(LEJ3myURP<E(R5tF?-L+xY_-@he8+*L=H0;&eTfF!EKFPk@RRL8^)n?UY
z`$_w=_dl+Qs_FQa`)ysVPHl1R#{<#>{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o
z4K@u`jhx2fBXC4{<mvYb-}fF3I@)%Od#vFH(;s#nXB{tULYnfLMw?Tb`&(jLx=+kL
z(bnqTdi+P*9}k=~JXv{4^Hj-c+UbJRlV|eJjGdL8eSR+a++f?HwtMGe&fjVeZ|}Mg
zbm7uP|BL54ygSZZ^0;*JvfJeoSGZT2uR33C>U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0
z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ?
z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd
z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P`
z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy000JJOGiWi{{a60
z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^Ra0s#&SGrM}FhyVZtR!Kxb
zR9M69*jsN@RTRMS|JwV^nd$U09fX2aBvGT`W<Vs-D5Qz-P?Z>C<i+@)iQhn<iSK>`
zKY$O$n2;!nCK$YMF%+YyAuSbw-fT;6b3JG8y?mfm6P*H`!PbQJILTh;x7XflpV<f2
zct|Uf=n)Lt7jwOWBB+3_I#7=g(NCVV*i9UFV$~2R<7%^9n=i>>l2rrh2_k&^J!xm>
zqekr>Re40w3@TTJbik#x3%TLBF?pTZe-2a-zAAJ(liQ84hZD&jkX*J`5hH0jORf5y
zC%kW5{bYXf`j{NXw-ngl-+vT1)M$_qWmB=v{vC7l?X9rkUQ3)8P{n)0!c@Z9^OnyB
z*756jp48ih0Pp=r$B%#h8c+lM$3&tA;|_iN-doF*Fh%RbxcOsvJ4kF(sNBeHMQAT%
z*uT3#-@XIH9lJ4^j)tk8fAig!fL>q}DBmg&YNN{l6G+F=bPlYCS_=AC)0(W1_!6Ny
zMr3<1zVl`)Sp=qU4+xM>{QK|0fnNXtbsjYVlEu}rLP#9J3#1h^odT)c3>Y=qZqaf$
z@skZI7*MSurX5W(q?wdV1_<CpNUPvn8`cJl&LF<L;x29oY=~RxEy*Hg1BME&I*yO(
zs0O^tkS1Mt(?c%PfrxGD9E?`h`+_0n`{Y#yPJc*ca-L1a2x9`1a}l<4D?9eQ$P@8t
zj4`VK1Q5d~$4{|m*RyPY;SK7w8GM?eCd<zkukppnA9?EK3?j|FO`DqDx2MkV*yB$#
zU&}LH>SCr^WTuqoz6Z8(`pmheam`h5sh84}QmM?sLK$5=YFYtn88C!^_a5&(cOsew
zswyD_LI`((D~e*Vh_#k_y}mYqOI1|WwF?xHmUeDSfg*x2rs+4v9R)5S*DNryhG6Ay
zf6~{;L2X2t7#U)0WRPlU5)p7AA`NX=6IL0hft_3LXZ-R>+RbkiqHBPs<U6@Cm1ozs
zUQh=TtpZRLH09vFhe&=u%BJoy*7txQ%$JlX>1OjY2MJ*gV=Oe$;VYb;60}a=mTyRU
zucP@4ak~YS_L|bOzC`4|#`_0BvX~~SXjTd|)CuWzLYxrC9;#)iR*0mI<N~Ri!TU03
zSdBfX1a&xHM@)d4gP==y1#CuenxL+RjXcJ#LX#LVh**O2C?0(H^E#m73Bdr;^cSS%
zfl*h30(ye;NVE>z3?bt%8Xy2Ui>o`FD`Ij*#1<gRwI2A~+dnM3#D#pywg<}e?KEtC
zSZHgrNCZh4E?+i$c_HEarAtgLjH1}q0*@X0v;b@d3XKMC*{E^XlWiMEH{^B}a`E1-
zcG&{N3l*Ijx>EURcxZg!{JHATFT*T2<Yt{R2c)-C!76YS7;ltudIA}ls1A-z$i-Y7
z&bGx-uL~hNyAWoFN8Htk>FTwKapoN2ZslsT_{`RSVLfq#DCr=prYk!#6>NRB<OZjx
mb$vknog2IIZrqLkb^HN;LI5u85#7iD0000<MNUMnLSTaXCPLu=

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
new file mode 100644
index 000000000..9cf37f4a5
--- /dev/null
+++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
@@ -0,0 +1,445 @@
+/****************************************************************
+ * This file is distributed under the following license:
+ *
+ * Copyright (C) 2014 RetroShare Team
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#ifndef WINDOWS_SYS
+#include <sys/times.h>
+#endif
+
+#include <iostream>
+#include <math.h>
+#include <QtGlobal>
+#include <QPainter>
+#include <QDateTime>
+#include <QTimer>
+#include <QMouseEvent>
+
+#include "RSPermissionMatrixWidget.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsservicecontrol.h>
+
+#define NOT_IMPLEMENTED std::cerr << __PRETTY_FUNCTION__ << ": not yet implemented." << std::endl;
+
+// The behavior of the widget is the following:
+// - when default is changed, switch all icons to the default position. Then every icon switch back by the user will be
+//   in the white list.
+// - each peer/service slot has a switch. If the peer doesn't allow the service, the  switch is shown with some
+//   indication. When both the current and adverse permissions are granted, the switch should show it as well.
+// - we should use tooltips
+
+const int RSPermissionMatrixWidget::ICON_SIZE_X    = 40 ;
+const int RSPermissionMatrixWidget::ICON_SIZE_Y    = 40 ;
+const int RSPermissionMatrixWidget::ROW_SIZE       = 42 ;
+const int RSPermissionMatrixWidget::COL_SIZE       = 42 ;
+const int RSPermissionMatrixWidget::MATRIX_START_X =  5 ;
+const int RSPermissionMatrixWidget::MATRIX_START_Y = 55 ;
+
+/** Default contructor */
+RSPermissionMatrixWidget::RSPermissionMatrixWidget(QWidget *parent)
+  :QFrame(parent)
+{
+  _painter = new QPainter();
+
+  setMouseTracking(true) ;
+
+  //_timer = new QTimer ;
+  //QObject::connect(_timer,SIGNAL(timeout()),this,SLOT(update())) ;
+  //_timer->start(1000);
+}
+
+void RSPermissionMatrixWidget::mousePressEvent(QMouseEvent *e)
+{
+    std::cerr << "mouse pressed at x=" << e->x() << ", y=" << e->y() << std::endl;
+
+    uint32_t service_id ;
+    RsPeerId peer_id ;
+
+    if(!computeServiceAndPeer(e->x(),e->y(),service_id,peer_id))
+    {
+        QFrame::mousePressEvent(e) ;
+        return ;
+    }
+
+    std::cerr << "Peer id: " << peer_id << ", service: " << service_id << std::endl;
+
+    switchPermission(service_id,peer_id) ;
+
+    update() ;
+}
+
+void RSPermissionMatrixWidget::switchPermission(uint32_t service,const RsPeerId& pid)
+{
+    RsServicePermissions serv_perms ;
+
+    if(!rsServiceControl->getServicePermissions(service,serv_perms))
+        return ;
+
+    if(serv_perms.peerHasPermission(pid))
+        serv_perms.resetPermission(pid) ;
+    else
+        serv_perms.setPermission(pid) ;
+
+    rsServiceControl->updateServicePermissions(service,serv_perms);
+}
+
+void RSPermissionMatrixWidget::mouseMoveEvent(QMouseEvent *e)
+{
+    uint32_t service_id ;
+    RsPeerId peer_id ;
+
+    if(!computeServiceAndPeer(e->x(),e->y(),service_id,peer_id))
+    {
+        service_id = ~0 ;
+        peer_id.clear() ;
+    }
+
+    if(_current_service_id != service_id || _current_peer_id != peer_id)
+    {
+        _current_service_id = service_id ;
+        _current_peer_id = peer_id ;
+
+    // redraw!
+        update() ;
+    }
+}
+
+/** Default destructor */
+RSPermissionMatrixWidget::~RSPermissionMatrixWidget()
+{
+    delete _painter;
+}
+
+/** Overloads default QWidget::paintEvent. Draws the actual 
+ * bandwidth graph. */
+void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
+{
+    //std::cerr << "In paint event!" << std::endl;
+
+  /* Set current graph dimensions */
+  _rec = this->frameRect();
+  
+  /* Start the painter */
+  _painter->begin(this);
+  
+  /* We want antialiased lines and text */
+  _painter->setRenderHint(QPainter::Antialiasing);
+  _painter->setRenderHint(QPainter::TextAntialiasing);
+  
+  /* Fill in the background */
+  _painter->fillRect(_rec, QBrush(BACK_COLOR));
+  _painter->drawRect(_rec);
+
+  // draw one line per friend.
+  std::list<RsPeerId> ssllist ;
+  rsPeers->getFriendList(ssllist) ;
+
+  RsPeerServiceInfo ownServices;
+  rsServiceControl->getOwnServices(ownServices);
+
+  // Display friend names at the beginning of each column
+
+  const QFont& font(_painter->font()) ;
+  QFontMetrics fm(font);
+  int peer_name_size = 0 ;
+  float line_height = 2 + fm.height() ;
+
+  std::vector<QString> names ;
+
+  for(std::list<RsPeerId>::const_iterator it(ssllist.begin());it!=ssllist.end();++it)
+  {
+      RsPeerDetails details ;
+      rsPeers->getPeerDetails(*it,details) ;
+
+      QString name = QString::fromUtf8(details.name.c_str());
+      peer_name_size = std::max(peer_name_size, fm.width(name)) ;
+      names.push_back(name) ;
+  }
+
+  QPen pen ;
+  pen.setWidth(2) ;
+  pen.setBrush(Qt::black) ;
+
+  _painter->setPen(pen) ;
+  int i=0;
+  int x=5 ;
+  int y=MATRIX_START_Y ;
+
+  for(std::list<RsPeerId>::const_iterator it(ssllist.begin());it!=ssllist.end();++it,++i)
+  {
+      float X = MATRIX_START_X + peer_name_size - fm.width(names[i]) ;
+      float Y = MATRIX_START_Y + (i+0.5)*ROW_SIZE + line_height/2.0f-2 ;
+
+      _painter->drawText(QPointF(X,Y),names[i]) ;
+
+      if(*it == _current_peer_id)
+          _painter->drawLine(QPointF(X,Y+3),QPointF(X+fm.width(names[i]),Y+3)) ;
+
+      y += line_height ;
+  }
+
+  matrix_start_x = 5 + MATRIX_START_X + peer_name_size ;
+
+  // now draw the service names
+
+  i=0 ;
+  std::vector<int> last_width(10,0) ;
+
+  for(std::map<uint32_t, RsServiceInfo>::const_iterator it(ownServices.mServiceList.begin());it!=ownServices.mServiceList.end();++it,++i)
+  {
+      QString name = QString::fromUtf8(it->second.mServiceName.c_str()) ;
+      int text_width = fm.width(name) ;
+
+      int X = matrix_start_x + COL_SIZE/2 - 2 + i*COL_SIZE - text_width/2;
+
+      int height_index = 0 ;
+      while(last_width[height_index] > X-5 && height_index < last_width.size()-1)
+          ++height_index ;
+
+      int Y = MATRIX_START_Y - 2 - line_height * height_index;
+
+      last_width[height_index] = X + text_width ;
+       // draw a half-transparent rectangle
+
+      QBrush brush ;
+      brush.setColor(QColor::fromHsvF(0.0f,0.0f,1.0f,0.8f));
+      brush.setStyle(Qt::SolidPattern) ;
+
+      QPen pen ;
+      pen.setWidth(2) ;
+
+      if(_current_service_id == it->second.mServiceType)
+          pen.setBrush(Qt::black) ;
+      else
+          pen.setBrush(Qt::gray) ;
+
+      _painter->setPen(pen) ;
+
+      QRect info_pos( X-5,Y-line_height-2, text_width + 10, line_height + 5) ;
+
+      //_painter->fillRect(info_pos,brush) ;
+      //_painter->drawRect(info_pos) ;
+
+      _painter->drawLine(QPointF(X,Y+3),QPointF(X+text_width,Y+3)) ;
+      _painter->drawLine(QPointF(X+text_width/2, Y+3), QPointF(X+text_width/2,MATRIX_START_Y+5)) ;
+
+      pen.setBrush(Qt::black) ;
+      _painter->setPen(pen) ;
+
+      _painter->drawText(QPointF(X,Y),name);
+  }
+
+  // Now draw the switches.
+
+  peer_ids.clear() ;
+  for(std::list<RsPeerId>::const_iterator it(ssllist.begin());it!=ssllist.end();++it)
+      peer_ids.push_back(*it) ;
+  service_ids.clear() ;
+  for(std::map<uint32_t, RsServiceInfo>::const_iterator sit(ownServices.mServiceList.begin());sit!=ownServices.mServiceList.end();++sit)
+      service_ids.push_back(sit->first) ;
+
+  // We draw for each service.
+
+  static const std::string pixmap_names[4] = { ":/images/switch00.png",
+                                               ":/images/switch01.png",
+                                               ":/images/switch10.png",
+                                               ":/images/switch11.png" } ;
+
+  int n_col = 0 ;
+  int n_col_selected = -1 ;
+  int n_row_selected = -1 ;
+
+  for(std::map<uint32_t, RsServiceInfo>::const_iterator sit(ownServices.mServiceList.begin());sit!=ownServices.mServiceList.end();++sit,++n_col)
+  {
+      RsServicePermissions service_perms ;
+
+      rsServiceControl->getServicePermissions(sit->first,service_perms) ;
+
+      // draw the default switch.
+
+
+      // draw one switch per friend.
+
+      int n_row = 0 ;
+
+      for(std::list<RsPeerId>::const_iterator it(ssllist.begin());it!=ssllist.end();++it,++n_row)
+      {
+          RsPeerServiceInfo local_service_perms ;
+          RsPeerServiceInfo remote_service_perms ;
+
+          rsServiceControl->getServicesAllowed (*it, local_service_perms) ;
+          rsServiceControl->getServicesProvided(*it,remote_service_perms) ;
+
+          bool  local_allowed =  local_service_perms.mServiceList.find(sit->first) !=  local_service_perms.mServiceList.end() ;
+          bool remote_allowed = remote_service_perms.mServiceList.find(sit->first) != remote_service_perms.mServiceList.end() ;
+
+      QPixmap pix(pixmap_names[(local_allowed << 1) + remote_allowed].c_str()) ;
+
+      bool selected = (sit->first == _current_service_id && *it == _current_peer_id) ;
+      QRect position = computeNodePosition(n_row,n_col,selected) ;
+
+      if(selected)
+      {
+          n_row_selected = n_row ;
+          n_col_selected = n_col ;
+      }
+          _painter->drawPixmap(position,pix,QRect(0,0,ICON_SIZE_X,ICON_SIZE_Y)) ;
+      }
+  }
+
+  // now display some info about current node.
+
+  if(n_row_selected < peer_ids.size() && n_col_selected < service_ids.size())
+  {
+      QRect position = computeNodePosition(n_row_selected,n_col_selected,false) ;
+
+      // draw text info
+
+      RsServicePermissions service_perms ;
+
+      rsServiceControl->getServicePermissions(service_ids[n_col_selected],service_perms) ;
+
+      QString service_name    = tr("Service name: ")+QString::fromUtf8(service_perms.mServiceName.c_str()) ;
+      QString service_default = service_perms.mDefaultAllowed?tr("Allowed by default"):tr("Denied by default");
+      QString peer_name = tr("Peer name: ") + names[n_row_selected] ;
+      QString peer_id = tr("Peer Id: ")+QString::fromStdString(_current_peer_id.toStdString()) ;
+
+      RsPeerServiceInfo pserv_info ;
+      rsServiceControl->getServicesAllowed(_current_peer_id,pserv_info) ;
+
+      QString local_status = (pserv_info.mServiceList.find(_current_service_id) != pserv_info.mServiceList.end())?tr("Locally enabled"):tr("Locally disabled") ;
+
+      rsServiceControl->getServicesProvided(_current_peer_id,pserv_info) ;
+
+      QString remote_status = (pserv_info.mServiceList.find(_current_service_id) != pserv_info.mServiceList.end())?tr("Enabled by remote peer"):tr("Disabled by remote peer") ;
+
+      const QFont& font(_painter->font()) ;
+      QFontMetrics fm(font);
+
+      int text_size_x = 0 ;
+      text_size_x = std::max(text_size_x,fm.width(service_name));
+      text_size_x = std::max(text_size_x,fm.width(peer_name));
+      text_size_x = std::max(text_size_x,fm.width(peer_id));
+      text_size_x = std::max(text_size_x,fm.width(local_status));
+      text_size_x = std::max(text_size_x,fm.width(remote_status));
+
+       // draw a half-transparent rectangle
+
+      QBrush brush ;
+      brush.setColor(QColor::fromHsvF(0.0f,0.0f,1.0f,0.8f));
+      brush.setStyle(Qt::SolidPattern) ;
+
+      QPen pen ;
+      pen.setWidth(2) ;
+      pen.setBrush(Qt::black) ;
+
+      _painter->setPen(pen) ;
+
+      QRect info_pos( position.x() + 50, position.y() - 10, text_size_x + 10, line_height * 5 + 5) ;
+
+      _painter->fillRect(info_pos,brush) ;
+      _painter->drawRect(info_pos) ;
+
+      // draw the text
+
+      float x = info_pos.x() + 5 ;
+      float y = info_pos.y() + line_height + 1 ;
+
+      _painter->drawText(QPointF(x,y), service_name)  ; y += line_height ;
+      _painter->drawText(QPointF(x,y), peer_name)     ; y += line_height ;
+      _painter->drawText(QPointF(x,y), peer_id)       ; y += line_height ;
+      _painter->drawText(QPointF(x,y), remote_status) ; y += line_height ;
+      _painter->drawText(QPointF(x,y), local_status)  ; y += line_height ;
+  }
+
+  /* Stop the painter */
+  _painter->end();
+}
+
+QRect RSPermissionMatrixWidget::computeNodePosition(int n_row,int n_col,bool selected) const
+{
+    float fact = selected?1.2f:1.0f;
+
+    return QRect(matrix_start_x + n_col * COL_SIZE + (COL_SIZE-ICON_SIZE_X*fact)/2,
+                 MATRIX_START_Y + n_row * ROW_SIZE + (ROW_SIZE-ICON_SIZE_Y*fact)/2,
+                 ICON_SIZE_X*fact,
+                 ICON_SIZE_Y*fact) ;
+}
+
+// This function is the inverse of the previous function. Given a mouse position, it
+// computes the peer/service switch that is under the mouse. The zoom factor is not
+// accounted for, on purpose.
+
+bool RSPermissionMatrixWidget::computeServiceAndPeer(int x,int y,uint32_t& service_id,RsPeerId& peer_id) const
+{
+    // 1 - make sure that x and y are on a widget
+
+    x -= matrix_start_x ;
+    y -= MATRIX_START_Y ;
+
+    if(x < 0 || x >= service_ids.size() * COL_SIZE) return false ;
+    if(y < 0 || y >= peer_ids.size()    * ROW_SIZE) return false ;
+
+    if( (x % COL_SIZE) < (COL_SIZE - ICON_SIZE_X)/2) return false ;
+    if( (x % COL_SIZE) > (COL_SIZE + ICON_SIZE_X)/2) return false ;
+
+    if( (y % ROW_SIZE) < (ROW_SIZE - ICON_SIZE_Y)/2) return false ;
+    if( (y % ROW_SIZE) > (ROW_SIZE + ICON_SIZE_Y)/2) return false ;
+
+    // 2 - find which widget, by looking into the service perm matrix
+
+    service_id = service_ids[x / COL_SIZE] ;
+    peer_id = peer_ids[y / COL_SIZE] ;
+
+    return true ;
+}
+
+void RSPermissionMatrixWidget::defaultPermissionSwitched(uint32_t ServiceId,bool b)
+{
+    NOT_IMPLEMENTED ;
+}
+
+void RSPermissionMatrixWidget::userPermissionSwitched(uint32_t ServiceId,const RsPeerId& friend_id,bool b)
+{
+    NOT_IMPLEMENTED ;
+}
+
+// void RSGraphWidget::paintLegend()
+// {
+//   int bottom = _rec.height();
+//
+//   std::vector<float> vals ;
+//   _source->getCurrentValues(vals) ;
+//
+//     for(uint i=0;i<vals.size();++i)
+//     {
+//         qreal paintStep = 4+FONT_SIZE;
+//         qreal pos = 20+i*paintStep;
+//         QString text = _source->legend(i,vals[i]) ;
+//
+//         QPen oldPen = _painter->pen();
+//         _painter->setPen(QPen(getColor(i), Qt::SolidLine));
+//         _painter->drawLine(QPointF(SCALE_WIDTH+10.0, pos),  QPointF(SCALE_WIDTH+30.0, pos));
+//         _painter->setPen(oldPen);
+//
+//     _painter->setPen(SCALE_COLOR);
+//         _painter->drawText(QPointF(SCALE_WIDTH + 40,pos + 0.5*FONT_SIZE), text) ;
+//     }
+// }
+
diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h
new file mode 100644
index 000000000..53379e0c1
--- /dev/null
+++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h
@@ -0,0 +1,103 @@
+/****************************************************************
+ * This file is distributed under the following license:
+ *
+ * Copyright (C) 2014 RetroShare Team
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#pragma once
+
+#include <map>
+#include <set>
+
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QFrame>
+
+#include <stdint.h>
+#include <retroshare/rspeers.h>
+
+#define HOR_SPC       2   /** Space between data points */
+#define SCALE_WIDTH   75  /** Width of the scale */
+
+#define BACK_COLOR    Qt::white
+#define SCALE_COLOR   Qt::black
+#define GRID_COLOR    Qt::lightGray
+#define RSDHT_COLOR   Qt::magenta
+#define ALLDHT_COLOR  Qt::yellow
+
+#define FONT_SIZE     11
+
+// This class provides a widget to represent an edit a matrix of permissions
+// for services and friends. The widget allows to:
+//   - set permission for each friend/service combination
+//   - set permissions for a given service all friends at once
+//   - set permissions for a given friend, all services at once
+//
+// The code can also be used to display bandwidth for each (friend,service) combination.
+// Maybe we should in the future make a base class with the matrix structure and use it for
+// various display usages.
+//
+class RSPermissionMatrixWidget: public QFrame
+{
+    Q_OBJECT
+
+public:
+    RSPermissionMatrixWidget(QWidget *parent=NULL);
+    virtual ~RSPermissionMatrixWidget() ;
+
+protected slots:
+    // Calls the internal source for a new data points; called by the timer. You might want to overload this
+    // if the collection system needs it. Otherwise, the default method will call getValues()
+    void updateDisplay() {}
+
+    void defaultPermissionSwitched(uint32_t ServiceId,bool b);
+    void userPermissionSwitched(uint32_t ServiceId,const RsPeerId& friend_id,bool b);
+
+    virtual void mousePressEvent(QMouseEvent *e) ;
+    virtual void mouseMoveEvent(QMouseEvent *e) ;
+protected:
+    /** Overloaded QWidget::paintEvent() */
+    void paintEvent(QPaintEvent *event);
+
+private:
+    bool computeServiceAndPeer(int x,int y,uint32_t& service_id,RsPeerId& peer_id) const ;
+    QRect computeNodePosition(int row,int col,bool selected) const ;
+
+    void switchPermission(uint32_t service_id,const RsPeerId& peer_id) ;
+
+    std::vector<RsPeerId> peer_ids ;
+    std::vector<uint32_t> service_ids ;
+
+    uint32_t _current_service_id ;
+    RsPeerId _current_peer_id ;
+    int matrix_start_x ;
+
+    /** A QPainter object that handles drawing the various graph elements. */
+    QPainter* _painter;
+    /** The current dimensions of the graph. */
+    QRect _rec;
+
+    static const int ROW_SIZE ;
+    static const int COL_SIZE ;
+    static const int ICON_SIZE_X ;
+    static const int ICON_SIZE_Y ;
+    static const int MATRIX_START_X ;
+    static const int MATRIX_START_Y ;
+};
+
+
diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp
index 394ffb7ca..b5871923f 100644
--- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp
@@ -40,8 +40,7 @@ ServicePermissionsPage::ServicePermissionsPage(QWidget * parent, Qt::WindowFlags
   /* Invoke the Qt Designer generated object setup routine */
   ui.setupUi(this);
 
-	QObject::connect(ui.tableWidget,SIGNAL(itemChanged(QTableWidgetItem *)), 
-	this, SLOT(tableItemChanged(QTableWidgetItem *))); 
+    //QObject::connect(ui.tableWidget,SIGNAL(itemChanged(QTableWidgetItem *)),  this, SLOT(tableItemChanged(QTableWidgetItem *)));
 
   /* Hide platform specific features */
 #ifdef Q_WS_WIN
@@ -58,6 +57,7 @@ QString ServicePermissionsPage::helpText() const
 	/** Saves the changes on this page */
 bool ServicePermissionsPage::save(QString &/*errmsg*/)
 {
+#ifdef SUSPENDED
 	std::cerr << "ServicePermissionsPage::save()";
 	std::cerr << std::endl;
 	size_t row, column;
@@ -142,8 +142,9 @@ bool ServicePermissionsPage::save(QString &/*errmsg*/)
 			}
 			rsServiceControl->updateServicePermissions(serviceId, permissions);
 		}
-	}	
-	return true;
+    }
+#endif
+    return true;
 }
 
 
@@ -183,6 +184,7 @@ void ServicePermissionsPage::load()
 	std::map<uint32_t, RsServiceInfo>::const_iterator sit;
 	rsServiceControl->getOwnServices(ownServices);
 
+#ifdef SUSPENDED
 	mStdRowCount = ownServices.mServiceList.size();
 	mStdColumnCount = peerList.size() + 1;
      	ui.tableWidget->setRowCount(mStdRowCount);
@@ -363,11 +365,13 @@ void ServicePermissionsPage::load()
 	}
 
 	ui.tableWidget->setHorizontalHeaderLabels(columnHeaders);
-	ui.tableWidget->setVerticalHeaderLabels(rowHeaders);
+    ui.tableWidget->setVerticalHeaderLabels(rowHeaders);
+#endif
 }
 
-void ServicePermissionsPage::tableItemChanged ( QTableWidgetItem * item ) 
+void ServicePermissionsPage::tableItemChanged ( int row, int col )
 {
+#ifdef SUSPENDED
 	std::cerr << "ServicePermissionsPage::tableItemChanged()";
 	std::cerr << std::endl;
 	std::cerr << "\t Node: Row: " << item->row() << " Column: " << item->column();
@@ -397,7 +401,8 @@ void ServicePermissionsPage::tableItemChanged ( QTableWidgetItem * item )
 			bool defaultOn = (Qt::Checked == defitem->checkState());
 			item->setBackground(getColor(defaultOn, item->checkState()));
 		}
-	}
+    }
+#endif
 }
 
 
diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.h b/retroshare-gui/src/gui/settings/ServicePermissionsPage.h
index 511974c01..217bdc60f 100644
--- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.h
+++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.h
@@ -29,28 +29,28 @@
 
 class ServicePermissionsPage: public ConfigPage
 {
-	Q_OBJECT
+    Q_OBJECT
 
-	public:
-		ServicePermissionsPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
-		~ServicePermissionsPage() {}
+public:
+    ServicePermissionsPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
+    ~ServicePermissionsPage() {}
 
-		/** Saves the changes on this page */
-		virtual bool save(QString &/*errmsg*/);
-		/** Loads the settings for this page */
-		virtual void load();
+    /** Saves the changes on this page */
+    virtual bool save(QString &/*errmsg*/);
+    /** Loads the settings for this page */
+    virtual void load();
 
-		virtual QPixmap iconPixmap() const { return QPixmap(":/images/admin-24.png") ; }
-	 virtual QString pageName() const { return tr("Permissions") ; }
-		virtual QString helpText() const ;
+    virtual QPixmap iconPixmap() const { return QPixmap(":/images/admin-24.png") ; }
+    virtual QString pageName() const { return tr("Permissions") ; }
+    virtual QString helpText() const ;
 
-	public slots:
-		void tableItemChanged ( QTableWidgetItem * item );
-	private:
+public slots:
+    void tableItemChanged(int row,int col);
+private:
 
-		size_t mStdRowCount;
-		size_t mStdColumnCount;
-		Ui::ServicePermissionsPage ui;
+    size_t mStdRowCount;
+    size_t mStdColumnCount;
+    Ui::ServicePermissionsPage ui;
 };
 
 #endif //SERVICEPERMISSIONSPAGE_H
diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui b/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui
index 6ee653efd..7460cda4e 100644
--- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui
+++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui
@@ -58,59 +58,13 @@
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>Permission changes are not saved permanently. (TODO)</string>
+        <widget class="RSPermissionMatrixWidget" name="frame">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
          </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QTableWidget" name="tableWidget">
-         <row>
-          <property name="text">
-           <string>Chat</string>
-          </property>
-         </row>
-         <row>
-          <property name="text">
-           <string>Row2</string>
-          </property>
-         </row>
-         <row>
-          <property name="text">
-           <string>Shares</string>
-          </property>
-         </row>
-         <row>
-          <property name="text">
-           <string>Channels</string>
-          </property>
-         </row>
-         <column>
-          <property name="text">
-           <string>Default</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Joe</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Sally</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Anne</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Jacki</string>
-          </property>
-         </column>
         </widget>
        </item>
       </layout>
@@ -119,6 +73,14 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>RSPermissionMatrixWidget</class>
+   <extends>QFrame</extends>
+   <header>gui/settings/RSPermissionMatrixWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 0599b8522..1985fdaed 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -398,6 +398,7 @@ HEADERS +=  rshare.h \
             gui/msgs/textformat.h \
             gui/msgs/MessageUserNotify.h \
             gui/images/retroshare_win.rc.h \
+            gui/settings/RSPermissionMatrixWidget.h \
             gui/settings/rsharesettings.h \
             gui/settings/RsharePeerSettings.h \
             gui/settings/rsettings.h \
@@ -780,6 +781,7 @@ SOURCES +=  main.cpp \
             gui/common/StyledElidedLabel.cpp \
             gui/style/RSStyle.cpp \
             gui/style/StyleDialog.cpp \
+            gui/settings/RSPermissionMatrixWidget.cpp \
             gui/settings/rsharesettings.cpp \
             gui/settings/RsharePeerSettings.cpp \
             gui/settings/rsettings.cpp \