From 7a74c5a3114f1bdfba618d6acb8b10778a9df7e2 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 22 Sep 2015 13:26:39 +0300 Subject: [PATCH] new channel blank photos, 0.8.58.dev version --- Telegram/SourceFiles/art/channelcolor1.png | Bin 0 -> 1951 bytes Telegram/SourceFiles/art/channelcolor2.png | Bin 0 -> 1944 bytes Telegram/SourceFiles/art/channelcolor3.png | Bin 0 -> 1876 bytes Telegram/SourceFiles/art/channelcolor4.png | Bin 0 -> 1895 bytes Telegram/SourceFiles/localstorage.cpp | 2 +- Telegram/SourceFiles/structs.cpp | 18 ++++++++++++++---- Telegram/SourceFiles/structs.h | 1 + Telegram/SourceFiles/telegram.qrc | 4 ++++ 8 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 Telegram/SourceFiles/art/channelcolor1.png create mode 100644 Telegram/SourceFiles/art/channelcolor2.png create mode 100644 Telegram/SourceFiles/art/channelcolor3.png create mode 100644 Telegram/SourceFiles/art/channelcolor4.png diff --git a/Telegram/SourceFiles/art/channelcolor1.png b/Telegram/SourceFiles/art/channelcolor1.png new file mode 100644 index 0000000000000000000000000000000000000000..fa84863938a11bbcb674141650510e1ac0a6d05b GIT binary patch literal 1951 zcmaJ?Yfuwc6kdWNO2JoEL~Pg4vDBJ`gd~ua7$5<}k^o68(PA|uOLl=|mt-Lc$PiJn zmLfBPC|Wdtg6NDoNYjFiwpELYC?b^+1feRTXnmoG&u)0w{wUqqz2`o@^PO|=J>Tq> z7)gZt6t5`&0Jujk6G=&Ha(u27vbDLCZ6eKFB1}QZutdVB)WblC8cTq|NUc%>OJSwj zoO%up0svvc>bbp%4kI4kNTso7@;c}UaL6#qr#qc9vE{(~CI9!Mo0FFLXGMZkU z2uVfZqp`>lpNbF!4lx);qmgd(r(=2zgURFZ92_hbjYQB4W*wn4(R2o%F$NKAQ0Y;e zKrtQYU{oexX#}52W;(J3E&iTXXBa&u^1v7-CC*^d{Ty2w1B%7}57lblqYZ=<{wLr6 zBsR#+ILwg31}sglA}=n{#}NvLgnC#>V0t-*rHq|o41y7u0l{!kDC2^@ai~s>84aHe z z5vEGh!a8EiSN)G~z_`ASQqbaLWD%@K(_wYE9@B!uTZYi_b77CmH|nb%KNrrpz6>%M zhT~%Ybd?_+4 zWau&9ax{9{1d9usf&@EzIkBzNNz?3Vb;<|4nl0ggJ2IhpWYvc>!>c4H%lqfeRph>?BM2!eaD5>DBVM&CydW=}4fUwK|lMG0UgDBr4Z=m-CMN!RpD#q~2e;I%mB^ zdduoAdKUmq+*MWfpAn#aeT@I$&-U`3IfzhpyzS(JGo>!Y-ICh5_bjv5UnT0F`9EgW zcAG*PcZ+F>6-Q6A|vS|9MDo)DMs83ZM(U;ts za}P^-SL?rpy{_-sm)TsbjLP5Qvw22nnblX)+Vj(mdCxM}dGyeN3-%n}&`@8N?DTPj zdR=UCUivks2a49`vXiOF9kYw(hEDxxo}AvjWNM+^!+t2ZgvWjc*tOX9AxeFAcH_C{ zIXlYGz<#@jqC_Z5%dMW*jFha-;YL7Fot9qnR}CAo*uQy0zPZYKF14QdzqY#f&F4*) z1z1%j-Xy{!EIr}wVnt^kv@LT|=(MH}G7+!V>hlZKoqZKI>q5)rPKW2Y6^qP*AF_R2 z4=lJJmn%I{B(Mjcy7T*tAn&|8Nq4SQ$TI#kAOU~%e^bdC*y%O1(WGfSXRCZ55VY|m zJp&!D>khJ?Ns{}G{HGJ&wB&E}888j*UlzXyIrT?dMEov6bVC7hVt!CpYFcC8)#VNK zZiDK3!YuVCS$O;-a>S8<=zmczVpD%`FnoVncSMscvn>sH3R24qZze;4c z7BMIw4O7Mm)Yqnvzq_w9|!rMp+>U5iV! z?X8u(y8XHT{*CcZ9>gWqT=y(bj9qlU=2cEqS90xU=TS8}xl=}DIjl!gmcx2<$THZW h#}U!iYM#VdoPgqeg4{O`>u8Q&W@MN|bU1Wv&fob44}|~# literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/art/channelcolor2.png b/Telegram/SourceFiles/art/channelcolor2.png new file mode 100644 index 0000000000000000000000000000000000000000..f3146254bcf17dc7515817f87517ccd70bda13fa GIT binary patch literal 1944 zcmaJ?X;c$e7!5)Zsi2jDf=gm>sbcm88Ho@WKxl$U*hEEQG9eL?87G5@A{9`vRZtNH z4I)8QaKWlYI0(^JJaQDF;V7aAV$~p`MXeyN*a=(vqjb*9yf^RNd%y3!_uVr;g#-uK z*}B*g2n4&pC15DtYR!+$82nvsUAPTzoH4&BOa#j?jTnUpd?~yJA_XeNaZo5EmTp*g z9r7d)EXj(nC@e}S03@)IDmG)NS|x(B2?S3sEh3i0Ll|id6sJ(}$S37x?pak*3mo5STY7Lb^929rj|Z!U$w1~^=R=}sED$apkV zDg#16|Djm;7mqB*Fa)5{G#U+6!=l1y9F5`O;bGQbGATHMqTZmw#9E3Ny9*)@c*GoUjfrp%4gEsWGui0tJFRGOj>XD5QWp=*t569{yZ9+lRsMNs0Ajl8Xw!CN?x3nd8%2?z< zsJwE*i63jf&1{zH{w(Siy|ARP4g!u~kgTGU}8^tcA?z|Te&Oia0cy^SG1wy4RLCl3$L8~tmz>Tv|U^oALHeA zS#V}UTlc9H?wp#}`Xi3ThG@CTLMixb?fOSLL6W0e%Ym|_wSI0l-=#NdZRC~>sTG;u z_cXR<$M<*HFG}giI~k)}XKz);D3ots(K-h4wD1|gy>fqyFRO+aJ;_wsNtM=j7CH1w=a+r8l4YIK`)X`- z^LWnHt=AFG9v~vP@zp^_+DFgSEuaiG9XPyjT1&=9;0StX#x0fJIWxe^t$p&nhSy#9 z+T$D|m(wD8A62#YCQv$ywXHE5KlL3;aX;F-LS6B&&#IsRPTF$9*kRCJxJ@Z~838y6 zqIO*Rqqth7m|MPi?KDRo!AcEaHlXY_9Wse8Z#6*H{^g5&4x7MP8_nU dGVha9EWs4P|8SQXcgy^*4D<^I&-lcq{SBe@3O@h< literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/art/channelcolor3.png b/Telegram/SourceFiles/art/channelcolor3.png new file mode 100644 index 0000000000000000000000000000000000000000..60896638dc7739afc7d1eb28c7ffa14901955408 GIT binary patch literal 1876 zcmaJ?c~BEq99|GCqJT_AhfBAiC?4b@31k%na%dbAH6Y-4K-es7gk6%j?{@QMX5DxegkMFgz}$S^3HRzSN!!TwRYv%Bx@d*Ao{e($~CH@kba zWSO0gl%)aS5*Xh*+4W#p@jOs#U-#kpCfTIv1 z&Y$ursR;3EkcZ(2$fo*u!*m7%V4+QC(gxZLN1L= zhGst4e;xGL5LrFu?s(afALE6OsK{!^$+GSQ9p95~xhdiYh3eX0b-a|i1kJFH(pMI( zQKtY4EOTq(H_=x8uqRt)ck=P8OQFuNz}`$R1nFqV2>^{v}qMv3-kp2MN_tNBE{{eMNpO?|g zG}3LaQ*#=&1Lq#_n~V)g-4z|n!KmgG?+PhQj$OjAv>GX**wGC47d&a3vue1D{%&~2<*G%2_cu7MEPCM89QI3f%KlWt?94Q2 z>XDdp8`9nkMR5*nT{_Z|KM6Y4Q2W8qL%mR6K4Z><)2)4%tM1sNNwFUzJ#x#X%(|GF z?fniXHeNOLD+ISP2sca+$pshYz*29AR*2~)afMU@sV`@M4Qg6(VTA9RJD z(OUzHJf&x+Rtr=0xB0Gk9#7{__eH()MmreZrlz}d-rnp#m(^J`{h=?ua|Ug zenxX0ymp+|d$G*8X!f4&t}0iw+e`n~2l(J~$JV~3kq6(@pX^K?3CwAG+fj03(cal* zvo23>!Y^GL$k_J&@ZPGB`N<!nXm3adz*A7-lGK<$WLfpxNdsnc;Jr&X)GX^Rk>{zjUAww{91mF9lgcW)tF|^_15sK1w7w;U)R@_Z8qN`rE$hBz(}GgsxEBtX?b2}NkV&mt9?>p z;n}{2O=oo#88u9)Hu84;3A7^O5WY2UL9Q<~Ga%^U`p&|sxwbujRuBK2-8w6_`TOjz zcJBDQotk5^%)NdzM^Y0d3?<2w44U?2Yb=<6@|;q|2dIB K!ap4xwf!HnW$y|A literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/art/channelcolor4.png b/Telegram/SourceFiles/art/channelcolor4.png new file mode 100644 index 0000000000000000000000000000000000000000..d683707426022633d693ab36b51df82aa7c2c473 GIT binary patch literal 1895 zcmaJ?2~ZPf6y6|EMN=%LrJ}ZLP&`VG4M`v?A%uiTl%R%KKt&13LINb4V1x3(W z(2)vNvBnVCWzde&6@r|Ni%8w=N4^ zM09d@0sw$03KmH4-emhG+Tm@vOeKLM5G;X1 zdh1k#cp1n?^$5tMc$4Kc2m)Cw3dCTtSdbS;r$KZo4S!i=hygQMFx>}y_mFUFdPOWO z5eVPe!e<k%1->ZK@}I2y%eN)$s4N>mH-!&u^8Y2*bf|$O65L+M+`Y`E13_8mj8s!R5 zd6F8@V53~cd#-R?t}PYRTHLY#(W{aXg;0;G!I2}ws_}i{kE{2Ns~F!G!MI#1?hMs- zvH!T}(Iq^4Y{Rj%#V2Elk7)30*W+nje<>pxua?^)0Z(db>AAB_(h}h67_Ikkv&%3~ zEDNI!q`nMJ-IcQs4s5iaG-=Wq)2W=YgMFPob>wT5ygGyD{J1oZgtL2qj>6eo?WwJ zsA=y}XKM^y*C{nWyq3KoD?CU_(r5S&94}PA?*v{UuhaGS_yPJH= zjTqoIHU43-CN5&*Y4Ox6+_?>2*9O0K|77j7dbzNsN&0JpKD^@qrB~8JU0f-rRn_FylzLgEh$Y<9_VomfX_PxmTU{xaK+V zf;WO9Qj+VMsW)CJBWq@z|G>KYi_q088NXz^FN#fF-q~9+;q0k9*X<+}(ezc3*0#q5 zH4f|dS1C?zatG#lXB}n@K8kgWd}xtZFIk=+$#2kJ+@BSVd`Lt>Ey~?&Ue>^x*ZrGv z!a_F9c&W@_mwGwTItV|pkRP6;X;fmoeOxNFjcZ&^u#;vk;)J=<=9FX|=5c!V?&zpn zG!!yyi6`V&Z$zTYgvqM{h<}`-mo9wqyeKPkd$r5zgqkD#?rY}bjT>fFwLh;Q?#emu zY$;R?wzo7t)ZO4VFXbY{>dC9o{`A(EP9KXxRM>u<+jYz(v0uD+_zH61cyCoPr0YEN z;x}vS;_5tTVCbeUC@;qucB^JZQPNtA%M%Ivnl2T68)CTBTok8tGW#^z*Y9K%TzxSd z&R=mO^FnRb%pe!S1Pxp9tzLpXbECUAS0MzOR3Awl%-Z+FcY^ zkrYr__o{1iE0F0~yS!4o;@s?2Tj%V7TbmxJPqavdu95c7%EhhchK?u)mJ&r_dBBAg zxfR!hAm?$HC4Pa6*=On2g?TGW)?{}NN9IpX5$75$cL!caVP^`aoEZ4hV{3D##Q)bV zn(4=o_;XzUY~>^VtqAwulWVUzh^u-BqFxsz=Z2=AJhZEAZQq8w5B$qY$SaoScy;zC zociWszOtf>SBD;NsE1a1p5)3xD&vga)%Cmv_p@zvT@mW8IO3input = MTP_inputPeerChannel(MTP_int(peerToChannel(channel->id)), MTP_long(access)); channel->inputChannel = MTP_inputChannel(MTP_int(peerToChannel(channel->id)), MTP_long(access)); - channel->photo = photoLoc.isNull() ? ImagePtr(chatDefPhoto(channel->colorIndex)) : ImagePtr(photoLoc); + channel->photo = photoLoc.isNull() ? ImagePtr(channelDefPhoto(channel->colorIndex)) : ImagePtr(photoLoc); } App::markPeerUpdated(result); emit App::main()->peerPhotoChanged(result); diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp index cb5ef5f12..ab15f05fa 100644 --- a/Telegram/SourceFiles/structs.cpp +++ b/Telegram/SourceFiles/structs.cpp @@ -82,6 +82,16 @@ ImagePtr chatDefPhoto(int32 index) { return chatDefPhotos[index]; } +ImagePtr channelDefPhoto(int32 index) { + static const ImagePtr channelDefPhotos[4] = { + ImagePtr(qsl(":/ava/art/channelcolor1.png"), "PNG"), + ImagePtr(qsl(":/ava/art/channelcolor2.png"), "PNG"), + ImagePtr(qsl(":/ava/art/channelcolor3.png"), "PNG"), + ImagePtr(qsl(":/ava/art/channelcolor4.png"), "PNG"), + }; + return channelDefPhotos[index]; +} + NotifySettings globalNotifyAll, globalNotifyUsers, globalNotifyChats; NotifySettingsPtr globalNotifyAllPtr = UnknownNotifySettings, globalNotifyUsersPtr = UnknownNotifySettings, globalNotifyChatsPtr = UnknownNotifySettings; @@ -89,7 +99,7 @@ PeerData::PeerData(const PeerId &id) : id(id), lnk(new PeerLink(this)) , loaded(false) , colorIndex(peerColorIndex(id)) , color(peerColor(colorIndex)) -, photo((isChat() || isChannel()) ? chatDefPhoto(colorIndex) : userDefPhoto(colorIndex)) +, photo(isChat() ? chatDefPhoto(colorIndex) : (isChannel() ? channelDefPhoto(colorIndex) : userDefPhoto(colorIndex))) , photoId(UnknownPeerPhotoId) , nameVersion(0) , notify(UnknownNotifySettings) @@ -351,13 +361,13 @@ void ChannelData::setPhoto(const MTPChatPhoto &p, const PhotoId &phId) { // see newPhotoId = phId; } newPhotoLoc = App::imageLocation(160, 160, d.vphoto_small); - newPhoto = newPhotoLoc.isNull() ? chatDefPhoto(colorIndex) : ImagePtr(newPhotoLoc); -// photoFull = ImagePtr(640, 640, d.vphoto_big, chatDefPhoto(colorIndex)); + newPhoto = newPhotoLoc.isNull() ? channelDefPhoto(colorIndex) : ImagePtr(newPhotoLoc); +// photoFull = ImagePtr(640, 640, d.vphoto_big, channelDefPhoto(colorIndex)); } break; default: { newPhotoId = 0; newPhotoLoc = StorageImageLocation(); - newPhoto = chatDefPhoto(colorIndex); + newPhoto = channelDefPhoto(colorIndex); // photoFull = ImagePtr(); } break; } diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h index cbe492291..6ed1ef8d9 100644 --- a/Telegram/SourceFiles/structs.h +++ b/Telegram/SourceFiles/structs.h @@ -173,6 +173,7 @@ inline bool isNotifyMuted(NotifySettingsPtr settings, int32 *changeIn = 0) { style::color peerColor(int32 index); ImagePtr userDefPhoto(int32 index); ImagePtr chatDefPhoto(int32 index); +ImagePtr channelDefPhoto(int32 index); static const PhotoId UnknownPeerPhotoId = 0xFFFFFFFFFFFFFFFFULL; diff --git a/Telegram/SourceFiles/telegram.qrc b/Telegram/SourceFiles/telegram.qrc index 6a0af5648..4fff41335 100644 --- a/Telegram/SourceFiles/telegram.qrc +++ b/Telegram/SourceFiles/telegram.qrc @@ -19,6 +19,10 @@ art/chatcolor2.png art/chatcolor3.png art/chatcolor4.png + art/channelcolor1.png + art/channelcolor2.png + art/channelcolor3.png + art/channelcolor4.png art/usercolor1.png art/usercolor2.png art/usercolor3.png