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

More SIADL

Browse source
This commit is contained in:
Royce551 2021-06-25 21:28:46 -05:00
parent 8c37b5ffc1
commit 956bb47e96
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Dependencies/SIADL.Avalonia.dll
View file

Binary file not shown.

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

@ -127,9 +127,6 @@ namespace FRESHMusicPlayer.ViewModels
set
{
Player.Queue.RepeatMode = value;
this.RaisePropertyChanged(nameof(RepeatModeNone));
this.RaisePropertyChanged(nameof(RepeatModeAll));
this.RaisePropertyChanged(nameof(RepeatModeOne));
}
}
private bool paused = false;
@ -159,18 +156,18 @@ namespace FRESHMusicPlayer.ViewModels
if (Player.Queue.RepeatMode == RepeatMode.None)
{
Player.Queue.RepeatMode = RepeatMode.RepeatAll;
}
else if (Player.Queue.RepeatMode == RepeatMode.RepeatAll)
{
Player.Queue.RepeatMode = RepeatMode.RepeatOne;
}
else
{
Player.Queue.RepeatMode = RepeatMode.None;
}
this.RaisePropertyChanged(nameof(RepeatModeNone));
this.RaisePropertyChanged(nameof(RepeatModeAll));
this.RaisePropertyChanged(nameof(RepeatModeOne));
}
public void PlayPauseCommand()
{
@ -199,6 +196,7 @@ namespace FRESHMusicPlayer.ViewModels
Player.Queue.Shuffle = true;
Shuffle = true;
}
this.RaisePropertyChanged(nameof(Shuffle));
}
public void SkipNextCommand()
{

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

@ -86,7 +86,7 @@
</NativeMenu>
</NativeMenu.Menu>
<Panel x:Name="RootPanel" DragDrop.AllowDrop="True">
<StackPanel Background="Transparent" Orientation="Horizontal" ZIndex="1" Height="50" Margin="0,0,10,0" VerticalAlignment="Top" HorizontalAlignment="Right">
<StackPanel Background="Transparent" Orientation="Horizontal" ZIndex="1" Height="40" Margin="0,0,10,0" VerticalAlignment="Top" HorizontalAlignment="Right">
<Button Margin="0,5">
<Image Source="{DynamicResource Search}"/>
</Button>
@ -128,7 +128,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock x:Name="ProgressIndicator1" Text="{Binding CurrentTime, StringFormat=\{0:mm\\:ss\}}" Foreground="{StaticResource SecondaryTextColor}" Grid.Column="0" FontSize="12" Margin="0,0,5,0"/>
<Slider x:Name="ProgressSlider" Height="50" Grid.Column="1" Value="{Binding CurrentTimeSeconds}" Maximum="{Binding TotalTimeSeconds}" Margin="0,-21,0,0"/>
<Slider x:Name="ProgressSlider" Height="50" Grid.Column="1" Value="{Binding CurrentTimeSeconds}" Maximum="{Binding TotalTimeSeconds}" Margin="0,-13,0,0"/>
<TextBlock x:Name="ProgressIndicator2" Text="{Binding TotalTime, StringFormat=\{0:mm\\:ss\}}" Foreground="{StaticResource SecondaryTextColor}" Grid.Column="2" FontSize="12" Margin="5,0,0,0"/>
</Grid>
</Grid>
@ -139,7 +139,7 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Slider x:Name="VolumeSlider" Grid.Row="1" Maximum="1" Value="{Binding Volume}" Margin="10,-10,10,-5"/>
<Slider x:Name="VolumeSlider" Grid.Row="1" Maximum="1" Value="{Binding Volume}" Margin="10,0,10,-5"/>
<StackPanel Grid.Row="2" VerticalAlignment="Center" Orientation="Horizontal" Margin="10,0">
<Button x:Name="PreviousTrackButton" Command="{Binding SkipPreviousCommand}">
<Image Source="{DynamicResource SkipPrevious}"/>