From bfdbb6429579c121ef4f095bdfd8ed7b35ec1e18 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 13 Dec 2021 14:16:40 +0400 Subject: [PATCH] Move some Settings icons to a subfolder. --- .../{ => settings}/settings_advanced.png | Bin .../{ => settings}/settings_advanced@2x.png | Bin .../{ => settings}/settings_advanced@3x.png | Bin .../icons/{ => settings}/settings_chat.png | Bin .../icons/{ => settings}/settings_chat@2x.png | Bin .../icons/{ => settings}/settings_chat@3x.png | Bin .../icons/{ => settings}/settings_edit.png | Bin .../icons/{ => settings}/settings_edit@2x.png | Bin .../icons/{ => settings}/settings_edit@3x.png | Bin .../{ => settings}/settings_edit_name.png | Bin .../{ => settings}/settings_edit_name@2x.png | Bin .../{ => settings}/settings_edit_name@3x.png | Bin .../icons/{ => settings}/settings_emoji.png | Bin .../{ => settings}/settings_emoji@2x.png | Bin .../{ => settings}/settings_emoji@3x.png | Bin .../icons/{ => settings}/settings_faq.png | Bin .../icons/{ => settings}/settings_faq@2x.png | Bin .../icons/{ => settings}/settings_faq@3x.png | Bin .../icons/{ => settings}/settings_folders.png | Bin .../{ => settings}/settings_folders@2x.png | Bin .../{ => settings}/settings_folders@3x.png | Bin .../{ => settings}/settings_information.png | Bin .../settings_information@2x.png | Bin .../settings_information@3x.png | Bin .../settings_interface_scale.png | Bin .../settings_interface_scale@2x.png | Bin .../settings_interface_scale@3x.png | Bin .../{ => settings}/settings_language.png | Bin .../{ => settings}/settings_language@2x.png | Bin .../{ => settings}/settings_language@3x.png | Bin .../icons/{ => settings}/settings_name.png | Bin .../icons/{ => settings}/settings_name@2x.png | Bin .../icons/{ => settings}/settings_name@3x.png | Bin .../{ => settings}/settings_notifications.png | Bin .../settings_notifications@2x.png | Bin .../settings_notifications@3x.png | Bin .../{ => settings}/settings_phone_number.png | Bin .../settings_phone_number@2x.png | Bin .../settings_phone_number@3x.png | Bin .../settings_privacy_security.png | Bin .../settings_privacy_security@2x.png | Bin .../settings_privacy_security@3x.png | Bin .../{ => settings}/settings_stickers.png | Bin .../{ => settings}/settings_stickers@2x.png | Bin .../{ => settings}/settings_stickers@3x.png | Bin .../icons/{ => settings}/settings_themes.png | Bin .../{ => settings}/settings_themes@2x.png | Bin .../{ => settings}/settings_themes@3x.png | Bin .../{ => settings}/settings_username.png | Bin .../{ => settings}/settings_username@2x.png | Bin .../{ => settings}/settings_username@3x.png | Bin Telegram/SourceFiles/boxes/boxes.style | 8 ++--- Telegram/SourceFiles/editor/editor.style | 6 ++-- Telegram/SourceFiles/info/info.style | 4 +-- Telegram/SourceFiles/settings/settings.style | 32 +++++++++--------- Telegram/SourceFiles/window/window.style | 8 ++--- 56 files changed, 29 insertions(+), 29 deletions(-) rename Telegram/Resources/icons/{ => settings}/settings_advanced.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_advanced@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_advanced@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_chat.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_chat@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_chat@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_edit.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_edit@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_edit@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_edit_name.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_edit_name@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_edit_name@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_emoji.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_emoji@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_emoji@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_faq.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_faq@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_faq@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_folders.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_folders@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_folders@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_information.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_information@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_information@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_interface_scale.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_interface_scale@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_interface_scale@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_language.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_language@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_language@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_name.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_name@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_name@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_notifications.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_notifications@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_notifications@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_phone_number.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_phone_number@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_phone_number@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_privacy_security.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_privacy_security@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_privacy_security@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_stickers.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_stickers@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_stickers@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_themes.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_themes@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_themes@3x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_username.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_username@2x.png (100%) rename Telegram/Resources/icons/{ => settings}/settings_username@3x.png (100%) diff --git a/Telegram/Resources/icons/settings_advanced.png b/Telegram/Resources/icons/settings/settings_advanced.png similarity index 100% rename from Telegram/Resources/icons/settings_advanced.png rename to Telegram/Resources/icons/settings/settings_advanced.png diff --git a/Telegram/Resources/icons/settings_advanced@2x.png b/Telegram/Resources/icons/settings/settings_advanced@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_advanced@2x.png rename to Telegram/Resources/icons/settings/settings_advanced@2x.png diff --git a/Telegram/Resources/icons/settings_advanced@3x.png b/Telegram/Resources/icons/settings/settings_advanced@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_advanced@3x.png rename to Telegram/Resources/icons/settings/settings_advanced@3x.png diff --git a/Telegram/Resources/icons/settings_chat.png b/Telegram/Resources/icons/settings/settings_chat.png similarity index 100% rename from Telegram/Resources/icons/settings_chat.png rename to Telegram/Resources/icons/settings/settings_chat.png diff --git a/Telegram/Resources/icons/settings_chat@2x.png b/Telegram/Resources/icons/settings/settings_chat@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_chat@2x.png rename to Telegram/Resources/icons/settings/settings_chat@2x.png diff --git a/Telegram/Resources/icons/settings_chat@3x.png b/Telegram/Resources/icons/settings/settings_chat@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_chat@3x.png rename to Telegram/Resources/icons/settings/settings_chat@3x.png diff --git a/Telegram/Resources/icons/settings_edit.png b/Telegram/Resources/icons/settings/settings_edit.png similarity index 100% rename from Telegram/Resources/icons/settings_edit.png rename to Telegram/Resources/icons/settings/settings_edit.png diff --git a/Telegram/Resources/icons/settings_edit@2x.png b/Telegram/Resources/icons/settings/settings_edit@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_edit@2x.png rename to Telegram/Resources/icons/settings/settings_edit@2x.png diff --git a/Telegram/Resources/icons/settings_edit@3x.png b/Telegram/Resources/icons/settings/settings_edit@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_edit@3x.png rename to Telegram/Resources/icons/settings/settings_edit@3x.png diff --git a/Telegram/Resources/icons/settings_edit_name.png b/Telegram/Resources/icons/settings/settings_edit_name.png similarity index 100% rename from Telegram/Resources/icons/settings_edit_name.png rename to Telegram/Resources/icons/settings/settings_edit_name.png diff --git a/Telegram/Resources/icons/settings_edit_name@2x.png b/Telegram/Resources/icons/settings/settings_edit_name@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_edit_name@2x.png rename to Telegram/Resources/icons/settings/settings_edit_name@2x.png diff --git a/Telegram/Resources/icons/settings_edit_name@3x.png b/Telegram/Resources/icons/settings/settings_edit_name@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_edit_name@3x.png rename to Telegram/Resources/icons/settings/settings_edit_name@3x.png diff --git a/Telegram/Resources/icons/settings_emoji.png b/Telegram/Resources/icons/settings/settings_emoji.png similarity index 100% rename from Telegram/Resources/icons/settings_emoji.png rename to Telegram/Resources/icons/settings/settings_emoji.png diff --git a/Telegram/Resources/icons/settings_emoji@2x.png b/Telegram/Resources/icons/settings/settings_emoji@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_emoji@2x.png rename to Telegram/Resources/icons/settings/settings_emoji@2x.png diff --git a/Telegram/Resources/icons/settings_emoji@3x.png b/Telegram/Resources/icons/settings/settings_emoji@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_emoji@3x.png rename to Telegram/Resources/icons/settings/settings_emoji@3x.png diff --git a/Telegram/Resources/icons/settings_faq.png b/Telegram/Resources/icons/settings/settings_faq.png similarity index 100% rename from Telegram/Resources/icons/settings_faq.png rename to Telegram/Resources/icons/settings/settings_faq.png diff --git a/Telegram/Resources/icons/settings_faq@2x.png b/Telegram/Resources/icons/settings/settings_faq@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_faq@2x.png rename to Telegram/Resources/icons/settings/settings_faq@2x.png diff --git a/Telegram/Resources/icons/settings_faq@3x.png b/Telegram/Resources/icons/settings/settings_faq@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_faq@3x.png rename to Telegram/Resources/icons/settings/settings_faq@3x.png diff --git a/Telegram/Resources/icons/settings_folders.png b/Telegram/Resources/icons/settings/settings_folders.png similarity index 100% rename from Telegram/Resources/icons/settings_folders.png rename to Telegram/Resources/icons/settings/settings_folders.png diff --git a/Telegram/Resources/icons/settings_folders@2x.png b/Telegram/Resources/icons/settings/settings_folders@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_folders@2x.png rename to Telegram/Resources/icons/settings/settings_folders@2x.png diff --git a/Telegram/Resources/icons/settings_folders@3x.png b/Telegram/Resources/icons/settings/settings_folders@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_folders@3x.png rename to Telegram/Resources/icons/settings/settings_folders@3x.png diff --git a/Telegram/Resources/icons/settings_information.png b/Telegram/Resources/icons/settings/settings_information.png similarity index 100% rename from Telegram/Resources/icons/settings_information.png rename to Telegram/Resources/icons/settings/settings_information.png diff --git a/Telegram/Resources/icons/settings_information@2x.png b/Telegram/Resources/icons/settings/settings_information@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_information@2x.png rename to Telegram/Resources/icons/settings/settings_information@2x.png diff --git a/Telegram/Resources/icons/settings_information@3x.png b/Telegram/Resources/icons/settings/settings_information@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_information@3x.png rename to Telegram/Resources/icons/settings/settings_information@3x.png diff --git a/Telegram/Resources/icons/settings_interface_scale.png b/Telegram/Resources/icons/settings/settings_interface_scale.png similarity index 100% rename from Telegram/Resources/icons/settings_interface_scale.png rename to Telegram/Resources/icons/settings/settings_interface_scale.png diff --git a/Telegram/Resources/icons/settings_interface_scale@2x.png b/Telegram/Resources/icons/settings/settings_interface_scale@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_interface_scale@2x.png rename to Telegram/Resources/icons/settings/settings_interface_scale@2x.png diff --git a/Telegram/Resources/icons/settings_interface_scale@3x.png b/Telegram/Resources/icons/settings/settings_interface_scale@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_interface_scale@3x.png rename to Telegram/Resources/icons/settings/settings_interface_scale@3x.png diff --git a/Telegram/Resources/icons/settings_language.png b/Telegram/Resources/icons/settings/settings_language.png similarity index 100% rename from Telegram/Resources/icons/settings_language.png rename to Telegram/Resources/icons/settings/settings_language.png diff --git a/Telegram/Resources/icons/settings_language@2x.png b/Telegram/Resources/icons/settings/settings_language@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_language@2x.png rename to Telegram/Resources/icons/settings/settings_language@2x.png diff --git a/Telegram/Resources/icons/settings_language@3x.png b/Telegram/Resources/icons/settings/settings_language@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_language@3x.png rename to Telegram/Resources/icons/settings/settings_language@3x.png diff --git a/Telegram/Resources/icons/settings_name.png b/Telegram/Resources/icons/settings/settings_name.png similarity index 100% rename from Telegram/Resources/icons/settings_name.png rename to Telegram/Resources/icons/settings/settings_name.png diff --git a/Telegram/Resources/icons/settings_name@2x.png b/Telegram/Resources/icons/settings/settings_name@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_name@2x.png rename to Telegram/Resources/icons/settings/settings_name@2x.png diff --git a/Telegram/Resources/icons/settings_name@3x.png b/Telegram/Resources/icons/settings/settings_name@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_name@3x.png rename to Telegram/Resources/icons/settings/settings_name@3x.png diff --git a/Telegram/Resources/icons/settings_notifications.png b/Telegram/Resources/icons/settings/settings_notifications.png similarity index 100% rename from Telegram/Resources/icons/settings_notifications.png rename to Telegram/Resources/icons/settings/settings_notifications.png diff --git a/Telegram/Resources/icons/settings_notifications@2x.png b/Telegram/Resources/icons/settings/settings_notifications@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_notifications@2x.png rename to Telegram/Resources/icons/settings/settings_notifications@2x.png diff --git a/Telegram/Resources/icons/settings_notifications@3x.png b/Telegram/Resources/icons/settings/settings_notifications@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_notifications@3x.png rename to Telegram/Resources/icons/settings/settings_notifications@3x.png diff --git a/Telegram/Resources/icons/settings_phone_number.png b/Telegram/Resources/icons/settings/settings_phone_number.png similarity index 100% rename from Telegram/Resources/icons/settings_phone_number.png rename to Telegram/Resources/icons/settings/settings_phone_number.png diff --git a/Telegram/Resources/icons/settings_phone_number@2x.png b/Telegram/Resources/icons/settings/settings_phone_number@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_phone_number@2x.png rename to Telegram/Resources/icons/settings/settings_phone_number@2x.png diff --git a/Telegram/Resources/icons/settings_phone_number@3x.png b/Telegram/Resources/icons/settings/settings_phone_number@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_phone_number@3x.png rename to Telegram/Resources/icons/settings/settings_phone_number@3x.png diff --git a/Telegram/Resources/icons/settings_privacy_security.png b/Telegram/Resources/icons/settings/settings_privacy_security.png similarity index 100% rename from Telegram/Resources/icons/settings_privacy_security.png rename to Telegram/Resources/icons/settings/settings_privacy_security.png diff --git a/Telegram/Resources/icons/settings_privacy_security@2x.png b/Telegram/Resources/icons/settings/settings_privacy_security@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_privacy_security@2x.png rename to Telegram/Resources/icons/settings/settings_privacy_security@2x.png diff --git a/Telegram/Resources/icons/settings_privacy_security@3x.png b/Telegram/Resources/icons/settings/settings_privacy_security@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_privacy_security@3x.png rename to Telegram/Resources/icons/settings/settings_privacy_security@3x.png diff --git a/Telegram/Resources/icons/settings_stickers.png b/Telegram/Resources/icons/settings/settings_stickers.png similarity index 100% rename from Telegram/Resources/icons/settings_stickers.png rename to Telegram/Resources/icons/settings/settings_stickers.png diff --git a/Telegram/Resources/icons/settings_stickers@2x.png b/Telegram/Resources/icons/settings/settings_stickers@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_stickers@2x.png rename to Telegram/Resources/icons/settings/settings_stickers@2x.png diff --git a/Telegram/Resources/icons/settings_stickers@3x.png b/Telegram/Resources/icons/settings/settings_stickers@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_stickers@3x.png rename to Telegram/Resources/icons/settings/settings_stickers@3x.png diff --git a/Telegram/Resources/icons/settings_themes.png b/Telegram/Resources/icons/settings/settings_themes.png similarity index 100% rename from Telegram/Resources/icons/settings_themes.png rename to Telegram/Resources/icons/settings/settings_themes.png diff --git a/Telegram/Resources/icons/settings_themes@2x.png b/Telegram/Resources/icons/settings/settings_themes@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_themes@2x.png rename to Telegram/Resources/icons/settings/settings_themes@2x.png diff --git a/Telegram/Resources/icons/settings_themes@3x.png b/Telegram/Resources/icons/settings/settings_themes@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_themes@3x.png rename to Telegram/Resources/icons/settings/settings_themes@3x.png diff --git a/Telegram/Resources/icons/settings_username.png b/Telegram/Resources/icons/settings/settings_username.png similarity index 100% rename from Telegram/Resources/icons/settings_username.png rename to Telegram/Resources/icons/settings/settings_username.png diff --git a/Telegram/Resources/icons/settings_username@2x.png b/Telegram/Resources/icons/settings/settings_username@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_username@2x.png rename to Telegram/Resources/icons/settings/settings_username@2x.png diff --git a/Telegram/Resources/icons/settings_username@3x.png b/Telegram/Resources/icons/settings/settings_username@3x.png similarity index 100% rename from Telegram/Resources/icons/settings_username@3x.png rename to Telegram/Resources/icons/settings/settings_username@3x.png diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index a38dcdae0..55c5e4975 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -135,8 +135,8 @@ editBioCountdownLabel: FlatLabel(defaultFlatLabel) { textFg: windowSubTextFg; } -contactUserIcon: icon {{ "settings_name", menuIconFg }}; -contactPhoneIcon: icon {{ "settings_phone_number", menuIconFg }}; +contactUserIcon: icon {{ "settings/settings_name", menuIconFg }}; +contactPhoneIcon: icon {{ "settings/settings_phone_number", menuIconFg }}; contactIconPosition: point(-5px, 23px); contactPadding: margins(49px, 2px, 0px, 12px); @@ -667,8 +667,8 @@ proxyRowEdit: IconButton(defaultIconButton) { width: 40px; height: 40px; - icon: icon {{ "settings_edit_name", menuIconFg }}; - iconOver: icon {{ "settings_edit_name", menuIconFgOver }}; + icon: icon {{ "settings/settings_edit_name", menuIconFg }}; + iconOver: icon {{ "settings/settings_edit_name", menuIconFgOver }}; iconPosition: point(12px, 13px); rippleAreaSize: 40px; diff --git a/Telegram/SourceFiles/editor/editor.style b/Telegram/SourceFiles/editor/editor.style index 262ffa356..9190b9a29 100644 --- a/Telegram/SourceFiles/editor/editor.style +++ b/Telegram/SourceFiles/editor/editor.style @@ -72,10 +72,10 @@ photoEditorRedoButton: IconButton(photoEditorRotateButton) { } photoEditorStickersButton: IconButton(photoEditorRotateButton) { - icon: icon {{ "settings_stickers", photoEditorButtonIconFg }}; - iconOver: icon {{ "settings_stickers", photoEditorButtonIconFgOver }}; + icon: icon {{ "settings/settings_stickers", photoEditorButtonIconFg }}; + iconOver: icon {{ "settings/settings_stickers", photoEditorButtonIconFgOver }}; } -photoEditorStickersIconActive: icon {{ "settings_stickers", photoEditorButtonIconFgActive }}; +photoEditorStickersIconActive: icon {{ "settings/settings_stickers", photoEditorButtonIconFgActive }}; photoEditorUndoButtonInactive: icon {{ "photo_editor/undo", photoEditorButtonIconFgInactive }}; photoEditorRedoButtonInactive: icon {{ "photo_editor/undo-flip_horizontal", photoEditorButtonIconFgInactive }}; diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 93269eba3..f3ebb58df 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -519,8 +519,8 @@ infoMembersCancelSearch: CrossButton { infoMembersSearchTop: 15px; infoChannelsAddChannel: IconButton(infoMembersButton) { - icon: icon {{ "settings_edit_name", menuIconFg, point(9px, 9px) }}; - iconOver: icon {{ "settings_edit_name", menuIconFgOver, point(9px, 9px) }}; + icon: icon {{ "settings/settings_edit_name", menuIconFg, point(9px, 9px) }}; + iconOver: icon {{ "settings/settings_edit_name", menuIconFgOver, point(9px, 9px) }}; } infoMembersCreatorIcon: icon {{ diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index 6dd224ce4..8ccbcb499 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -44,18 +44,18 @@ settingsUpdate: SettingsButton(infoMainButton, settingsButton) { settingsUpdateStatePosition: point(22px, 29px); settingsDividerLabelPadding: margins(22px, 10px, 22px, 19px); -settingsIconInformation: icon {{ "settings_information", menuIconFg }}; -settingsIconNotifications: icon {{ "settings_notifications", menuIconFg }}; -settingsIconChat: icon {{ "settings_chat", menuIconFg }}; -settingsIconFolders: icon {{ "settings_folders", menuIconFg }}; -settingsIconGeneral: icon {{ "settings_advanced", menuIconFg }}; -settingsIconPrivacySecurity: icon {{ "settings_privacy_security", menuIconFg }}; -settingsIconLanguage: icon {{ "settings_language", menuIconFg }}; -settingsIconInterfaceScale: icon {{ "settings_interface_scale", menuIconFg }}; -settingsIconFaq: icon {{ "settings_faq", menuIconFg }}; -settingsIconStickers: icon {{ "settings_stickers", menuIconFg }}; -settingsIconEmoji: icon {{ "settings_emoji", menuIconFg }}; -settingsIconThemes: icon {{ "settings_themes", menuIconFg }}; +settingsIconInformation: icon {{ "settings/settings_information", menuIconFg }}; +settingsIconNotifications: icon {{ "settings/settings_notifications", menuIconFg }}; +settingsIconChat: icon {{ "settings/settings_chat", menuIconFg }}; +settingsIconFolders: icon {{ "settings/settings_folders", menuIconFg }}; +settingsIconGeneral: icon {{ "settings/settings_advanced", menuIconFg }}; +settingsIconPrivacySecurity: icon {{ "settings/settings_privacy_security", menuIconFg }}; +settingsIconLanguage: icon {{ "settings/settings_language", menuIconFg }}; +settingsIconInterfaceScale: icon {{ "settings/settings_interface_scale", menuIconFg }}; +settingsIconFaq: icon {{ "settings/settings_faq", menuIconFg }}; +settingsIconStickers: icon {{ "settings/settings_stickers", menuIconFg }}; +settingsIconEmoji: icon {{ "settings/settings_emoji", menuIconFg }}; +settingsIconThemes: icon {{ "settings/settings_themes", menuIconFg }}; settingsSetPhotoSkip: 7px; @@ -129,7 +129,7 @@ settingsInfoAbout: FlatLabel(settingsInfoValue) { settingsInfoAboutPosition: point(78px, 34px); settingsInfoRightSkip: 60px; settingsInfoEditRight: 14px; -settingsInfoEditIconOver: icon {{ "settings_edit", menuIconFgOver }}; +settingsInfoEditIconOver: icon {{ "settings/settings_edit", menuIconFgOver }}; settingsBio: InputField(defaultInputField) { textBg: transparent; textMargins: margins(0px, 7px, 0px, 13px); @@ -146,9 +146,9 @@ settingsBio: InputField(defaultInputField) { font: boxTextFont; } settingsInfoAfterSkip: 14px; -settingsInfoName: icon {{ "settings_name", menuIconFg }}; -settingsInfoPhone: icon {{ "settings_phone_number", menuIconFg }}; -settingsInfoUsername: icon {{ "settings_username", menuIconFg }}; +settingsInfoName: icon {{ "settings/settings_name", menuIconFg }}; +settingsInfoPhone: icon {{ "settings/settings_phone_number", menuIconFg }}; +settingsInfoUsername: icon {{ "settings/settings_username", menuIconFg }}; settingsBioMargins: margins(20px, 6px, 20px, 6px); settingsBioCountdown: FlatLabel(defaultFlatLabel) { diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index a9fb195c7..a6278553d 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -134,10 +134,10 @@ mainMenuNewGroup: icon {{ "menu_new_group", menuIconFg }}; mainMenuNewGroupOver: icon {{ "menu_new_group", menuIconFgOver }}; mainMenuNewChannel: icon {{ "menu_new_channel", menuIconFg }}; mainMenuNewChannelOver: icon {{ "menu_new_channel", menuIconFgOver }}; -mainMenuContacts: icon {{ "settings_name", menuIconFg }}; -mainMenuContactsOver: icon {{ "settings_name", menuIconFgOver }}; -mainMenuCalls: icon {{ "settings_phone_number", menuIconFg }}; -mainMenuCallsOver: icon {{ "settings_phone_number", menuIconFgOver }}; +mainMenuContacts: icon {{ "settings/settings_name", menuIconFg }}; +mainMenuContactsOver: icon {{ "settings/settings_name", menuIconFgOver }}; +mainMenuCalls: icon {{ "settings/settings_phone_number", menuIconFg }}; +mainMenuCallsOver: icon {{ "settings/settings_phone_number", menuIconFgOver }}; mainMenuSettings: icon {{ "menu_settings", menuIconFg }}; mainMenuSettingsOver: icon {{ "menu_settings", menuIconFgOver }}; mainMenuNightMode: icon {{ "menu_night_mode", menuIconFg }};