Move audio player icons to "player" folder.

Telegram/SourceFiles/media/player/media_player.style

@@ -51,7 +51,7 @@ mediaPlayerRepeatButton: IconButton {
 	height: 30px;
 
 	icon: icon {
-		{ "player_repeat", mediaPlayerActiveFg, point(9px, 11px) }
+		{ "player/player_repeat", mediaPlayerActiveFg, point(9px, 11px) }
 	};
 	iconPosition: point(0px, 0px);
 
@@ -62,14 +62,14 @@ mediaPlayerRepeatButton: IconButton {
 	}
 }
 mediaPlayerRepeatDisabledIcon: icon {
-	{ "player_repeat", menuIconFg, point(9px, 11px)}
+	{ "player/player_repeat", menuIconFg, point(9px, 11px)}
 };
 mediaPlayerRepeatDisabledIconOver: icon {
-	{ "player_repeat", menuIconFgOver, point(9px, 11px)}
+	{ "player/player_repeat", menuIconFgOver, point(9px, 11px)}
 };
 mediaPlayerRepeatDisabledRippleBg: windowBgOver;
 mediaPlayerRepeatInactiveIcon: icon {
-	{ "player_repeat", mediaPlayerInactiveFg, point(9px, 11px)}
+	{ "player/player_repeat", mediaPlayerInactiveFg, point(9px, 11px)}
 };
 
 mediaPlayerSpeedButton: IconButton {
@@ -77,7 +77,7 @@ mediaPlayerSpeedButton: IconButton {
 	height: 30px;
 
 	icon: icon {
-		{ "voice_speed/voice_speed2", mediaPlayerActiveFg }
+		{ "player/voice_speed/voice_speed2", mediaPlayerActiveFg }
 	};
 	iconPosition: point(3px, 10px);
 
@@ -88,28 +88,28 @@ mediaPlayerSpeedButton: IconButton {
 	}
 }
 mediaPlayerSpeedDisabledIcon: icon {
-	{ "voice_speed/voice_speed2", menuIconFg }
+	{ "player/voice_speed/voice_speed2", menuIconFg }
 };
 mediaPlayerSpeedDisabledIconOver: icon {
-	{ "voice_speed/voice_speed2", menuIconFgOver }
+	{ "player/voice_speed/voice_speed2", menuIconFgOver }
 };
 mediaPlayerSpeedSlowIcon: icon {
-	{ "voice_speed/voice_speed0.5", mediaPlayerActiveFg }
+	{ "player/voice_speed/voice_speed0.5", mediaPlayerActiveFg }
 };
 mediaPlayerSpeedSlowDisabledIcon: icon {
-	{ "voice_speed/voice_speed0.5", menuIconFg }
+	{ "player/voice_speed/voice_speed0.5", menuIconFg }
 };
 mediaPlayerSpeedSlowDisabledIconOver: icon {
-	{ "voice_speed/voice_speed0.5", menuIconFgOver }
+	{ "player/voice_speed/voice_speed0.5", menuIconFgOver }
 };
 mediaPlayerSpeedFastIcon: icon {
-	{ "voice_speed/voice_speed1.5", mediaPlayerActiveFg }
+	{ "player/voice_speed/voice_speed1.5", mediaPlayerActiveFg }
 };
 mediaPlayerSpeedFastDisabledIcon: icon {
-	{ "voice_speed/voice_speed1.5", menuIconFg }
+	{ "player/voice_speed/voice_speed1.5", menuIconFg }
 };
 mediaPlayerSpeedFastDisabledIconOver: icon {
-	{ "voice_speed/voice_speed1.5", menuIconFgOver }
+	{ "player/voice_speed/voice_speed1.5", menuIconFgOver }
 };
 mediaPlayerSpeedDisabledRippleBg: windowBgOver;
 
@@ -119,19 +119,19 @@ mediaPlayerPopupMenu: PopupMenu(defaultPopupMenu) {
 		itemPadding: margins(34px, 8px, 17px, 7px);
 	}
 }
