From 22618de00c0a878a0b98d9fa69442ae2cc958589 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 29 May 2020 18:16:59 +0200 Subject: [PATCH] * Added missed facepalming emoji & stylesheet fixes * Added missed facepalming emoji * Added default stylesheets for Messages selection & hover * Added default selection color for the Main Window ListView --- retroshare-gui/src/gui/emojione.qrc | 2 ++ retroshare-gui/src/gui/emojione/emotes.acs | 2 ++ .../src/gui/emojione/man-facepalming.png | Bin 0 -> 2166 bytes .../src/gui/emojione/woman-facepalming.png | Bin 0 -> 2212 bytes .../src/gui/qss/stylesheet/Standard.qss | 19 ++++++++++++++++++ 5 files changed, 23 insertions(+) create mode 100644 retroshare-gui/src/gui/emojione/man-facepalming.png create mode 100644 retroshare-gui/src/gui/emojione/woman-facepalming.png diff --git a/retroshare-gui/src/gui/emojione.qrc b/retroshare-gui/src/gui/emojione.qrc index fdbfc58aa..b636f7b09 100644 --- a/retroshare-gui/src/gui/emojione.qrc +++ b/retroshare-gui/src/gui/emojione.qrc @@ -937,5 +937,7 @@ emojione/1F1FF-1F1FC.png emojione/flags.png emojione/flags2.png + emojione/man-facepalming.png + emojione/woman-facepalming.png diff --git a/retroshare-gui/src/gui/emojione/emotes.acs b/retroshare-gui/src/gui/emojione/emotes.acs index 6e9007948..26af35787 100644 --- a/retroshare-gui/src/gui/emojione/emotes.acs +++ b/retroshare-gui/src/gui/emojione/emotes.acs @@ -113,6 +113,8 @@ "emojione/people2.png"|":man_with_gua_pi_mao:":"emojione/1F472.png"; "emojione/people2.png"|":levitate:|:man_in_business_suit_levitating:":"emojione/1F574.png"; "emojione/people2.png"|":dancer:":"emojione/1F483.png"; +"emojione/people2.png"|":man_facepalming:":"emojione/man-facepalming.png"; +"emojione/people2.png"|":woman_facepalming:":"emojione/woman-facepalming.png"; "emojione/people2.png"|":bust_in_silhouette:":"emojione/1F464.png"; "emojione/people2.png"|":busts_in_silhouette:":"emojione/1F465.png"; "emojione/people2.png"|":family:":"emojione/1F46A.png"; diff --git a/retroshare-gui/src/gui/emojione/man-facepalming.png b/retroshare-gui/src/gui/emojione/man-facepalming.png new file mode 100644 index 0000000000000000000000000000000000000000..d0594eefdd610a67acaa7fee4425af8ede29e7b1 GIT binary patch literal 2166 zcmZ{lX*AT27skKVG$i{L85uN|jG2^B%nX?!`x@DYLCM&olzlC`knB69RE(`bV=XCr z6H;V}(NMND!*6=|fAK%}Joh>0x#x54xvy@LnTf$MkOT+-fMZyUo(0pv|HQ?~?1ACo zTTEleBaM*&(3r+ecjfpubjMg213UnaBm{ z+XdlVgFH0d13Z`pz+rHh3JjqFgImGjn(7*w>SvW;FijXNG&Df^e*j-UoVRD#{|7h~ z-39xaXGFVitY29(!vK~X}r zs1nww3JXPR5W{?*&o~bGR4EQ+WS-61M1`1~+u3iVQNm`v%~1T^Zin7jp1$~q@>gTG zeL0v0YVqePN243t7FLSNPIn;PhlaiE8I^&{RF|G(E@SL{z~=jIU*bUW*0HPEyoxWz z6_U$_|7!R7G^{ypY43=*Q^%bTwHW;Bh%ZF`bNViG4UX7eVo~baDiL0r%|B%|kjaJg zGTDvj+SVRd=H~7-Z2a=PC@!uz)zs9XJ2Ds?_W?s)r%g?WnFM)Sqf3AB zX+w0S59Hs$1>ze<))E&lyl!>Kbt)`!niDu7AVz(soq?4j;pKTqt3FvHlMLOxwO{SW z)kOsJXmcZW_f?HWlWFng({4GWrca%L%OSF781?lC-^@;#(S}yapR5nps>mu`ov*xf zBXyu6gr?_qPbMhqex@c)T%65OVwa{-nH2Z$gse_gCDIO#KFI1#dbT3_4IG-6IWNU~ zR}Y-oMSevBgN_Fjt13A|AISY!cJ!`mPpf*Q^Xr;#)C7U# z9G~90$)93}d!vV}9M}20Sxf~^Z?GdX??`^e%QnD!*tx|k0irotz5sZvIFA)Zzt;c0 ze=SHXc;!V*>@Y06i#Iwe+9v+=$k&}jUQ{3M=EhtnMsHecG%1c- zJsPlcNlgfEWG8k+j?SR?MA`H(wgubBZ2CY@8U)I zk&r0qx!a2fMtW8&7@sxEa@8JzrOg{PvgL{0xxrP09xh}W);Q)4WK6T@Vj$v6cp9(F(#Ic`)nJJKj}Ct* z`kL0KZPkOkKDYbq-oIvT@j73x%_p*8rV4ecs)no9ds z`;n_9y?VQTLOv>ephI>6w;iHwOJU13L==-(gA?MV6w>H&R@1CSav2-_VAW%Ts(BGh zQ@5-aYR2N{bZ8|?9~6sa9Nk$Ar*sM6gSkNP% z$==0xKG=;8<4+9ghM!r>^AdVGHWacqDA-aqiTPTdFVpc7mS}-jr9)JPiEp?$C!&uA zixw$TBi37u_VAWQXV1L?`X?4vMyxkqx%ORBFnkZS%#G-{Fcm|)p~X7cB#TUzzQ+{U6T}F@=>-L-7E$ImQdFie~aq z>F`~ly2PF;E`1=oS3r@3fsBM=Dj7@{3L<6Kt&P3ExWyg`elRsOU z+-x_;;qI=+GcZe_U+mc)6T%Tke>SJtOYbl~>rAK(!iMzyG~!IU!%^+SESdfK-vYDBq_p8Jup{+s+Y%_< z%d4fU!wvP!R_$XRc_K6R-rw1lJc^09Zoc89vm9u4qJH~tx={Q^@9l&5sbRClw$zF2 z;(JvEB4H<_@{w)MaSzsI(nAU3lzcj}xi?bz zJkXjCv_W^rEg|=((Y1P$_6B>#Eu0)SifA>16swv8E&7U+*28@s(16ec2oa_rxmZhh z4NM)Clt##;INyAfA@6Hbvk`evS8B-aL+2}NZbHp<#VI}zT>MLjc2n*NW(^uCZMRIa zTZR(OsSbUR%^9*(TpFC(nwI^xejOrabn2+}tzYVgPN8C*B*xwQrB*NvSPqWc>*R_J%4@SQA1;8^H_>ZAxkUd5Ro3-C literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/emojione/woman-facepalming.png b/retroshare-gui/src/gui/emojione/woman-facepalming.png new file mode 100644 index 0000000000000000000000000000000000000000..10346185ef0aad7b3871caa5298379e788259345 GIT binary patch literal 2212 zcmZ{lXEfW57sr2yEfi7fF&k6Q=1U8QG1W52x=F#V$|NNHDWYoRZ+W-)k<5` zXsOzzMbVn&(U<=h|8vjxe$V;b^F8<6S2xkb=nj~Uiw*z)u&$1#>811k6%Ey8$A*L) zTpGwt%}@;hn$qac94P+|opekM0U$&e0HR_6;N%iTZ2$lc1^}D(007Se0CvBk4kY4o zKP!FSJj!9L?}SZ zD!|zxzyMYm_HvSF`WJ$I`7D7-pgDEx%bFGy((+Pz1B-NxV{CiY739Gc_7Cz}fVs0GW zCvSzAyh zAVfo+yKn!I>BxmSVIt=TI(X~LME1#>XH631hu?P=Fk+)va2w7}F1yux3?v#~J6TPw z9z{)tC@n`38%^K7e3N%H{`w--md}`}>!{*Od5!3rSrjqp3m+NSUd*eamx`MzX z5LUC_ZE5#7{e4hByHlC=G+2Sr9X%D9ZzLS3Ux~0$fcU>aLFXlfP+a$N|J{0!r(5|U zi3Jf#s2gMC8?-kgpEwOXEQ~vEEZ-`>n_EwxIJ_mpEGQt6Gwtpz3K4rS+FT#=MC~?* zL?>AxOO#-V&P309lr+_0fXU{LhCr-RrZT!|8z5*xuI+)XjZ~Vzos;?pYXD> zvWSqbWGnK{=2_t>ROI7E3F~#Q#~$`aznjuv3MSelBlhr9R7GZ15h^GARS|^zniCf% zk0F112?<9$3-t6I$MZ^DlLPf%l@q$R5kdPh2OW$F1*;sN;GnHy1vV2V)|3SveGR6h z^zEN$L|}UytKI!{15Jh%O)Y8gP~t7Q96%`JAao;ChJh)3VJOWAwYy=@oRR|fPjMwo zj;{2gsmYuOYar0ZRgv{(I%3*yUvM}DwBjY zpUJ<`rAKQ4=e8lv(xTSb%Q)c+9h1>PL}+8nqvb`O8#Y=r8WWDQgQ30CqA#{Yr{~A} z{s3n3XsfokFfTganuNG8?8ZH%Pc#G2h7~jWNwS@7CVNg4C5rahvB-LCKfX4E8x)W> zQK7nUw~B_{z?FlTItCNdac+SPds?qA@yp+l4slQQjIh!OtWwbAQlF3!6z@2T~=Q!Gho)Hm)3yx*%f`y=akA5JN-v z9za&-OJigjVoC5}WMyT2qEs3l3;)_J zCfZr&#haq|&4?_fcBE?XpHq{8LQEKI&+(Kfnp;UvcUF&9XPt6t@Ok>xR@^yf!@co= z>X2H+@#8OVCC;CBpV$nBMDct1sc(Cm8xQP|wpBeIF5S>jGsR_a#!K zQookod`dyhFmRb~E`&=>@DA!UL7N1HafXm?P(y3o=0FdpL^D~Fu1J$oah=*kkE^&6 zR;`IIYz@Eof;S%fNB0Q-s=Z|gXKJ9hH14#r$@p^9Q*7!Gv=lr)E(Yb}Qm?2m<*LAb&WXDbw!k0n z?!&Y6OEg}s)Nm#j^HTX_ZZ-B%FggCtgtSZqnqF9l&1N)tb9V?Z{d1G!nH^D%HJ@?? z>y#(Tk=He=PYYMQib*C^)pYFa#b++DhR+`@JVGK`)?!@1tEbWvzIB@_8P-q5KckhY z;*e_D^Qz^6^le!A57zKAVyX6fKSH7ZoEf37XFXvq-0i(0dkWD={p8=6y#T>VoMulm7tv(8l zENqdGwjidAn$@Q(@W)~&J2|iG#||_wg7SQ~ZKF+6Rr4hBtbTciaxg_+7|A4T??zw^ kp6YjzJ+i4q{3g4geliN7@!7