From df0ed8e77ebd58af9ce42aec3a2f94fe517e9a07 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 28 May 2020 22:15:44 +0200 Subject: [PATCH] Added to display the headshot images on the group item --- .../src/gui/TheWire/TheWire_images.qrc | 9 +++++--- .../src/gui/TheWire/WireGroupItem.cpp | 20 ++++++++++++++++++ .../src/gui/TheWire/WireGroupItem.ui | 9 +++++++- .../src/gui/TheWire/images/like.png | Bin 0 -> 1841 bytes .../src/gui/TheWire/images/reply.png | Bin 0 -> 3168 bytes .../src/gui/TheWire/images/retweet.png | Bin 0 -> 2041 bytes 6 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 retroshare-gui/src/gui/TheWire/images/like.png create mode 100644 retroshare-gui/src/gui/TheWire/images/reply.png create mode 100644 retroshare-gui/src/gui/TheWire/images/retweet.png diff --git a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc index f6cf0b441..b26e6b7da 100644 --- a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc +++ b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc @@ -1,5 +1,8 @@ - - images/compose.png - + + images/compose.png + images/like.png + images/reply.png + images/retweet.png + diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp index c3843c497..5c7a00fea 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp +++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp @@ -51,6 +51,25 @@ void WireGroupItem::setup() label_authorId->setId(mGroup.mMeta.mAuthorId); frame_details->setVisible(false); + if (mGroup.mHeadshot.mData ) + { + QPixmap pixmap; + if (GxsIdDetails::loadPixmapFromData( + mGroup.mHeadshot.mData, + mGroup.mHeadshot.mSize, + pixmap,GxsIdDetails::ORIGINAL)) + { + pixmap = pixmap.scaled(32,32); + label_headshot->setPixmap(pixmap); + } + } + else + { + // default. + QPixmap pixmap = QPixmap(":/icons/wire.png").scaled(32,32); + label_headshot->setPixmap(pixmap); + } + RsIdentityDetails idDetails ; rsIdentity->getIdDetails(mGroup.mMeta.mAuthorId,idDetails); @@ -59,6 +78,7 @@ void WireGroupItem::setup() if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) pixmap = GxsIdDetails::makeDefaultIcon(mGroup.mMeta.mAuthorId,GxsIdDetails::SMALL); + pixmap = pixmap.scaled(24,24); label_avatar->setPixmap(pixmap); connect(toolButton_show, SIGNAL(clicked()), this, SLOT(show())); diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.ui b/retroshare-gui/src/gui/TheWire/WireGroupItem.ui index b0d53f4c6..eeb793614 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupItem.ui +++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.ui @@ -38,7 +38,7 @@ - + 32 @@ -102,6 +102,13 @@ QFrame::Raised + + + + Avatar + + + diff --git a/retroshare-gui/src/gui/TheWire/images/like.png b/retroshare-gui/src/gui/TheWire/images/like.png new file mode 100644 index 0000000000000000000000000000000000000000..cd0cd99efd9b05ec20fd5bdc60fa74fdb6619eb5 GIT binary patch literal 1841 zcmZ`&eK=HE96opM+!?0KglvgvCzPbI6P1j18Ox%U6{_LU?uemw$TW$*mYdQi($~t& zkTzP`zOb9pY9>5=D2Xv+C`&b!kW{Si?75?!ZU5N&oO{mi_q*@=p7(dobN2`MdmGVa z&;S5NzCNCTaK(w&0EKg3`{5zDkfV8iJOGLhO&SfyV9tv03G@SC+Z>474Ztvg?*L#k z2Y^li0NfJ*OcTq?S1bhpc^mL;uonb?qH%CS1G3d*xf+E-Mhucv19D-i(Wi}MnBwD@ zY$DZw94%3oszLTWeGKWXB$?KzdM0q1P z@(?8gH5eZ!bZ`av6EG%M!|^XSS4Cj*AClk<%}n@|67~QTB+NrK0#C_q!m=l9Lk~@` z0*QL(4Fp))1hShakR-W=P&?TMQy9P*%YiL?;KGz3>bWR%d#Z^H+n1@p@sCAMT6|{lFxn;&8}0kU~_*`mLc95ySZ-5ye;I&Qi-ZKqUP(nh0#ui zqLBF`&@Zxfxwj|ShcSI%Vkq_r*#rQ+ns|}p_H+waq{jRDc~Nzk#b;)WV*b7y0MI~R zPhRkrmRHh&AXDB{+}R@&&plvZm1km?Vv=sKf^2;tolH8w!wT%QQ@pydsn&}dwcBqD z?4@;9TV5@>)?DHI^wGe(`$=s!PH_%d-uu$wQ=6O`@jb1`O>LOD*sV47S>5g3Zux9} zA!~3Ndr$I`EPhX2C~aOzR!CRf#!5>GbJcLx3m(aSe&35}Hp8dH1;Qku*}CGE65Ptq z?Mf40_XUNy?A)8I@_teY`^_ziz)HAka3w0Hi`czct2;)*b9N*@0cp_{@d^z{I~{nr zt@OqNMZJCVMJEt(tmZv9kTxbOvKcv;K6WXjM9~u4eerO&^K@MCCiZYwTd3$Q7IU=A z*%B{pR4?zhU?@W_FYg~oJTYWHBXW4rNucgN_HuPX_VBa&c~(Jg`I4}%voVj(-^q2M z4oF8_q8?ly^V?R2HQLrv+9zLUmAYxqCFgLJG2nhfWjEswk`S*q6{IbGj-&48;!8P| zjJ^CZhrG!Ki4O)Jb3{tx8c?vOhT-jMj+W0wGwO$sjKtCki;h#13^ed^%Dem-j5*D?3 zEUC)yN;*?abrno@$=lVx(=*ETF}5%6oJ8LM|utLX)N#YUtx z42i8A{b?u+v8yEInp^;JibCA(IxsOd>rHbK1ZFA}N1c@4y(?RQ)fq;Et+T3M(ClBuqCIm_pFY2m_p{h;zP}o=c9z{4vTku5Ur|*t zMNQk=wZ`%Nz_#&D3x_F%S^S&#$_o1mN8J0?4f-(Mj~z+)D%sDaK6*m$@Z$h})kY&T&p2H@12{xJD%%ZTzaI_Kx(-EYAGxS2Z``Gsh(f z=}+z&jqbLthd>C|E$dl21A>6B Lm%rx)4?)U59Q7=l literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/TheWire/images/reply.png b/retroshare-gui/src/gui/TheWire/images/reply.png new file mode 100644 index 0000000000000000000000000000000000000000..c2f5fdf627136182b7040d37e2c6954d5323257a GIT binary patch literal 3168 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 Q6o4ROL$jmL58H+P3(g|UGynhq literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/TheWire/images/retweet.png b/retroshare-gui/src/gui/TheWire/images/retweet.png new file mode 100644 index 0000000000000000000000000000000000000000..e5272b6ba8a80144bf255936527276f39002b085 GIT binary patch literal 2041 zcmZ`(30PBC8ogwJurF$iGAK)=EC$1(NLb^55EO(E>9C3Hi=-^34I%005c{FLx%KbC8RGh4;5p#UJ2=i=+F{0k~GE{xJd%*M?DEOdkL;Od;+h0CEIB z1Hji*0A3sffK~y(`V`SkeLCkGXdmk%AV4zwI z1douQL5!;!MTjB^xHPe8~l@1?4Fzgk+Qo5SK3lL3=5Uq&n{1+Wm!&a=Gh!~WOV4yf+ zeh6`kmO!nd@oHPp9Ra~8dM*;QoD@{T#*VG-2=$MMpeG2cBYv<#q=Yhr2~i6A6qHNx zurw@JjWi9u9qnd`c5u4RVfqGuFZM(n@Z6-wiv7}onD=nxsAkGrap87M#+!dcCjG`# z(zsTNQ~&2r7TN>KyWd4?^*5jC{hm_vGd{JuiTt~qrq*?p#DDrps@kze|B6{BhtS3q zxTxItuC*mgIC%R+!-wU+o~jhh+wI7&+S<5KGM8Oe{S9_ys-pO;?XySrj>&O#wIRO_ zy}Y^Z?rfhfyGG~E%&jAnPkhb?d^GtwO5$oBd%RH#lBhKmFv>%8uzjsK)bnVl4tUUuX7ceOSq3G>KD{w|18F)=ZZKJeTYH%!$7x(RK8}Q2oFJFPFni<#`nisCCB; z$P{7EpXMj=Bbl*h&HFoUyOaltP7@ZmEts`yGu}+U8*W@OK5@)rS-V;HPj>0=>^Jwc zjGocnY_#T1c^CP;+2gvgsBgxtomwAu)i%B^?QVKj9H~y3HoEqM8dshB9YeKYoRGgg z@+>Jsc#*h7dlD)ZQ?N>LbOT>z$!Q)NeI~?VyY~6~ z$aNQ$SNIyXS-5KiuK46v zM@?WkJ=OJOewdDpO!ah`S4uHkoi#&jtc?jxGvyFgLcIgR+yrhZ;~VCp-+XzIE7};m zyZq-Kp4O{D%d^smEf{)P-A9WFwwX%z%AJ=t4$SIW88>bFeUhqfc`NbIlF#m=M}XcV zJvDiS^D%6*8vc_dF6Un1PWZn3uU}3!4t%=DJ$ef4I+?`{BwV=b@M2?bdC-(2Snr%J zWd@sv5*=xeJGO=Dr|~vv@J3b4T(D#-P4i7!b){v+x~XT_ds9xToK9GD!8)Z$vS#?5{fW+45o>Z|D`bN&LKtzA7%tt2M}ni>@HhF^HrpW@4>lW>>Y zhDgSS1)h1{ZVaL?&wy@A#w?`sF9lg&?Q2WIDgT!3ge*IlHzjI5unTvAGEQ1%9+ZHH8m$+Ass2yirwMe!|I%rb#uzfzkA@Tba3$aQd z$ns9IVcd%^U(ER}65qX#YD_=fsnTi1*PSwXyhY}Gz-T!~;1i1>owpNQZ$CM^b})Q8 zEeNXk$^DVD(9S#FBD*S__{akI(Xt=_QQF@ literal 0 HcmV?d00001