mirrors/FRESHMusicPlayer
1
0
Fork 0
mirror of https://github.com/Royce551/FRESHMusicPlayer.git synced 2025-01-22 10:51:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stuff changed

Browse source
This commit is contained in:
Royce551 2021-10-30 19:02:57 -05:00
parent d5284a8bc6
commit 80f2d3b9b8
12 changed files with 70 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Controls/TrackInfo.xaml
View file

@ -24,16 +24,16 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock x:Name="BitrateLabel" Margin="10,2,5,5" Grid.Row="1" TextWrapping="Wrap" Text="{x:Static resx:Resources.TRACKINFO_BITRATE}" Foreground="{StaticResource SecondaryTextColor}" FontSize="14" Panel.ZIndex="1" VerticalAlignment="Center"/>
<TextBlock x:Name="BitrateLabel" Margin="10,2,5,2" Grid.Row="1" TextWrapping="Wrap" Text="{x:Static resx:Resources.TRACKINFO_BITRATE}" Foreground="{StaticResource SecondaryTextColor}" FontSize="14" Panel.ZIndex="1" VerticalAlignment="Center"/>
<TextBlock x:Name="DiscNumberLabel" Margin="10,2,5,2" Grid.Row="2" TextWrapping="Wrap" Text="{x:Static resx:Resources.TRACKINFO_DISCNUMBER}" Foreground="{StaticResource SecondaryTextColor}" FontSize="14" Panel.ZIndex="1" VerticalAlignment="Center"/>
<TextBlock x:Name="TrackNumberLabel" Margin="10,2,5,5" Grid.Row="3" TextWrapping="Wrap" Text="{x:Static resx:Resources.TRACKINFO_TRACKNUMBER}" Foreground="{StaticResource SecondaryTextColor}" FontSize="14" Panel.ZIndex="1" VerticalAlignment="Center"/>
<TextBlock x:Name="TrackNumberLabel" Margin="10,2,5,2" Grid.Row="3" TextWrapping="Wrap" Text="{x:Static resx:Resources.TRACKINFO_TRACKNUMBER}" Foreground="{StaticResource SecondaryTextColor}" FontSize="14" Panel.ZIndex="1" VerticalAlignment="Center"/>
<TextBlock x:Name="YearLabel" Margin="10,2,5,2" Grid.Row="4" TextWrapping="Wrap" Text="{x:Static resx:Resources.TRACKINFO_YEAR}" Foreground="{StaticResource SecondaryTextColor}" FontSize="14" Panel.ZIndex="1" VerticalAlignment="Center"/>
<TextBlock x:Name="GenreLabel" Margin="10,2,5,2" Grid.Row="5" TextWrapping="Wrap" Text="{x:Static resx:Resources.TRACKINFO_GENRE}" Foreground="{StaticResource SecondaryTextColor}" FontSize="14" Panel.ZIndex="1" VerticalAlignment="Center"/>
<TextBlock x:Name="AlbumLabel" Margin="10,2,5,10" Grid.Row="6" TextWrapping="Wrap" Text="{x:Static resx:Resources.TRACKINFO_ALBUM}" Foreground="{StaticResource SecondaryTextColor}" FontSize="14" Panel.ZIndex="1" VerticalAlignment="Center"/>
<TextBlock x:Name="BitrateBox" Grid.Row="1" Grid.Column="2" Background="{x:Null}" Foreground="{StaticResource PrimaryTextColor}" Margin="2,2,10,5" VerticalAlignment="Stretch" FontSize="14" TextWrapping="Wrap" Panel.ZIndex="1"/>
<TextBlock x:Name="BitrateBox" Grid.Row="1" Grid.Column="2" Background="{x:Null}" Foreground="{StaticResource PrimaryTextColor}" Margin="2,2,10,2" VerticalAlignment="Stretch" FontSize="14" TextWrapping="Wrap" Panel.ZIndex="1"/>
<TextBlock x:Name="DiscBox" Grid.Row="2" Grid.Column="2" Background="{x:Null}" Foreground="{StaticResource PrimaryTextColor}" Margin="2,2,10,2" VerticalAlignment="Stretch" FontSize="14" TextWrapping="Wrap" Panel.ZIndex="1"/>
<TextBlock x:Name="TrackBox" Grid.Row="3" Grid.Column="2" Background="{x:Null}" Foreground="{StaticResource PrimaryTextColor}" Margin="2,2,10,5" VerticalAlignment="Stretch" FontSize="14" TextWrapping="Wrap" Panel.ZIndex="1"/>
<TextBlock x:Name="TrackBox" Grid.Row="3" Grid.Column="2" Background="{x:Null}" Foreground="{StaticResource PrimaryTextColor}" Margin="2,2,10,2" VerticalAlignment="Stretch" FontSize="14" TextWrapping="Wrap" Panel.ZIndex="1"/>
<TextBlock x:Name="YearBox" Grid.Row="4" Grid.Column="2" Background="{x:Null}" Foreground="{StaticResource PrimaryTextColor}" Margin="2,2,10,2" VerticalAlignment="Stretch" FontSize="14" TextWrapping="Wrap" Panel.ZIndex="1"/>
<TextBlock x:Name="GenreBox" Grid.Row="5" Grid.Column="2" Background="{x:Null}" Foreground="{StaticResource PrimaryTextColor}" Margin="2,2,10,2" VerticalAlignment="Stretch" FontSize="14" TextWrapping="Wrap" Panel.ZIndex="1"/>
<TextBlock x:Name="AlbumBox" Grid.Row="6" Grid.Column="2" Background="{x:Null}" Foreground="{StaticResource PrimaryTextColor}" Margin="2,2,10,10" VerticalAlignment="Stretch" FontSize="14" TextWrapping="Wrap" Panel.ZIndex="1"/>

