diff --git a/Telegram/Resources/icons/settings/devices/device_desktop_mac.lottie b/Telegram/Resources/icons/settings/devices/device_desktop_mac.lottie new file mode 100644 index 0000000000..8185f1dd60 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_desktop_mac.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_desktop_mac.png b/Telegram/Resources/icons/settings/devices/device_desktop_mac.png new file mode 100644 index 0000000000..8490e5e07b Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_desktop_mac.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_desktop_mac@2x.png b/Telegram/Resources/icons/settings/devices/device_desktop_mac@2x.png new file mode 100644 index 0000000000..6992485c1c Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_desktop_mac@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_desktop_mac@3x.png b/Telegram/Resources/icons/settings/devices/device_desktop_mac@3x.png new file mode 100644 index 0000000000..75e0e14f8d Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_desktop_mac@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_desktop_win.lottie b/Telegram/Resources/icons/settings/devices/device_desktop_win.lottie new file mode 100644 index 0000000000..979b7d8ea6 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_desktop_win.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_desktop_win.png b/Telegram/Resources/icons/settings/devices/device_desktop_win.png new file mode 100644 index 0000000000..713026f682 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_desktop_win.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_desktop_win@2x.png b/Telegram/Resources/icons/settings/devices/device_desktop_win@2x.png new file mode 100644 index 0000000000..1c9da12437 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_desktop_win@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_desktop_win@3x.png b/Telegram/Resources/icons/settings/devices/device_desktop_win@3x.png new file mode 100644 index 0000000000..3d42cf390a Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_desktop_win@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_linux.lottie b/Telegram/Resources/icons/settings/devices/device_linux.lottie new file mode 100644 index 0000000000..bdbaff768a Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_linux.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_linux.png b/Telegram/Resources/icons/settings/devices/device_linux.png new file mode 100644 index 0000000000..9bd1ab9c3a Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_linux.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_linux@2x.png b/Telegram/Resources/icons/settings/devices/device_linux@2x.png new file mode 100644 index 0000000000..e6eecd5770 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_linux@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_linux@3x.png b/Telegram/Resources/icons/settings/devices/device_linux@3x.png new file mode 100644 index 0000000000..728a922cfa Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_linux@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_phone_android.lottie b/Telegram/Resources/icons/settings/devices/device_phone_android.lottie new file mode 100644 index 0000000000..355d944318 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_phone_android.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_phone_android.png b/Telegram/Resources/icons/settings/devices/device_phone_android.png new file mode 100644 index 0000000000..19b73ecd00 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_phone_android.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_phone_android@2x.png b/Telegram/Resources/icons/settings/devices/device_phone_android@2x.png new file mode 100644 index 0000000000..331136c787 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_phone_android@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_phone_android@3x.png b/Telegram/Resources/icons/settings/devices/device_phone_android@3x.png new file mode 100644 index 0000000000..710ba2fa98 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_phone_android@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_phone_ios.lottie b/Telegram/Resources/icons/settings/devices/device_phone_ios.lottie new file mode 100644 index 0000000000..e5cefd5369 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_phone_ios.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_phone_ios.png b/Telegram/Resources/icons/settings/devices/device_phone_ios.png new file mode 100644 index 0000000000..9c67d38a18 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_phone_ios.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_phone_ios@2x.png b/Telegram/Resources/icons/settings/devices/device_phone_ios@2x.png new file mode 100644 index 0000000000..c7b96ea8ae Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_phone_ios@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_phone_ios@3x.png b/Telegram/Resources/icons/settings/devices/device_phone_ios@3x.png new file mode 100644 index 0000000000..935622b5ea Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_phone_ios@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_tablet_android.png b/Telegram/Resources/icons/settings/devices/device_tablet_android.png new file mode 100644 index 0000000000..a88ae751ca Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_tablet_android.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_tablet_android@2x.png b/Telegram/Resources/icons/settings/devices/device_tablet_android@2x.png new file mode 100644 index 0000000000..44a4660344 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_tablet_android@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_tablet_android@3x.png b/Telegram/Resources/icons/settings/devices/device_tablet_android@3x.png new file mode 100644 index 0000000000..596ae04258 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_tablet_android@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_tablet_ios.lottie b/Telegram/Resources/icons/settings/devices/device_tablet_ios.lottie new file mode 100644 index 0000000000..8817d76b46 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_tablet_ios.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_tablet_ios.png b/Telegram/Resources/icons/settings/devices/device_tablet_ios.png new file mode 100644 index 0000000000..09fbacf4c7 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_tablet_ios.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_tablet_ios@2x.png b/Telegram/Resources/icons/settings/devices/device_tablet_ios@2x.png new file mode 100644 index 0000000000..2af837f4c5 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_tablet_ios@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_tablet_ios@3x.png b/Telegram/Resources/icons/settings/devices/device_tablet_ios@3x.png new file mode 100644 index 0000000000..2dcf36c1d1 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_tablet_ios@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_chrome.lottie b/Telegram/Resources/icons/settings/devices/device_web_chrome.lottie new file mode 100644 index 0000000000..b97d9dba05 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_chrome.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_chrome.png b/Telegram/Resources/icons/settings/devices/device_web_chrome.png new file mode 100644 index 0000000000..bc24453548 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_chrome.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_chrome@2x.png b/Telegram/Resources/icons/settings/devices/device_web_chrome@2x.png new file mode 100644 index 0000000000..928758262a Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_chrome@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_chrome@3x.png b/Telegram/Resources/icons/settings/devices/device_web_chrome@3x.png new file mode 100644 index 0000000000..8776b1c28f Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_chrome@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_edge.lottie b/Telegram/Resources/icons/settings/devices/device_web_edge.lottie new file mode 100644 index 0000000000..487209ad55 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_edge.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_edge.png b/Telegram/Resources/icons/settings/devices/device_web_edge.png new file mode 100644 index 0000000000..4f3e0d750e Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_edge.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_edge@2x.png b/Telegram/Resources/icons/settings/devices/device_web_edge@2x.png new file mode 100644 index 0000000000..451475472e Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_edge@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_edge@3x.png b/Telegram/Resources/icons/settings/devices/device_web_edge@3x.png new file mode 100644 index 0000000000..cd347cea8e Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_edge@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_firefox.lottie b/Telegram/Resources/icons/settings/devices/device_web_firefox.lottie new file mode 100644 index 0000000000..2db4fbd72e Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_firefox.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_firefox.png b/Telegram/Resources/icons/settings/devices/device_web_firefox.png new file mode 100644 index 0000000000..aba0ee2de1 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_firefox.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_firefox@2x.png b/Telegram/Resources/icons/settings/devices/device_web_firefox@2x.png new file mode 100644 index 0000000000..d7a177b83e Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_firefox@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_firefox@3x.png b/Telegram/Resources/icons/settings/devices/device_web_firefox@3x.png new file mode 100644 index 0000000000..06ec192d5b Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_firefox@3x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_safari.lottie b/Telegram/Resources/icons/settings/devices/device_web_safari.lottie new file mode 100644 index 0000000000..5ff6fcbba0 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_safari.lottie differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_safari.png b/Telegram/Resources/icons/settings/devices/device_web_safari.png new file mode 100644 index 0000000000..6ca985c193 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_safari.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_safari@2x.png b/Telegram/Resources/icons/settings/devices/device_web_safari@2x.png new file mode 100644 index 0000000000..5ac37986cd Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_safari@2x.png differ diff --git a/Telegram/Resources/icons/settings/devices/device_web_safari@3x.png b/Telegram/Resources/icons/settings/devices/device_web_safari@3x.png new file mode 100644 index 0000000000..b7d19c5663 Binary files /dev/null and b/Telegram/Resources/icons/settings/devices/device_web_safari@3x.png differ diff --git a/Telegram/Resources/qrc/telegram/telegram.qrc b/Telegram/Resources/qrc/telegram/telegram.qrc index 437895e445..13e96d5ea6 100644 --- a/Telegram/Resources/qrc/telegram/telegram.qrc +++ b/Telegram/Resources/qrc/telegram/telegram.qrc @@ -68,6 +68,20 @@ ../../art/recording/recording_info_video_landscape.svg ../../art/recording/recording_info_video_portrait.svg + + ../../icons/calls/hands.lottie + ../../icons/calls/voice.lottie + ../../icons/settings/devices/device_desktop_mac.lottie + ../../icons/settings/devices/device_desktop_win.lottie + ../../icons/settings/devices/device_linux.lottie + ../../icons/settings/devices/device_phone_android.lottie + ../../icons/settings/devices/device_phone_ios.lottie + ../../icons/settings/devices/device_tablet_ios.lottie + ../../icons/settings/devices/device_web_chrome.lottie + ../../icons/settings/devices/device_web_edge.lottie + ../../icons/settings/devices/device_web_firefox.lottie + ../../icons/settings/devices/device_web_safari.lottie + ../qmime/freedesktop.org.xml diff --git a/Telegram/SourceFiles/ui/controls/call_mute_button.cpp b/Telegram/SourceFiles/ui/controls/call_mute_button.cpp index 9084f0faa8..523e22a043 100644 --- a/Telegram/SourceFiles/ui/controls/call_mute_button.cpp +++ b/Telegram/SourceFiles/ui/controls/call_mute_button.cpp @@ -590,13 +590,13 @@ void CallMuteButton::refreshLabels() { void CallMuteButton::refreshIcons() { _icons[0].emplace(Lottie::IconDescriptor{ - .path = u":/gui/icons/calls/voice.lottie"_q, + .path = u":/icons/calls/voice.lottie"_q, .color = st::groupCallIconFg, .sizeOverride = _st->lottieSize, .frame = (_iconState.index ? 0 : _iconState.frameTo), }); _icons[1].emplace(Lottie::IconDescriptor{ - .path = u":/gui/icons/calls/hands.lottie"_q, + .path = u":/icons/calls/hands.lottie"_q, .color = st::groupCallIconFg, .sizeOverride = _st->lottieSize, .frame = (_iconState.index ? _iconState.frameTo : 0),