diff --git a/MusicX/Controls/BlockControl.xaml b/MusicX/Controls/BlockControl.xaml index 8abb4d39..06d2abba 100644 --- a/MusicX/Controls/BlockControl.xaml +++ b/MusicX/Controls/BlockControl.xaml @@ -31,7 +31,7 @@ - + diff --git a/MusicX/Controls/Blocks/TitleBlockControl.xaml b/MusicX/Controls/Blocks/TitleBlockControl.xaml index 288b731d..93961d5e 100644 --- a/MusicX/Controls/Blocks/TitleBlockControl.xaml +++ b/MusicX/Controls/Blocks/TitleBlockControl.xaml @@ -24,7 +24,7 @@ Style="{StaticResource HeaderHyperlinkButtonStyle}" FontFamily="{StaticResource VKSansDemiBold}" FontSize="30" - FontWeight="DemiBold" + FontWeight="Bold" Click="MoreButton_Click" Content="{TemplateBinding Content}"> @@ -36,7 +36,7 @@ diff --git a/MusicX/Controls/PlayerControl.xaml.cs b/MusicX/Controls/PlayerControl.xaml.cs index 4f7a860b..7b4b1cb0 100644 --- a/MusicX/Controls/PlayerControl.xaml.cs +++ b/MusicX/Controls/PlayerControl.xaml.cs @@ -286,8 +286,8 @@ private void UpdateSpeakerIcon() { _ when PlayerService.IsMuted => new SymbolIcon(SymbolRegular.SpeakerOff28), 0.0 => new SymbolIcon(SymbolRegular.SpeakerOff28), - > 0.0 and < 0.30 => new SymbolIcon(SymbolRegular.Speaker032), - > 0.30 and < 0.60 => new SymbolIcon(SymbolRegular.Speaker132), + > 0.0 and < 0.10 => new SymbolIcon(SymbolRegular.Speaker032), + > 0.10 and < 0.60 => new SymbolIcon(SymbolRegular.Speaker132), > 0.80 => new SymbolIcon(SymbolRegular.Speaker232), _ => SpeakerIcon.Icon }; diff --git a/MusicX/Views/SettingsView.xaml b/MusicX/Views/SettingsView.xaml index bea7c027..65de18a0 100644 --- a/MusicX/Views/SettingsView.xaml +++ b/MusicX/Views/SettingsView.xaml @@ -83,37 +83,44 @@ FontSize="30" Text="Настройки" /> + - + + + + - + Загрузка треков - + + + + + - - + + - + + + - - + + + + - + Логи - + + + + + - + + + - - + + - + + + - + @@ -331,7 +355,7 @@ Height="30" Margin="10,0,0,0" Appearance="Secondary" - Click="TelegramButton_Click" + Click="TelegramChat_Click" Content="Телеграм чат" /> @@ -366,6 +390,9 @@ NavigateUri="https://github.com/lepoco/wpfui/blob/main/LICENSE" /> + + + @@ -383,6 +410,9 @@ NavigateUri="https://t.me/VkDotNet" /> + + + @@ -396,6 +426,9 @@ NavigateUri="https://github.com/flowersne/VkNet.AudioBypass/blob/master/LICENSE" /> + + + @@ -405,6 +438,8 @@ NavigateUri="https://ffmpeg.org/" /> + + @@ -418,6 +453,8 @@ NavigateUri="https://github.com/cmxl/FFmpeg.NET/blob/master/LICENSE.md" /> + + @@ -431,15 +468,6 @@ NavigateUri="https://github.com/Lachee/discord-rpc-csharp/blob/master/LICENSE" /> - - - - - - diff --git a/MusicX/Views/SettingsView.xaml.cs b/MusicX/Views/SettingsView.xaml.cs index 39ebc129..0d3e7768 100644 --- a/MusicX/Views/SettingsView.xaml.cs +++ b/MusicX/Views/SettingsView.xaml.cs @@ -250,6 +250,15 @@ private void TelegramButton_Click(object sender, RoutedEventArgs e) }); } + private void TelegramChat_Click(object sender, RoutedEventArgs e) + { + Process.Start(new ProcessStartInfo + { + FileName = "https://t.me/+lO37psdwX2s3NjZi", + UseShellExecute = true + }); + } + private void OpenLogs_Click(object sender, RoutedEventArgs e) { Process.Start(new ProcessStartInfo