diff --git a/Telegram/Resources/icons/info/edit/hidden_members.png b/Telegram/Resources/icons/info/edit/hidden_members.png new file mode 100644 index 0000000000..5023e3ae71 Binary files /dev/null and b/Telegram/Resources/icons/info/edit/hidden_members.png differ diff --git a/Telegram/Resources/icons/info/edit/hidden_members@2x.png b/Telegram/Resources/icons/info/edit/hidden_members@2x.png new file mode 100644 index 0000000000..6e26f1cbe9 Binary files /dev/null and b/Telegram/Resources/icons/info/edit/hidden_members@2x.png differ diff --git a/Telegram/Resources/icons/info/edit/hidden_members@3x.png b/Telegram/Resources/icons/info/edit/hidden_members@3x.png new file mode 100644 index 0000000000..aa51437911 Binary files /dev/null and b/Telegram/Resources/icons/info/edit/hidden_members@3x.png differ diff --git a/Telegram/Resources/icons/menu/spoiler.png b/Telegram/Resources/icons/menu/spoiler.png deleted file mode 100644 index a8c47bdcab..0000000000 Binary files a/Telegram/Resources/icons/menu/spoiler.png and /dev/null differ diff --git a/Telegram/Resources/icons/menu/spoiler@2x.png b/Telegram/Resources/icons/menu/spoiler@2x.png deleted file mode 100644 index 97f644192d..0000000000 Binary files a/Telegram/Resources/icons/menu/spoiler@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/menu/spoiler@3x.png b/Telegram/Resources/icons/menu/spoiler@3x.png deleted file mode 100644 index 0963b5076c..0000000000 Binary files a/Telegram/Resources/icons/menu/spoiler@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/menu/spoiler_off.png b/Telegram/Resources/icons/menu/spoiler_off.png new file mode 100644 index 0000000000..c694fd15da Binary files /dev/null and b/Telegram/Resources/icons/menu/spoiler_off.png differ diff --git a/Telegram/Resources/icons/menu/spoiler_off@2x.png b/Telegram/Resources/icons/menu/spoiler_off@2x.png new file mode 100644 index 0000000000..9400628b8d Binary files /dev/null and b/Telegram/Resources/icons/menu/spoiler_off@2x.png differ diff --git a/Telegram/Resources/icons/menu/spoiler_off@3x.png b/Telegram/Resources/icons/menu/spoiler_off@3x.png new file mode 100644 index 0000000000..ce6598ad85 Binary files /dev/null and b/Telegram/Resources/icons/menu/spoiler_off@3x.png differ diff --git a/Telegram/Resources/icons/menu/spoiler_on.png b/Telegram/Resources/icons/menu/spoiler_on.png new file mode 100644 index 0000000000..8c295861e5 Binary files /dev/null and b/Telegram/Resources/icons/menu/spoiler_on.png differ diff --git a/Telegram/Resources/icons/menu/spoiler_on@2x.png b/Telegram/Resources/icons/menu/spoiler_on@2x.png new file mode 100644 index 0000000000..2e4e74961a Binary files /dev/null and b/Telegram/Resources/icons/menu/spoiler_on@2x.png differ diff --git a/Telegram/Resources/icons/menu/spoiler_on@3x.png b/Telegram/Resources/icons/menu/spoiler_on@3x.png new file mode 100644 index 0000000000..23c83bbbae Binary files /dev/null and b/Telegram/Resources/icons/menu/spoiler_on@3x.png differ diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 634c957828..e8d4a5b914 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -2326,7 +2326,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_context_animated_reactions_many#other" = "Reactions contain emoji from **{count} packs**."; "lng_context_spoiler_effect" = "Hide with Spoiler"; -"lng_context_disable_spoiler" = "Disable Spoiler Effect"; +"lng_context_disable_spoiler" = "Remove Spoiler"; "lng_downloads_section" = "Downloads"; "lng_downloads_view_in_chat" = "View in chat"; diff --git a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp index f881a34629..02d6b12adf 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp @@ -36,7 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL rpl::single(QString()), [] {}, st::manageGroupTopicsButton, - { &st::infoRoundedIconAntiSpam, Settings::kIconPurple } + { &st::infoRoundedIconHideMembers, Settings::kIconDarkBlue } ))->toggleOn(rpl::single( (megagroup->flags() & ChannelDataFlag::ParticipantsHidden) != 0 ) | rpl::then(state->toggled.events())); diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp index 3805176c02..83858a27eb 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp @@ -532,7 +532,7 @@ void SendFilesBox::addMenuButton() { ? tr::lng_context_disable_spoiler(tr::now) : tr::lng_context_spoiler_effect(tr::now)), [=] { toggleSpoilers(!spoilered); }, - (spoilered ? &st::menuIconDisable : &st::menuIconSpoiler)); + spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler); if (hasSendMenu()) { _menu->addSeparator(); } diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 640168f2b2..de3d384ed2 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -388,6 +388,7 @@ infoRoundedIconInviteLinks: icon {{ "info/edit/group_manage_links", settingsIcon infoRoundedIconReactions: icon {{ "info/edit/group_manage_reactions", settingsIconFg }}; infoRoundedIconSignature: icon {{ "info/edit/channel_manage_signature", settingsIconFg }}; infoRoundedIconAntiSpam: icon {{ "info/edit/antispam", settingsIconFg }}; +infoRoundedIconHideMembers: icon {{ "info/edit/hidden_members", settingsIconFg }}; infoIconShare: icon {{ "info/info_share", infoIconFg }}; infoIconEdit: icon {{ "info/info_edit", infoIconFg }}; diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp index c905035c15..2962e93595 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp @@ -269,7 +269,7 @@ void AbstractSingleMediaPreview::showContextMenu(QPoint position) { ? tr::lng_context_disable_spoiler(tr::now) : tr::lng_context_spoiler_effect(tr::now), [=] { setSpoiler(!spoilered); - }, spoilered ? &st::menuIconDisable : &st::menuIconSpoiler); + }, spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler); if (_menu->empty()) { _menu = nullptr; diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp index 00f7eba624..24e46d3d8f 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp @@ -593,7 +593,7 @@ void AlbumPreview::showContextMenu( ? tr::lng_context_disable_spoiler(tr::now) : tr::lng_context_spoiler_effect(tr::now), [=] { thumb->setSpoiler(!spoilered); - }, spoilered ? &st::menuIconDisable : &st::menuIconSpoiler); + }, spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler); if (_menu->empty()) { _menu = nullptr; diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index b160ba8884..fef75c9ad7 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -94,7 +94,8 @@ menuIconStartStreamWith: icon {{ "menu/start_stream_with", menuIconColor }}; menuIconVideoChat: icon {{ "menu/video_chat", menuIconColor }}; menuIconTranslate: icon {{ "menu/translate", menuIconColor }}; menuIconReportAntiSpam: icon {{ "menu/false_positive", menuIconColor }}; -menuIconSpoiler: icon {{ "menu/spoiler", menuIconColor }}; +menuIconSpoiler: icon {{ "menu/spoiler_on", menuIconColor }}; +menuIconSpoilerOff: icon {{ "menu/spoiler_off", menuIconColor }}; menuIconDisable: icon {{ "menu/disable", menuIconColor }}; menuIconPhotoSet: icon {{ "menu/photo_set", menuIconColor }}; menuIconPhotoSuggest: icon {{ "menu/photo_suggest", menuIconColor }};