From c5aa5efca423e555ea23408a8d51ecdec5fb04e8 Mon Sep 17 00:00:00 2001 From: Tichau Date: Mon, 11 Apr 2016 08:36:08 +0200 Subject: [PATCH] Add feedback to indicate that the application will automatically terminate (github issue #1). --- Application/FileConverter/Application.xaml.cs | 35 ++++++++++++++-- .../FileConverter/ApplicationTerminateArgs.cs | 18 ++++++++ .../FileConverter/FileConverter.csproj | 1 + .../FileConverter/Windows/MainWindow.xaml | 5 ++- .../FileConverter/Windows/MainWindow.xaml.cs | 42 +++++++++++++++++++ 5 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 Application/FileConverter/ApplicationTerminateArgs.cs diff --git a/Application/FileConverter/Application.xaml.cs b/Application/FileConverter/Application.xaml.cs index 3d9e23a..284a2a8 100644 --- a/Application/FileConverter/Application.xaml.cs +++ b/Application/FileConverter/Application.xaml.cs @@ -57,6 +57,8 @@ namespace FileConverter } } + public event System.EventHandler OnApplicationTerminate; + public ReadOnlyCollection ConvertionJobs { get; @@ -90,6 +92,11 @@ namespace FileConverter public void CancelAutoExit() { this.cancelAutoExit = true; + + if (this.OnApplicationTerminate != null) + { + this.OnApplicationTerminate.Invoke(this, new ApplicationTerminateArgs(float.NaN)); + } } protected override void OnStartup(StartupEventArgs e) @@ -390,13 +397,33 @@ namespace FileConverter allConversionsSucceed &= this.conversionJobs[index].State == ConversionJob.ConversionState.Done; } + if (this.cancelAutoExit) + { + return; + } + if (allConversionsSucceed) { - System.Threading.Thread.Sleep((int)this.Settings.DurationBetweenEndOfConversionsAndApplicationExit * 1000); - - if (this.cancelAutoExit) + float remainingTime = this.Settings.DurationBetweenEndOfConversionsAndApplicationExit; + while (remainingTime > 0f) { - return; + if (this.OnApplicationTerminate != null) + { + this.OnApplicationTerminate.Invoke(this, new ApplicationTerminateArgs(remainingTime)); + } + + System.Threading.Thread.Sleep(1000); + remainingTime--; + + if (this.cancelAutoExit) + { + return; + } + } + + if (this.OnApplicationTerminate != null) + { + this.OnApplicationTerminate.Invoke(this, new ApplicationTerminateArgs(remainingTime)); } Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown())); diff --git a/Application/FileConverter/ApplicationTerminateArgs.cs b/Application/FileConverter/ApplicationTerminateArgs.cs new file mode 100644 index 0000000..67fd277 --- /dev/null +++ b/Application/FileConverter/ApplicationTerminateArgs.cs @@ -0,0 +1,18 @@ +// License: http://www.gnu.org/licenses/gpl.html GPL version 3. + +namespace FileConverter +{ + public class ApplicationTerminateArgs : System.EventArgs + { + public ApplicationTerminateArgs(float remainingTimeBeforeTermination) + { + this.RemainingTimeBeforeTermination = remainingTimeBeforeTermination; + } + + public float RemainingTimeBeforeTermination + { + get; + private set; + } + } +} \ No newline at end of file diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index a734fb9..1e97239 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -87,6 +87,7 @@ MSBuild:Compile Designer + EncodingQualitySliderControl.xaml diff --git a/Application/FileConverter/Windows/MainWindow.xaml b/Application/FileConverter/Windows/MainWindow.xaml index 006ba1a..2d0f220 100644 --- a/Application/FileConverter/Windows/MainWindow.xaml +++ b/Application/FileConverter/Windows/MainWindow.xaml @@ -27,7 +27,10 @@ -