keb/unison
1
0
Fork 0
Code Releases 6 Activity

Shuffle messages feedback

Browse Source
This commit is contained in:
Théo Marchal 2022-11-17 01:16:10 +01:00
parent 18143d0311
commit e80f06d8bf
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Resources.Designer.cs generated
View File

@ -943,7 +943,7 @@ namespace unison.Resources {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to done!. /// Looks up a localized string similar to done!.
/// </summary> /// </summary>
public static string Stats_UpdateDBMessage2 { public static string Stats_UpdateDBMessage2 {
get { get {

2
Resources/Resources.fr-FR.resx
View File

@ -160,7 +160,7 @@
<value>minutes</value> <value>minutes</value>
</data> </data>
<data name="Operator_Contains" xml:space="preserve"> <data name="Operator_Contains" xml:space="preserve">
<value>continent</value> <value>contient</value>
</data> </data>
<data name="Operator_Is" xml:space="preserve"> <data name="Operator_Is" xml:space="preserve">
<value>est</value> <value>est</value>

2
Resources/Resources.resx
View File

@ -412,7 +412,7 @@
<value>Updating database...</value> <value>Updating database...</value>
</data> </data>
<data name="Stats_UpdateDBMessage2" xml:space="preserve"> <data name="Stats_UpdateDBMessage2" xml:space="preserve">
<value> done!</value> <value>done!</value>
</data> </data>
<data name="Stats_Uptime" xml:space="preserve"> <data name="Stats_Uptime" xml:space="preserve">
<value>MPD uptime:</value> <value>MPD uptime:</value>

9
Views/Settings.xaml
View File

@ -225,7 +225,7 @@
</DockPanel> </DockPanel>
</TabItem> </TabItem>
<TabItem Header="{x:Static properties:Resources.Database}"> <TabItem Header="{x:Static properties:Resources.Database}" Height="20" VerticalAlignment="Bottom">
<DockPanel Margin="8"> <DockPanel Margin="8">
<GroupBox DockPanel.Dock="Top" Padding="0,4,0,0"> <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
<GroupBox.Header> <GroupBox.Header>
@ -250,11 +250,8 @@
<StackPanel Orientation="Horizontal" Margin="0,10,0,0"> <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
<Button x:Name="UpdateDatabaseButton" Content="{x:Static properties:Resources.Settings_UpdateDatabase}" Click="MPDDatabaseUpdate_Clicked" MinWidth="120" Padding="3,1,3,1" FocusVisualStyle="{x:Null}"/> <Button x:Name="UpdateDatabaseButton" Content="{x:Static properties:Resources.Settings_UpdateDatabase}" Click="MPDDatabaseUpdate_Clicked" MinWidth="120" Padding="3,1,3,1" FocusVisualStyle="{x:Null}"/>
<TextBlock x:Name="UpdateDBMessage" Text="{x:Static properties:Resources.Stats_UpdateDBMessage1}" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
<StackPanel Orientation="Horizontal"> <TextBlock x:Name="UpdateDBMessage2" Text="{x:Static properties:Resources.Stats_UpdateDBMessage2}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
<TextBlock x:Name="UpdateDBMessage" Text="{x:Static properties:Resources.Stats_UpdateDBMessage1}" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
<TextBlock x:Name="UpdateDBMessage2" Text="{x:Static properties:Resources.Stats_UpdateDBMessage2}" Margin="0,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</GroupBox> </GroupBox>

6
Views/Shuffle.xaml
View File

@ -69,6 +69,7 @@
<Button Content="{x:Static properties:Resources.Shuffle_FilterQuery}" Click="UpdateFilter_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}" Margin="0,0,10,0"/> <Button Content="{x:Static properties:Resources.Shuffle_FilterQuery}" Click="UpdateFilter_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}" Margin="0,0,10,0"/>
<Button Content="{x:Static properties:Resources.Shuffle_FilterReset}" Click="Reset_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/> <Button Content="{x:Static properties:Resources.Shuffle_FilterReset}" Click="Reset_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/>
<TextBlock x:Name="QueryFilterText" Text="{x:Static properties:Resources.Shuffle_Querying1}" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed" /> <TextBlock x:Name="QueryFilterText" Text="{x:Static properties:Resources.Shuffle_Querying1}" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
<TextBlock x:Name="QueryFilterText2" Text="{x:Static properties:Resources.Shuffle_Querying2}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@ -76,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="248"> <GroupBox DockPanel.Dock="Right" Padding="0,4,0,0" Width="270">
<GroupBox.Header> <GroupBox.Header>
<TextBlock> <TextBlock>
<emoji:EmojiInline Text="➕"/> <emoji:EmojiInline Text="➕"/>
@ -93,11 +94,12 @@
<TextBlock x:Name="SearchStatus" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed"> <TextBlock x:Name="SearchStatus" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed">
<Run Text="{x:Static properties:Resources.Shuffle_ButtonMessage1}"/><Run Text=" "/><Run x:Name="NumberAddedSongs"/><Run Text=" "/><Run Text="{x:Static properties:Resources.Shuffle_ButtonMessage2}"/> <Run Text="{x:Static properties:Resources.Shuffle_ButtonMessage1}"/><Run Text=" "/><Run x:Name="NumberAddedSongs"/><Run Text=" "/><Run Text="{x:Static properties:Resources.Shuffle_ButtonMessage2}"/>
</TextBlock> </TextBlock>
<TextBlock x:Name="SearchStatus2" Text="{x:Static properties:Resources.Shuffle_ButtonMessage3}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</GroupBox> </GroupBox>
<GroupBox DockPanel.Dock="Left" Padding="0,4,0,0" Width="248" Margin="0,0,5,0"> <GroupBox DockPanel.Dock="Left" Padding="0,4,0,0" Width="230" Margin="0,0,5,0">
<GroupBox.Header> <GroupBox.Header>
<TextBlock> <TextBlock>
<emoji:EmojiInline Text="♾️"/> <emoji:EmojiInline Text="♾️"/>

14
Views/Shuffle.xaml.cs
View File

@ -217,9 +217,13 @@ namespace unison
{ {
QueryFilterText.Visibility = Visibility.Visible; QueryFilterText.Visibility = Visibility.Visible;
await UpdateFilter(); await UpdateFilter();
QueryFilterText2.Visibility = Visibility.Visible;
TimedText(QueryFilterText, 1); TimedText(QueryFilterText, 1);
TimedText(QueryFilterText2, 1);
} }
private void TimedText(TextBlock textBlock, int time) private void TimedText(TextBlock textBlock, int time)
{ {
DispatcherTimer Timer = new DispatcherTimer(); DispatcherTimer Timer = new DispatcherTimer();
@ -330,18 +334,16 @@ namespace unison
await UpdateFilter(); await UpdateFilter();
QueueValidationNumber(); QueueValidationNumber();
// TODO
// Added => Adding songs...
// to
// Added X songs! (display for 5 seconds)
NumberAddedSongs.Text = SongNumber.Text; NumberAddedSongs.Text = SongNumber.Text;
SearchStatus.Visibility = Visibility.Visible; SearchStatus.Visibility = Visibility.Visible;
int Num = int.Parse(SongNumber.Text); int Num = int.Parse(SongNumber.Text);
await AddToQueue_Internal(Num); await AddToQueue_Internal(Num);
SearchStatus2.Visibility = Visibility.Visible;
TimedText(SearchStatus, 2); TimedText(SearchStatus, 2);
TimedText(SearchStatus2, 2);
} }
private async Task AddToQueue_Internal(int Num) private async Task AddToQueue_Internal(int Num)