Add loading icons to task queue (#1173)

* Add loading icons for running, ready, waiting, and stopping in task queue & add stopping icon for pages * Crush images
lay295 · Aug 4, 2024 · d6e0116 · d6e0116
1 parent 67c76f5
commit d6e0116
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 0 deletions.
diff --git a/TwitchDownloaderWPF/Images/ppStretch.gif b/TwitchDownloaderWPF/Images/ppStretch.gif
diff --git a/TwitchDownloaderWPF/PageChatDownload.xaml.cs b/TwitchDownloaderWPF/PageChatDownload.xaml.cs
@@ -586,6 +586,7 @@ private async void SplitBtnDownload_Click(object sender, RoutedEventArgs e)
         private void BtnCancel_Click(object sender, RoutedEventArgs e)
         {
             statusMessage.Text = Translations.Strings.StatusCanceling;
+            SetImage("Images/ppStretch.gif", true);
             try
             {
                 _cancellationTokenSource.Cancel();

diff --git a/TwitchDownloaderWPF/PageChatRender.xaml.cs b/TwitchDownloaderWPF/PageChatRender.xaml.cs
@@ -696,6 +696,7 @@ private void BtnEnqueue_Click(object sender, RoutedEventArgs e)
         private void BtnCancel_Click(object sender, RoutedEventArgs e)
         {
             statusMessage.Text = Translations.Strings.StatusCanceling;
+            SetImage("Images/ppStretch.gif", true);
             try
             {
                 _cancellationTokenSource.Cancel();

diff --git a/TwitchDownloaderWPF/PageChatUpdate.xaml.cs b/TwitchDownloaderWPF/PageChatUpdate.xaml.cs
@@ -603,6 +603,7 @@ private async void SplitBtnUpdate_Click(object sender, RoutedEventArgs e)
         private void BtnCancel_Click(object sender, RoutedEventArgs e)
         {
             statusMessage.Text = Translations.Strings.StatusCanceling;
+            SetImage("Images/ppStretch.gif", true);
             try
             {
                 _cancellationTokenSource.Cancel();

diff --git a/TwitchDownloaderWPF/PageClipDownload.xaml.cs b/TwitchDownloaderWPF/PageClipDownload.xaml.cs
@@ -265,6 +265,7 @@ private ClipDownloadOptions GetOptions(string fileName)
         private void BtnCancel_Click(object sender, RoutedEventArgs e)
         {
             statusMessage.Text = Translations.Strings.StatusCanceling;
+            SetImage("Images/ppStretch.gif", true);
             try
             {
                 _cancellationTokenSource.Cancel();

diff --git a/TwitchDownloaderWPF/PageQueue.xaml b/TwitchDownloaderWPF/PageQueue.xaml
@@ -5,6 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="clr-namespace:TwitchDownloaderWPF"
       xmlns:lex="http://wpflocalizeextension.codeplex.com"
+      xmlns:gif="http://wpfanimatedgif.codeplex.com"
       lex:LocalizeDictionary.DesignCulture=""
       lex:ResxLocalizationProvider.DefaultAssembly="TwitchDownloaderWPF"
       lex:ResxLocalizationProvider.DefaultDictionary="Strings"
@@ -76,6 +77,7 @@
                                             <Button Content="{lex:Loc TaskCancel}" Margin="0,0,4,0" MinWidth="60" Height="28" FontSize="12" Click="BtnCancelTask_Click" IsEnabled="{Binding CanCancel}" Background="{DynamicResource ActionButtonBackground}" Foreground="{DynamicResource ActionButtonText}" BorderBrush="{DynamicResource ActionButtonBorder}" />
                                             <Button Visibility="{Binding Exception.Visibility}" Content="{lex:Loc TaskErrorButton}" Margin="0,0,4,0" MinWidth="60" Height="28" FontSize="12" Click="BtnTaskError_Click" Background="{DynamicResource ActionButtonBackground}" Foreground="{DynamicResource ActionButtonText}" BorderBrush="{DynamicResource ActionButtonBorder}" />
                                             <ProgressBar Height="16" Width="200" Minimum="0" Maximum="100" Value="{Binding Progress, Mode=OneWay, NotifyOnSourceUpdated=True, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Background="{DynamicResource AppElementInnerBackground}" Foreground="{DynamicResource ProgressBarForeground}" />
+                                            <Image MaxHeight="20" Margin="5,0" gif:ImageBehavior.AnimatedSource="{Binding StatusImage, Mode=OneWay, NotifyOnSourceUpdated=True, UpdateSourceTrigger=PropertyChanged}" />
                                         </StackPanel>
                                     </StackPanel>
                                     <Button Grid.Column="2" Padding="7, 0" VerticalAlignment="Top" Height="24" FontSize="12" Content="X" Click="BtnRemoveTask_Click" Background="{DynamicResource AppElementBackground}" Foreground="{DynamicResource AppTextDisabled}" BorderBrush="{DynamicResource AppElementBorder}" />

diff --git a/TwitchDownloaderWPF/PageVodDownload.xaml.cs b/TwitchDownloaderWPF/PageVodDownload.xaml.cs
@@ -493,6 +493,7 @@ private DirectoryInfo[] HandleCacheCleanerCallback(DirectoryInfo[] directories)
         private void BtnCancel_Click(object sender, RoutedEventArgs e)
         {
             statusMessage.Text = Translations.Strings.StatusCanceling;
+            SetImage("Images/ppStretch.gif", true);
             try
             {
                 _cancellationTokenSource.Cancel();

diff --git a/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj b/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj
@@ -25,6 +25,7 @@
   <ItemGroup>
     <Resource Include="Images\ppOverheat.gif" />
     <Resource Include="Images\ppHop.gif" />
+    <Resource Include="Images\ppStretch.gif" />
     <Resource Include="Images\peepoSad.png" />
   </ItemGroup>
   <ItemGroup>

diff --git a/TwitchDownloaderWPF/TwitchTasks/ChatDownloadTask.cs b/TwitchDownloaderWPF/TwitchTasks/ChatDownloadTask.cs
@@ -35,6 +35,13 @@ public string DisplayStatus
             private set => SetField(ref _displayStatus, value);
         }
 
+        private string _statusImage;
+        public string StatusImage
+        {
+            get => _statusImage;
+            private set => SetField(ref _statusImage, value);
+        }
+
         public ChatDownloadOptions DownloadOptions { get; init; }
         public CancellationTokenSource TokenSource { get; set; } = new CancellationTokenSource();
         public ITwitchTask DependantTask { get; set; }
@@ -90,6 +97,14 @@ public void ChangeStatus(TwitchTaskStatus newStatus)
             {
                 CanCancel = false;
             }
+
+            StatusImage = newStatus switch
+            {
+                TwitchTaskStatus.Running => "Images/ppOverheat.gif",
+                TwitchTaskStatus.Ready or TwitchTaskStatus.Waiting => "Images/ppHop.gif",
+                TwitchTaskStatus.Stopping => "Images/ppStretch.gif",
+                _ => null
+            };
         }
 
         public async Task RunAsync()

diff --git a/TwitchDownloaderWPF/TwitchTasks/ChatRenderTask.cs b/TwitchDownloaderWPF/TwitchTasks/ChatRenderTask.cs
@@ -35,6 +35,13 @@ public string DisplayStatus
             private set => SetField(ref _displayStatus, value);
         }
 
+        private string _statusImage;
+        public string StatusImage
+        {
+            get => _statusImage;
+            private set => SetField(ref _statusImage, value);
+        }
+
         public ChatRenderOptions DownloadOptions { get; init; }
         public CancellationTokenSource TokenSource { get; set; } = new CancellationTokenSource();
         public ITwitchTask DependantTask { get; set; }
@@ -109,6 +116,14 @@ public void ChangeStatus(TwitchTaskStatus newStatus)
             {
                 CanCancel = false;
             }
+
+            StatusImage = newStatus switch
+            {
+                TwitchTaskStatus.Running => "Images/ppOverheat.gif",
+                TwitchTaskStatus.Ready or TwitchTaskStatus.Waiting => "Images/ppHop.gif",
+                TwitchTaskStatus.Stopping => "Images/ppStretch.gif",
+                _ => null
+            };
         }
 
         public async Task RunAsync()

diff --git a/TwitchDownloaderWPF/TwitchTasks/ChatUpdateTask.cs b/TwitchDownloaderWPF/TwitchTasks/ChatUpdateTask.cs
@@ -35,6 +35,13 @@ public string DisplayStatus
             private set => SetField(ref _displayStatus, value);
         }
 
+        private string _statusImage;
+        public string StatusImage
+        {
+            get => _statusImage;
+            private set => SetField(ref _statusImage, value);
+        }
+
         public ChatUpdateOptions UpdateOptions { get; init; }
         public CancellationTokenSource TokenSource { get; set; } = new CancellationTokenSource();
         public ITwitchTask DependantTask { get; set; }
@@ -90,6 +97,14 @@ public void ChangeStatus(TwitchTaskStatus newStatus)
             {
                 CanCancel = false;
             }
+
+            StatusImage = newStatus switch
+            {
+                TwitchTaskStatus.Running => "Images/ppOverheat.gif",
+                TwitchTaskStatus.Ready or TwitchTaskStatus.Waiting => "Images/ppHop.gif",
+                TwitchTaskStatus.Stopping => "Images/ppStretch.gif",
+                _ => null
+            };
         }
 
         public async Task RunAsync()

diff --git a/TwitchDownloaderWPF/TwitchTasks/ClipDownloadTask.cs b/TwitchDownloaderWPF/TwitchTasks/ClipDownloadTask.cs
@@ -35,6 +35,13 @@ public string DisplayStatus
             private set => SetField(ref _displayStatus, value);
         }
 
+        private string _statusImage;
+        public string StatusImage
+        {
+            get => _statusImage;
+            private set => SetField(ref _statusImage, value);
+        }
+
         public ClipDownloadOptions DownloadOptions { get; init; }
         public CancellationTokenSource TokenSource { get; set; } = new CancellationTokenSource();
         public ITwitchTask DependantTask { get; set; }
@@ -90,6 +97,14 @@ public void ChangeStatus(TwitchTaskStatus newStatus)
             {
                 CanCancel = false;
             }
+
+            StatusImage = newStatus switch
+            {
+                TwitchTaskStatus.Running => "Images/ppOverheat.gif",
+                TwitchTaskStatus.Ready or TwitchTaskStatus.Waiting => "Images/ppHop.gif",
+                TwitchTaskStatus.Stopping => "Images/ppStretch.gif",
+                _ => null
+            };
         }
 
         public async Task RunAsync()

diff --git a/TwitchDownloaderWPF/TwitchTasks/ITwitchTask.cs b/TwitchDownloaderWPF/TwitchTasks/ITwitchTask.cs
@@ -21,6 +21,7 @@ public interface ITwitchTask : INotifyPropertyChanged
         int Progress { get; }
         TwitchTaskStatus Status { get; }
         string DisplayStatus { get; }
+        string StatusImage { get; }
         CancellationTokenSource TokenSource { get; set; }
         ITwitchTask DependantTask { get; set; }
         string TaskType { get; }

diff --git a/TwitchDownloaderWPF/TwitchTasks/VodDownloadTask.cs b/TwitchDownloaderWPF/TwitchTasks/VodDownloadTask.cs
@@ -35,6 +35,13 @@ public string DisplayStatus
             private set => SetField(ref _displayStatus, value);
         }
 
+        private string _statusImage;
+        public string StatusImage
+        {
+            get => _statusImage;
+            private set => SetField(ref _statusImage, value);
+        }
+
         public VideoDownloadOptions DownloadOptions { get; init; }
         public CancellationTokenSource TokenSource { get; set; } = new CancellationTokenSource();
         public ITwitchTask DependantTask { get; set; }
@@ -90,6 +97,14 @@ public void ChangeStatus(TwitchTaskStatus newStatus)
             {
                 CanCancel = false;
             }
+
+            StatusImage = newStatus switch
+            {
+                TwitchTaskStatus.Running => "Images/ppOverheat.gif",
+                TwitchTaskStatus.Ready or TwitchTaskStatus.Waiting => "Images/ppHop.gif",
+                TwitchTaskStatus.Stopping => "Images/ppStretch.gif",
+                _ => null
+            };
         }
 
         public async Task RunAsync()