-mediaPlayerMenuCheck: icon {{ "player_check", mediaPlayerActiveFg }};
+mediaPlayerMenuCheck: icon {{ "player/player_check", mediaPlayerActiveFg }};
 
 mediaPlayerVolumeIcon0: icon {
-	{ "player_volume0", mediaPlayerActiveFg },
+	{ "player/player_volume0", mediaPlayerActiveFg },
 };
 mediaPlayerVolumeIcon1: icon {
-	{ "player_volume1", mediaPlayerActiveFg },
+	{ "player/player_volume1", mediaPlayerActiveFg },
 };
 mediaPlayerVolumeIcon2: icon {
-	{ "player_volume2", mediaPlayerActiveFg },
+	{ "player/player_volume2", mediaPlayerActiveFg },
 };
 mediaPlayerVolumeIcon3: icon {
-	{ "player_volume3", mediaPlayerActiveFg },
+	{ "player/player_volume3", mediaPlayerActiveFg },
 };
 mediaPlayerVolumeToggle: IconButton {
 	width: 31px;
@@ -149,43 +149,37 @@ mediaPlayerVolumeToggle: IconButton {
 mediaPlayerVolumeMargin: 10px;
 mediaPlayerVolumeSize: size(27px, 100px);
 
-mediaPlayerPanelPinButton: IconButton(mediaPlayerRepeatButton) {
-	icon: icon {
-		{ "player_panel_pin", mediaPlayerActiveFg, point(9px, 11px) }
-	};
-}
-
 mediaPlayerNextButton: IconButton(mediaPlayerRepeatButton) {
 	width: 25px;
 	icon: icon {
-		{ "player_next", mediaPlayerActiveFg, mediaPlayerSkipIconPosition },
+		{ "player/player_next", mediaPlayerActiveFg, mediaPlayerSkipIconPosition },
 	};
 
 	rippleAreaPosition: point(0px, 5px);
 }
 mediaPlayerNextDisabledIcon: icon {
-	{ "player_next", mediaPlayerInactiveFg, mediaPlayerSkipIconPosition },
+	{ "player/player_next", mediaPlayerInactiveFg, mediaPlayerSkipIconPosition },
 };
 mediaPlayerPreviousButton: IconButton(mediaPlayerNextButton) {
 	icon: icon {
-		{ "player_next-flip_horizontal", mediaPlayerActiveFg, mediaPlayerSkipIconPosition },
+		{ "player/player_next-flip_horizontal", mediaPlayerActiveFg, mediaPlayerSkipIconPosition },
 	};
 	rippleAreaPosition: point(1px, 5px);
 }
 mediaPlayerPreviousDisabledIcon: icon {
-	{ "player_next-flip_horizontal", mediaPlayerInactiveFg, mediaPlayerSkipIconPosition },
+	{ "player/player_next-flip_horizontal", mediaPlayerInactiveFg, mediaPlayerSkipIconPosition },
 };
 
-touchBarIconPlayerClose: icon {{ "player_close", windowFg }};
+touchBarIconPlayerClose: icon {{ "player/player_close", windowFg }};
 touchBarIconPlayerPlay: icon {{ "media_play", windowFg }};
 touchBarIconPlayerPause: icon {{ "media_pause", windowFg }};
-touchBarIconPlayerNext: icon {{ "player_next", windowFg }};
-touchBarIconPlayerPrevious: icon {{ "player_next-flip_horizontal", windowFg }};
+touchBarIconPlayerNext: icon {{ "player/player_next", windowFg }};
+touchBarIconPlayerPrevious: icon {{ "player/player_next-flip_horizontal", windowFg }};
 
 mediaPlayerClose: IconButton(mediaPlayerRepeatButton) {
 	width: 37px;
-	icon: icon {{ "player_close", menuIconFg, point(10px, 12px) }};
-	iconOver: icon {{ "player_close", menuIconFgOver, point(10px, 12px) }};
+	icon: icon {{ "player/player_close", menuIconFg, point(10px, 12px) }};
+	iconOver: icon {{ "player/player_close", menuIconFgOver, point(10px, 12px) }};
 
 	rippleAreaPosition: point(3px, 5px);
 	ripple: RippleAnimation(defaultRippleAnimation) {
@@ -224,22 +218,22 @@ mediaPlayerCoverHeight: 102px;
 mediaPlayerPanelClose: IconButton(mediaPlayerClose) {
 	width: 43px;
 	height: 28px;
-	icon: icon {{ "player_close", menuIconFg, point(16px, 14px) }};
-	iconOver: icon {{ "player_close", menuIconFgOver, point(16px, 14px) }};
+	icon: icon {{ "player/player_close", menuIconFg, point(16px, 14px) }};
+	iconOver: icon {{ "player/player_close", menuIconFgOver, point(16px, 14px) }};
 }
 
 mediaPlayerPanelNextButton: IconButton(mediaPlayerRepeatButton) {
 	width: 37px;
-	icon: icon {{ "player_panel_next", mediaPlayerActiveFg, point(10px, 10px) }};
+	icon: icon {{ "player/player_panel_next", mediaPlayerActiveFg, point(10px, 10px) }};
 }
 mediaPlayerPanelNextDisabledIcon: icon {
-	{ "player_panel_next", mediaPlayerInactiveFg, point(10px, 10px) },
+	{ "player/player_panel_next", mediaPlayerInactiveFg, point(10px, 10px) },
 };
 mediaPlayerPanelPreviousButton: IconButton(mediaPlayerPanelNextButton) {
-	icon: icon {{ "player_panel_next-flip_horizontal", mediaPlayerActiveFg, point(10px, 10px) }};
+	icon: icon {{ "player/player_panel_next-flip_horizontal", mediaPlayerActiveFg, point(10px, 10px) }};
 }
 mediaPlayerPanelPreviousDisabledIcon: icon {
-	{ "player_panel_next-flip_horizontal", mediaPlayerInactiveFg, point(10px, 10px) },
+	{ "player/player_panel_next-flip_horizontal", mediaPlayerInactiveFg, point(10px, 10px) },
 };
 
 mediaPlayerPanelPadding: 16px;
@@ -264,7 +258,7 @@ mediaPlayerScroll: ScrollArea(defaultSolidScroll) {
 mediaPlayerListHeightMax: 280px;
 mediaPlayerListMarginBottom: 10px;
 mediaPlayerScrollShadow: Shadow {
-	bottom: icon {{ "playlist_shadow", windowShadowFg }};
+	bottom: icon {{ "player/playlist_shadow", windowShadowFg }};
 	extend: margins(2px, 2px, 2px, 2px);
 }
 

Telegram/SourceFiles/media/view/media_view.style

@@ -46,12 +46,12 @@ mediaviewPlayButton: IconButton(mediaviewControlsButton) {
 	height: 42px;
 	rippleAreaSize: 42px;
 
-	icon: icon {{ "player_play", mediaviewPlaybackIconFg }};
-	iconOver: icon {{ "player_play", mediaviewPlaybackIconFgOver }};
+	icon: icon {{ "player/player_play", mediaviewPlaybackIconFg }};
+	iconOver: icon {{ "player/player_play", mediaviewPlaybackIconFgOver }};
 	iconPosition: point(9px, 9px);
 }
-mediaviewPauseIcon: icon {{ "player_pause", mediaviewPlaybackIconFg }};
-mediaviewPauseIconOver: icon {{ "player_pause", mediaviewPlaybackIconFgOver }};
+mediaviewPauseIcon: icon {{ "player/player_pause", mediaviewPlaybackIconFg }};
+mediaviewPauseIconOver: icon {{ "player/player_pause", mediaviewPlaybackIconFgOver }};
 
 mediaviewButtonsTop: 7px;
 
@@ -60,34 +60,34 @@ mediaviewMenuToggle: IconButton(mediaviewControlsButton) {
 	width: 34px;
 	height: 34px;
 	rippleAreaSize: 34px;
-	icon: icon {{ "player_more", mediaviewPlaybackIconFg }};
-	iconOver: icon {{ "player_more", mediaviewPlaybackIconFgOver }};
+	icon: icon {{ "player/player_more", mediaviewPlaybackIconFg }};
+	iconOver: icon {{ "player/player_more", mediaviewPlaybackIconFgOver }};
 	iconPosition: point(5px, 5px);
 }
 
 mediaviewPipButtonSkip: 5px;
 mediaviewPipButton: IconButton(mediaviewMenuToggle) {
-	icon: icon {{ "player_pip", mediaviewPlaybackIconFg }};
-	iconOver: icon {{ "player_pip", mediaviewPlaybackIconFgOver }};
+	icon: icon {{ "player/player_pip", mediaviewPlaybackIconFg }};
+	iconOver: icon {{ "player/player_pip", mediaviewPlaybackIconFgOver }};
 }
 
 mediaviewFullScreenButtonSkip: 8px;
 mediaviewFullScreenButton: IconButton(mediaviewMenuToggle) {
-	icon: icon {{ "player_fullscreen", mediaviewPlaybackIconFg }};
-	iconOver: icon {{ "player_fullscreen", mediaviewPlaybackIconFgOver }};
+	icon: icon {{ "player/player_fullscreen", mediaviewPlaybackIconFg }};
+	iconOver: icon {{ "player/player_fullscreen", mediaviewPlaybackIconFgOver }};
 }
-mediaviewFullScreenOutIcon: icon {{ "player_minimize", mediaviewPlaybackIconFg }};
-mediaviewFullScreenOutIconOver: icon {{ "player_minimize", mediaviewPlaybackIconFgOver }};
+mediaviewFullScreenOutIcon: icon {{ "player/player_minimize", mediaviewPlaybackIconFg }};
+mediaviewFullScreenOutIconOver: icon {{ "player/player_minimize", mediaviewPlaybackIconFgOver }};
 
 mediaviewVolumeWidth: 75px;
 mediaviewControllerRadius: 9px;
 
-mediaviewVolumeIcon0: icon {{ "player_volume_off", mediaviewPlaybackIconFg }};
-mediaviewVolumeIcon0Over: icon {{ "player_volume_off", mediaviewPlaybackIconFgOver }};
-mediaviewVolumeIcon1: icon {{ "player_volume_small", mediaviewPlaybackIconFg }};
-mediaviewVolumeIcon1Over: icon {{ "player_volume_small", mediaviewPlaybackIconFgOver }};
-mediaviewVolumeIcon2: icon {{ "player_volume_on", mediaviewPlaybackIconFg }};
-mediaviewVolumeIcon2Over: icon {{ "player_volume_on", mediaviewPlaybackIconFgOver }};
+mediaviewVolumeIcon0: icon {{ "player/player_volume_off", mediaviewPlaybackIconFg }};
+mediaviewVolumeIcon0Over: icon {{ "player/player_volume_off", mediaviewPlaybackIconFgOver }};
+mediaviewVolumeIcon1: icon {{ "player/player_volume_small", mediaviewPlaybackIconFg }};
+mediaviewVolumeIcon1Over: icon {{ "player/player_volume_small", mediaviewPlaybackIconFgOver }};
+mediaviewVolumeIcon2: icon {{ "player/player_volume_on", mediaviewPlaybackIconFg }};
+mediaviewVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPlaybackIconFgOver }};
 mediaviewVolumeTop: 10px;
 mediaviewVolumeToggleSkip: 11px;
 mediaviewVolumeToggle: IconButton(mediaviewControlsButton) {
@@ -205,7 +205,7 @@ mediaviewControlsPopupMenu: PopupMenu(defaultPopupMenu) {
 	menu: mediaviewControlsMenu;
 	animation: mediaviewControlsPanelAnimation;
 }
-mediaviewMenuCheck: icon {{ "player_check", mediaviewPlaybackProgressFg }};
+mediaviewMenuCheck: icon {{ "player/player_check", mediaviewPlaybackProgressFg }};
 
 mediaviewSaveMsgCheck: icon {{ "mediaview_save_check", mediaviewSaveMsgFg }};
 mediaviewSaveMsgPadding: margins(55px, 19px, 29px, 20px);
@@ -293,19 +293,19 @@ pipPlaybackWide: 4px;
 pipPlaybackSkip: 4px;
 pipPlaybackTextSkip: 6px;
 pipPlaybackFont: font(11px);
-pipPlayIcon: icon {{ "player_pip_play", mediaviewPipControlsFg }};
-pipPlayIconOver: icon {{ "player_pip_play", mediaviewPipControlsFgOver }};
-pipPauseIcon: icon {{ "player_pip_pause", mediaviewPipControlsFg }};
-pipPauseIconOver: icon {{ "player_pip_pause", mediaviewPipControlsFgOver }};
-pipCloseIcon: icon {{ "player_pip_close", mediaviewPipControlsFg }};
-pipCloseIconOver: icon {{ "player_pip_close", mediaviewPipControlsFgOver }};
-pipEnlargeIcon: icon {{ "player_pip_enlarge", mediaviewPipControlsFg }};
-pipEnlargeIconOver: icon {{ "player_pip_enlarge", mediaviewPipControlsFgOver }};
-pipVolumeIcon0: icon {{ "player_volume_off", mediaviewPipControlsFg }};
-pipVolumeIcon0Over: icon {{ "player_volume_off", mediaviewPipControlsFgOver }};
-pipVolumeIcon1: icon {{ "player_volume_small", mediaviewPipControlsFg }};
-pipVolumeIcon1Over: icon {{ "player_volume_small", mediaviewPipControlsFgOver }};
-pipVolumeIcon2: icon {{ "player_volume_on", mediaviewPipControlsFg }};
-pipVolumeIcon2Over: icon {{ "player_volume_on", mediaviewPipControlsFgOver }};
+pipPlayIcon: icon {{ "player/player_pip_play", mediaviewPipControlsFg }};
+pipPlayIconOver: icon {{ "player/player_pip_play", mediaviewPipControlsFgOver }};
+pipPauseIcon: icon {{ "player/player_pip_pause", mediaviewPipControlsFg }};
+pipPauseIconOver: icon {{ "player/player_pip_pause", mediaviewPipControlsFgOver }};
+pipCloseIcon: icon {{ "player/player_pip_close", mediaviewPipControlsFg }};
+pipCloseIconOver: icon {{ "player/player_pip_close", mediaviewPipControlsFgOver }};
+pipEnlargeIcon: icon {{ "player/player_pip_enlarge", mediaviewPipControlsFg }};
+pipEnlargeIconOver: icon {{ "player/player_pip_enlarge", mediaviewPipControlsFgOver }};
+pipVolumeIcon0: icon {{ "player/player_volume_off", mediaviewPipControlsFg }};
+pipVolumeIcon0Over: icon {{ "player/player_volume_off", mediaviewPipControlsFgOver }};
+pipVolumeIcon1: icon {{ "player/player_volume_small", mediaviewPipControlsFg }};
+pipVolumeIcon1Over: icon {{ "player/player_volume_small", mediaviewPipControlsFgOver }};
+pipVolumeIcon2: icon {{ "player/player_volume_on", mediaviewPipControlsFg }};
+pipVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPipControlsFgOver }};
 
 speedSliderDividerSize: size(2px, 8px);

Telegram/SourceFiles/overview/overview.style

@@ -73,23 +73,23 @@ overviewFileExtTop: 24px;
 overviewFileExtFg: windowFgActive;
 overviewFileExtFont: font(18px semibold);
 
-overviewVoicePause: icon {{ "playlist_pause", historyFileInIconFg }};
-overviewVoicePauseSelected: icon {{ "playlist_pause", historyFileInIconFgSelected }};
-overviewVoicePlay: icon {{ "playlist_play", historyFileInIconFg }};
-overviewVoicePlaySelected: icon {{ "playlist_play", historyFileInIconFgSelected }};
-overviewVoiceCancel: icon {{ "playlist_cancel", historyFileInIconFg }};
-overviewVoiceCancelSelected: icon {{ "playlist_cancel", historyFileInIconFgSelected }};
-overviewVoiceDownload: icon {{ "playlist_download", historyFileInIconFg }};
-overviewVoiceDownloadSelected: icon {{ "playlist_download", historyFileInIconFgSelected }};
+overviewVoicePause: icon {{ "player/playlist_pause", historyFileInIconFg }};
+overviewVoicePauseSelected: icon {{ "player/playlist_pause", historyFileInIconFgSelected }};
+overviewVoicePlay: icon {{ "player/playlist_play", historyFileInIconFg }};
+overviewVoicePlaySelected: icon {{ "player/playlist_play", historyFileInIconFgSelected }};
+overviewVoiceCancel: icon {{ "player/playlist_cancel", historyFileInIconFg }};
+overviewVoiceCancelSelected: icon {{ "player/playlist_cancel", historyFileInIconFgSelected }};
+overviewVoiceDownload: icon {{ "player/playlist_download", historyFileInIconFg }};
+overviewVoiceDownloadSelected: icon {{ "player/playlist_download", historyFileInIconFgSelected }};
 
-overviewSongPause: icon {{ "playlist_pause", historyFileThumbIconFg }};
-overviewSongPauseSelected: icon {{ "playlist_pause", historyFileThumbIconFgSelected }};
-overviewSongPlay: icon {{ "playlist_play", historyFileThumbIconFg }};
-overviewSongPlaySelected: icon {{ "playlist_play", historyFileThumbIconFgSelected }};
-overviewSongCancel: icon {{ "playlist_cancel", historyFileThumbIconFg }};
-overviewSongCancelSelected: icon {{ "playlist_cancel", historyFileThumbIconFgSelected }};
-overviewSongDownload: icon {{ "playlist_download", historyFileThumbIconFg }};
-overviewSongDownloadSelected: icon {{ "playlist_download", historyFileThumbIconFgSelected }};
+overviewSongPause: icon {{ "player/playlist_pause", historyFileThumbIconFg }};
+overviewSongPauseSelected: icon {{ "player/playlist_pause", historyFileThumbIconFgSelected }};
+overviewSongPlay: icon {{ "player/playlist_play", historyFileThumbIconFg }};
+overviewSongPlaySelected: icon {{ "player/playlist_play", historyFileThumbIconFgSelected }};
+overviewSongCancel: icon {{ "player/playlist_cancel", historyFileThumbIconFg }};
+overviewSongCancelSelected: icon {{ "player/playlist_cancel", historyFileThumbIconFgSelected }};
+overviewSongDownload: icon {{ "player/playlist_download", historyFileThumbIconFg }};
+overviewSongDownloadSelected: icon {{ "player/playlist_download", historyFileThumbIconFgSelected }};
 overviewSmallCancel: icon {{ "history_audio_cancel", historyFileInIconFg }};
 overviewSmallCancelSelected: icon {{ "history_audio_cancel", historyFileInIconFgSelected }};
 overviewSmallDownload: icon {{ "history_audio_download", historyFileInIconFg }};

Telegram/SourceFiles/ui/chat/chat.style

@@ -782,10 +782,10 @@ historyGroupAboutSkip: 8px;
 
 historyVideoDownloadSize: 44px;
 historyVideoMuteSize: 22px;
-historyVideoCancel: icon {{ "playlist_cancel", historyFileThumbIconFg }};
-historyVideoCancelSelected: icon {{ "playlist_cancel", historyFileThumbIconFgSelected }};
-historyVideoDownload: icon {{ "playlist_download", historyFileThumbIconFg }};
-historyVideoDownloadSelected: icon {{ "playlist_download", historyFileThumbIconFgSelected }};
+historyVideoCancel: icon {{ "player/playlist_cancel", historyFileThumbIconFg }};
+historyVideoCancelSelected: icon {{ "player/playlist_cancel", historyFileThumbIconFgSelected }};
+historyVideoDownload: icon {{ "player/playlist_download", historyFileThumbIconFg }};
+historyVideoDownloadSelected: icon {{ "player/playlist_download", historyFileThumbIconFgSelected }};
 historyVideoRadialLine: msgFileRadialLine;
 
 historyAudioDownloadSize: 20px;