9
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Handlers/Configuration/ConfigurationFile.cs
View file

@ -67,7 +67,16 @@ namespace FRESHMusicPlayer.Handlers.Configuration
/// The last menu FMP was on before closing
/// </summary>
public Tab CurrentMenu { get; set; } = Tab.Import;
/// <summary>
/// File paths to automatically import tracks from on startup
/// </summary>
public List<string> AutoImportPaths { get; set; } = new List<string>();
/// <summary>
/// The last recorded version of FMP we're on. If this doesn't match the actual version,
/// FMP was updated.
/// </summary>
public string LastRecordedVersion { get; set; }
}
}

21
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Handlers/Notifications/NotificationBox.xaml
View file

@ -5,26 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FRESHMusicPlayer.Handlers.Notifications"
mc:Ignorable="d"
d:DesignHeight="120
" d:DesignWidth="200" MouseEnter="UserControl_MouseEnter" MouseLeave="UserControl_MouseLeave">
<UserControl.Triggers>
<EventTrigger RoutedEvent="FrameworkElement.Loaded">
<BeginStoryboard>
<Storyboard>
<DoubleAnimation Storyboard.TargetName="BackgroundPanel"
Storyboard.TargetProperty="Opacity"
From="0"
To="1.0" Duration="0:0:.25"
/>
<DoubleAnimation Storyboard.TargetName="Border"
Storyboard.TargetProperty="Opacity"
From="0"
To="1.0" Duration="0:0:.25"
/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</UserControl.Triggers>
d:DesignHeight="120" d:DesignWidth="200" MouseEnter="UserControl_MouseEnter" MouseLeave="UserControl_MouseLeave">
<Border x:Name="Border" CornerRadius="2" BorderBrush="{StaticResource ForegroundColor}" BorderThickness="1">
<Grid MouseLeftButtonDown="UserControl_MouseLeftButtonDown">
<Grid x:Name="BackgroundPanel" Background="{StaticResource ForegroundColor}">

10
FRESHMusicPlayer/FRESHMusicPlayer-WPF/MainWindow.xaml
View file

