From b0a24238e8a4e685182e2484ac65f5a356abd650 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 16 Dec 2022 16:44:03 +0400 Subject: [PATCH] Add icons to the photo set/suggest menu. --- Telegram/Resources/icons/menu/photo_set.png | Bin 0 -> 722 bytes .../Resources/icons/menu/photo_set@2x.png | Bin 0 -> 1198 bytes .../Resources/icons/menu/photo_set@3x.png | Bin 0 -> 1848 bytes .../Resources/icons/menu/photo_suggest.png | Bin 0 -> 768 bytes .../Resources/icons/menu/photo_suggest@2x.png | Bin 0 -> 1527 bytes .../Resources/icons/menu/photo_suggest@3x.png | Bin 0 -> 2201 bytes Telegram/SourceFiles/ui/menu_icons.style | 2 ++ Telegram/SourceFiles/ui/special_buttons.cpp | 18 ++++++++++++------ 8 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 Telegram/Resources/icons/menu/photo_set.png create mode 100644 Telegram/Resources/icons/menu/photo_set@2x.png create mode 100644 Telegram/Resources/icons/menu/photo_set@3x.png create mode 100644 Telegram/Resources/icons/menu/photo_suggest.png create mode 100644 Telegram/Resources/icons/menu/photo_suggest@2x.png create mode 100644 Telegram/Resources/icons/menu/photo_suggest@3x.png diff --git a/Telegram/Resources/icons/menu/photo_set.png b/Telegram/Resources/icons/menu/photo_set.png new file mode 100644 index 0000000000000000000000000000000000000000..d96cdb0ecd1d62bd151f69cb17602c5285ddfa20 GIT binary patch literal 722 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 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/menu/photo_suggest@3x.png b/Telegram/Resources/icons/menu/photo_suggest@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..3fed795851f7c6c8ab6b8fe4ff7ec1d2713e9683 GIT binary patch literal 2201 zcmV;K2xj+*P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS@14%?dRA>e5nn#EgO%Q-xUDGOx zu7X+25fkdgfC#38VGW2E1F{ATU_6;tP%z>_L`)dKi({VL{wC@Q*Z&hh`G zu(sdKyqP!iW_1rUhu!Mxs_Lrl>gww1SENYvMKci1Kr{o<3`8>!%|J8*(F`Ox11U-J zJF=&wq|~cduVKT6MT-`7BmnvI=g&KL?%ca~4U{|Gf?b_F_T}#ZO7^)jLZq%(?*DkP7V45^(^61f{7=8UTo<4orvSrH< zEeU6jwQbvW-@bj7DpeBAaIhsymR!Dk`NxkR@pLU#tXPW{Ev8PLTCQ9QD$BQT-w=4})G5e5efp&M(132;x?R71-P5`5-@i{h^fhX& zTD5N8yy+?V`Sa&v$By+S*_(Lc#ECeS=h#=ST&Y&AnzuL`Mdiws&zw2qDIbE(n>XV) zHUWVUef#$1s4++V{{1_*o;9m$J-)~s2o$@=x{y~w@#H*DCT;_BD0??qmK{Vd(>+qXp-0*U8HadSE0B$*K4 z$&)8{@80zkS8xPu>|@7{iF|@h*|KHb$MP^t`N<621^tEIhYug>DCNtSSJ)9qb;O2+ zB;IfgRIOSSu}lz)PkOer(acclyf|@mJwq?r}atPg` z7Jx1YAWK{<_XZV0_T$dz;fn6ej=ki5L@f^MfddD++(+nw05XU*U33%}3>mUvjT<-S zkR3K`nB`!2`}Qp{jSs+76f%fmfziYlIPA+6xw*W0^-8@3fa}?W2@~qnsbeZi6Qt$l z1|#eynH~1!igxxGOyY(Sg2{l@Dl(&?Lx)<{%@j=+1du5U>YNsv<5& z!Na1KV-qrnl@TG1WP|Ni!C>*UFk zRmlGR`xOohgkTtY;98==q)C&SH*ap&=H<(mf;6kVO4g-Imoa0;NHaG#_rQSz+7%cG z!7u{af&~ji11fVwh>8^}S`^}9A{YgffOK)|)~#9wdDz)wFbNt455+n24uXFcFJ3%G zmaRdgF>gA+>FMbWiM-LK?e5GsoPCFy2%**vCPcYbnQ4q{mo&Lx7R`KcE`ux!~fcTr~V zjvYHhCezLAm|ebM4k(euU*bXH{NxtO=mNysg!X|bwzCyQ6fdB50t?2&6?g93sSKoi zmeWbQ>_CDuYB|>Iaumb1)W>^MD<$v^oH%hpr~JZ&3yv9+T_{PGaFHwiXZ!Fa>E%Vw z&TGL?CtkaDt?EEtVy4;_Vr_bR>iF^F3C;3~*``e!Habbh#fuj;KNMLH9z0-pf`K#@ z$j;8Dl&#|lKq4m>17@%BA5$1d-iO-PgunIZVnhQfZ(BX77tjo zXpxH62yyi2QAH}iJBtWezI?eLSr)8~Ct2~9nu-bx4s`6;k=#NDa0K@3*`ouH*9r}; zn3k5NcmUp$^tGPpmo8FaN12Lz|NgyswJ`-I3*#6gM~);3bevj3mRalMM+B-9C!5*^ zuxZmK?HWFOxT-~=O81@;eEj$kwD*k{b^1QUmXj== zea}@u$Z&6N&1QZ`mw8&Uuq>3yEG&ST0qF{u0IOP9boHeN`P9ON3;8jWX^g-i=g*&? z>~pKDHUVAHRc1^l_cX$N`}XansK!?0XFL?%{_SrNVpNP8(F{a05Y0d|1JMjbGZ4){ bk~8o>uX&Yn7I8$D00000NkvXXu0mjfx3mkO literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index 373f59886..b160ba888 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -96,6 +96,8 @@ menuIconTranslate: icon {{ "menu/translate", menuIconColor }}; menuIconReportAntiSpam: icon {{ "menu/false_positive", menuIconColor }}; menuIconSpoiler: icon {{ "menu/spoiler", menuIconColor }}; menuIconDisable: icon {{ "menu/disable", menuIconColor }}; +menuIconPhotoSet: icon {{ "menu/photo_set", menuIconColor }}; +menuIconPhotoSuggest: icon {{ "menu/photo_suggest", menuIconColor }}; menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }}; menuIconTTLAnyTextPosition: point(11px, 22px); diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp index 181dc651f..c739d0f82 100644 --- a/Telegram/SourceFiles/ui/special_buttons.cpp +++ b/Telegram/SourceFiles/ui/special_buttons.cpp @@ -46,6 +46,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_peer_photo.h" #include "styles/style_boxes.h" #include "styles/style_chat.h" +#include "styles/style_menu_icons.h" namespace Ui { namespace { @@ -305,7 +306,9 @@ void UserpicButton::choosePhotoLocally() { if (!IsCameraAvailable()) { chooseFile(); } else { - _menu = base::make_unique_q(this); + _menu = base::make_unique_q( + this, + st::popupMenuWithIcons); const auto user = _peer ? _peer->asUser() : nullptr; if (user && !user->isSelf()) { const auto name = user->firstName.isEmpty() @@ -313,27 +316,30 @@ void UserpicButton::choosePhotoLocally() { : user->firstName; _menu->addAction( tr::lng_profile_set_photo_for(tr::now, lt_user, name), - [=] { chooseFile(); }); + [=] { chooseFile(); }, + &st::menuIconPhotoSet); _menu->addAction( tr::lng_profile_suggest_photo(tr::now, lt_user, name), - [=] { chooseFile(ChosenType::Suggest); }); + [=] { chooseFile(ChosenType::Suggest); }, + &st::menuIconPhotoSuggest); if (user->hasPersonalPhoto()) { _menu->addAction( tr::lng_profile_photo_reset(tr::now), [=] { user->session().api().peerPhoto().clearPersonal( - user); _userpicCustom = false; }); + user); _userpicCustom = false; }, + &st::menuIconRemove); } } else { _menu->addAction(tr::lng_attach_file(tr::now), [=] { chooseFile(); - }); + }, &st::menuIconPhoto); _menu->addAction(tr::lng_attach_camera(tr::now), [=] { _window->show(Box( CameraBox, _window, _peer, callback(ChosenType::Set))); - }); + }, &st::menuIconPhotoSet); } _menu->popup(QCursor::pos()); }