keb/unison
1
0
Fork 0
Code Releases 6 Activity

Shuffle translation fixes

Browse Source
This commit is contained in:
Théo Marchal 2022-11-18 02:17:06 +01:00
parent 5a8a5baa33
commit b95edde7df
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Handlers/ShuffleHandler.cs
View File

@ -81,6 +81,7 @@ namespace unison
AddedSongs++; AddedSongs++;
} }
commandList.Add(new PlayCommand(0));
await _mpd.SafelySendCommandAsync(commandList); await _mpd.SafelySendCommandAsync(commandList);
} }
// more available songs than requested => // more available songs than requested =>
@ -101,6 +102,7 @@ namespace unison
AddedSongs++; AddedSongs++;
} }
commandList.Add(new PlayCommand(0));
await _mpd.SafelySendCommandAsync(commandList); await _mpd.SafelySendCommandAsync(commandList);
} }
} }

4
Views/Shuffle.xaml
View File

@ -77,7 +77,7 @@
<StackPanel Orientation="Horizontal" Margin="0,5,0,0"> <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
<GroupBox DockPanel.Dock="Right" Padding="0,4,0,0" Width="270"> <GroupBox DockPanel.Dock="Right" Padding="0,4,0,0" Width="300">
<GroupBox.Header> <GroupBox.Header>
<TextBlock> <TextBlock>
<emoji:EmojiInline Text="➕"/> <emoji:EmojiInline Text="➕"/>
@ -99,7 +99,7 @@
</StackPanel> </StackPanel>
</GroupBox> </GroupBox>
<GroupBox DockPanel.Dock="Left" Padding="0,4,0,0" Width="230" Margin="0,0,5,0"> <GroupBox DockPanel.Dock="Left" Padding="0,4,0,0" Width="260" Margin="0,0,5,0">
<GroupBox.Header> <GroupBox.Header>
<TextBlock> <TextBlock>
<emoji:EmojiInline Text="♾️"/> <emoji:EmojiInline Text="♾️"/>

22
Views/Shuffle.xaml.cs
View File

@ -126,26 +126,26 @@ namespace unison
private static ITag FilterEquivalence_Type(string value) private static ITag FilterEquivalence_Type(string value)
{ {
if (value == "Song") if (value == unison.Resources.Resources.FilterType_Song)
return MpdTags.Title; return MpdTags.Title;
else if (value == "Artist") else if (value == unison.Resources.Resources.FilterType_Artist)
return MpdTags.Artist; return MpdTags.Artist;
else if (value == "Album") else if (value == unison.Resources.Resources.FilterType_Album)
return MpdTags.Album; return MpdTags.Album;
else if (value == "Year") else if (value == unison.Resources.Resources.FilterType_Year)
return MpdTags.Date; return MpdTags.Date;
else if (value == "Genre") else if (value == unison.Resources.Resources.FilterType_Genre)
return MpdTags.Genre; return MpdTags.Genre;
return MpdTags.Title; return MpdTags.Title;
} }
private static FilterOperator FilterEquivalence_Operator(string value) private static FilterOperator FilterEquivalence_Operator(string value)
{ {
if (value == "contains") if (value == unison.Resources.Resources.Operator_Contains)
return FilterOperator.Contains; return FilterOperator.Contains;
else if (value == "is") else if (value == unison.Resources.Resources.Operator_Is)
return FilterOperator.Equal; return FilterOperator.Equal;
else if (value == "is not") else if (value == unison.Resources.Resources.Operator_IsNot)
return FilterOperator.Different; return FilterOperator.Different;
return FilterOperator.Equal; return FilterOperator.Equal;
} }
@ -180,9 +180,9 @@ namespace unison
private void FilterType_SelectionChanged(object sender, SelectionChangedEventArgs e) private void FilterType_SelectionChanged(object sender, SelectionChangedEventArgs e)
{ {
string item = e.AddedItems[0].ToString(); string item = e.AddedItems[0].ToString();
if (item == "Genre") if (item == unison.Resources.Resources.FilterType_Genre)
FilterType_Change(sender, "OperatorTypeB", GenreList); FilterType_Change(sender, "OperatorTypeB", GenreList);
else if (item == "Directory") else if (item == unison.Resources.Resources.FilterType_Directory)
FilterType_Change(sender, "OperatorTypeC", FolderList); FilterType_Change(sender, "OperatorTypeC", FolderList);
else else
{ {
@ -258,7 +258,7 @@ namespace unison
{ {
if (child.Name == "FilterType") if (child.Name == "FilterType")
{ {
if (child.SelectedItem.ToString() == "Directory") if (child.SelectedItem.ToString() == unison.Resources.Resources.FilterType_Directory)
isDir = true; isDir = true;
else else
tag = FilterEquivalence_Type(child.SelectedItem.ToString()); tag = FilterEquivalence_Type(child.SelectedItem.ToString());