@ -84,16 +84,16 @@
<TextBlock x:Name="ArtistLabel" HorizontalAlignment="Stretch" Margin="5,35,10,0" TextWrapping="NoWrap" Text="{x:Static resx:Resources.MAINWINDOW_NOTHINGPLAYING}" VerticalAlignment="Top" Grid.Column="1" Height="20" Foreground="{StaticResource SecondaryTextColor}" TextTrimming="CharacterEllipsis"/>
<Path x:Name="PlayPauseButton" Data="{StaticResource PauseIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,40.386,92.5,8.414" Width="35" HorizontalAlignment="Right"/>
<Path x:Name="ShuffleButton" Data="{StaticResource ShuffleIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,46.467,55,15" Width="20" HorizontalAlignment="Right"/>
<Path x:Name="ShuffleButton" Data="{StaticResource ShuffleIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,46.467,142.505,15" Width="20" HorizontalAlignment="Right"/>
<Path x:Name="NextTrackButton" Data="{StaticResource NextIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,46.467,15,15" Width="20" HorizontalAlignment="Right" MouseLeftButtonDown="NextTrackButton_MouseLeftButtonDown"/>
<Path x:Name="RepeatOneButton" Data="{StaticResource RepeatAllIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,45,142.505,13" Width="26" HorizontalAlignment="Right" MouseLeftButtonDown="RepeatOneButton_MouseLeftButtonDown"/>
<Path x:Name="RepeatOneButton" Data="{StaticResource RepeatAllIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,45,55,13" Width="26" HorizontalAlignment="Right" MouseLeftButtonDown="RepeatOneButton_MouseLeftButtonDown"/>
<Path x:Name="PreviousTrackButton" Data="{StaticResource PreviousIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,47.803,182.505,15.997" Width="25.612" HorizontalAlignment="Right" MouseLeftButtonDown="PreviousButton_MouseLeftButtonDown"/>
<Path x:Name="VolumeIcon" Data="{StaticResource VolumeIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,15,15,0" Width="20" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Panel.ZIndex="1"/>
<!--Hitboxes for the above paths-->
<Rectangle Stretch="Uniform" Fill="Transparent" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,45,143,13" Width="23" HorizontalAlignment="Right" MouseLeftButtonDown="RepeatOneButton_MouseLeftButtonDown" Cursor="Hand"/>
<Rectangle Stretch="Uniform" Fill="Transparent" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,46,55,15" Width="23" HorizontalAlignment="Right" MouseLeftButtonDown="RepeatOneButton_MouseLeftButtonDown" Cursor="Hand"/>
<Rectangle Stretch="Uniform" Fill="Transparent" RenderTransformOrigin="0.5,0.5" Grid.Column="2" Margin="0,46,15,15" Width="20" HorizontalAlignment="Right" MouseLeftButtonDown="NextTrackButton_MouseLeftButtonDown" Cursor="Hand"/>
<Rectangle Grid.Column="2" Stretch="Uniform" Fill="Transparent" RenderTransformOrigin="0.5,0.5" Margin="0,46,55,15" Width="20" HorizontalAlignment="Right" MouseLeftButtonDown="ShuffleButton_MouseLeftButtonDown" Cursor="Hand"/>
<Rectangle Grid.Column="2" Stretch="Uniform" Fill="Transparent" RenderTransformOrigin="0.5,0.5" Margin="0,45,143,13" Width="20" HorizontalAlignment="Right" MouseLeftButtonDown="ShuffleButton_MouseLeftButtonDown" Cursor="Hand"/>
<Rectangle Grid.Column="2" Margin="0,40,92,8" Width="36" HorizontalAlignment="Right" MouseLeftButtonDown="PlayPauseButton_MouseLeftButtonDown" Fill="Transparent" Cursor="Hand"/>
<Rectangle Grid.Column="2" Margin="0,48,183,16" Width="22" HorizontalAlignment="Right" MouseLeftButtonDown="PreviousButton_MouseLeftButtonDown" Fill="Transparent" Cursor="Hand"/>
<!--Sorry, this is more than a little messy LMAO-->
@ -121,7 +121,7 @@
</EventTrigger>
</Rectangle.Triggers>
</Rectangle>
<Slider x:Name="VolumeBar" Grid.Column="2" Margin="0,14,43,0" Foreground="Red" BorderBrush="#FFAC0505" Height="21" VerticalAlignment="Top" HorizontalAlignment="Right" Width="104" Opacity="0" Maximum="100" ValueChanged="VolumeBar_ValueChanged" IsMoveToPointEnabled="True" Value="100" Style="{StaticResource Progress_Slider}" Panel.ZIndex="1">
<Slider x:Name="VolumeBar" Grid.Column="2" Margin="0,14,43,0" Height="21" VerticalAlignment="Top" HorizontalAlignment="Right" Width="104" Opacity="0" Maximum="100" ValueChanged="VolumeBar_ValueChanged" IsMoveToPointEnabled="True" Value="100" Style="{StaticResource Progress_Slider}" Panel.ZIndex="1">
<Slider.Triggers>
<EventTrigger RoutedEvent="MouseEnter">
<BeginStoryboard>

2
FRESHMusicPlayer/FRESHMusicPlayer-WPF/MainWindow.xaml.cs
View file

