From 2bc4cbddaae07abc915aac87f9ea6fd8b0ff6e97 Mon Sep 17 00:00:00 2001 From: Tichau Date: Wed, 20 Apr 2016 08:44:56 +0200 Subject: [PATCH] Stylecop --- Application/FileConverter/Application.xaml.cs | 4 ++-- .../ConversionJobs/ConversionJob_FFMPEG.Converters.cs | 2 +- .../FileConverter/ConversionJobs/ConversionJob_Gif.cs | 5 ++--- Application/FileConverter/FileConverter.csproj | 2 +- .../FileConverter/ValueConverters/Generic/ValueToString.cs | 2 +- Application/FileConverter/Windows/MainWindow.xaml.cs | 3 ++- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Application/FileConverter/Application.xaml.cs b/Application/FileConverter/Application.xaml.cs index b587625..e4d9c63 100644 --- a/Application/FileConverter/Application.xaml.cs +++ b/Application/FileConverter/Application.xaml.cs @@ -49,6 +49,8 @@ namespace FileConverter this.ConvertionJobs = this.conversionJobs.AsReadOnly(); } + public event EventHandler OnApplicationTerminate; + public static Version ApplicationVersion { get @@ -57,8 +59,6 @@ namespace FileConverter } } - public event System.EventHandler OnApplicationTerminate; - public ReadOnlyCollection ConvertionJobs { get; diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs index a2baece..b517283 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs @@ -3,9 +3,9 @@ namespace FileConverter.ConversionJobs { using System; + using System.Globalization; using FileConverter.Controls; - using System.Globalization; public partial class ConversionJob_FFMPEG { diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs index 560e398..6d0aaf1 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs @@ -1,11 +1,10 @@ -// License: http://www.gnu.org/licenses/gpl.html GPL version 3. - -using System.Threading.Tasks; +// License: http://www.gnu.org/licenses/gpl.html GPL version 3. namespace FileConverter.ConversionJobs { using System; using System.IO; + using System.Threading.Tasks; public class ConversionJob_Gif : ConversionJob { diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index d4b6edd..5434907 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -105,7 +105,6 @@ - @@ -113,6 +112,7 @@ Resources.en.resx True True + True diff --git a/Application/FileConverter/ValueConverters/Generic/ValueToString.cs b/Application/FileConverter/ValueConverters/Generic/ValueToString.cs index e0fc089..44ffdc2 100644 --- a/Application/FileConverter/ValueConverters/Generic/ValueToString.cs +++ b/Application/FileConverter/ValueConverters/Generic/ValueToString.cs @@ -1,4 +1,4 @@ -// License: http://www.gnu.org/licenses/gpl.html GPL version 3. +// License: http://www.gnu.org/licenses/gpl.html GPL version 3. namespace FileConverter.ValueConverters.Generic { diff --git a/Application/FileConverter/Windows/MainWindow.xaml.cs b/Application/FileConverter/Windows/MainWindow.xaml.cs index 70c9e99..2cf90c8 100644 --- a/Application/FileConverter/Windows/MainWindow.xaml.cs +++ b/Application/FileConverter/Windows/MainWindow.xaml.cs @@ -23,7 +23,7 @@ namespace FileConverter Application application = Application.Current as Application; - application.OnApplicationTerminate += Application_OnApplicationTerminate; + application.OnApplicationTerminate += this.Application_OnApplicationTerminate; this.ConverterJobsList.ItemsSource = application.ConvertionJobs; @@ -158,6 +158,7 @@ namespace FileConverter { this.InformationMessage = string.Format("The application will automatically terminate in {0} second.", remaingingSeconds); } + if (remaingingSeconds <= 0) { this.InformationMessage = string.Format("The application is terminating.");