diff --git a/Application/FileConverter/Application.xaml.cs b/Application/FileConverter/Application.xaml.cs index eecada6..ad57477 100644 --- a/Application/FileConverter/Application.xaml.cs +++ b/Application/FileConverter/Application.xaml.cs @@ -19,45 +19,35 @@ namespace FileConverter using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading; + using System.Threading.Tasks; using System.Windows; using FileConverter.ConversionJobs; using FileConverter.Diagnostics; + using FileConverter.Windows; public partial class Application : System.Windows.Application { - private int numberOfConversionThread = 1; - private static readonly Version Version = new Version() { Major = 0, - Minor = 4, + Minor = 5, + Patch = 0, }; private readonly List conversionJobs = new List(); - private bool debugMode; - private bool initialized; + private int numberOfConversionThread = 1; + + private bool needToRunConversionThread; private bool cancelAutoExit; + private UpgradeVersionDescription upgradeVersionDescription = null; public Application() { this.ConvertionJobs = this.conversionJobs.AsReadOnly(); } - protected override void OnStartup(StartupEventArgs e) - { - base.OnStartup(e); - - this.Initialize(); - - if (this.initialized) - { - Thread fileConvertionThread = new Thread(this.ConvertFiles); - fileConvertionThread.Start(); - } - } - public static Version ApplicationVersion { get @@ -84,6 +74,12 @@ namespace FileConverter set; } + public bool HideMainWindow + { + get; + set; + } + public bool Verbose { get; @@ -94,7 +90,68 @@ namespace FileConverter { this.cancelAutoExit = true; } - + + protected override void OnStartup(StartupEventArgs e) + { + base.OnStartup(e); + + this.Initialize(); + + if (this.needToRunConversionThread) + { + Thread fileConvertionThread = new Thread(this.ConvertFiles); + fileConvertionThread.Start(); + } + } + + protected override void OnExit(ExitEventArgs e) + { + base.OnExit(e); + + Debug.Log("Exit application."); + + if (this.upgradeVersionDescription != null && this.upgradeVersionDescription.NeedToUpgrade) + { + Debug.Log("A new version of file converter has been found: {0}.", this.upgradeVersionDescription.LatestVersion); + + if (string.IsNullOrEmpty(this.upgradeVersionDescription.InstallerPath)) + { + Debug.LogError("Invalid installer path."); + } + else + { + Debug.Log("Wait for the end of the installer download."); + while (this.upgradeVersionDescription.InstallerDownloadInProgress) + { + Thread.Sleep(1000); + } + + string installerPath = this.upgradeVersionDescription.InstallerPath; + if (!System.IO.File.Exists(installerPath)) + { + Debug.LogError("Can't find upgrade installer ({0}). Try to restart the application.", installerPath); + return; + } + + // Start process. + Debug.Log("Start file converter upgrade from version {0} to {1}.", ApplicationVersion, this.upgradeVersionDescription.LatestVersion); + + System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo(installerPath); + startInfo.UseShellExecute = true; + + Debug.Log("Start upgrade process: {0}{1}.", System.IO.Path.GetFileName(startInfo.FileName), startInfo.Arguments); + System.Diagnostics.Process process = new System.Diagnostics.Process + { + StartInfo = startInfo + }; + + process.Start(); + } + } + + Debug.Release(); + } + private void Initialize() { Diagnostics.Debug.Log("The number of processors on this computer is {0}. Set the default number of conversion threads to {0}", Environment.ProcessorCount); @@ -109,7 +166,7 @@ namespace FileConverter Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown())); return; } - + // Retrieve arguments. Debug.Log("Retrieve arguments..."); string[] args = Environment.GetCommandLineArgs(); @@ -117,28 +174,27 @@ namespace FileConverter #if (DEBUG) if (args.Length <= 1) { - this.debugMode = true; - System.Array.Resize(ref args, 8); - args[1] = "--conversion-preset"; - args[2] = "To Ogg"; - args[3] = "--verbose"; - - args[4] = @"D:\Test\TrailerV2 compressed.mkv"; - args[4] = @"D:\Test\image.png"; - args[4] = @"E:\Track01.cda"; - args[4] = @"D:\Test\Track01.mp3"; - args[5] = @"D:\Test\Track02.mp3"; - args[6] = @"D:\Test\Track03.mp3"; - args[7] = @"D:\Test\Track04.mp3"; + //System.Array.Resize(ref args, 8); + //args[1] = "--conversion-preset"; + //args[2] = "To Ogg"; + //args[3] = "--verbose"; - //System.Array.Resize(ref args, 2); - //args[1] = "--settings"; + //args[4] = @"D:\Test\TrailerV2 compressed.mkv"; + //args[4] = @"D:\Test\image.png"; + //args[4] = @"E:\Track01.cda"; + //args[4] = @"D:\Test\Track01.mp3"; + //args[5] = @"D:\Test\Track02.mp3"; + //args[6] = @"D:\Test\Track03.mp3"; + //args[7] = @"D:\Test\Track04.mp3"; - System.Array.Resize(ref args, 5); - args[1] = "--conversion-preset"; - args[2] = "To Aac"; - args[3] = "--verbose"; - args[4] = @"D:\Test\02 - Corn on the Cob.flac"; + System.Array.Resize(ref args, 2); + args[1] = "--settings"; + + //System.Array.Resize(ref args, 5); + //args[1] = "--conversion-preset"; + //args[2] = "To Jpg"; + //args[3] = "--verbose"; + //args[4] = @"D:\Test\Test avec accents héhé\imagé.png"; } #endif @@ -150,6 +206,15 @@ namespace FileConverter Debug.Log(string.Empty); + if (args.Length == 1) + { + // Diplay help windows to explain that this application is a context menu extension. + ApplicationStartHelp applicationStartHelp = new ApplicationStartHelp(); + applicationStartHelp.Show(); + this.HideMainWindow = true; + return; + } + ConversionPreset conversionPreset = null; List filePaths = new List(); @@ -164,9 +229,15 @@ namespace FileConverter switch (parameterTitle) { + case "version": + Console.Write(ApplicationVersion.ToString()); + Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown())); + return; + case "settings": this.ShowSettings = true; - return; + this.HideMainWindow = true; + break; case "apply-settings": Settings.ApplyTemporarySettings(); @@ -191,7 +262,7 @@ namespace FileConverter index++; continue; - + case "verbose": { this.Verbose = true; @@ -200,7 +271,7 @@ namespace FileConverter break; default: - Debug.LogError("Unknown option {0}.", parameterTitle); + Debug.LogError("Unknown application argument: '--{0}'.", parameterTitle); return; } } @@ -210,41 +281,41 @@ namespace FileConverter } } - if (conversionPreset == null) + if (this.Settings.CheckUpgradeAtStartup) { - Debug.LogError("Can't retrieve the conversion preset from arguments."); - return; - } + long fileTime = Registry.GetValue(Registry.Keys.LastUpdateCheckDate); + DateTime lastUpdateDateTime = DateTime.FromFileTime(fileTime); - // Create convertion jobs. - Debug.Log("Create jobs for conversion preset: '{0}'", conversionPreset.Name); - try - { - for (int index = 0; index < filePaths.Count; index++) + TimeSpan durationSinceLastUpdate = DateTime.Now.Subtract(lastUpdateDateTime); + if (durationSinceLastUpdate > new TimeSpan(1, 0, 0, 0)) { - string inputFilePath = filePaths[index]; - ConversionJob conversionJob = ConversionJobFactory.Create(conversionPreset, inputFilePath); - conversionJob.PrepareConversion(inputFilePath); - - this.conversionJobs.Add(conversionJob); + Task task = Upgrade.Helpers.GetLatestVersionDescriptionAsync(this.OnGetLatestVersionDescription); } } - catch (Exception exception) + + if (conversionPreset != null) { - Debug.LogError(exception.Message); - throw; + // Create convertion jobs. + Debug.Log("Create jobs for conversion preset: '{0}'", conversionPreset.Name); + try + { + for (int index = 0; index < filePaths.Count; index++) + { + string inputFilePath = filePaths[index]; + ConversionJob conversionJob = ConversionJobFactory.Create(conversionPreset, inputFilePath); + conversionJob.PrepareConversion(inputFilePath); + + this.conversionJobs.Add(conversionJob); + } + } + catch (Exception exception) + { + Debug.LogError(exception.Message); + throw; + } + + this.needToRunConversionThread = true; } - - this.initialized = true; - } - - protected override void OnExit(ExitEventArgs e) - { - base.OnExit(e); - - Debug.Log("Exit application."); - - Debug.Release(); } private void ConvertFiles() @@ -352,5 +423,23 @@ namespace FileConverter Debug.Log("The conversion job failed but there is an output file that does exists."); } } + + private void OnGetLatestVersionDescription(UpgradeVersionDescription upgradeVersionDescription) + { + if (upgradeVersionDescription == null) + { + return; + } + + Registry.SetValue(Registry.Keys.LastUpdateCheckDate, DateTime.Now.ToFileTime()); + + if (upgradeVersionDescription.LatestVersion <= ApplicationVersion) + { + return; + } + + this.upgradeVersionDescription = upgradeVersionDescription; + (this.MainWindow as MainWindow).OnNewVersionReleased(upgradeVersionDescription); + } } } diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs b/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs index 8e97cbf..be223b9 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs @@ -6,13 +6,11 @@ namespace FileConverter.ConversionJobs using System.IO; using System.Threading; + using Diagnostics; using Ripper; - using WaveLib; using Yeti.MMedia; - using FileConverter.Diagnostics; - public class ConversionJob_ExtractCDA : ConversionJob { private Ripper.CDDrive cdDrive; diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs index fd621e3..7adca67 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs @@ -131,6 +131,18 @@ namespace FileConverter.ConversionJobs throw new Exception("Unknown Wav encoding."); } + /// + /// Convert video quality index to MPEG4 video quality level. + /// + /// The quality index. + /// Returns the H264 constant rate factor. + /// The range of the video quality level is 1-31: where 1 is the highest quality/largest filesize, 31 being the lowest quality/smallest filesize. + /// https://trac.ffmpeg.org/wiki/Encode/MPEG-4 + private int MPEG4QualityToQualityIndex(int quality) + { + return 31 - quality; + } + /// /// Convert video quality index to H264 constant rate factor. /// diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs index bd1d615..5f21fab 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs @@ -4,6 +4,7 @@ namespace FileConverter.ConversionJobs { using System; using System.Diagnostics; + using System.Globalization; using System.IO; using System.Text.RegularExpressions; @@ -27,6 +28,15 @@ namespace FileConverter.ConversionJobs { } + protected virtual string FfmpegPath + { + get + { + string applicationDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); + return System.IO.Path.Combine(applicationDirectory, "ffmpeg.exe"); + } + } + protected override void Initialize() { base.Initialize(); @@ -38,8 +48,7 @@ namespace FileConverter.ConversionJobs this.ffmpegProcessStartInfo = null; - string applicationDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); - string ffmpegPath = string.Format("{0}\\ffmpeg.exe", applicationDirectory); + string ffmpegPath = this.FfmpegPath; if (!System.IO.File.Exists(ffmpegPath)) { this.ConversionFailed("Can't find ffmpeg executable. You should try to reinstall the application."); @@ -61,7 +70,7 @@ namespace FileConverter.ConversionJobs { // https://trac.ffmpeg.org/wiki/Encode/AAC int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate); - string encoderArgs = string.Format("-c:a aac -q:a {0} -strict experimental", this.AACBitrateToQualityIndex(audioEncodingBitrate)); + string encoderArgs = string.Format("-c:a aac -q:a {0}", this.AACBitrateToQualityIndex(audioEncodingBitrate)); arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); } @@ -108,6 +117,25 @@ namespace FileConverter.ConversionJobs break; + case OutputType.Avi: + { + // https://trac.ffmpeg.org/wiki/Encode/MPEG-4 + int videoEncodingQuality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality); + int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate); + + float scaleFactor = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale); + string scaleArgs = string.Empty; + if (Math.Abs(scaleFactor - 1f) >= 0.005f) + { + scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture)); + } + + string encoderArgs = string.Format("-c:v mpeg4 -vtag xvid -qscale:v {0} -c:a libmp3lame -qscale:a {1} {2}", this.MPEG4QualityToQualityIndex(videoEncodingQuality), this.MP3VBRBitrateToQualityIndex(audioEncodingBitrate), scaleArgs); + arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); + } + + break; + case OutputType.Mkv: { // https://trac.ffmpeg.org/wiki/Encode/H.264 @@ -115,7 +143,15 @@ namespace FileConverter.ConversionJobs int videoEncodingQuality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality); string videoEncodingSpeed = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed); int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate); - string encoderArgs = string.Format("-c:v libx264 -preset {0} -crf {1} -c:a aac -q:a {2} -strict experimental", this.H264EncodingSpeedToPreset(videoEncodingSpeed), this.H264QualityToCRF(videoEncodingQuality), this.AACBitrateToQualityIndex(audioEncodingBitrate)); + + float scaleFactor = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale); + string scaleArgs = string.Empty; + if (Math.Abs(scaleFactor - 1f) >= 0.005f) + { + scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture)); + } + + string encoderArgs = string.Format("-c:v libx264 -preset {0} -crf {1} -c:a aac -q:a {2} {3}", this.H264EncodingSpeedToPreset(videoEncodingSpeed), this.H264QualityToCRF(videoEncodingQuality), this.AACBitrateToQualityIndex(audioEncodingBitrate), scaleArgs); arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); } @@ -132,8 +168,16 @@ namespace FileConverter.ConversionJobs case OutputType.Png: { + float scaleFactor = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale); + string scaleArgs = string.Empty; + if (Math.Abs(scaleFactor - 1f) >= 0.005f) + { + scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture)); + } + // http://www.howtogeek.com/203979/is-the-png-format-lossless-since-it-has-a-compression-parameter/ - string encoderArgs = string.Format("-compression_level 100"); + string encoderArgs = string.Format("-compression_level 100 {0}", scaleArgs); + arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); } @@ -142,7 +186,16 @@ namespace FileConverter.ConversionJobs case OutputType.Jpg: { int encodingQuality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality); - string encoderArgs = string.Format("-q:v {0}", this.JPGQualityToQualityIndex(encodingQuality)); + + float scaleFactor = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale); + string scaleArgs = string.Empty; + if (Math.Abs(scaleFactor - 1f) >= 0.005f) + { + scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture)); + } + + string encoderArgs = string.Format("-q:v {0} {1}", this.JPGQualityToQualityIndex(encodingQuality), scaleArgs); + arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); } @@ -206,7 +259,7 @@ namespace FileConverter.ConversionJobs throw; } - Diagnostics.Debug.Log(""); + Diagnostics.Debug.Log(string.Empty); } private void ParseFFMPEGOutput(string input) diff --git a/Application/FileConverter/ConversionPreset/ConversionPreset.cs b/Application/FileConverter/ConversionPreset/ConversionPreset.cs index 835b80f..cae8828 100644 --- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs +++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs @@ -421,11 +421,23 @@ namespace FileConverter break; + case OutputType.Avi: + switch (settingsKey) + { + case ConversionPreset.ConversionSettingKeys.AudioBitrate: + case ConversionPreset.ConversionSettingKeys.VideoQuality: + case ConversionPreset.ConversionSettingKeys.VideoScale: + return true; + } + + break; + case OutputType.Mkv: switch (settingsKey) { case ConversionPreset.ConversionSettingKeys.AudioBitrate: case ConversionPreset.ConversionSettingKeys.VideoQuality: + case ConversionPreset.ConversionSettingKeys.VideoScale: case ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed: return true; } @@ -436,6 +448,16 @@ namespace FileConverter switch (settingsKey) { case ConversionPreset.ConversionSettingKeys.ImageQuality: + case ConversionPreset.ConversionSettingKeys.ImageScale: + return true; + } + + break; + + case OutputType.Png: + switch (settingsKey) + { + case ConversionPreset.ConversionSettingKeys.ImageScale: return true; } @@ -453,18 +475,29 @@ namespace FileConverter this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128"); break; - case OutputType.Flac: case OutputType.Ico: + case OutputType.Flac: + break; + case OutputType.Png: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1"); break; case OutputType.Jpg: this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "25"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1"); + break; + + case OutputType.Avi: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "20"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190"); break; case OutputType.Mkv: this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "28"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, "Very Slow"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, "Medium"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128"); break; @@ -634,8 +667,10 @@ namespace FileConverter public const string AudioEncodingMode = "AudioEncodingMode"; public const string AudioBitrate = "AudioBitrate"; public const string ImageQuality = "ImageQuality"; + public const string ImageScale = "ImageScale"; public const string VideoQuality = "VideoQuality"; public const string VideoEncodingSpeed = "VideoEncodingSpeed"; + public const string VideoScale = "VideoScale"; } } } diff --git a/Application/FileConverter/Diagnostics/Debug.cs b/Application/FileConverter/Diagnostics/Debug.cs index 55f4a14..779cab6 100644 --- a/Application/FileConverter/Diagnostics/Debug.cs +++ b/Application/FileConverter/Diagnostics/Debug.cs @@ -1,6 +1,5 @@ -// License: http://www.gnu.org/licenses/gpl.html GPL version 3. +// License: http://www.gnu.org/licenses/gpl.html GPL version 3. -using System.Linq; namespace FileConverter.Diagnostics { @@ -9,7 +8,7 @@ namespace FileConverter.Diagnostics using System.ComponentModel; using System.Diagnostics; using System.IO; - using System.Text; + using System.Linq; using System.Windows; public static class Debug @@ -18,8 +17,6 @@ namespace FileConverter.Diagnostics private static Dictionary diagnosticsDataById = new Dictionary(); private static int threadCount = 0; - public static event EventHandler StaticPropertyChanged; - static Debug() { string path = PathHelpers.GetUserDataFolderPath(); @@ -42,6 +39,8 @@ namespace FileConverter.Diagnostics Directory.CreateDirectory(Debug.diagnosticsFolderPath); } + public static event EventHandler StaticPropertyChanged; + public static DiagnosticsData[] Data { get @@ -91,6 +90,5 @@ namespace FileConverter.Diagnostics Debug.diagnosticsDataById.Clear(); } - } } diff --git a/Application/FileConverter/Diagnostics/DiagnosticsData.cs b/Application/FileConverter/Diagnostics/DiagnosticsData.cs index ce6fa59..ac2efc6 100644 --- a/Application/FileConverter/Diagnostics/DiagnosticsData.cs +++ b/Application/FileConverter/Diagnostics/DiagnosticsData.cs @@ -1,14 +1,13 @@ // License: http://www.gnu.org/licenses/gpl.html GPL version 3. -using System.Collections.ObjectModel; - namespace FileConverter.Diagnostics { using System.Collections.Generic; + using System.Collections.ObjectModel; using System.ComponentModel; using System.IO; - using System.Text; using System.Runtime.CompilerServices; + using System.Text; using FileConverter.Annotations; @@ -19,14 +18,14 @@ namespace FileConverter.Diagnostics private System.IO.TextWriter logFileWriter; private string name; - public event PropertyChangedEventHandler PropertyChanged; - public DiagnosticsData(string name) { this.Name = name; this.LogMessages = new ReadOnlyCollection(this.logMessages); } + public event PropertyChangedEventHandler PropertyChanged; + public string Name { get diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index 3a6d136..ddcd7a8 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -46,6 +46,9 @@ + + ..\..\Middleware\Markdown.Xaml.dll + @@ -101,7 +104,10 @@ True True + + + @@ -112,12 +118,16 @@ + + + ApplicationStartHelp.xaml + DiagnosticsWindow.xaml @@ -128,11 +138,18 @@ SettingsWindow.xaml + + UpgradeWindow.xaml + Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -156,6 +173,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + @@ -199,7 +220,17 @@ + + + + + + + + copy /Y "$(SolutionDir)Middleware\ffmpeg.exe" "$(TargetDir)ffmpeg.exe" +copy /Y "$(ProjectDir)Settings.xml" "$(TargetDir)Settings.xml" + +