@ -41,7 +41,7 @@ namespace FRESHMusicPlayer
public GUILibrary Library;
public IMetadataProvider CurrentTrack;
public const string WindowName = "FRESHMusicPlayer [Blueprint 11 b.10.10.2021; Not stable!]";
public const string WindowName = "FRESHMusicPlayer [Blueprint 11 b.10.24.2021; Not stable!]";
public PlaytimeTrackingHandler TrackingHandler;
public bool PauseAfterCurrentTrack = false;

13
FRESHMusicPlayer/FRESHMusicPlayer-WPF/MainWindow_Logic.xaml.cs
View file

@ -7,8 +7,10 @@ using FRESHMusicPlayer.Pages.Lyrics;
using FRESHMusicPlayer.Utilities;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@ -353,6 +355,17 @@ namespace FRESHMusicPlayer
TrackingHandler?.Close();
TrackingHandler = null;
}
var version = Assembly.GetEntryAssembly().GetName().Version.ToString();
if (version != App.Config.LastRecordedVersion)
NotificationHandler.Add(new Notification
{
ContentText = $"You're now on FRESHMusicPlayer {version}!",
ButtonText = "Changelog",
Type = NotificationType.Success,
OnButtonClicked = () => { Process.Start("https://github.com/royce551/freshmusicplayer/releases/latest"); return true; }
});
App.Config.LastRecordedVersion = version;
}
public async void HandlePersistence()
{

2
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/Library/SearchPage.xaml.cs
View file

@ -90,6 +90,6 @@ namespace FRESHMusicPlayer.Pages.Library
await window.Player.PlayAsync();
}
private void Page_Loaded(object sender, RoutedEventArgs e) => window.Dispatcher.Invoke(() => SearchBox.Focus(), DispatcherPriority.ApplicationIdle);
private async void Page_Loaded(object sender, RoutedEventArgs e) => await window.Dispatcher.InvokeAsync(() => SearchBox.Focus(), DispatcherPriority.ApplicationIdle);
}
}

54
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/Library/SongEntry.xaml
View file

