diff --git a/Telegram/Resources/icons/dialogs_bot.png b/Telegram/Resources/icons/dialogs/dialogs_bot.png similarity index 100% rename from Telegram/Resources/icons/dialogs_bot.png rename to Telegram/Resources/icons/dialogs/dialogs_bot.png diff --git a/Telegram/Resources/icons/dialogs_bot@2x.png b/Telegram/Resources/icons/dialogs/dialogs_bot@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_bot@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_bot@2x.png diff --git a/Telegram/Resources/icons/dialogs_bot@3x.png b/Telegram/Resources/icons/dialogs/dialogs_bot@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_bot@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_bot@3x.png diff --git a/Telegram/Resources/icons/dialogs_calendar.png b/Telegram/Resources/icons/dialogs/dialogs_calendar.png similarity index 100% rename from Telegram/Resources/icons/dialogs_calendar.png rename to Telegram/Resources/icons/dialogs/dialogs_calendar.png diff --git a/Telegram/Resources/icons/dialogs_calendar@2x.png b/Telegram/Resources/icons/dialogs/dialogs_calendar@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_calendar@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_calendar@2x.png diff --git a/Telegram/Resources/icons/dialogs_calendar@3x.png b/Telegram/Resources/icons/dialogs/dialogs_calendar@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_calendar@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_calendar@3x.png diff --git a/Telegram/Resources/icons/dialogs_cancel_search.png b/Telegram/Resources/icons/dialogs/dialogs_cancel_search.png similarity index 100% rename from Telegram/Resources/icons/dialogs_cancel_search.png rename to Telegram/Resources/icons/dialogs/dialogs_cancel_search.png diff --git a/Telegram/Resources/icons/dialogs_cancel_search@2x.png b/Telegram/Resources/icons/dialogs/dialogs_cancel_search@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_cancel_search@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_cancel_search@2x.png diff --git a/Telegram/Resources/icons/dialogs_cancel_search@3x.png b/Telegram/Resources/icons/dialogs/dialogs_cancel_search@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_cancel_search@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_cancel_search@3x.png diff --git a/Telegram/Resources/icons/dialogs_channel.png b/Telegram/Resources/icons/dialogs/dialogs_channel.png similarity index 100% rename from Telegram/Resources/icons/dialogs_channel.png rename to Telegram/Resources/icons/dialogs/dialogs_channel.png diff --git a/Telegram/Resources/icons/dialogs_channel@2x.png b/Telegram/Resources/icons/dialogs/dialogs_channel@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_channel@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_channel@2x.png diff --git a/Telegram/Resources/icons/dialogs_channel@3x.png b/Telegram/Resources/icons/dialogs/dialogs_channel@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_channel@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_channel@3x.png diff --git a/Telegram/Resources/icons/dialogs_chat.png b/Telegram/Resources/icons/dialogs/dialogs_chat.png similarity index 100% rename from Telegram/Resources/icons/dialogs_chat.png rename to Telegram/Resources/icons/dialogs/dialogs_chat.png diff --git a/Telegram/Resources/icons/dialogs_chat@2x.png b/Telegram/Resources/icons/dialogs/dialogs_chat@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_chat@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_chat@2x.png diff --git a/Telegram/Resources/icons/dialogs_chat@3x.png b/Telegram/Resources/icons/dialogs/dialogs_chat@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_chat@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_chat@3x.png diff --git a/Telegram/Resources/icons/dialogs_lock.png b/Telegram/Resources/icons/dialogs/dialogs_lock.png similarity index 100% rename from Telegram/Resources/icons/dialogs_lock.png rename to Telegram/Resources/icons/dialogs/dialogs_lock.png diff --git a/Telegram/Resources/icons/dialogs_lock@2x.png b/Telegram/Resources/icons/dialogs/dialogs_lock@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_lock@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_lock@2x.png diff --git a/Telegram/Resources/icons/dialogs_lock@3x.png b/Telegram/Resources/icons/dialogs/dialogs_lock@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_lock@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_lock@3x.png diff --git a/Telegram/Resources/icons/dialogs_menu.png b/Telegram/Resources/icons/dialogs/dialogs_menu.png similarity index 100% rename from Telegram/Resources/icons/dialogs_menu.png rename to Telegram/Resources/icons/dialogs/dialogs_menu.png diff --git a/Telegram/Resources/icons/dialogs_menu@2x.png b/Telegram/Resources/icons/dialogs/dialogs_menu@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_menu@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_menu@2x.png diff --git a/Telegram/Resources/icons/dialogs_menu@3x.png b/Telegram/Resources/icons/dialogs/dialogs_menu@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_menu@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_menu@3x.png diff --git a/Telegram/Resources/icons/dialogs_menu_unread.png b/Telegram/Resources/icons/dialogs/dialogs_menu_unread.png similarity index 100% rename from Telegram/Resources/icons/dialogs_menu_unread.png rename to Telegram/Resources/icons/dialogs/dialogs_menu_unread.png diff --git a/Telegram/Resources/icons/dialogs_menu_unread@2x.png b/Telegram/Resources/icons/dialogs/dialogs_menu_unread@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_menu_unread@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_menu_unread@2x.png diff --git a/Telegram/Resources/icons/dialogs_menu_unread@3x.png b/Telegram/Resources/icons/dialogs/dialogs_menu_unread@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_menu_unread@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_menu_unread@3x.png diff --git a/Telegram/Resources/icons/dialogs_menu_unread_dot.png b/Telegram/Resources/icons/dialogs/dialogs_menu_unread_dot.png similarity index 100% rename from Telegram/Resources/icons/dialogs_menu_unread_dot.png rename to Telegram/Resources/icons/dialogs/dialogs_menu_unread_dot.png diff --git a/Telegram/Resources/icons/dialogs_menu_unread_dot@2x.png b/Telegram/Resources/icons/dialogs/dialogs_menu_unread_dot@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_menu_unread_dot@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_menu_unread_dot@2x.png diff --git a/Telegram/Resources/icons/dialogs_menu_unread_dot@3x.png b/Telegram/Resources/icons/dialogs/dialogs_menu_unread_dot@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_menu_unread_dot@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_menu_unread_dot@3x.png diff --git a/Telegram/Resources/icons/dialogs_pinned.png b/Telegram/Resources/icons/dialogs/dialogs_pinned.png similarity index 100% rename from Telegram/Resources/icons/dialogs_pinned.png rename to Telegram/Resources/icons/dialogs/dialogs_pinned.png diff --git a/Telegram/Resources/icons/dialogs_pinned@2x.png b/Telegram/Resources/icons/dialogs/dialogs_pinned@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_pinned@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_pinned@2x.png diff --git a/Telegram/Resources/icons/dialogs_pinned@3x.png b/Telegram/Resources/icons/dialogs/dialogs_pinned@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_pinned@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_pinned@3x.png diff --git a/Telegram/Resources/icons/dialogs_received.png b/Telegram/Resources/icons/dialogs/dialogs_received.png similarity index 100% rename from Telegram/Resources/icons/dialogs_received.png rename to Telegram/Resources/icons/dialogs/dialogs_received.png diff --git a/Telegram/Resources/icons/dialogs_received@2x.png b/Telegram/Resources/icons/dialogs/dialogs_received@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_received@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_received@2x.png diff --git a/Telegram/Resources/icons/dialogs_received@3x.png b/Telegram/Resources/icons/dialogs/dialogs_received@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_received@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_received@3x.png diff --git a/Telegram/Resources/icons/dialogs_search_from.png b/Telegram/Resources/icons/dialogs/dialogs_search_from.png similarity index 100% rename from Telegram/Resources/icons/dialogs_search_from.png rename to Telegram/Resources/icons/dialogs/dialogs_search_from.png diff --git a/Telegram/Resources/icons/dialogs_search_from@2x.png b/Telegram/Resources/icons/dialogs/dialogs_search_from@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_search_from@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_search_from@2x.png diff --git a/Telegram/Resources/icons/dialogs_search_from@3x.png b/Telegram/Resources/icons/dialogs/dialogs_search_from@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_search_from@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_search_from@3x.png diff --git a/Telegram/Resources/icons/dialogs_sending.png b/Telegram/Resources/icons/dialogs/dialogs_sending.png similarity index 100% rename from Telegram/Resources/icons/dialogs_sending.png rename to Telegram/Resources/icons/dialogs/dialogs_sending.png diff --git a/Telegram/Resources/icons/dialogs_sending@2x.png b/Telegram/Resources/icons/dialogs/dialogs_sending@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_sending@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_sending@2x.png diff --git a/Telegram/Resources/icons/dialogs_sending@3x.png b/Telegram/Resources/icons/dialogs/dialogs_sending@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_sending@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_sending@3x.png diff --git a/Telegram/Resources/icons/dialogs_sent.png b/Telegram/Resources/icons/dialogs/dialogs_sent.png similarity index 100% rename from Telegram/Resources/icons/dialogs_sent.png rename to Telegram/Resources/icons/dialogs/dialogs_sent.png diff --git a/Telegram/Resources/icons/dialogs_sent@2x.png b/Telegram/Resources/icons/dialogs/dialogs_sent@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_sent@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_sent@2x.png diff --git a/Telegram/Resources/icons/dialogs_sent@3x.png b/Telegram/Resources/icons/dialogs/dialogs_sent@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_sent@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_sent@3x.png diff --git a/Telegram/Resources/icons/dialogs_unlock.png b/Telegram/Resources/icons/dialogs/dialogs_unlock.png similarity index 100% rename from Telegram/Resources/icons/dialogs_unlock.png rename to Telegram/Resources/icons/dialogs/dialogs_unlock.png diff --git a/Telegram/Resources/icons/dialogs_unlock@2x.png b/Telegram/Resources/icons/dialogs/dialogs_unlock@2x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_unlock@2x.png rename to Telegram/Resources/icons/dialogs/dialogs_unlock@2x.png diff --git a/Telegram/Resources/icons/dialogs_unlock@3x.png b/Telegram/Resources/icons/dialogs/dialogs_unlock@3x.png similarity index 100% rename from Telegram/Resources/icons/dialogs_unlock@3x.png rename to Telegram/Resources/icons/dialogs/dialogs_unlock@3x.png diff --git a/Telegram/Resources/icons/dialogs/dialogs_verified_check.png b/Telegram/Resources/icons/dialogs/dialogs_verified_check.png new file mode 100644 index 0000000000..14dfa4ee68 Binary files /dev/null and b/Telegram/Resources/icons/dialogs/dialogs_verified_check.png differ diff --git a/Telegram/Resources/icons/dialogs/dialogs_verified_check@2x.png b/Telegram/Resources/icons/dialogs/dialogs_verified_check@2x.png new file mode 100644 index 0000000000..1caf9a6853 Binary files /dev/null and b/Telegram/Resources/icons/dialogs/dialogs_verified_check@2x.png differ diff --git a/Telegram/Resources/icons/dialogs/dialogs_verified_check@3x.png b/Telegram/Resources/icons/dialogs/dialogs_verified_check@3x.png new file mode 100644 index 0000000000..f2b4cea40f Binary files /dev/null and b/Telegram/Resources/icons/dialogs/dialogs_verified_check@3x.png differ diff --git a/Telegram/Resources/icons/dialogs/dialogs_verified_star.png b/Telegram/Resources/icons/dialogs/dialogs_verified_star.png new file mode 100644 index 0000000000..334e70cdf5 Binary files /dev/null and b/Telegram/Resources/icons/dialogs/dialogs_verified_star.png differ diff --git a/Telegram/Resources/icons/dialogs/dialogs_verified_star@2x.png b/Telegram/Resources/icons/dialogs/dialogs_verified_star@2x.png new file mode 100644 index 0000000000..9bfd666d5c Binary files /dev/null and b/Telegram/Resources/icons/dialogs/dialogs_verified_star@2x.png differ diff --git a/Telegram/Resources/icons/dialogs/dialogs_verified_star@3x.png b/Telegram/Resources/icons/dialogs/dialogs_verified_star@3x.png new file mode 100644 index 0000000000..bcfd5eeb77 Binary files /dev/null and b/Telegram/Resources/icons/dialogs/dialogs_verified_star@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_verified_check.png b/Telegram/Resources/icons/dialogs_verified_check.png deleted file mode 100644 index 67b732e6df..0000000000 Binary files a/Telegram/Resources/icons/dialogs_verified_check.png and /dev/null differ diff --git a/Telegram/Resources/icons/dialogs_verified_check@2x.png b/Telegram/Resources/icons/dialogs_verified_check@2x.png deleted file mode 100644 index b98a405e0f..0000000000 Binary files a/Telegram/Resources/icons/dialogs_verified_check@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/dialogs_verified_check@3x.png b/Telegram/Resources/icons/dialogs_verified_check@3x.png deleted file mode 100644 index ce4145c47b..0000000000 Binary files a/Telegram/Resources/icons/dialogs_verified_check@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/dialogs_verified_star.png b/Telegram/Resources/icons/dialogs_verified_star.png deleted file mode 100644 index 9a4b8467c2..0000000000 Binary files a/Telegram/Resources/icons/dialogs_verified_star.png and /dev/null differ diff --git a/Telegram/Resources/icons/dialogs_verified_star@2x.png b/Telegram/Resources/icons/dialogs_verified_star@2x.png deleted file mode 100644 index de65718526..0000000000 Binary files a/Telegram/Resources/icons/dialogs_verified_star@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/dialogs_verified_star@3x.png b/Telegram/Resources/icons/dialogs_verified_star@3x.png deleted file mode 100644 index 22b94f4838..0000000000 Binary files a/Telegram/Resources/icons/dialogs_verified_star@3x.png and /dev/null differ diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style index 4b7cf1b1c5..cc53226730 100644 --- a/Telegram/SourceFiles/dialogs/dialogs.style +++ b/Telegram/SourceFiles/dialogs/dialogs.style @@ -101,8 +101,8 @@ dialogsMenuToggle: IconButton { width: 40px; height: 40px; - icon: icon {{ "dialogs_menu", dialogsMenuIconFg }}; - iconOver: icon {{ "dialogs_menu", dialogsMenuIconFgOver }}; + icon: icon {{ "dialogs/dialogs_menu", dialogsMenuIconFg }}; + iconOver: icon {{ "dialogs/dialogs_menu", dialogsMenuIconFgOver }}; iconPosition: point(-1px, -1px); rippleAreaPosition: point(0px, 0px); @@ -112,32 +112,32 @@ dialogsMenuToggle: IconButton { } } dialogsMenuToggleUnread: icon { - { "dialogs_menu_unread", dialogsMenuIconFg }, - { "dialogs_menu_unread_dot", dialogsUnreadBg }, + { "dialogs/dialogs_menu_unread", dialogsMenuIconFg }, + { "dialogs/dialogs_menu_unread_dot", dialogsUnreadBg }, }; dialogsMenuToggleUnreadMuted: icon { - { "dialogs_menu_unread", dialogsMenuIconFg }, - { "dialogs_menu_unread_dot", dialogsMenuIconFg }, + { "dialogs/dialogs_menu_unread", dialogsMenuIconFg }, + { "dialogs/dialogs_menu_unread_dot", dialogsMenuIconFg }, }; dialogsLock: IconButton(dialogsMenuToggle) { - icon: icon {{ "dialogs_lock", dialogsMenuIconFg }}; - iconOver: icon {{ "dialogs_lock", dialogsMenuIconFgOver }}; + icon: icon {{ "dialogs/dialogs_lock", dialogsMenuIconFg }}; + iconOver: icon {{ "dialogs/dialogs_lock", dialogsMenuIconFgOver }}; } -dialogsUnlockIcon: icon {{ "dialogs_unlock", dialogsMenuIconFg }}; -dialogsUnlockIconOver: icon {{ "dialogs_unlock", dialogsMenuIconFgOver }}; +dialogsUnlockIcon: icon {{ "dialogs/dialogs_unlock", dialogsMenuIconFg }}; +dialogsUnlockIconOver: icon {{ "dialogs/dialogs_unlock", dialogsMenuIconFgOver }}; dialogsCalendar: IconButton { width: 29px; height: 32px; - icon: icon {{ "dialogs_calendar", dialogsMenuIconFg }}; - iconOver: icon {{ "dialogs_calendar", dialogsMenuIconFgOver }}; + icon: icon {{ "dialogs/dialogs_calendar", dialogsMenuIconFg }}; + iconOver: icon {{ "dialogs/dialogs_calendar", dialogsMenuIconFgOver }}; iconPosition: point(0px, 5px); } dialogsSearchFrom: IconButton(dialogsCalendar) { width: 26px; - icon: icon {{ "dialogs_search_from", dialogsMenuIconFg }}; - iconOver: icon {{ "dialogs_search_from", dialogsMenuIconFgOver }}; + icon: icon {{ "dialogs/dialogs_search_from", dialogsMenuIconFg }}; + iconOver: icon {{ "dialogs/dialogs_search_from", dialogsMenuIconFgOver }}; } dialogsSearchForNarrowFilters: IconButton(dialogsMenuToggle) { icon: icon {{ "top_bar_search", menuIconFg }}; @@ -154,8 +154,8 @@ dialogsFilter: FlatInput(defaultFlatInput) { textMrg: margins(12px, 3px, 30px, 3px); } dialogsCancelSearchInPeer: IconButton(dialogsMenuToggle) { - icon: icon {{ "dialogs_cancel_search", dialogsMenuIconFg }}; - iconOver: icon {{ "dialogs_cancel_search", dialogsMenuIconFgOver }}; + icon: icon {{ "dialogs/dialogs_cancel_search", dialogsMenuIconFg }}; + iconOver: icon {{ "dialogs/dialogs_cancel_search", dialogsMenuIconFgOver }}; iconPosition: point(11px, 11px); rippleAreaPosition: point(3px, 3px); rippleAreaSize: 34px; @@ -180,49 +180,49 @@ dialogsCancelSearch: CrossButton { } dialogsChatTypeSkip: 22px; -dialogsChatIcon: icon {{ "dialogs_chat", dialogsChatIconFg, point(1px, 4px) }}; -dialogsChatIconOver: icon {{ "dialogs_chat", dialogsChatIconFgOver, point(1px, 4px) }}; -dialogsChatIconActive: icon {{ "dialogs_chat", dialogsChatIconFgActive, point(1px, 4px) }}; -dialogsChannelIcon: icon {{ "dialogs_channel", dialogsChatIconFg, point(3px, 4px) }}; -dialogsChannelIconOver: icon {{ "dialogs_channel", dialogsChatIconFgOver, point(3px, 4px) }}; -dialogsChannelIconActive: icon {{ "dialogs_channel", dialogsChatIconFgActive, point(3px, 4px) }}; -dialogsBotIcon: icon {{ "dialogs_bot", dialogsChatIconFg, point(1px, 3px) }}; -dialogsBotIconOver: icon {{ "dialogs_bot", dialogsChatIconFgOver, point(1px, 3px) }}; -dialogsBotIconActive: icon {{ "dialogs_bot", dialogsChatIconFgActive, point(1px, 3px) }}; +dialogsChatIcon: icon {{ "dialogs/dialogs_chat", dialogsChatIconFg, point(1px, 4px) }}; +dialogsChatIconOver: icon {{ "dialogs/dialogs_chat", dialogsChatIconFgOver, point(1px, 4px) }}; +dialogsChatIconActive: icon {{ "dialogs/dialogs_chat", dialogsChatIconFgActive, point(1px, 4px) }}; +dialogsChannelIcon: icon {{ "dialogs/dialogs_channel", dialogsChatIconFg, point(3px, 4px) }}; +dialogsChannelIconOver: icon {{ "dialogs/dialogs_channel", dialogsChatIconFgOver, point(3px, 4px) }}; +dialogsChannelIconActive: icon {{ "dialogs/dialogs_channel", dialogsChatIconFgActive, point(3px, 4px) }}; +dialogsBotIcon: icon {{ "dialogs/dialogs_bot", dialogsChatIconFg, point(1px, 3px) }}; +dialogsBotIconOver: icon {{ "dialogs/dialogs_bot", dialogsChatIconFgOver, point(1px, 3px) }}; +dialogsBotIconActive: icon {{ "dialogs/dialogs_bot", dialogsChatIconFgActive, point(1px, 3px) }}; dialogsArchiveUserpic: icon {{ "archive_userpic", historyPeerUserpicFg }}; dialogsRepliesUserpic: icon {{ "replies_userpic", historyPeerUserpicFg }}; dialogsSendStateSkip: 20px; -dialogsSendingIcon: icon {{ "dialogs_sending", dialogsSendingIconFg, point(8px, 4px) }}; -dialogsSendingIconOver: icon {{ "dialogs_sending", dialogsSendingIconFgOver, point(8px, 4px) }}; -dialogsSendingIconActive: icon {{ "dialogs_sending", dialogsSendingIconFgActive, point(8px, 4px) }}; -dialogsSentIcon: icon {{ "dialogs_sent", dialogsSentIconFg, point(10px, 4px) }}; -dialogsSentIconOver: icon {{ "dialogs_sent", dialogsSentIconFgOver, point(10px, 4px) }}; -dialogsSentIconActive: icon {{ "dialogs_sent", dialogsSentIconFgActive, point(10px, 4px) }}; -dialogsReceivedIcon: icon {{ "dialogs_received", dialogsSentIconFg, point(5px, 4px) }}; -dialogsReceivedIconOver: icon {{ "dialogs_received", dialogsSentIconFgOver, point(5px, 4px) }}; -dialogsReceivedIconActive: icon {{ "dialogs_received", dialogsSentIconFgActive, point(5px, 4px) }}; -dialogsPinnedIcon: icon {{ "dialogs_pinned", dialogsUnreadBgMuted }}; -dialogsPinnedIconOver: icon {{ "dialogs_pinned", dialogsUnreadBgMutedOver }}; -dialogsPinnedIconActive: icon {{ "dialogs_pinned", dialogsUnreadBgMutedActive }}; +dialogsSendingIcon: icon {{ "dialogs/dialogs_sending", dialogsSendingIconFg, point(8px, 4px) }}; +dialogsSendingIconOver: icon {{ "dialogs/dialogs_sending", dialogsSendingIconFgOver, point(8px, 4px) }}; +dialogsSendingIconActive: icon {{ "dialogs/dialogs_sending", dialogsSendingIconFgActive, point(8px, 4px) }}; +dialogsSentIcon: icon {{ "dialogs/dialogs_sent", dialogsSentIconFg, point(10px, 4px) }}; +dialogsSentIconOver: icon {{ "dialogs/dialogs_sent", dialogsSentIconFgOver, point(10px, 4px) }}; +dialogsSentIconActive: icon {{ "dialogs/dialogs_sent", dialogsSentIconFgActive, point(10px, 4px) }}; +dialogsReceivedIcon: icon {{ "dialogs/dialogs_received", dialogsSentIconFg, point(5px, 4px) }}; +dialogsReceivedIconOver: icon {{ "dialogs/dialogs_received", dialogsSentIconFgOver, point(5px, 4px) }}; +dialogsReceivedIconActive: icon {{ "dialogs/dialogs_received", dialogsSentIconFgActive, point(5px, 4px) }}; +dialogsPinnedIcon: icon {{ "dialogs/dialogs_pinned", dialogsUnreadBgMuted }}; +dialogsPinnedIconOver: icon {{ "dialogs/dialogs_pinned", dialogsUnreadBgMutedOver }}; +dialogsPinnedIconActive: icon {{ "dialogs/dialogs_pinned", dialogsUnreadBgMutedActive }}; dialogsVerifiedIcon: icon { - { "dialogs_verified_star", dialogsVerifiedIconBg, point(4px, 2px) }, - { "dialogs_verified_check", dialogsVerifiedIconFg, point(7px, 7px) }, + { "dialogs/dialogs_verified_star", dialogsVerifiedIconBg }, + { "dialogs/dialogs_verified_check", dialogsVerifiedIconFg }, }; dialogsVerifiedIconOver: icon { - { "dialogs_verified_star", dialogsVerifiedIconBgOver, point(4px, 2px) }, - { "dialogs_verified_check", dialogsVerifiedIconFgOver, point(7px, 7px) }, + { "dialogs/dialogs_verified_star", dialogsVerifiedIconBgOver }, + { "dialogs/dialogs_verified_check", dialogsVerifiedIconFgOver }, }; dialogsVerifiedIconActive: icon { - { "dialogs_verified_star", dialogsVerifiedIconBgActive, point(4px, 2px) }, - { "dialogs_verified_check", dialogsVerifiedIconFgActive, point(7px, 7px) }, + { "dialogs/dialogs_verified_star", dialogsVerifiedIconBgActive }, + { "dialogs/dialogs_verified_check", dialogsVerifiedIconFgActive }, }; -historySendingIcon: icon {{ "dialogs_sending", historySendingOutIconFg, point(5px, 5px) }}; -historySendingInvertedIcon: icon {{ "dialogs_sending", historySendingInvertedIconFg, point(5px, 5px) }}; -historyViewsSendingIcon: icon {{ "dialogs_sending", historySendingInIconFg, point(3px, 0px) }}; -historyViewsSendingInvertedIcon: icon {{ "dialogs_sending", historySendingInvertedIconFg, point(3px, 0px) }}; +historySendingIcon: icon {{ "dialogs/dialogs_sending", historySendingOutIconFg, point(5px, 5px) }}; +historySendingInvertedIcon: icon {{ "dialogs/dialogs_sending", historySendingInvertedIconFg, point(5px, 5px) }}; +historyViewsSendingIcon: icon {{ "dialogs/dialogs_sending", historySendingInIconFg, point(3px, 0px) }}; +historyViewsSendingInvertedIcon: icon {{ "dialogs/dialogs_sending", historySendingInvertedIconFg, point(3px, 0px) }}; dialogsUpdateButton: FlatButton { color: activeButtonFg; diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index 854c5df4ba..a9fb195c7f 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -281,17 +281,17 @@ windowFiltersButton: SideBarButton(defaultSideBarButton) { iconPosition: point(-1px, 6px); } windowFiltersMainMenu: SideBarButton(windowFiltersButton) { - icon: icon {{ "dialogs_menu", sideBarIconFg }}; + icon: icon {{ "dialogs/dialogs_menu", sideBarIconFg }}; iconPosition: point(-1px, -1px); minHeight: 54px; } windowFiltersMainMenuUnread: icon { - { "dialogs_menu_unread", sideBarIconFg }, - { "dialogs_menu_unread_dot", sideBarBadgeBg }, + { "dialogs/dialogs_menu_unread", sideBarIconFg }, + { "dialogs/dialogs_menu_unread_dot", sideBarBadgeBg }, }; windowFiltersMainMenuUnreadMuted: icon { - { "dialogs_menu_unread", sideBarIconFg }, - { "dialogs_menu_unread_dot", sideBarBadgeBgMuted }, + { "dialogs/dialogs_menu_unread", sideBarIconFg }, + { "dialogs/dialogs_menu_unread_dot", sideBarBadgeBgMuted }, }; windowFilterSmallItem: PeerListItem(defaultPeerListItem) { height: 44px;