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

Resampling fixes, new translatables

Browse source
This commit is contained in:
Royce551 2021-06-27 13:04:52 -05:00
parent d6da528e14
commit 0a68970545
8 changed files with 81 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Backends/FmpBassBackend.dll
View file

Binary file not shown.

45
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Properties/Resources.Designer.cs generated
View file

@ -96,6 +96,24 @@ namespace FRESHMusicPlayer.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Bitrate.
/// </summary>
public static string Bitrate {
get {
return ResourceManager.GetString("Bitrate", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Disc.
/// </summary>
public static string Disc {
get {
return ResourceManager.GetString("Disc", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to File path or URL.
/// </summary>
@ -609,6 +627,24 @@ namespace FRESHMusicPlayer.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Track.
/// </summary>
public static string Track {
get {
return ResourceManager.GetString("Track", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Track Info.
/// </summary>
public static string TrackInfo {
get {
return ResourceManager.GetString("TrackInfo", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Tracks.
/// </summary>
@ -617,5 +653,14 @@ namespace FRESHMusicPlayer.Properties {
return ResourceManager.GetString("Tracks", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Year.
/// </summary>
public static string Year {
get {
return ResourceManager.GetString("Year", resourceCulture);
}
}
}
}

15
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Properties/Resources.resx
View file

@ -129,6 +129,12 @@
<data name="Artists" xml:space="preserve">
<value>Artists</value>
</data>
<data name="Bitrate" xml:space="preserve">
<value>Bitrate</value>
</data>
<data name="Disc" xml:space="preserve">
<value>Disc</value>
</data>
<data name="FilePathOrUrl" xml:space="preserve">
<value>File path or URL</value>
</data>
@ -300,7 +306,16 @@
<data name="TagEditor" xml:space="preserve">
<value>Tag Editor</value>
</data>
<data name="Track" xml:space="preserve">
<value>Track</value>
</data>
<data name="TrackInfo" xml:space="preserve">
<value>Track Info</value>
</data>
<data name="Tracks" xml:space="preserve">
<value>Tracks</value>
</data>
<data name="Year" xml:space="preserve">
<value>Year</value>
</data>
</root>

4
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/MainWindowViewModel.cs
View file

@ -264,13 +264,13 @@ namespace FRESHMusicPlayer.ViewModels
set => this.RaiseAndSetIfChanged(ref coverArt, value);
}
private string artist = "Nothing Playing";
private string artist = Properties.Resources.NothingPlaying;
public string Artist
{
get => artist;
set => this.RaiseAndSetIfChanged(ref artist, value);
}
private string title = "Nothing Playing";
private string title = Properties.Resources.NothingPlaying;
public string Title
{
get => title;

4
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml
View file

@ -93,10 +93,10 @@
<Button Margin="0,5">
<Image Source="{DynamicResource Notification}"/>
</Button>
<Button Margin="0,5" Command="{Binding OpenQueueManagementCommand}">
<Button Margin="0,5" Command="{Binding OpenQueueManagementCommand}" ToolTip.Tip="{x:Static resx:Resources.QueueManagement}">
<Image Source="{DynamicResource Queue}"/>
</Button>
<Button Margin="0,5" Command="{Binding OpenSettingsCommand}">
<Button Margin="0,5" Command="{Binding OpenSettingsCommand}" ToolTip.Tip="{x:Static resx:Resources.Settings}">
<Image Source="{DynamicResource Settings}"/>
</Button>
</StackPanel>

9
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/QueueManagement.axaml
View file

@ -6,7 +6,7 @@
mc:Ignorable="d" Width="500" Height="400"
xmlns:svg="clr-namespace:Avalonia.Svg.Skia;assembly=Avalonia.Svg.Skia"
xmlns:resx ="clr-namespace:FRESHMusicPlayer.Properties"
x:Class="FRESHMusicPlayer.Views.QueueManagement" Closing="OnClosing" WindowStartupLocation="CenterOwner"
x:Class="FRESHMusicPlayer.Views.QueueManagement" Closing="OnClosing" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
Icon="/Assets/icon.ico" Title="{x:Static resx:Resources.QueueManagement}">
<Window.DataContext>
<vm:QueueManagementViewModel/>
@ -15,7 +15,12 @@
<svg:SvgImage x:Key="Play" Source="/Assets/play.svg"/>
<svg:SvgImage x:Key="Delete" Source="/Assets/delete.svg"/>
</Window.Resources>
<Window.Styles>
<Style Selector="ListBoxItem">
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
</Style>
</Window.Styles>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>

2
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/Settings.axaml
View file

@ -6,7 +6,7 @@
xmlns:resx ="clr-namespace:FRESHMusicPlayer.Properties"
mc:Ignorable="d"
Width="600" Height="400"
x:Class="FRESHMusicPlayer.Views.Settings" WindowStartupLocation="CenterOwner"
x:Class="FRESHMusicPlayer.Views.Settings" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
Icon="/Assets/icon.ico" Title="{x:Static resx:Resources.Settings}">
<Window.DataContext>

17
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/TrackInfo.axaml
View file

@ -4,9 +4,10 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:FRESHMusicPlayer.Controls.BlurryImage"
xmlns:vm="using:FRESHMusicPlayer.ViewModels"
xmlns:resx ="clr-namespace:FRESHMusicPlayer.Properties"
mc:Ignorable="d" Width="500" Height="300"
x:Class="FRESHMusicPlayer.Views.TrackInfo" WindowStartupLocation="CenterOwner" Closing="OnClosing"
Icon="/Assets/icon.ico" Title="Track Info">
x:Class="FRESHMusicPlayer.Views.TrackInfo" WindowStartupLocation="CenterOwner" Closing="OnClosing" ShowInTaskbar="False"
Icon="/Assets/icon.ico" Title="{x:Static resx:Resources.TrackInfo}">
<Window.DataContext>
<vm:TrackInfoViewModel/>
</Window.DataContext>
@ -24,7 +25,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<CheckBox Grid.ColumnSpan="3" IsChecked="{Binding $parent[Window].Topmost}" Content="Pin to top"/>
<CheckBox Grid.ColumnSpan="3" IsChecked="{Binding $parent[Window].Topmost}" Content="{x:Static resx:Resources.PinToTop}"/>
<Image Grid.Row="1" Grid.Column="0" Source="{Binding CoverArt}" HorizontalAlignment="Right">
</Image>
@ -42,11 +43,11 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Grid.Column="0" Grid.Row="0" Margin="0,2" Text="Bitrate" Foreground="{StaticResource SecondaryTextColor}"/>
<TextBlock Grid.Column="0" Grid.Row="1" Margin="0,2" Text="Disc" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding DiscNumberShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="2" Margin="0,2" Text="Track" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding TrackNumberShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="3" Margin="0,2" Text="Year" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding YearShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="4" Margin="0,2" Text="Album" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding AlbumShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="0" Margin="0,2" Text="{x:Static resx:Resources.Bitrate}" Foreground="{StaticResource SecondaryTextColor}"/>
<TextBlock Grid.Column="0" Grid.Row="1" Margin="0,2" Text="{x:Static resx:Resources.Disc}" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding DiscNumberShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="2" Margin="0,2" Text="{x:Static resx:Resources.Track}" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding TrackNumberShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="3" Margin="0,2" Text="{x:Static resx:Resources.Year}" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding YearShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="4" Margin="0,2" Text="{x:Static resx:Resources.Album}" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding AlbumShouldBeVisible}"/>
<TextBlock Grid.Column="1" Grid.Row="0" Margin="10,2,0,2" Text="{Binding BitrateText}"/>
<TextBlock Grid.Column="1" Grid.Row="1" Margin="10,2,0,2" Text="{Binding DiscNumberText}" IsVisible="{Binding DiscNumberShouldBeVisible}"/>