@ -20,30 +20,34 @@
</BeginStoryboard>
</EventTrigger>
</UserControl.Triggers>
<Grid x:Name="MainPanel" Background="{StaticResource ForegroundColor}" >
<Grid.RowDefinitions>
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition x:Name="ButtonColumn" Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.ContextMenu>
<ContextMenu>
<MenuItem x:Name="MiscContext" Header="{x:Static resx:Resources.LIBRARY_ADD_TO_PLAYLIST}" Click="ContextMenu_Click" SubmenuOpened="MainPanel_ContextMenuOpening">
<MenuItem/> <!--will be replaced with generated context menu by code behind-->
</MenuItem>
<MenuItem Header="{x:Static resx:Resources.LIBRARY_OPEN_FILEEXPLORER}" Click="OpenInFileExplorer_Click"/>
</ContextMenu>
</Grid.ContextMenu>
<TextBlock x:Name="TitleLabel" Grid.Column="0" Margin="5,0,0,13" Text="TextBlock" Foreground="{StaticResource PrimaryTextColor}" FontSize="16" Grid.ColumnSpan="1" TextTrimming="CharacterEllipsis"/>
<TextBlock x:Name="ArtistAlbumLabel" Margin="5,24,0,2" Text="TextBlock" Foreground="{StaticResource SecondaryTextColor}" FontSize="9" Grid.ColumnSpan="1" TextTrimming="CharacterEllipsis" Grid.Column="0"/>
<Path x:Name="PlayButton" Data="{StaticResource PlayIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="10,3.65,49.574,4.745" HorizontalAlignment="Right" Width="18.426" Opacity="1" Visibility="Collapsed"/>
<Path x:Name="QueueButton" Data="{StaticResource AddQueueIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="0,7.087,30.384,6.561" HorizontalAlignment="Right" Width="12.101" Opacity="1" Visibility="Collapsed"/>
<Path x:Name="DeleteButton" Data="{StaticResource DeleteIcon}" Stretch="Uniform" Fill="#FFD5463F" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="0,6.457,10.923,6.578" HorizontalAlignment="Right" Width="10.211" Opacity="1" Visibility="Collapsed"/>
<Border x:Name="MainPanel" CornerRadius="2" BorderBrush="{StaticResource ForegroundColor}" Background="{StaticResource ForegroundColor}" BorderThickness="1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition x:Name="ButtonColumn" Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.ContextMenu>
<ContextMenu>
<MenuItem x:Name="MiscContext" Header="{x:Static resx:Resources.LIBRARY_ADD_TO_PLAYLIST}" Click="ContextMenu_Click" SubmenuOpened="MainPanel_ContextMenuOpening">
<MenuItem/>
<!--will be replaced with generated context menu by code behind-->
</MenuItem>
<MenuItem Header="{x:Static resx:Resources.LIBRARY_OPEN_FILEEXPLORER}" Click="OpenInFileExplorer_Click"/>
</ContextMenu>
</Grid.ContextMenu>
<TextBlock x:Name="TitleLabel" Grid.Column="0" Margin="5,0,0,13" Text="TextBlock" Foreground="{StaticResource PrimaryTextColor}" FontSize="16" Grid.ColumnSpan="1" TextTrimming="CharacterEllipsis"/>
<TextBlock x:Name="ArtistAlbumLabel" Margin="5,24,0,2" Text="TextBlock" Foreground="{StaticResource SecondaryTextColor}" FontSize="9" Grid.ColumnSpan="1" TextTrimming="CharacterEllipsis" Grid.Column="0"/>
<Path x:Name="PlayButton" Data="{StaticResource PlayIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="10,3.65,49.574,4.745" HorizontalAlignment="Right" Width="18.426" Opacity="1" Visibility="Collapsed"/>
<Path x:Name="QueueButton" Data="{StaticResource AddQueueIcon}" Stretch="Uniform" Fill="{StaticResource PrimaryTextColor}" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="0,7.087,30.384,6.561" HorizontalAlignment="Right" Width="12.101" Opacity="1" Visibility="Collapsed"/>
<Path x:Name="DeleteButton" Data="{StaticResource DeleteIcon}" Stretch="Uniform" Fill="#FFD5463F" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="0,6.457,10.923,6.578" HorizontalAlignment="Right" Width="10.211" Opacity="1" Visibility="Collapsed"/>
<Rectangle x:Name="PlayHitbox" Fill="White" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="10,3.65,49.574,4.745" HorizontalAlignment="Right" Width="18.426" Opacity="0" MouseLeftButtonDown="PlayButtonClick" Cursor="Hand" Visibility="Collapsed"/>
<Rectangle x:Name="QueueHitbox" Fill="White" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="0,7.087,30.384,6.561" HorizontalAlignment="Right" Width="12.101" Opacity="0" MouseLeftButtonDown="QueueButtonClick" Cursor="Hand" Visibility="Collapsed"/>
<Rectangle x:Name="DeleteHitbox" Fill="White" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="0,12,11,5" HorizontalAlignment="Right" Width="10" Opacity="0" MouseLeftButtonDown="DeleteButtonClick" Cursor="Hand" Visibility="Collapsed"/>
</Grid>
<Rectangle x:Name="PlayHitbox" Fill="White" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="10,3.65,49.574,4.745" HorizontalAlignment="Right" Width="18.426" Opacity="0" MouseLeftButtonDown="PlayButtonClick" Cursor="Hand" Visibility="Collapsed"/>
<Rectangle x:Name="QueueHitbox" Fill="White" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="0,7.087,30.384,6.561" HorizontalAlignment="Right" Width="12.101" Opacity="0" MouseLeftButtonDown="QueueButtonClick" Cursor="Hand" Visibility="Collapsed"/>
<Rectangle x:Name="DeleteHitbox" Fill="White" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Margin="0,12,11,5" HorizontalAlignment="Right" Width="10" Opacity="0" MouseLeftButtonDown="DeleteButtonClick" Cursor="Hand" Visibility="Collapsed"/>
</Grid>
</Border>
</UserControl>

13
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/QueueManagement/QueueEntry.xaml
View file

@ -5,19 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="40" d:DesignWidth="344" MouseEnter="UserControl_MouseEnter" MouseLeave="UserControl_MouseLeave" MouseLeftButtonDown="UserControl_MouseLeftButtonDown">
<UserControl.Triggers>
<EventTrigger RoutedEvent="FrameworkElement.Loaded">
<BeginStoryboard>
<Storyboard>
<DoubleAnimation Storyboard.TargetName="MainPanel"
Storyboard.TargetProperty="Opacity"
From="0.6"
To="1.0" Duration="0:0:0.15"
/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</UserControl.Triggers>
<Grid x:Name="MainPanel" Background="{StaticResource ForegroundColor}">
<Grid.RowDefinitions>
<RowDefinition Height="7*"/>

