This commit is contained in:
Tichau committed 2016-04-20 08:44:56 +02:00
1 parent e447410a1e
commit 2bc4cbddaa
6 files changed
+9 -9

No files matched your search

@@ -49,6 +49,8 @@ namespace FileConverter
this.ConvertionJobs = this.conversionJobs.AsReadOnly();
}
public event EventHandler<ApplicationTerminateArgs> OnApplicationTerminate;
public static Version ApplicationVersion
{
get
@@ -57,8 +59,6 @@ namespace FileConverter
}
}
public event System.EventHandler<ApplicationTerminateArgs> OnApplicationTerminate;
public ReadOnlyCollection<ConversionJob> ConvertionJobs
{
get;
@@ -3,9 +3,9 @@
namespace FileConverter.ConversionJobs
{
using System;
using System.Globalization;
using FileConverter.Controls;
using System.Globalization;
public partial class ConversionJob_FFMPEG
{
@@ -1,11 +1,10 @@
// <copyright file="ConversionJob_Ico.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
using System.Threading.Tasks;
// <copyright file="ConversionJob_Gif.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ConversionJobs
{
using System;
using System.IO;
using System.Threading.Tasks;
public class ConversionJob_Gif : ConversionJob
{
@@ -105,7 +105,6 @@
<Compile Include="Diagnostics\DiagnosticsData.cs" />
<Compile Include="Controls\EncodingMode.cs" />
<Compile Include="ConversionPreset\IConversionSettings.cs" />
<Compile Include="IfoFile.cs" />
<Compile Include="InputPostConversionAction.cs" />
<Compile Include="IXmlSerializable.cs" />
<Compile Include="PathHelpers.cs" />
@@ -113,6 +112,7 @@
<DependentUpon>Resources.en.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<ExcludeFromStyleCop>True</ExcludeFromStyleCop>
</Compile>
<Compile Include="Registry.cs" />
<Compile Include="Settings.Settings.cs" />
@@ -1,4 +1,4 @@
// <copyright file="StringToEnum.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
// <copyright file="ValueToString.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ValueConverters.Generic
{
@@ -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.");