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

overflowoverflow

Browse source
This commit is contained in:
Royce551 2021-05-26 21:47:02 -05:00
parent 5c8685deec
commit ccac095071
4 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -316,14 +316,14 @@ namespace FRESHMusicPlayer.ViewModels
{
Player.Queue.Add(args.ToArray());
Player.PlayMusic();
Player.PauseMusic();
}
else
{
if (!string.IsNullOrEmpty(Config.FilePath))
{
Player.PlayMusic(Config.FilePath);
Player.CurrentTime.Add(TimeSpan.FromSeconds(Config.FilePosition));
Player.PauseMusic();
Player.CurrentTime.Add(TimeSpan.FromSeconds(Config.FilePosition));
}
}
}

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

@ -19,11 +19,8 @@ namespace FRESHMusicPlayer.ViewModels
public ObservableCollection<QueueManagementEntry> Queue { get; set; } = new();
private bool isReady = false;
public void Update()
{
isReady = false;
Queue.Clear();
int number = 1;
foreach (var track in Player.Queue.Queue)
@ -40,7 +37,6 @@ namespace FRESHMusicPlayer.ViewModels
Queue.Add(entry);
number++;
}
isReady = true;
}
public void JumpToCommand(int position)

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

@ -83,7 +83,26 @@
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Image x:Name="CoverArtImage" Source="{Binding CoverArt}" Grid.Column="0" Margin="10,10,0,5" />
<Image x:Name="CoverArtImage" Source="{Binding CoverArt}" Grid.Column="0" Margin="10,10,0,5" ToolTip.ShowDelay="10">
<Image.ContextMenu>
<ContextMenu>
<MenuItem Command="{Binding OpenTagEditorCommand}" Header="Tag Editor"/>
<MenuItem Command="{Binding OpenPlaylistManagementCommand}" Header="Playlist Management"/>
<MenuItem Command="{Binding OpenTrackCommand}" Header="Open"/>
<MenuItem Header="Go to">
<MenuItem Command="{Binding GoToArtistCommand}" Header="Artist"/>
<MenuItem Command="{Binding GoToAlbumCommand}" Header="Album"/>
</MenuItem>
<MenuItem Command="{Binding OpenLyricsCommand}" Header="Lyrics"/>
<Separator/>
<MenuItem Command="{Binding MiniPlayerCommand}" Header="Mini Player"/>
<MenuItem Command="{Binding PauseAfterCurrentTrackCommand}" Header="Pause after current track"/>
</ContextMenu>
</Image.ContextMenu>
<ToolTip.Tip>
<Image Source="{Binding CoverArt}"/>
</ToolTip.Tip>
</Image>
<!--Middle Section-->
<Grid Grid.Column="1" Margin="0,10,0,5">
<Grid.RowDefinitions>

1
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Handlers/Configuration/ConfigurationFile.cs
View file

@ -69,4 +69,5 @@ namespace FRESHMusicPlayer.Handlers.Configuration
public Menu CurrentMenu { get; set; } = Menu.Import;
public List<string> AutoImportPaths { get; set; } = new List<string>();
}
}