3
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/Settings/SettingsPage.xaml
View file

@ -106,8 +106,7 @@
<TextBlock Text="{x:Static resx:Resources.SETTINGS_ABOUT}" Style="{StaticResource Header}"/>
<TextBlock x:Name="FMPVersionLabel" Text="FRESHMusicPlayer Ver. 10.1.1" Foreground="{StaticResource PrimaryTextColor}" FontSize="14" Padding="0,0,0,5"/>
<TextBlock x:Name="FMPCoreVersionLabel" Text="FRESHMusicPlayer Core Ver. 3.0.0" Foreground="{StaticResource PrimaryTextColor}" FontSize="14" Padding="0,0,0,5"/>
<TextBlock x:Name="FMPVersionLabel" Foreground="{StaticResource PrimaryTextColor}" FontSize="14" Padding="0,0,0,5"/>
<TextBlock Text="{x:Static resx:Resources.SETTINGS_CREDITS}" Foreground="{StaticResource PrimaryTextColor}" FontSize="14" Padding="0,0,0,5" TextWrapping="Wrap"/>
</StackPanel>
</ScrollViewer>

2
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/Settings/SettingsPage.xaml.cs
View file

@ -6,6 +6,7 @@ using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@ -39,6 +40,7 @@ namespace FRESHMusicPlayer.Pages
Integration_DiscordRPCCheck.IsChecked = App.Config.IntegrateDiscordRPC;
Integration_SMTCCheck.IsChecked = App.Config.IntegrateSMTC;
Updates_LastCheckedLabel.Text = string.Format(Properties.Resources.SETTINGS_UPDATESLASTCHECKED, App.Config.UpdatesLastChecked);
FMPVersionLabel.Text = $"FRESHMusicPlayer {Assembly.GetEntryAssembly().GetName().Version}";
switch (App.Config.Language) // TODO: investigate making this less ugly
{
case "automatic":

34
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Resources/Styles.xaml
View file

@ -16,7 +16,6 @@
CornerRadius="2"
BorderBrush="{TemplateBinding Background}"
TextElement.Foreground="{TemplateBinding Foreground}"
Tag="{TemplateBinding Background}"
BorderThickness="1"
Background="{TemplateBinding Background}"
RenderTransformOrigin="0.5,0.5">
@ -490,14 +489,14 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Border x:Name="Grid" VerticalAlignment="Top" Grid.Column="0" Margin="0,0,5,0" Width="22" Height="22"
<Border x:Name="Grid" VerticalAlignment="Top" Grid.Column="0" Margin="0,0,5,0" Width="20" Height="20"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="2"
CornerRadius="2"
RenderTransformOrigin="0.5,0.5"
SnapsToDevicePixels="True" Padding="3">
<Viewbox x:Name="Check" Stretch="UniformToFill" Visibility="Collapsed" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-3,0,0">
SnapsToDevicePixels="True" Padding="2">
<Viewbox x:Name="Check" Stretch="UniformToFill" Visibility="Collapsed" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-10,0,0">
<Path Fill="{StaticResource PrimaryTextColor}" Data="M 17.939453 5.439453 L 7.5 15.888672 L 2.060547 10.439453 L 2.939453 9.560547 L 7.5 14.111328 L 17.060547 4.560547 Z"/>
</Viewbox>
<Border.RenderTransform>
@ -506,33 +505,8 @@
</Border>
<ContentPresenter Grid.Column="1" VerticalAlignment="Center"/>
</Grid>
<ControlTemplate.Triggers>
<!--<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsChecked" Value="True"/>
<Condition Property="IsMouseOver" Value="True"/>
<Setter TargetName="Check" Property="Visibility" Value="Visible"/>
</MultiTrigger.Conditions>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsChecked" Value="True"/>
<Condition Property="IsMouseOver" Value="False"/>
</MultiTrigger.Conditions>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsChecked" Value="False"/>
<Condition Property="IsMouseOver" Value="True"/>
</MultiTrigger.Conditions>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsChecked" Value="True"/>
<Condition Property="IsMouseOver" Value="False"/>
</MultiTrigger.Conditions>
</MultiTrigger>-->
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="Check" Property="Visibility" Value="Visible"/>
</Trigger>