Add some more icons for folders.

Telegram/SourceFiles/ui/filter_icon_panel.cpp

@@ -26,29 +26,43 @@ constexpr auto kIconsPerRow = 6;
 
 constexpr auto kIcons = std::array{
 	FilterIcon::Cat,
-	FilterIcon::Crown,
-	FilterIcon::Favorite,
-	FilterIcon::Flower,
+	FilterIcon::Book,
+	FilterIcon::Money,
+	// FilterIcon::Camera,
 	FilterIcon::Game,
+	// FilterIcon::House,
+	FilterIcon::Light,
+	FilterIcon::Like,
+	// FilterIcon::Plus,
+	FilterIcon::Note,
+	FilterIcon::Palette,
+	FilterIcon::Travel,
+	FilterIcon::Sport,
+	FilterIcon::Favorite,
+	FilterIcon::Study,
+	FilterIcon::Airplane,
+	// FilterIcon::Microbe,
+	// FilterIcon::Worker,
+	FilterIcon::Private,
+	FilterIcon::Groups,
+	FilterIcon::All,
+	FilterIcon::Unread,
+	// FilterIcon::Check,
+	FilterIcon::Bots,
+	// FilterIcon::Folders,
+	FilterIcon::Crown,
+	FilterIcon::Flower,
 	FilterIcon::Home,
 	FilterIcon::Love,
 	FilterIcon::Mask,
 	FilterIcon::Party,
-	FilterIcon::Sport,
-	FilterIcon::Study,
 	FilterIcon::Trade,
-	FilterIcon::Travel,
 	FilterIcon::Work,
-
-	FilterIcon::All,
-	FilterIcon::Unread,
 	FilterIcon::Unmuted,
-	FilterIcon::Bots,
 	FilterIcon::Channels,
-	FilterIcon::Groups,
-	FilterIcon::Private,
 	FilterIcon::Custom,
 	FilterIcon::Setup,
+	// FilterIcon::Poo,
 };
 
 } // namespace

Telegram/SourceFiles/ui/filter_icons.cpp

@@ -15,76 +15,141 @@ namespace Ui {
 namespace {
 
 const auto kIcons = std::vector<FilterIcons>{
-	{
-		&st::filtersAll,
-		&st::filtersAllActive,
-		"\xF0\x9F\x92\xAC"_cs.utf16()
-	},
-	{
-		&st::filtersUnread,
-		&st::filtersUnreadActive,
-		"\xE2\x9C\x85"_cs.utf16()
-	},
-	{
-		&st::filtersUnmuted,
-		&st::filtersUnmutedActive,
-		"\xF0\x9F\x94\x94"_cs.utf16()
-	},
-	{
-		&st::filtersBots,
-		&st::filtersBotsActive,
-		"\xF0\x9F\xA4\x96"_cs.utf16()
-	},
-	{
-		&st::filtersChannels,
-		&st::filtersChannelsActive,
-		"\xF0\x9F\x93\xA2"_cs.utf16()
-	},
-	{
-		&st::filtersGroups,
-		&st::filtersGroupsActive,
-		"\xF0\x9F\x91\xA5"_cs.utf16()
-	},
-	{
-		&st::filtersPrivate,
-		&st::filtersPrivateActive,
-		"\xF0\x9F\x91\xA4"_cs.utf16()
-	},
-	{
-		&st::filtersCustom,
-		&st::filtersCustomActive,
-		"\xF0\x9F\x93\x81"_cs.utf16()
-	},
-	{
-		&st::filtersSetup,
-		&st::filtersSetupActive,
-		"\xF0\x9F\x93\x8B"_cs.utf16()
-	},
 	{
 		&st::foldersCat,
 		&st::foldersCatActive,
 		"\xF0\x9F\x90\xB1"_cs.utf16()
 	},
+	{
+		&st::foldersBook,
+		&st::foldersBookActive,
+		"\xF0\x9F\x93\x95"_cs.utf16()
+	},
+	{
+		&st::foldersMoney,
+		&st::foldersMoneyActive,
+		"\xF0\x9F\x92\xB0"_cs.utf16()
+	},
+	//{
+	//	&st::foldersCamera,
+	//	&st::foldersCameraActive,
+	//	"\xF0\x9F\x93\xB8"_cs.utf16()
+	//},
+	{
+		&st::foldersGame,
+		&st::foldersGameActive,
+		"\xF0\x9F\x8E\xAE"_cs.utf16()
+	},
+	//{
+	//	&st::foldersHouse,
+	//	&st::foldersHouseActive,
+	//	"\xF0\x9F\x8F\xA1"_cs.utf16()
+	//},
+	{
+		&st::foldersLight,
+		&st::foldersLightActive,
+		"\xF0\x9F\x92\xA1"_cs.utf16()
+	},
+	{
+		&st::foldersLike,
+		&st::foldersLikeActive,
+		"\xF0\x9F\x91\x8C"_cs.utf16()
+	},
+	//{
+	//	&st::foldersPlus,
+	//	&st::foldersPlusActive,
+	//	"\xE2\x9E\x95"_cs.utf16()
+	//},
+	{
+		&st::foldersNote,
+		&st::foldersNoteActive,
+		"\xF0\x9F\x8E\xB5"_cs.utf16()
+	},
+	{
+		&st::foldersPalette,
+		&st::foldersPaletteActive,
+		"\xF0\x9F\x8E\xA8"_cs.utf16()
+	},
+	{
+		&st::foldersTravel,
+		&st::foldersTravelActive,
+		"\xE2\x9C\x88\xEF\xB8\x8F"_cs.utf16()
+	},
+	{
+		&st::foldersSport,
+		&st::foldersSportActive,
+		"\xE2\x9A\xBD\xEF\xB8\x8F"_cs.utf16()
+	},
+	{
+		&st::foldersFavorite,
+		&st::foldersFavoriteActive,
+		"\xE2\xAD\x90"_cs.utf16()
+	},
+	{
+		&st::foldersStudy,
+		&st::foldersStudyActive,
+		"\xF0\x9F\x8E\x93"_cs.utf16()
+	},
+	{
+		&st::foldersAirplane,
+		&st::foldersAirplaneActive,
+		"\xF0\x9F\x9B\xAB"_cs.utf16()
+	},
+	//{
+	//	&st::foldersMicrobe,
+	//	&st::foldersMicrobeActive,
+	//	"\xF0\x9F\xA6\xA0"_cs.utf16()
+	//},
+	//{
+	//	&st::foldersWorker,
+	//	&st::foldersWorkerActive,
+	//	"\xF0\x9F\x91\xA8\xE2\x80\x8D\xF0\x9F\x92\xBC"_cs.utf16()
+	//},
+	{
+		&st::foldersPrivate,
+		&st::foldersPrivateActive,
+		"\xF0\x9F\x91\xA4"_cs.utf16()
+	},
+	{
+		&st::foldersGroups,
+		&st::foldersGroupsActive,
+		"\xF0\x9F\x91\xA5"_cs.utf16()
+	},
+	{
+		&st::foldersAll,
+		&st::foldersAllActive,
+		"\xF0\x9F\x92\xAC"_cs.utf16()
+	},
+	{
+		&st::foldersUnread,
+		&st::foldersUnreadActive,
+		"\xE2\x9C\x85"_cs.utf16()
+	},
+	//{
+	//	&st::foldersCheck,
+	//	&st::foldersCheckActive,
+	//	"\xE2\x98\x91\xEF\xB8\x8F"_cs.utf16()
+	//},
+	{
+		&st::foldersBots,
+		&st::foldersBotsActive,
+		"\xF0\x9F\xA4\x96"_cs.utf16()
+	},
+	//{
+	//	&st::foldersFolders,
+	//	&st::foldersFoldersActive,
+	//	"\xF0\x9F\x97\x82"_cs.utf16()
+	//},
 	{
 		&st::foldersCrown,
 		&st::foldersCrownActive,
 		"\xF0\x9F\x91\x91"_cs.utf16()
 	},
-	{
-		&st::foldersFavorite,
-		&st::foldersFavoriteActive,
-		"\xE2\xAD\x90\xEF\xB8\x8F"_cs.utf16()
-	},
 	{
 		&st::foldersFlower,
 		&st::foldersFlowerActive,
 		"\xF0\x9F\x8C\xB9"_cs.utf16()
 	},
-	{
-		&st::foldersGame,
-		&st::foldersGameActive,
-		"\xF0\x9F\x8E\xAE"_cs.utf16()
-	},
 	{
 		&st::foldersHome,
 		&st::foldersHomeActive,
@@ -93,7 +158,7 @@ const auto kIcons = std::vector<FilterIcons>{
 	{
 		&st::foldersLove,
 		&st::foldersLoveActive,
-		"\xE2\x9D\xA4\xEF\xB8\x8F"_cs.utf16()
+		"\xE2\x9D\xA4"_cs.utf16()
 	},
 	{
 		&st::foldersMask,
@@ -105,31 +170,41 @@ const auto kIcons = std::vector<FilterIcons>{
 		&st::foldersPartyActive,
 		"\xF0\x9F\x8D\xB8"_cs.utf16()
 	},
-	{
-		&st::foldersSport,
-		&st::foldersSportActive,
-		"\xE2\x9A\xBD\xEF\xB8\x8F"_cs.utf16()
-	},
-	{
-		&st::foldersStudy,
-		&st::foldersStudyActive,
-		"\xF0\x9F\x8E\x93"_cs.utf16()
-	},
 	{
 		&st::foldersTrade,
 		&st::foldersTradeActive,
 		"\xF0\x9F\x93\x88"_cs.utf16()
 	},
-	{
-		&st::foldersTravel,
-		&st::foldersTravelActive,
-		"\xE2\x9C\x88\xEF\xB8\x8F"_cs.utf16()
-	},
 	{
 		&st::foldersWork,
 		&st::foldersWorkActive,
 		"\xF0\x9F\x92\xBC"_cs.utf16()
 	},
+	{
+		&st::foldersUnmuted,
+		&st::foldersUnmutedActive,
+		"\xF0\x9F\x94\x94"_cs.utf16()
+	},
+	{
+		&st::foldersChannels,
+		&st::foldersChannelsActive,
+		"\xF0\x9F\x93\xA2"_cs.utf16()
+	},
+	{
+		&st::foldersCustom,
+		&st::foldersCustomActive,
+		"\xF0\x9F\x93\x81"_cs.utf16()
+	},
+	{
+		&st::foldersSetup,
+		&st::foldersSetupActive,
+		"\xF0\x9F\x93\x8B"_cs.utf16()
+	},
+	//{
+	//	&st::foldersPoo,
+	//	&st::foldersPooActive,
+	//	"\xF0\x9F\x92\xA9"_cs.utf16()
+	//},
 	{
 		&st::filtersEdit,
 		&st::filtersEdit,

Telegram/SourceFiles/ui/filter_icons.h

@@ -20,30 +20,44 @@ class ChatFilter;
 namespace Ui {
 
 enum class FilterIcon : uchar {
+	Cat,
+	Book,
+	Money,
+	// Camera,
+	Game,
+	// House,
+	Light,
+	Like,
+	// Plus,
+	Note,
+	Palette,
+	Travel,
+	Sport,
+	Favorite,
+	Study,
+	Airplane,
+	// Microbe,
+	// Worker,
+	Private,
+	Groups,
 	All,
 	Unread,
-	Unmuted,
+	// Check,
 	Bots,
-	Channels,
-	Groups,
-	Private,
-	Custom,
-	Setup,
-
-	Cat,
+	// Folders,
 	Crown,
-	Favorite,
 	Flower,
-	Game,
 	Home,
 	Love,
 	Mask,
 	Party,
-	Sport,
-	Study,
 	Trade,
-	Travel,
 	Work,
+	Unmuted,
+	Channels,
+	Custom,
+	Setup,
+	// Poo,
 
 	Edit,
 };

Telegram/SourceFiles/ui/filter_icons.style

@@ -7,37 +7,60 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 using "ui/colors.palette";
 
-filtersAll: icon {{ "folders/folders_all", sideBarIconFg }};
-filtersAllActive: icon {{ "folders/folders_all", sideBarIconFgActive }};
-filtersUnread: icon {{ "folders/folders_unread", sideBarIconFg }};
-filtersUnreadActive: icon {{ "folders/folders_unread", sideBarIconFgActive }};
-filtersUnmuted: icon {{ "folders/folders_unmuted", sideBarIconFg }};
-filtersUnmutedActive: icon {{ "folders/folders_unmuted", sideBarIconFgActive }};
-filtersBots: icon {{ "folders/folders_bots", sideBarIconFg }};
-filtersBotsActive: icon {{ "folders/folders_bots", sideBarIconFgActive }};
-filtersChannels: icon {{ "folders/folders_channels", sideBarIconFg }};
-filtersChannelsActive: icon {{ "folders/folders_channels", sideBarIconFgActive }};
-filtersGroups: icon {{ "folders/folders_group", sideBarIconFg }};
-filtersGroupsActive: icon {{ "folders/folders_group", sideBarIconFgActive }};
-filtersPrivate: icon {{ "folders/folders_private", sideBarIconFg }};
-filtersPrivateActive: icon {{ "folders/folders_private", sideBarIconFgActive }};
-filtersCustom: icon {{ "folders/folders_custom", sideBarIconFg }};
-filtersCustomActive: icon {{ "folders/folders_custom", sideBarIconFgActive }};
-filtersSetup: icon {{ "folders/folders_setup", sideBarIconFg }};
-filtersSetupActive: icon {{ "folders/folders_setup", sideBarIconFgActive }};
-
-filtersEdit: icon {{ "folders/folders_edit", sideBarIconFg }};
-
 foldersCat: icon {{ "folders/folders_cat", sideBarIconFg }};
 foldersCatActive: icon {{ "folders/folders_cat", sideBarIconFgActive }};
-foldersCrown: icon {{ "folders/folders_crown", sideBarIconFg }};
-foldersCrownActive: icon {{ "folders/folders_crown", sideBarIconFgActive }};
-foldersFavorite: icon {{ "folders/folders_favorite", sideBarIconFg }};
-foldersFavoriteActive: icon {{ "folders/folders_favorite", sideBarIconFgActive }};
-foldersFlower: icon {{ "folders/folders_flower", sideBarIconFg }};
-foldersFlowerActive: icon {{ "folders/folders_flower", sideBarIconFgActive }};
+foldersBook: icon {{ "folders/folders_book", sideBarIconFg }};
+foldersBookActive: icon {{ "folders/folders_book", sideBarIconFgActive }};
+foldersMoney: icon {{ "folders/folders_money", sideBarIconFg }};
+foldersMoneyActive: icon {{ "folders/folders_money", sideBarIconFgActive }};
+// foldersCamera: icon {{ "folders/folders_camera", sideBarIconFg }};
+// foldersCameraActive: icon {{ "folders/folders_camera", sideBarIconFgActive }};
 foldersGame: icon {{ "folders/folders_game", sideBarIconFg }};
 foldersGameActive: icon {{ "folders/folders_game", sideBarIconFgActive }};
+// foldersHouse: icon {{ "folders/folders_house", sideBarIconFg }};
+// foldersHouseActive: icon {{ "folders/folders_house", sideBarIconFgActive }};
+foldersLight: icon {{ "folders/folders_light", sideBarIconFg }};
+foldersLightActive: icon {{ "folders/folders_light", sideBarIconFgActive }};
+foldersLike: icon {{ "folders/folders_like", sideBarIconFg }};
+foldersLikeActive: icon {{ "folders/folders_like", sideBarIconFgActive }};
+// foldersPlus: icon {{ "folders/folders_plus", sideBarIconFg }};
+// foldersPlusActive: icon {{ "folders/folders_plus", sideBarIconFgActive }};
+foldersNote: icon {{ "folders/folders_note", sideBarIconFg }};
+foldersNoteActive: icon {{ "folders/folders_note", sideBarIconFgActive }};
+foldersPalette: icon {{ "folders/folders_palette", sideBarIconFg }};
+foldersPaletteActive: icon {{ "folders/folders_palette", sideBarIconFgActive }};
+foldersTravel: icon {{ "folders/folders_travel", sideBarIconFg }};
+foldersTravelActive: icon {{ "folders/folders_travel", sideBarIconFgActive }};
+foldersSport: icon {{ "folders/folders_sport", sideBarIconFg }};
+foldersSportActive: icon {{ "folders/folders_sport", sideBarIconFgActive }};
+foldersFavorite: icon {{ "folders/folders_favorite", sideBarIconFg }};
+foldersFavoriteActive: icon {{ "folders/folders_favorite", sideBarIconFgActive }};
+foldersStudy: icon {{ "folders/folders_study", sideBarIconFg }};
+foldersStudyActive: icon {{ "folders/folders_study", sideBarIconFgActive }};
+foldersAirplane: icon {{ "folders/folders_airplane", sideBarIconFg }};
+foldersAirplaneActive: icon {{ "folders/folders_airplane", sideBarIconFgActive }};
+// foldersMicrobe: icon {{ "folders/folders_microbe", sideBarIconFg }};
+// foldersMicrobeActive: icon {{ "folders/folders_microbe", sideBarIconFgActive }};
+// foldersWorker: icon {{ "folders/folders_worker", sideBarIconFg }};
+// foldersWorkerActive: icon {{ "folders/folders_worker", sideBarIconFgActive }};
+foldersPrivate: icon {{ "folders/folders_private", sideBarIconFg }};
+foldersPrivateActive: icon {{ "folders/folders_private", sideBarIconFgActive }};
+foldersGroups: icon {{ "folders/folders_group", sideBarIconFg }};
+foldersGroupsActive: icon {{ "folders/folders_group", sideBarIconFgActive }};
+foldersAll: icon {{ "folders/folders_all", sideBarIconFg }};
+foldersAllActive: icon {{ "folders/folders_all", sideBarIconFgActive }};
+foldersUnread: icon {{ "folders/folders_unread", sideBarIconFg }};
+foldersUnreadActive: icon {{ "folders/folders_unread", sideBarIconFgActive }};
+// foldersCheck: icon {{ "folders/folders_check", sideBarIconFg }};
+// foldersCheckActive: icon {{ "folders/folders_check", sideBarIconFgActive }};
+foldersBots: icon {{ "folders/folders_bots", sideBarIconFg }};
+foldersBotsActive: icon {{ "folders/folders_bots", sideBarIconFgActive }};
+// foldersFolders: icon {{ "folders/folders_folders", sideBarIconFg }};
+// foldersFoldersActive: icon {{ "folders/folders_folders", sideBarIconFgActive }};
+foldersCrown: icon {{ "folders/folders_crown", sideBarIconFg }};
+foldersCrownActive: icon {{ "folders/folders_crown", sideBarIconFgActive }};
+foldersFlower: icon {{ "folders/folders_flower", sideBarIconFg }};
+foldersFlowerActive: icon {{ "folders/folders_flower", sideBarIconFgActive }};
 foldersHome: icon {{ "folders/folders_home", sideBarIconFg }};
 foldersHomeActive: icon {{ "folders/folders_home", sideBarIconFgActive }};
 foldersLove: icon {{ "folders/folders_love", sideBarIconFg }};
@@ -46,13 +69,19 @@ foldersMask: icon {{ "folders/folders_mask", sideBarIconFg }};
 foldersMaskActive: icon {{ "folders/folders_mask", sideBarIconFgActive }};
 foldersParty: icon {{ "folders/folders_party", sideBarIconFg }};
 foldersPartyActive: icon {{ "folders/folders_party", sideBarIconFgActive }};
-foldersSport: icon {{ "folders/folders_sport", sideBarIconFg }};
-foldersSportActive: icon {{ "folders/folders_sport", sideBarIconFgActive }};
-foldersStudy: icon {{ "folders/folders_study", sideBarIconFg }};
-foldersStudyActive: icon {{ "folders/folders_study", sideBarIconFgActive }};
 foldersTrade: icon {{ "folders/folders_trade", sideBarIconFg }};
 foldersTradeActive: icon {{ "folders/folders_trade", sideBarIconFgActive }};
-foldersTravel: icon {{ "folders/folders_travel", sideBarIconFg }};
-foldersTravelActive: icon {{ "folders/folders_travel", sideBarIconFgActive }};
 foldersWork: icon {{ "folders/folders_work", sideBarIconFg }};
 foldersWorkActive: icon {{ "folders/folders_work", sideBarIconFgActive }};
+foldersUnmuted: icon {{ "folders/folders_unmuted", sideBarIconFg }};
+foldersUnmutedActive: icon {{ "folders/folders_unmuted", sideBarIconFgActive }};
+foldersChannels: icon {{ "folders/folders_channels", sideBarIconFg }};
+foldersChannelsActive: icon {{ "folders/folders_channels", sideBarIconFgActive }};
+foldersCustom: icon {{ "folders/folders_custom", sideBarIconFg }};
+foldersCustomActive: icon {{ "folders/folders_custom", sideBarIconFgActive }};
+foldersSetup: icon {{ "folders/folders_setup", sideBarIconFg }};
+foldersSetupActive: icon {{ "folders/folders_setup", sideBarIconFgActive }};
+foldersPoo: icon {{ "folders/folders_poo", sideBarIconFg }};
+foldersPooActive: icon {{ "folders/folders_poo", sideBarIconFgActive }};
+
+filtersEdit: icon {{ "folders/folders_edit", sideBarIconFg }};