Compare commits

58 Commits
Author SHA1 Message Date
Tichau ff20b26a03 Fix spell issues in change log. 2016-02-18 08:36:50 +01:00
Tichau af4c708652 Change application version to 0.6 2016-02-18 08:19:02 +01:00
Tichau 7539a7e448 New screenshot 2016-02-17 21:14:05 +01:00
Tichau beb64eb1de New screenshots 2016-02-17 21:13:18 +01:00
Tichau 585ea47702 Rename settings entry in context menu 2016-02-17 20:59:51 +01:00
Tichau 9dee8067a0 Update default settings. 2016-02-17 20:48:14 +01:00
Tichau 6728cdd509 Fixed: Magick dll packing in installer. 2016-02-17 20:30:07 +01:00
Tichau 2cf4c690be Update changelog 2016-02-17 19:15:30 +01:00
Tichau 560364d320 Remove pdf from input type list. 2016-02-17 19:12:52 +01:00
Tichau c59ff01a73 New default settings 2016-02-17 19:12:40 +01:00
Tichau 245411bd8b Stylecop 2016-02-17 18:52:16 +01:00
Tichau 73fface5cb Change the possible scale factors.
This encourage the user to use pixel perfect ratio.
2016-02-17 18:48:30 +01:00
Adrien Allard c53a886353 Update the readme file. 2016-02-17 12:36:36 +01:00
Adrien Allard 0abd3da8d6 Update changelog. 2016-02-17 12:28:09 +01:00
Tichau 04adacee45 Add image and video rotation. 2016-02-16 19:28:48 +01:00
Tichau f4f4a4c357 Rebind JPG quality slider. 2016-02-15 19:12:19 +01:00
Tichau 5c9a931558 Add exr input type 2016-02-15 18:41:00 +01:00
Tichau 2161f170fc Add new input type (m4v) 2016-02-15 08:45:54 +01:00
Tichau 7674071fce Stylecop 2016-02-15 08:42:20 +01:00
Tichau 6a1dc7a847 Add Mp4 output type. 2016-02-15 08:38:30 +01:00
Tichau 347d34ff28 Add clamp to power of 2 option (for jpg and png conversion) 2016-02-12 08:29:48 +01:00
Tichau ffc81bc378 Add progress update in ImageMagick conversions. 2016-02-11 18:52:32 +01:00
Tichau 0fd9e3d801 Fixed: Missing default values for png preset. 2016-02-02 18:39:15 +01:00
Tichau 7a4666aa15 Better error handling 2016-02-02 08:51:36 +01:00
Tichau 6594d95120 Add possibility to convert all images to ico (no restriction on size anymore) 2016-02-02 08:51:23 +01:00
Tichau ad051308e1 Add support for input types psd, tga and svg. 2016-02-02 08:50:27 +01:00
Tichau dda464c64e Fixed; Settings version number is now updated. 2016-01-25 08:26:25 +01:00
Tichau 7fc4646c19 Update version number to 0.5.1 2016-01-22 18:32:28 +01:00
Tichau 424abe9aa4 Fixed: issue with installer
Issue where the installer detect the utilisation of the extension dll in
explorer, ask to the user to restart it and fail to do it.
2016-01-22 08:33:24 +01:00
Tichau 21b6187812 Use NuGet pakages. 2016-01-22 08:16:32 +01:00
Tichau b2501a1a04 Fixed issue where aac bitrate was not saved. 2016-01-14 08:15:49 +01:00
Tichau e8a01c91f2 Post installation settings initialization
Fixed: Issue where it is impossible to delete a conversion preset define
in default settings.
Fixed: Issue where the windows context menu does not contains user
preset after an application upgrade.
2016-01-13 20:17:55 +01:00
Tichau efed37b4dc Rename default settings file. 2016-01-13 08:20:27 +01:00
Tichau 1289db0bfa Change version file for auto upgrade 2016-01-12 22:50:14 +01:00
Tichau 6fdb5f2e7a Merge branch 'development' 2016-01-12 22:41:42 +01:00
Tichau 6f4b3f85ba Fix spell mistakes in change log. 2016-01-12 22:16:00 +01:00
Tichau 0f8bcfab57 Rename To small Png 2016-01-12 22:06:52 +01:00
Tichau 4718c0a9dc Update screenshots 2016-01-12 19:15:33 +01:00
Tichau 63633eb3a5 Change version number 2016-01-12 19:06:55 +01:00
Tichau 571ee4bec5 Polish 2016-01-12 19:06:23 +01:00
Tichau a735eab698 Upgrade default settings. 2016-01-12 18:51:56 +01:00
Tichau dd4389eb24 Update readme and changelog 2016-01-12 08:38:10 +01:00
Tichau 64f9f66724 Cleaning and stylecop 2016-01-12 08:34:19 +01:00
Tichau dac4f092ae Save the last update check date in registry. 2016-01-11 16:12:55 +01:00
Tichau 32514af57c Add registry to contains implicit user info
Registry is save each time the application quit.
2016-01-11 16:12:31 +01:00
Tichau d3ea351731 Rearrange settings window size 2016-01-11 11:59:08 +01:00
Tichau b13e2621c9 Integration of the new version of ffmpeg
aac experimental flag is not required anymore.
2016-01-11 11:50:45 +01:00
Tichau 42ccbdb8fa Add application start help
In case the user launch the application without using the context menu
it launch a window to help him.
2016-01-10 21:42:05 +01:00
Tichau 939d6db778 Add new output file format (avi) 2016-01-09 19:17:41 +01:00
Tichau 375e8dbb26 Add new input file format (3gp, webm, wmv) 2016-01-09 19:17:14 +01:00
Tichau f5172223b8 Add scale ration option on video conversion presets (mkv). 2016-01-09 16:00:29 +01:00
Tichau 250ec2f7d3 Add: scale ratio option on image conversion presets (jpg/png). 2016-01-08 18:42:02 +01:00
Tichau 34138ef00c Update upgrade uri 2016-01-07 21:52:09 +01:00
Tichau 3f9b0a0f32 Stylecop 2016-01-07 21:47:22 +01:00
Tichau b4061a7bdf Add software update system 2016-01-07 21:47:14 +01:00
Tichau 801e1a415f Add download icon. 2016-01-07 00:03:57 +01:00
Adrien Allard 8e6db881ea Add mp4 to input video supported file format 2015-12-23 10:15:14 +01:00
Tichau 5b975fb463 Merge remote-tracking branch 'refs/remotes/origin/master' into development 2015-12-21 23:25:48 +01:00
65 changed files with 2536 additions and 10758 deletions

No files matched your search

+182 -89
View File
@@ -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 = 6,
Patch = 0,
};
private readonly List<ConversionJob> conversionJobs = new List<ConversionJob>();
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,54 +90,91 @@ namespace FileConverter
{
this.cancelAutoExit = true;
}
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);
this.numberOfConversionThread = Environment.ProcessorCount;
// Load settigns.
Debug.Log("Load settings...");
this.Settings = Settings.Load();
if (this.Settings == null)
protected override void OnStartup(StartupEventArgs e)
{
base.OnStartup(e);
this.Initialize();
if (this.needToRunConversionThread)
{
Diagnostics.Debug.LogError("The application will now shutdown. If you want to fix the problem yourself please edit or delete the file: C:\\Users\\UserName\\AppData\\Local\\FileConverter\\Settings.user.xml.");
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
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)
{
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("File Converter v" + ApplicationVersion.ToString());
Diagnostics.Debug.Log("The number of processors on this computer is {0}. Set the default number of conversion threads to {0}", Environment.ProcessorCount);
this.numberOfConversionThread = Environment.ProcessorCount;
// Retrieve arguments.
Debug.Log("Retrieve arguments...");
string[] args = Environment.GetCommandLineArgs();
#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, 2);
//args[1] = "--settings";
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, 5);
////args[1] = "--conversion-preset";
////args[2] = "To Png";
////args[3] = "--verbose";
////args[4] = @"D:\Test\images\Mario Big.png";
}
#endif
// Log arguments.
for (int index = 0; index < args.Length; index++)
{
string argument = args[index];
@@ -150,10 +183,18 @@ namespace FileConverter
Debug.Log(string.Empty);
ConversionPreset conversionPreset = null;
List<string> filePaths = new List<string>();
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;
}
// Parse arguments.
List<string> filePaths = new List<string>();
string conversionPresetName = null;
for (int index = 1; index < args.Length; index++)
{
string argument = args[index];
@@ -164,9 +205,20 @@ namespace FileConverter
switch (parameterTitle)
{
case "post-install-init":
Settings.PostInstallationInitialization();
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
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();
@@ -181,17 +233,10 @@ namespace FileConverter
return;
}
conversionPreset = this.Settings.GetPresetFromName(args[index + 1]);
if (conversionPreset == null)
{
Debug.LogError("Invalid conversion preset '{0}'. (code 0x02)", args[index + 1]);
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
}
conversionPresetName = args[index + 1];
index++;
continue;
case "verbose":
{
this.Verbose = true;
@@ -200,7 +245,7 @@ namespace FileConverter
break;
default:
Debug.LogError("Unknown option {0}.", parameterTitle);
Debug.LogError("Unknown application argument: '--{0}'.", parameterTitle);
return;
}
}
@@ -210,41 +255,64 @@ namespace FileConverter
}
}
if (conversionPreset == null)
// Load settigns.
Debug.Log("Load settings...");
this.Settings = Settings.Load();
if (this.Settings == null)
{
Debug.LogError("Can't retrieve the conversion preset from arguments.");
Diagnostics.Debug.LogError("The application will now shutdown. If you want to fix the problem yourself please edit or delete the file: C:\\Users\\UserName\\AppData\\Local\\FileConverter\\Settings.user.xml.");
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
}
// Create convertion jobs.
Debug.Log("Create jobs for conversion preset: '{0}'", conversionPreset.Name);
try
// Check upgrade.
if (this.Settings.CheckUpgradeAtStartup)
{
for (int index = 0; index < filePaths.Count; index++)
{
string inputFilePath = filePaths[index];
ConversionJob conversionJob = ConversionJobFactory.Create(conversionPreset, inputFilePath);
conversionJob.PrepareConversion(inputFilePath);
long fileTime = Registry.GetValue<long>(Registry.Keys.LastUpdateCheckDate);
DateTime lastUpdateDateTime = DateTime.FromFileTime(fileTime);
this.conversionJobs.Add(conversionJob);
TimeSpan durationSinceLastUpdate = DateTime.Now.Subtract(lastUpdateDateTime);
if (durationSinceLastUpdate > new TimeSpan(1, 0, 0, 0))
{
Task<UpgradeVersionDescription> task = Upgrade.Helpers.GetLatestVersionDescriptionAsync(this.OnGetLatestVersionDescription);
}
}
catch (Exception exception)
ConversionPreset conversionPreset = null;
if (!string.IsNullOrEmpty(conversionPresetName))
{
Debug.LogError(exception.Message);
throw;
conversionPreset = this.Settings.GetPresetFromName(conversionPresetName);
if (conversionPreset == null)
{
Debug.LogError("Invalid conversion preset '{0}'. (code 0x02)", conversionPresetName);
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
return;
}
}
this.initialized = true;
}
if (conversionPreset != null)
{
// 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);
protected override void OnExit(ExitEventArgs e)
{
base.OnExit(e);
this.conversionJobs.Add(conversionJob);
}
}
catch (Exception exception)
{
Debug.LogError(exception.Message);
throw;
}
Debug.Log("Exit application.");
Debug.Release();
this.needToRunConversionThread = true;
}
}
private void ConvertFiles()
@@ -341,7 +409,14 @@ namespace FileConverter
return;
}
conversionJob.StartConvertion();
try
{
conversionJob.StartConvertion();
}
catch (Exception)
{
throw;
}
if (conversionJob.State == ConversionJob.ConversionState.Done && !System.IO.File.Exists(conversionJob.OutputFilePath))
{
@@ -352,5 +427,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);
}
}
}
@@ -252,8 +252,15 @@ namespace FileConverter.ConversionJobs
Debug.Log("Convert file {0} to {1}.", this.InputFilePath, this.OutputFilePath);
this.State = ConversionState.InProgress;
this.Convert();
try
{
this.Convert();
}
catch (Exception exception)
{
this.ConversionFailed(exception.Message);
}
if (this.State == ConversionState.Failed)
{
@@ -323,6 +330,8 @@ namespace FileConverter.ConversionJobs
protected void ConversionFailed(string exitingMessage)
{
Debug.Log("Fail: {0}", exitingMessage);
if (this.State == ConversionState.Failed)
{
// Already failed, don't override informations.
@@ -6,20 +6,24 @@ namespace FileConverter.ConversionJobs
{
public static ConversionJob Create(ConversionPreset conversionPreset, string inputFilePath)
{
ConversionJob conversionJob = null;
string extension = System.IO.Path.GetExtension(inputFilePath);
extension = extension.ToLowerInvariant().Substring(1, extension.Length - 1);
if (extension == "cda")
{
conversionJob = new ConversionJob_ExtractCDA(conversionPreset);
}
else
{
conversionJob = new ConversionJob_FFMPEG(conversionPreset);
return new ConversionJob_ExtractCDA(conversionPreset);
}
return conversionJob;
if (conversionPreset.OutputType == OutputType.Ico)
{
return new ConversionJob_Ico(conversionPreset);
}
if (PathHelpers.GetExtensionCategory(extension) == PathHelpers.InputCategoryNames.Image)
{
return new ConversionJob_ImageMagick(conversionPreset);
}
return new ConversionJob_FFMPEG(conversionPreset);
}
}
}
@@ -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;
@@ -131,6 +131,18 @@ namespace FileConverter.ConversionJobs
throw new Exception("Unknown Wav encoding.");
}
/// <summary>
/// Convert video quality index to MPEG4 video quality level.
/// </summary>
/// <param name="quality">The quality index.</param>
/// <returns>Returns the H264 constant rate factor.</returns>
/// 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;
}
/// <summary>
/// Convert video quality index to H264 constant rate factor.
/// </summary>
@@ -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,77 @@ namespace FileConverter.ConversionJobs
{
// https://trac.ffmpeg.org/wiki/Encode/AAC
int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(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);
}
break;
case OutputType.Avi:
{
// https://trac.ffmpeg.org/wiki/Encode/MPEG-4
int videoEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoQuality);
int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoScale);
string scaleArgs = string.Empty;
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
{
scaleArgs = string.Format("scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
}
float rotationAngleInDegrees = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoRotation);
string rotationArgs = string.Empty;
if (Math.Abs(rotationAngleInDegrees - 0f) >= 0.05f)
{
// Transpose:
// 0: 90 CounterClockwise and vertical flip
// 1: 90 Clockwise
// 2: 90 CounterClockwise
// 3: 90 Clockwise and vertical flip
if (Math.Abs(rotationAngleInDegrees - 90f) <= 0.05f)
{
rotationArgs = "transpose=2";
}
else if (Math.Abs(rotationAngleInDegrees - 180f) <= 0.05f)
{
rotationArgs = "vflip,hflip";
}
else if (Math.Abs(rotationAngleInDegrees - 270f) <= 0.05f)
{
rotationArgs = "transpose=1";
}
else
{
Diagnostics.Debug.LogError("Unsupported rotation: {0}°", rotationAngleInDegrees);
}
}
// Build vf args (-vf "scale=..., transpose=...")
string transformArgs = string.Empty;
if (!string.IsNullOrEmpty(scaleArgs) || !string.IsNullOrEmpty(rotationArgs))
{
transformArgs = "-vf \"";
if (!string.IsNullOrEmpty(scaleArgs))
{
transformArgs += scaleArgs;
}
if (!string.IsNullOrEmpty(rotationArgs))
{
if (!string.IsNullOrEmpty(scaleArgs))
{
transformArgs += ",";
}
transformArgs += rotationArgs;
}
transformArgs += "\"";
}
// Compute final arguments.
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), transformArgs);
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
}
@@ -84,6 +163,24 @@ namespace FileConverter.ConversionJobs
break;
case OutputType.Jpg:
{
int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(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);
}
break;
case OutputType.Mp3:
{
string encoderArgs = string.Empty;
@@ -109,13 +206,72 @@ namespace FileConverter.ConversionJobs
break;
case OutputType.Mkv:
case OutputType.Mp4:
{
// https://trac.ffmpeg.org/wiki/Encode/H.264
// https://trac.ffmpeg.org/wiki/Encode/AAC
int videoEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoQuality);
string videoEncodingSpeed = this.ConversionPreset.GetSettingsValue<string>(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed);
int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(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<float>(ConversionPreset.ConversionSettingKeys.VideoScale);
string scaleArgs = string.Empty;
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
{
scaleArgs = string.Format("scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
}
float rotationAngleInDegrees = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoRotation);
string rotationArgs = string.Empty;
if (Math.Abs(rotationAngleInDegrees - 0f) >= 0.05f)
{
// Transpose:
// 0: 90 CounterClockwise and vertical flip
// 1: 90 Clockwise
// 2: 90 CounterClockwise
// 3: 90 Clockwise and vertical flip
if (Math.Abs(rotationAngleInDegrees - 90f) <= 0.05f)
{
rotationArgs = "transpose=2";
}
else if (Math.Abs(rotationAngleInDegrees - 180f) <= 0.05f)
{
rotationArgs = "vflip,hflip";
}
else if (Math.Abs(rotationAngleInDegrees - 270f) <= 0.05f)
{
rotationArgs = "transpose=1";
}
else
{
Diagnostics.Debug.LogError("Unsupported rotation: {0}°", rotationAngleInDegrees);
}
}
// Build vf args (-vf "scale=..., transpose=...")
string transformArgs = string.Empty;
if (!string.IsNullOrEmpty(scaleArgs) || !string.IsNullOrEmpty(rotationArgs))
{
transformArgs = "-vf \"";
if (!string.IsNullOrEmpty(scaleArgs))
{
transformArgs += scaleArgs;
}
if (!string.IsNullOrEmpty(rotationArgs))
{
if (!string.IsNullOrEmpty(scaleArgs))
{
transformArgs += ",";
}
transformArgs += rotationArgs;
}
transformArgs += "\"";
}
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), transformArgs);
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
}
@@ -132,17 +288,16 @@ namespace FileConverter.ConversionJobs
case OutputType.Png:
{
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(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");
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
}
string encoderArgs = string.Format("-compression_level 100 {0}", scaleArgs);
break;
case OutputType.Jpg:
{
int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
string encoderArgs = string.Format("-q:v {0}", this.JPGQualityToQualityIndex(encodingQuality));
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
}
@@ -206,7 +361,7 @@ namespace FileConverter.ConversionJobs
throw;
}
Diagnostics.Debug.Log("");
Diagnostics.Debug.Log(string.Empty);
}
private void ParseFFMPEGOutput(string input)
@@ -0,0 +1,76 @@
// <copyright file="ConversionJob_Ico.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ConversionJobs
{
using System;
using System.IO;
public class ConversionJob_Ico : ConversionJob
{
private string intermediateFilePath;
private ConversionJob pngConversionJob;
private ConversionJob icoConversionJob;
public ConversionJob_Ico(ConversionPreset conversionPreset) : base(conversionPreset)
{
}
protected override void Initialize()
{
base.Initialize();
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
// Generate intermediate file path.
string fileName = Path.GetFileName(this.OutputFilePath);
string tempPath = Path.GetTempPath();
this.intermediateFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + ".png");
// Convert input in png file to send it to ffmpeg for the ico conversion.
ConversionPreset intermediatePreset = new ConversionPreset("To compatible image", OutputType.Png, this.ConversionPreset.InputTypes.ToArray());
intermediatePreset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "True");
intermediatePreset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "256");
this.pngConversionJob = ConversionJobFactory.Create(intermediatePreset, this.InputFilePath);
this.pngConversionJob.PrepareConversion(this.InputFilePath, this.intermediateFilePath);
// Convert png file into ico.
this.icoConversionJob = new ConversionJob_FFMPEG(this.ConversionPreset);
this.icoConversionJob.PrepareConversion(this.intermediateFilePath, this.OutputFilePath);
}
protected override void Convert()
{
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
Diagnostics.Debug.Log(string.Empty);
Diagnostics.Debug.Log("Convert image to PNG (intermediate format).");
this.pngConversionJob.StartConvertion();
if (this.pngConversionJob.State != ConversionState.Done)
{
this.ConversionFailed(this.pngConversionJob.ErrorMessage);
return;
}
Diagnostics.Debug.Log(string.Empty);
Diagnostics.Debug.Log("Convert png intermediate image to ICO.");
this.icoConversionJob.StartConvertion();
if (this.icoConversionJob.State != ConversionState.Done)
{
this.ConversionFailed(this.icoConversionJob.ErrorMessage);
return;
}
Diagnostics.Debug.Log("Delete intermediate file {0}.", this.intermediateFilePath);
File.Delete(this.intermediateFilePath);
}
}
}
@@ -0,0 +1,111 @@
// <copyright file="ConversionJob_ImageMagick.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ConversionJobs
{
using System;
using FileConverter.Diagnostics;
using ImageMagick;
public class ConversionJob_ImageMagick : ConversionJob
{
public ConversionJob_ImageMagick() : base()
{
}
public ConversionJob_ImageMagick(ConversionPreset conversionPreset) : base(conversionPreset)
{
}
protected override void Initialize()
{
base.Initialize();
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
}
protected override void Convert()
{
if (this.ConversionPreset == null)
{
throw new Exception("The conversion preset must be valid.");
}
using (MagickImage image = new MagickImage(this.InputFilePath))
{
image.Progress += this.Image_Progress;
Debug.Log("Load image {0} succeed.", this.InputFilePath);
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
{
Debug.Log("Apply scale factor: {0}%.", scaleFactor * 100);
image.Scale(new Percentage(scaleFactor * 100f));
}
float rotateAngleInDegrees = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageRotation);
if (Math.Abs(rotateAngleInDegrees - 0f) >= 0.05f)
{
Debug.Log("Apply rotation: {0}°.", rotateAngleInDegrees);
image.Rotate(rotateAngleInDegrees);
}
bool clampSizeToPowerOf2 = this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2);
if (clampSizeToPowerOf2)
{
int referenceSize = System.Math.Min(image.Width, image.Height);
int size = 2;
while (size * 2 < referenceSize)
{
size *= 2;
}
Debug.Log("Clamp size to the nearest power of 2 size (from {0}x{1} to {2}x{2}).", image.Width, image.Height, size);
image.Scale(size, size);
}
int maximumSize = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageMaximumSize);
if (maximumSize > 0)
{
int width = System.Math.Min(image.Width, maximumSize);
int height = System.Math.Min(image.Height, maximumSize);
Debug.Log("Clamp size to maximum size of {2}x{2} (from {0}x{1} to {2}x{3}).", image.Width, image.Height, width, height);
image.Scale(width, height);
}
Debug.Log("Convert image (output: {0}).", this.OutputFilePath);
switch (this.ConversionPreset.OutputType)
{
case OutputType.Png:
image.Quality = 100;
break;
case OutputType.Jpg:
image.Quality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
break;
default:
this.ConversionFailed(string.Format("Unsupported output format {0}.", this.ConversionPreset.OutputType));
image.Progress -= this.Image_Progress;
return;
}
image.Write(this.OutputFilePath);
image.Progress -= this.Image_Progress;
}
}
private void Image_Progress(object sender, ProgressEventArgs eventArgs)
{
this.Progress = (float)eventArgs.Progress.ToDouble() / 100f;
}
}
}
@@ -11,6 +11,7 @@ namespace FileConverter
using FileConverter.Annotations;
using FileConverter.Controls;
using FileConverter.Diagnostics;
using FileConverter.ValueConverters;
[XmlRoot]
@@ -355,6 +356,11 @@ namespace FileConverter
{
string settingsValue = this.GetSettingsValue(settingsKey);
if (settingsValue == null)
{
return default(T);
}
Type type = typeof(T);
if (type.IsEnum)
{
@@ -393,10 +399,51 @@ namespace FileConverter
{
switch (this.OutputType)
{
case OutputType.Wav:
case OutputType.Aac:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioEncodingMode:
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
return true;
}
break;
case OutputType.Avi:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
case ConversionPreset.ConversionSettingKeys.VideoQuality:
case ConversionPreset.ConversionSettingKeys.VideoScale:
case ConversionPreset.ConversionSettingKeys.VideoRotation:
return true;
}
break;
case OutputType.Flac:
case OutputType.Ico:
break;
case OutputType.Jpg:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.ImageQuality:
case ConversionPreset.ConversionSettingKeys.ImageScale:
case ConversionPreset.ConversionSettingKeys.ImageRotation:
case ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2:
return true;
}
break;
case OutputType.Mkv:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
case ConversionPreset.ConversionSettingKeys.VideoQuality:
case ConversionPreset.ConversionSettingKeys.VideoScale:
case ConversionPreset.ConversionSettingKeys.VideoRotation:
case ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed:
return true;
}
@@ -412,6 +459,19 @@ namespace FileConverter
break;
case OutputType.Mp4:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
case ConversionPreset.ConversionSettingKeys.VideoQuality:
case ConversionPreset.ConversionSettingKeys.VideoScale:
case ConversionPreset.ConversionSettingKeys.VideoRotation:
case ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed:
return true;
}
break;
case OutputType.Ogg:
switch (settingsKey)
{
@@ -421,25 +481,30 @@ namespace FileConverter
break;
case OutputType.Mkv:
case OutputType.Png:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
case ConversionPreset.ConversionSettingKeys.VideoQuality:
case ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed:
case ConversionPreset.ConversionSettingKeys.ImageScale:
case ConversionPreset.ConversionSettingKeys.ImageRotation:
case ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2:
case ConversionPreset.ConversionSettingKeys.ImageMaximumSize:
return true;
}
break;
case OutputType.Jpg:
case OutputType.Wav:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.ImageQuality:
case ConversionPreset.ConversionSettingKeys.AudioEncodingMode:
return true;
}
break;
default:
Debug.LogError("Relevant settings '{1}' are not define for output type {0}.", this.OutputType, settingsKey);
break;
}
return false;
@@ -453,18 +518,37 @@ 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");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0");
break;
case OutputType.Jpg:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "25");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "90");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0");
break;
case OutputType.Avi:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "20");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
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.VideoRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128");
break;
@@ -473,6 +557,14 @@ namespace FileConverter
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190");
break;
case OutputType.Mp4:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "28");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, "Medium");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128");
break;
case OutputType.Ogg:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160");
break;
@@ -634,8 +726,14 @@ 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 ImageRotation = "ImageRotation";
public const string ImageClampSizePowerOf2 = "ImageClampSizePowerOf2";
public const string ImageMaximumSize = "ImageMaximumSize";
public const string VideoQuality = "VideoQuality";
public const string VideoEncodingSpeed = "VideoEncodingSpeed";
public const string VideoScale = "VideoScale";
public const string VideoRotation = "VideoRotation";
}
}
}
@@ -1,6 +1,4 @@
// <copyright file="Diagnostics.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
using System.Linq;
// <copyright file="Debug.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.Diagnostics
{
@@ -9,7 +7,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 +16,6 @@ namespace FileConverter.Diagnostics
private static Dictionary<int, DiagnosticsData> diagnosticsDataById = new Dictionary<int, DiagnosticsData>();
private static int threadCount = 0;
public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
static Debug()
{
string path = PathHelpers.GetUserDataFolderPath();
@@ -42,6 +38,8 @@ namespace FileConverter.Diagnostics
Directory.CreateDirectory(Debug.diagnosticsFolderPath);
}
public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
public static DiagnosticsData[] Data
{
get
@@ -91,6 +89,5 @@ namespace FileConverter.Diagnostics
Debug.diagnosticsDataById.Clear();
}
}
}
@@ -1,14 +1,13 @@
// <copyright file="DiagnosticsData.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
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<string>(this.logMessages);
}
public event PropertyChangedEventHandler PropertyChanged;
public string Name
{
get
@@ -46,6 +46,13 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="Magick.NET-Q16-AnyCPU, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
<HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0101\lib\net40-client\Magick.NET-Q16-AnyCPU.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Markdown.Xaml">
<HintPath>..\..\Middleware\Markdown.Xaml.dll</HintPath>
</Reference>
<Reference Include="PresentationUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="ReachFramework" />
<Reference Include="Ripper, Version=1.0.5806.33932, Culture=neutral, processorArchitecture=MSIL">
@@ -88,6 +95,8 @@
<Compile Include="ConversionJobs\ConversionJobFactory.cs" />
<Compile Include="ConversionJobs\ConversionJob_FFMPEG.Converters.cs" />
<Compile Include="ConversionJobs\ConversionJob_FFMPEG.cs" />
<Compile Include="ConversionJobs\ConversionJob_Ico.cs" />
<Compile Include="ConversionJobs\ConversionJob_ImageMagick.cs" />
<Compile Include="ConversionPreset\ConversionSettingsOverride.cs" />
<Compile Include="ConversionPreset\ConversionSettings.cs" />
<Compile Include="Diagnostics\DiagnosticsData.cs" />
@@ -101,7 +110,10 @@
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Registry.cs" />
<Compile Include="Settings.Settings.cs" />
<Compile Include="Upgrade\Helpers.cs" />
<Compile Include="Upgrade\UpgradeVersionDescription.cs" />
<Compile Include="ValueConverters\ApplicationVersionToApplicationName.cs" />
<Compile Include="ConversionPreset\ConversionPreset.cs" />
<Compile Include="ValueConverters\BitrateToString.cs" />
@@ -112,12 +124,16 @@
<Compile Include="ValueConverters\Generic\DoubleToTimeString.cs" />
<Compile Include="ValueConverters\Generic\EqualsConverter.cs" />
<Compile Include="ValueConverters\Generic\CollectionContainsElementToBool.cs" />
<Compile Include="ValueConverters\Generic\FormatStringConverter.cs" />
<Compile Include="ValueConverters\Generic\StringToValueType.cs" />
<Compile Include="ValueConverters\InputTypesToBool.cs" />
<Compile Include="Settings.cs" />
<Compile Include="ValueConverters\OutputTypeToVisibility.cs" />
<Compile Include="ValueConverters\Generic\StringToEnum.cs" />
<Compile Include="ValueConverters\Generic\ValueConverterGroup.cs" />
<Compile Include="Windows\ApplicationStartHelp.xaml.cs">
<DependentUpon>ApplicationStartHelp.xaml</DependentUpon>
</Compile>
<Compile Include="Windows\DiagnosticsWindow.xaml.cs">
<DependentUpon>DiagnosticsWindow.xaml</DependentUpon>
</Compile>
@@ -128,11 +144,18 @@
<DependentUpon>SettingsWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Version.cs" />
<Compile Include="Windows\UpgradeWindow.xaml.cs">
<DependentUpon>UpgradeWindow.xaml</DependentUpon>
</Compile>
<Compile Include="XmlHelpers.cs" />
<Page Include="Controls\EncodingQualitySliderControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Windows\ApplicationStartHelp.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Windows\DiagnosticsWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -156,6 +179,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Windows\UpgradeWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="OutputType.cs" />
@@ -184,6 +211,7 @@
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -199,7 +227,17 @@
<ItemGroup>
<Resource Include="Resources\ApplicationIcon.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DownloadIcon.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\ContextMenuScreenshot.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
copy /Y "$(ProjectDir)Settings.default.xml" "$(TargetDir)Settings.default.xml"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
+2
View File
@@ -7,11 +7,13 @@ namespace FileConverter
None,
Aac,
Avi,
Flac,
Ico,
Jpg,
Mkv,
Mp3,
Mp4,
Ogg,
Png,
Wav,
+12 -1
View File
@@ -90,18 +90,27 @@ namespace FileConverter
case "avi":
case "bik":
case "3gp":
case "flv":
case "m4v":
case "mp4":
case "mov":
case "mkv":
case "webm":
case "wmv":
return InputCategoryNames.Video;
case "bmp":
case "exr":
case "ico":
case "jpg":
case "jpeg":
case "png":
case "psd":
case "tga":
case "tiff":
case "svg":
case "xcf":
return InputCategoryNames.Image;
}
@@ -125,7 +134,9 @@ namespace FileConverter
case OutputType.Wav:
return category == InputCategoryNames.Audio || category == InputCategoryNames.Video;
case OutputType.Avi:
case OutputType.Mkv:
case OutputType.Mp4:
return category == InputCategoryNames.Video;
case OutputType.Ico:
@@ -140,7 +151,7 @@ namespace FileConverter
public static string GetUserDataFolderPath()
{
string path = System.Environment.GetFolderPath((System.Environment.SpecialFolder.LocalApplicationData));
string path = System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData);
path = System.IO.Path.Combine(path, "FileConverter");
if (!System.IO.Directory.Exists(path))
@@ -60,6 +60,24 @@ namespace FileConverter.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to 90° counter clockwise rotation.
/// </summary>
public static string NinetyDegreesRotationTooltip {
get {
return ResourceManager.GetString("NinetyDegreesRotationTooltip", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to 180° rotation.
/// </summary>
public static string OneEightyDegreesRotationTooltip {
get {
return ResourceManager.GetString("OneEightyDegreesRotationTooltip", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to C:\Music\Artist\Album\Song.wav.
/// </summary>
@@ -91,6 +109,15 @@ namespace FileConverter.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to 90° clockwise rotation.
/// </summary>
public static string TwoSeventyDegreesRotationTooltip {
get {
return ResourceManager.GetString("TwoSeventyDegreesRotationTooltip", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Define the ratio &apos;file size&apos; versus &apos;video quality&apos;. A lower value will give you a smaller file, a greater value give you a better video quality..
/// </summary>
@@ -108,5 +135,14 @@ namespace FileConverter.Properties {
return ResourceManager.GetString("VideoEncodingSpeedTooltip", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to No rotation.
/// </summary>
public static string ZeroDegreesRotationTooltip {
get {
return ResourceManager.GetString("ZeroDegreesRotationTooltip", resourceCulture);
}
}
}
}
@@ -117,6 +117,12 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="NinetyDegreesRotationTooltip" xml:space="preserve">
<value>90° counter clockwise rotation</value>
</data>
<data name="OneEightyDegreesRotationTooltip" xml:space="preserve">
<value>180° rotation</value>
</data>
<data name="OuputFileNameTemplateSample" xml:space="preserve">
<value>C:\Music\Artist\Album\Song.wav</value>
</data>
@@ -136,10 +142,16 @@ Special paths:
(p:v): my videos path
(p:p): my pictures path</value>
</data>
<data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
<value>90° clockwise rotation</value>
</data>
<data name="VideoEncodingQualityTooltip" xml:space="preserve">
<value>Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality.</value>
</data>
<data name="VideoEncodingSpeedTooltip" xml:space="preserve">
<value>Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression.</value>
</data>
<data name="ZeroDegreesRotationTooltip" xml:space="preserve">
<value>No rotation</value>
</data>
</root>
@@ -117,6 +117,12 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="NinetyDegreesRotationTooltip" xml:space="preserve">
<value>90° counter clockwise rotation</value>
</data>
<data name="OneEightyDegreesRotationTooltip" xml:space="preserve">
<value>180° rotation</value>
</data>
<data name="OuputFileNameTemplateSample" xml:space="preserve">
<value>C:\Music\Artist\Album\Song.wav</value>
</data>
@@ -136,10 +142,16 @@ Special paths:
(p:v): my videos path
(p:p): my pictures path</value>
</data>
<data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
<value>90° clockwise rotation</value>
</data>
<data name="VideoEncodingQualityTooltip" xml:space="preserve">
<value>Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality.</value>
</data>
<data name="VideoEncodingSpeedTooltip" xml:space="preserve">
<value>Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression.</value>
</data>
<data name="ZeroDegreesRotationTooltip" xml:space="preserve">
<value>No rotation</value>
</data>
</root>
+203
View File
@@ -0,0 +1,203 @@
// <copyright file="Registry.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter
{
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
public class Registry : IDisposable
{
private static Registry instance;
private Dictionary<string, string> registryEntries = new Dictionary<string, string>();
~Registry()
{
this.Dispose();
Registry.instance = null;
}
[XmlElement("Entry")]
public Entry[] SerializableEntries
{
get
{
Entry[] entries = new Entry[this.registryEntries.Count];
int index = 0;
foreach (KeyValuePair<string, string> kvp in this.registryEntries)
{
if (kvp.Value == null)
{
continue;
}
entries[index] = new Entry(kvp.Key, kvp.Value);
index++;
}
return entries;
}
set
{
if (value == null)
{
return;
}
this.registryEntries.Clear();
for (int index = 0; index < value.Length; index++)
{
Entry entry = value[index];
if (entry.Key == null)
{
continue;
}
if (this.registryEntries.ContainsKey(entry.Key))
{
Diagnostics.Debug.Log("Ignore registry entry {0}.", entry.Key);
continue;
}
this.registryEntries.Add(entry.Key, entry.Value);
}
}
}
private static Registry Instance
{
get
{
if (Registry.instance == null)
{
Registry.Load();
}
return Registry.instance;
}
}
public static T GetValue<T>(string key)
{
Registry registry = Registry.Instance;
string stringValue;
if (!registry.registryEntries.TryGetValue(key, out stringValue))
{
return default(T);
}
try
{
object value = System.Convert.ChangeType(stringValue, typeof(T));
return (T)value;
}
catch (Exception exception)
{
Diagnostics.Debug.LogError("Can't convert registry value: {0}.", exception.Message);
}
return default(T);
}
public static void SetValue<T>(string key, T value)
{
Registry registry = Registry.Instance;
if (!registry.registryEntries.ContainsKey(key))
{
registry.registryEntries.Add(key, null);
}
try
{
string stringValue = (string)System.Convert.ChangeType(value, typeof(string));
registry.registryEntries[key] = stringValue;
}
catch (Exception exception)
{
Diagnostics.Debug.LogError("Can't convert registry value: {0}.", exception.Message);
}
}
public void Dispose()
{
// SAVE
string registryFilePath = Registry.GetUserRegistryFilePath();
try
{
XmlHelpers.SaveToFile("Registry", registryFilePath, this);
}
catch (Exception exception)
{
Diagnostics.Debug.LogError("Fail to save registry. {0}", exception.Message);
}
}
private static void Load()
{
string registryFilePath = Registry.GetUserRegistryFilePath();
if (!File.Exists(registryFilePath))
{
Registry.instance = new Registry();
return;
}
try
{
Registry.instance = null;
XmlHelpers.LoadFromFile<Registry>("Registry", registryFilePath, out Registry.instance);
}
catch (Exception exception)
{
Registry.instance = new Registry();
Diagnostics.Debug.LogError("Fail to load registry. {0}", exception.Message);
while (exception.InnerException != null)
{
exception = exception.InnerException;
Diagnostics.Debug.LogError("Inner exception: {0}", exception.Message);
}
}
}
private static string GetUserRegistryFilePath()
{
string path = PathHelpers.GetUserDataFolderPath();
path = Path.Combine(path, "Registry.xml");
return path;
}
[XmlRoot("Entry")]
public struct Entry
{
public Entry(string key, string value)
{
this.Key = key;
this.Value = value;
}
[XmlAttribute]
public string Key
{
get;
set;
}
[XmlText]
public string Value
{
get;
set;
}
}
public static class Keys
{
public static readonly string LastUpdateCheckDate = "LastUpdateCheckDate";
}
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

+18 -4
View File
@@ -2,19 +2,18 @@
namespace FileConverter
{
using System.Linq;
using System.Collections.ObjectModel;
using System.Linq;
using System.Xml.Serialization;
public partial class Settings : IXmlSerializable
{
public const int Version = 1;
private double settingsWindowHeight = 640;
private double settingsWindowWidth = 800;
private bool exitApplicationWhenConversionsFinished = true;
private float durationBetweenEndOfConversionsAndApplicationExit = 3f;
private ObservableCollection<ConversionPreset> conversionPresets = new ObservableCollection<ConversionPreset>();
private bool checkUpgradeAtStartup = true;
[XmlAttribute]
public int SerializationVersion
@@ -85,6 +84,21 @@ namespace FileConverter
}
}
[XmlElement]
public bool CheckUpgradeAtStartup
{
get
{
return this.checkUpgradeAtStartup;
}
set
{
this.checkUpgradeAtStartup = value;
this.OnPropertyChanged();
}
}
public void OnDeserializationComplete()
{
this.DurationBetweenEndOfConversionsAndApplicationExit = System.Math.Max(0, System.Math.Min(10, this.DurationBetweenEndOfConversionsAndApplicationExit));
+70 -12
View File
@@ -11,12 +11,11 @@ namespace FileConverter
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Security.Principal;
using System.Xml.Serialization;
using System.Windows;
using Microsoft.Win32;
using System.Xml.Serialization;
using FileConverter.Annotations;
using Microsoft.Win32;
[XmlRoot]
[XmlType]
@@ -73,7 +72,7 @@ namespace FileConverter
Settings settings = null;
XmlHelpers.LoadFromFile("Settings", temporaryFilePath, out settings);
RegistryKey registryKey = Registry.CurrentUser.OpenSubKey(@"Software\FileConverter");
RegistryKey registryKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(@"Software\FileConverter");
if (registryKey == null)
{
Diagnostics.Debug.LogError("Can't apply settings in registry. (code 0x03)");
@@ -94,7 +93,7 @@ namespace FileConverter
}
}
public static Settings Load()
public static void PostInstallationInitialization()
{
Settings defaultSettings = null;
@@ -116,6 +115,7 @@ namespace FileConverter
Diagnostics.Debug.LogError("Default settings not found at path {0}. You should try to reinstall the application.", defaultFilePath);
}
// Load user settings if exists.
Settings userSettings = null;
string userFilePath = Settings.GetUserSettingsFilePath();
if (File.Exists(userFilePath))
@@ -124,9 +124,43 @@ namespace FileConverter
{
XmlHelpers.LoadFromFile<Settings>("Settings", userFilePath, out userSettings);
}
catch (Exception exception)
catch (Exception)
{
MessageBoxResult messageBoxResult = MessageBox.Show("Can't load file converter user settings. Do you want to fall back to default settings ?", "Error", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
System.IO.File.Delete(userFilePath);
}
if (userSettings != null && userSettings.SerializationVersion != Version)
{
Diagnostics.Debug.Log("File converter settings has been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
userSettings.SerializationVersion = Version;
}
}
Settings settings = userSettings != null ? userSettings.Merge(defaultSettings) : defaultSettings;
settings.Save();
}
public static Settings Load()
{
Settings settings = null;
string userFilePath = Settings.GetUserSettingsFilePath();
if (File.Exists(userFilePath))
{
Settings userSettings = null;
try
{
XmlHelpers.LoadFromFile<Settings>("Settings", userFilePath, out userSettings);
settings = userSettings;
}
catch (Exception)
{
MessageBoxResult messageBoxResult =
MessageBox.Show(
"Can't load file converter user settings. Do you want to fall back to default settings ?",
"Error",
MessageBoxButton.YesNo,
MessageBoxImage.Exclamation);
if (messageBoxResult == MessageBoxResult.Yes)
{
System.IO.File.Delete(userFilePath);
@@ -141,10 +175,34 @@ namespace FileConverter
if (userSettings != null && userSettings.SerializationVersion != Version)
{
Diagnostics.Debug.Log("File converter settings has been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
userSettings.SerializationVersion = Version;
userSettings.Save();
}
}
else
{
// Load the default settings.
string defaultFilePath = Settings.GetDefaultSettingsFilePath();
if (File.Exists(defaultFilePath))
{
Settings defaultSettings = null;
try
{
XmlHelpers.LoadFromFile<Settings>("Settings", defaultFilePath, out defaultSettings);
settings = defaultSettings;
}
catch (Exception exception)
{
Diagnostics.Debug.LogError("Fail to load file converter default settings. {0}", exception.Message);
}
}
else
{
Diagnostics.Debug.LogError("Default settings not found at path {0}. You should try to reinstall the application.", defaultFilePath);
}
}
return userSettings != null ? userSettings.Merge(defaultSettings) : defaultSettings;
return settings;
}
public ConversionPreset GetPresetFromName(string presetName)
@@ -171,7 +229,7 @@ namespace FileConverter
// Write the settings in registry.
if (Settings.IsInAdmininstratorPrivileges)
{
// We are in admin mode, write reigstry ...
// We are in admin mode, write registry ...
bool succeed = Settings.ApplyRegistryModifications(registryEntries);
if (succeed)
{
@@ -212,7 +270,7 @@ namespace FileConverter
return false;
}
RegistryKey registryKey = Registry.CurrentUser.OpenSubKey(@"Software\FileConverter", RegistryKeyPermissionCheck.ReadWriteSubTree);
RegistryKey registryKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(@"Software\FileConverter", RegistryKeyPermissionCheck.ReadWriteSubTree);
if (registryKey == null)
{
MessageBox.Show("Can't apply settings in registry. (code 0x05)", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -302,7 +360,7 @@ namespace FileConverter
Directory.CreateDirectory(path);
}
path = Path.Combine(path, "Settings.xml");
path = Path.Combine(path, "Settings.default.xml");
return path;
}
@@ -323,7 +381,7 @@ namespace FileConverter
private static bool IsRegistryNeedModifications(Dictionary<string, List<string>> registryEntries)
{
// Compare to registry entries.
RegistryKey registryKey = Registry.CurrentUser.OpenSubKey(@"Software\FileConverter");
RegistryKey registryKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(@"Software\FileConverter");
if (registryKey == null)
{
return true;
@@ -0,0 +1,355 @@
<?xml version="1.0" encoding="utf-8"?>
<Settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" SerializationVersion="1">
<ExitApplicationWhenConversionsFinished>true</ExitApplicationWhenConversionsFinished>
<DurationBetweenEndOfConversionsAndApplicationExit>3</DurationBetweenEndOfConversionsAndApplicationExit>
<ConversionPreset Name="To Mkv" OutputType="Mkv">
<InputTypes>3gp</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp4" OutputType="Mp4">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp4 (low quality)" OutputType="Mp4">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="20" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="96" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp4 (rotate left)" OutputType="Mp4">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="90" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp4 (rotate right)" OutputType="Mp4">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Medium" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="270" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Avi" OutputType="Avi">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="27" />
<Settings Key="VideoScale" Value="1" />
<Settings Key="VideoRotation" Value="0" />
<Settings Key="AudioBitrate" Value="190" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Ogg" OutputType="Ogg">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="160" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Flac" OutputType="Flac">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Wav" OutputType="Wav">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Wav16" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp3" OutputType="Mp3">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
<Settings Key="AudioBitrate" Value="190" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Aac" OutputType="Aac">
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>3gp</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="128" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Flac" OutputType="Flac">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Ogg" OutputType="Ogg">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="192" />
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Mp3" OutputType="Mp3">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
<Settings Key="AudioBitrate" Value="225" />
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Png" OutputType="Png">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="1" />
<Settings Key="ImageRotation" Value="0" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<Settings Key="ImageMaximumSize" Value="0" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To small Png (25%)" OutputType="Png">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="0,25" />
<Settings Key="ImageRotation" Value="0" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<Settings Key="ImageMaximumSize" Value="0" />
<OutputFileNameTemplate>(p)(f)-small</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Png (rotate left)" OutputType="Png">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="1" />
<Settings Key="ImageRotation" Value="90" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<Settings Key="ImageMaximumSize" Value="0" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Png (rotate right)" OutputType="Png">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageScale" Value="1" />
<Settings Key="ImageRotation" Value="270" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<Settings Key="ImageMaximumSize" Value="0" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Jpg" OutputType="Jpg">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageQuality" Value="40" />
<Settings Key="ImageScale" Value="1" />
<Settings Key="ImageRotation" Value="0" />
<Settings Key="ImageClampSizePowerOf2" Value="False" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Ico" OutputType="Ico">
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>psd</InputTypes>
<InputTypes>svg</InputTypes>
<InputTypes>tga</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>xcf</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<CheckUpgradeAtStartup>true</CheckUpgradeAtStartup>
</Settings>
-164
View File
@@ -1,164 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" SerializationVersion="0">
<ExitApplicationWhenConversionsFinished>true</ExitApplicationWhenConversionsFinished>
<DurationBetweenEndOfConversionsAndApplicationExit>3</DurationBetweenEndOfConversionsAndApplicationExit>
<ConversionPreset Name="To Mkv" OutputType="Mkv">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="30" />
<Settings Key="VideoEncodingSpeed" Value="Very Slow" />
<Settings Key="AudioBitrate" Value="155" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mkv (low quality)" OutputType="Mkv">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="VideoQuality" Value="20" />
<Settings Key="VideoEncodingSpeed" Value="Very Slow" />
<Settings Key="AudioBitrate" Value="96" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Ogg" OutputType="Ogg">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="160" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Flac" OutputType="Flac">
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>ape</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Wav" OutputType="Wav">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Wav16" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Mp3" OutputType="Mp3">
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
<Settings Key="AudioBitrate" Value="190" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Aac" OutputType="Aac">
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>wma</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>flac</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Flac" OutputType="Flac">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Ogg" OutputType="Ogg">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioBitrate" Value="192" />
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract CDA to Mp3" OutputType="Mp3">
<InputTypes>cda</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
<Settings Key="AudioBitrate" Value="225" />
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Png" OutputType="Png">
<InputTypes>bmp</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Jpg" OutputType="Jpg">
<InputTypes>bmp</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>tiff</InputTypes>
<InputTypes>ico</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="ImageQuality" Value="25" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Ico (max 256x256)" OutputType="Ico">
<InputTypes>bmp</InputTypes>
<InputTypes>jpg</InputTypes>
<InputTypes>jpeg</InputTypes>
<InputTypes>png</InputTypes>
<InputTypes>tiff</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
</Settings>
@@ -0,0 +1,130 @@
// <copyright file="Helpers.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.Upgrade
{
using System;
using System.IO;
using System.Net;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Xml;
using System.Xml.Serialization;
public static class Helpers
{
#if DEBUG
private const string BaseURI = "https://raw.githubusercontent.com/Tichau/FileConverter/development/";
#else
private const string BaseURI = "https://raw.githubusercontent.com/Tichau/FileConverter/master/";
#endif
private static WebClient webClient = new WebClient();
public delegate void OnUpgradeOperationCompletedEventHandler(UpgradeVersionDescription upgradeVersionDescription);
public static async Task<UpgradeVersionDescription> GetLatestVersionDescriptionAsync(OnUpgradeOperationCompletedEventHandler onGetCompleteDelegate = null)
{
Uri uri = new Uri(Helpers.BaseURI + "version.xml");
Stream stream = await Helpers.webClient.OpenReadTaskAsync(uri);
UpgradeVersionDescription upgradeVersionDescription = null;
try
{
XmlRootAttribute xmlRoot = new XmlRootAttribute
{
ElementName = "Version"
};
XmlSerializer serializer = new XmlSerializer(typeof(UpgradeVersionDescription), xmlRoot);
XmlReaderSettings xmlReaderSettings = new XmlReaderSettings
{
IgnoreWhitespace = true,
IgnoreComments = true
};
using (XmlReader xmlReader = XmlReader.Create(stream, xmlReaderSettings))
{
upgradeVersionDescription = (UpgradeVersionDescription)serializer.Deserialize(xmlReader);
}
}
catch (Exception)
{
Diagnostics.Debug.LogError("Error while retrieving change log.");
return null;
}
onGetCompleteDelegate?.Invoke(upgradeVersionDescription);
return upgradeVersionDescription;
}
public static async Task<string> GetChangeLogAsync(UpgradeVersionDescription upgradeVersionDescription, OnUpgradeOperationCompletedEventHandler onGetCompleteDelegate = null)
{
if (upgradeVersionDescription == null)
{
throw new ArgumentNullException("upgradeVersionDescription");
}
Uri uri = new Uri(Helpers.BaseURI + "CHANGELOG.md");
Stream stream = await Helpers.webClient.OpenReadTaskAsync(uri);
try
{
using (StreamReader reader = new StreamReader(stream))
{
upgradeVersionDescription.ChangeLog = reader.ReadToEnd();
}
}
catch (Exception)
{
Diagnostics.Debug.LogError("Error while retrieving change log.");
return null;
}
onGetCompleteDelegate?.Invoke(upgradeVersionDescription);
return upgradeVersionDescription.ChangeLog;
}
public static void DownloadInstallerAsync(UpgradeVersionDescription upgradeVersionDescription)
{
Thread thread = new Thread(Helpers.DownloadInstallerAsync);
thread.Start(upgradeVersionDescription);
}
private static void DownloadInstallerAsync(object parameter)
{
UpgradeVersionDescription upgradeVersionDescription = parameter as UpgradeVersionDescription;
if (upgradeVersionDescription == null)
{
throw new ArgumentNullException("upgradeVersionDescription");
}
Uri uri = new Uri(upgradeVersionDescription.InstallerURL);
string fileName = "FileConverter-setup.msi";
Regex retrieveFileNameRegex = new Regex("/([^/]*)");
MatchCollection matchCollection = retrieveFileNameRegex.Matches(upgradeVersionDescription.InstallerURL);
if (matchCollection.Count > 0)
{
Match match = matchCollection[matchCollection.Count - 1];
if (match.Groups.Count > 1)
{
fileName = match.Groups[1].Value;
}
}
string tempPath = System.IO.Path.GetTempPath();
string installerPath = System.IO.Path.Combine(tempPath, fileName);
upgradeVersionDescription.InstallerPath = installerPath;
upgradeVersionDescription.InstallerDownloadInProgress = true;
Helpers.webClient.DownloadFile(uri, installerPath);
upgradeVersionDescription.InstallerDownloadInProgress = false;
}
}
}
@@ -0,0 +1,51 @@
// <copyright file="UpgradeVersionDescription.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter
{
using System.Xml.Serialization;
public class UpgradeVersionDescription
{
[XmlElement("Latest")]
public Version LatestVersion
{
get;
set;
}
[XmlElement("URL")]
public string InstallerURL
{
get;
set;
}
[XmlIgnore]
public string ChangeLog
{
get;
set;
}
[XmlIgnore]
public string InstallerPath
{
get;
set;
}
[XmlIgnore]
public bool InstallerDownloadInProgress
{
get;
set;
}
[XmlIgnore]
public bool NeedToUpgrade
{
get;
set;
}
}
}
@@ -62,19 +62,19 @@ namespace FileConverter.ValueConverters
outputPath = outputPath.Replace("(i)", inputExtension);
outputPath = outputPath.Replace("(I)", inputExtension.ToUpperInvariant());
string myDocumentsFolder = System.Environment.GetFolderPath((System.Environment.SpecialFolder.MyDocuments)) + "\\";
string myDocumentsFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\";
outputPath = outputPath.Replace("(p:d)", myDocumentsFolder);
outputPath = outputPath.Replace("(p:documents)", myDocumentsFolder);
string myMusicFolder = System.Environment.GetFolderPath((System.Environment.SpecialFolder.MyMusic)) + "\\";
string myMusicFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyMusic) + "\\";
outputPath = outputPath.Replace("(p:m)", myMusicFolder);
outputPath = outputPath.Replace("(p:music)", myMusicFolder);
string myVideoFolder = System.Environment.GetFolderPath((System.Environment.SpecialFolder.MyVideos)) + "\\";
string myVideoFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyVideos) + "\\";
outputPath = outputPath.Replace("(p:v)", myVideoFolder);
outputPath = outputPath.Replace("(p:videos)", myVideoFolder);
string myPictureFolder = System.Environment.GetFolderPath((System.Environment.SpecialFolder.MyPictures)) + "\\";
string myPictureFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyPictures) + "\\";
outputPath = outputPath.Replace("(p:p)", myPictureFolder);
outputPath = outputPath.Replace("(p:pictures)", myPictureFolder);
@@ -0,0 +1,32 @@
// <copyright file="FormatStringConverter.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ValueConverters.Generic
{
using System;
using System.Globalization;
using System.Windows.Data;
public class FormatStringConverter : IMultiValueConverter
{
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
if (values == null)
{
throw new ArgumentException("The values must not be null.");
}
string format = parameter as string;
if (format == null)
{
return string.Empty;
}
return string.Format(format, values);
}
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}
+79 -2
View File
@@ -2,14 +2,91 @@
namespace FileConverter
{
public struct Version
using System.Xml.Serialization;
public struct Version : System.IComparable<Version>
{
[XmlAttribute]
public int Major;
[XmlAttribute]
public int Minor;
[XmlAttribute]
public int Patch;
public static bool operator !=(Version a, Version b)
{
return a.CompareTo(b) != 0;
}
public static bool operator ==(Version a, Version b)
{
return a.CompareTo(b) == 0;
}
public static bool operator <=(Version a, Version b)
{
return a.CompareTo(b) <= 0;
}
public static bool operator >=(Version a, Version b)
{
return a.CompareTo(b) >= 0;
}
public static bool operator <(Version a, Version b)
{
return a.CompareTo(b) < 0;
}
public static bool operator >(Version a, Version b)
{
return a.CompareTo(b) > 0;
}
public override string ToString()
{
return string.Format("{0}.{1}", this.Major, this.Minor);
if (this.Patch == 0)
{
return string.Format("{0}.{1}", this.Major, this.Minor);
}
return string.Format("{0}.{1}.{2}", this.Major, this.Minor, this.Patch);
}
public override bool Equals(object obj)
{
if (!(obj is Version))
{
return false;
}
Version other = (Version)obj;
return this.Major == other.Major && this.Minor == other.Minor && this.Patch == other.Patch;
}
public override int GetHashCode()
{
return base.GetHashCode();
}
public int CompareTo(Version other)
{
if (this.Major == other.Major && this.Minor == other.Minor && this.Patch == other.Patch)
{
return 0;
}
if (this.Major > other.Major ||
(this.Major == other.Major && this.Minor > other.Minor) ||
(this.Major == other.Major && this.Minor == other.Minor && this.Patch > other.Patch))
{
return 1;
}
return -1;
}
}
}
@@ -0,0 +1,24 @@
<Window x:Class="FileConverter.Windows.ApplicationStartHelp"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:FileConverter.Windows"
xmlns:fileConverter="clr-namespace:FileConverter"
xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
mc:Ignorable="d"
Height="480" Width="640" Icon="/FileConverter;component/Resources/ApplicationIcon.ico" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="NoResize">
<Window.Resources>
<valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
</Window.Resources>
<Window.Title>
<Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(fileConverter:Application.ApplicationVersion)"/>
</Window.Title>
<StackPanel Margin="5">
<TextBlock Margin="0,0,0,4" Text="File Converter is a shell extension." TextWrapping="Wrap" FontWeight="Bold" FontSize="13.333"/>
<TextBlock Text="That means it is integrated into the Windows explorer." TextWrapping="Wrap"/>
<TextBlock Text="To use File Converter please open the explorer and right-click on any file you like to bring up the context menu where you will find File Converter commands (see the readme file to see the list of compatible file formats)." TextWrapping="Wrap" />
<Image Margin="0,7,0,7" HorizontalAlignment="Left" Height="Auto" VerticalAlignment="Top" Width="Auto" Source="/FileConverter;component/Resources/ContextMenuScreenshot.png" Stretch="None"/>
<Button Content="Ok" Height="28" Click="OkButton_Click"/>
</StackPanel>
</Window>
@@ -0,0 +1,29 @@
// <copyright file="ApplicationStartHelp.xaml.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.Windows
{
using System;
using System.Windows;
public partial class ApplicationStartHelp : Window
{
public ApplicationStartHelp()
{
this.InitializeComponent();
}
public static FileConverter.Version ApplicationVersion
{
get
{
return FileConverter.Application.ApplicationVersion;
}
}
private void OkButton_Click(object sender, RoutedEventArgs e)
{
this.Close();
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
}
}
}
@@ -13,6 +13,12 @@ namespace FileConverter.Windows
set;
}
public DataTemplate AviSettingsDataTemplate
{
get;
set;
}
public DataTemplate WavSettingsDataTemplate
{
get;
@@ -25,6 +31,12 @@ namespace FileConverter.Windows
set;
}
public DataTemplate Mp4SettingsDataTemplate
{
get;
set;
}
public DataTemplate OggSettingsDataTemplate
{
get;
@@ -42,6 +54,12 @@ namespace FileConverter.Windows
get;
set;
}
public DataTemplate PngSettingsDataTemplate
{
get;
set;
}
public DataTemplate MkvSettingsDataTemplate
{
@@ -60,23 +78,32 @@ namespace FileConverter.Windows
switch (outputType)
{
case OutputType.Wav:
return this.WavSettingsDataTemplate;
case OutputType.Mp3:
return this.Mp3SettingsDataTemplate;
case OutputType.Ogg:
return this.OggSettingsDataTemplate;
case OutputType.Aac:
return this.AacSettingsDataTemplate;
case OutputType.Avi:
return this.AviSettingsDataTemplate;
case OutputType.Jpg:
return this.JpgSettingsDataTemplate;
case OutputType.Mkv:
return this.MkvSettingsDataTemplate;
case OutputType.Jpg:
return this.JpgSettingsDataTemplate;
case OutputType.Mp3:
return this.Mp3SettingsDataTemplate;
case OutputType.Mp4:
return this.Mp4SettingsDataTemplate;
case OutputType.Ogg:
return this.OggSettingsDataTemplate;
case OutputType.Png:
return this.PngSettingsDataTemplate;
case OutputType.Wav:
return this.WavSettingsDataTemplate;
}
return this.DefaultDataTemplate;
@@ -13,6 +13,7 @@ namespace FileConverter
{
private DiagnosticsWindow diagnosticsWindow;
private SettingsWindow settingsWindow;
private UpgradeWindow upgradeWindow;
public MainWindow()
{
@@ -21,6 +22,12 @@ namespace FileConverter
Application application = Application.Current as Application;
this.ConverterJobsList.ItemsSource = application.ConvertionJobs;
if (application.HideMainWindow)
{
this.Hide();
}
if (application.Verbose)
{
this.ShowDiagnosticsWindow();
@@ -28,15 +35,19 @@ namespace FileConverter
if (application.ShowSettings)
{
this.Hide();
this.ShowSettingsWindow();
this.settingsWindow.OnSettingsWindowHide += this.SettingsWindow_Closed;
}
}
public event PropertyChangedEventHandler PropertyChanged;
public void OnNewVersionReleased(UpgradeVersionDescription upgradeVersionDescription)
{
this.ShowUpgradeWindow();
this.upgradeWindow.VersionDescription = upgradeVersionDescription;
}
[NotifyPropertyChangedInvocator]
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
{
@@ -94,5 +105,21 @@ namespace FileConverter
application?.CancelAutoExit();
this.settingsWindow.Show();
}
private void ShowUpgradeWindow()
{
if (this.upgradeWindow != null && this.upgradeWindow.IsVisible)
{
return;
}
else
{
this.upgradeWindow = new UpgradeWindow();
}
Application application = Application.Current as Application;
application?.CancelAutoExit();
this.upgradeWindow.Show();
}
}
}
@@ -8,7 +8,7 @@
xmlns:project="clr-namespace:FileConverter.Properties"
xmlns:System="clr-namespace:System;assembly=mscorlib" x:Name="window" x:Class="FileConverter.SettingsWindow"
MinWidth="640" MinHeight="480"
Width="800" Height="600"
Width="900" Height="675"
WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
Closing="SettingsWindow_OnClosing">
<Window.Resources>
@@ -17,6 +17,7 @@
<generic:BoolToVisibility x:Key="BoolToVisibility"/>
<valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
<generic:CollectionContainsElementToBool x:Key="CollectionContainsElementToBool"/>
<generic:FormatStringConverter x:Key="FormatStringConverter"/>
<generic:ValueConverterGroup x:Key="ConversionSettingsToEnum">
<valueConverters:ConversionSettingsToString/>
@@ -99,7 +100,6 @@
</StackPanel>
</DataTemplate>
<DataTemplate x:Key="AacSettingsDataTemplate">
<StackPanel>
<DockPanel>
@@ -110,64 +110,246 @@
</StackPanel>
</DataTemplate>
<DataTemplate x:Key="AviSettingsDataTemplate">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<DockPanel Grid.Row="0" Grid.Column="0">
<Label Content="Video" FontWeight="Bold" />
<Label Content="(Xvid)" FontWeight="Light" Foreground="#004B82" />
</DockPanel>
<Label Content="Quality :" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
<Slider x:Name="QualitySlider" Grid.Row="1" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="28" Minimum="0" Maximum="30" TickPlacement="BottomRight" SmallChange="1" LargeChange="5" TickFrequency="1" Foreground="#004B82" />
<!-- Scale -->
<Label Content="Scale :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="2" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="2" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P0}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
</Grid>
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
<DockPanel Grid.Row="4" Grid.Column="0" >
<Label Content="Audio" FontWeight="Bold" />
<Label Content="(Mp3)" FontWeight="Light" Foreground="#004B82" />
</DockPanel>
<Label Content="Quality :" Grid.Row="5" Grid.Column="0" HorizontalContentAlignment="Right"/>
<controls:EncodingQualitySliderControl Grid.Row="5" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="Mp3VBR"
Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
</Grid>
</DataTemplate>
<DataTemplate x:Key="MkvSettingsDataTemplate">
<StackPanel>
<DockPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<DockPanel Grid.Row="0" Grid.Column="0">
<Label Content="Video" FontWeight="Bold" />
<Label Content="(H.264)" FontWeight="Light" Foreground="#004B82" />
</DockPanel>
<DockPanel>
<Label Content="Quality :" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}"/>
<Slider x:Name="QualitySlider" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
<Label Content="Quality :" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
<Slider x:Name="QualitySlider" Grid.Row="1" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="33" Minimum="0" Maximum="51" TickPlacement="BottomRight" SmallChange="1" LargeChange="6" TickFrequency="1" Foreground="#004B82" />
</DockPanel>
<DockPanel>
<Label Content="Encoding speed :" ToolTip="{x:Static project:Resources.VideoEncodingSpeedTooltip}" />
<ComboBox SelectedValue="{Binding SelectedPreset.Settings, ConverterParameter=VideoEncodingSpeed|System.String, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=veryslow}">
<System:String>Ultra Fast</System:String>
<System:String>Super Fast</System:String>
<System:String>Very Fast</System:String>
<System:String>Faster</System:String>
<System:String>Fast</System:String>
<System:String>Medium</System:String>
<System:String>Slow</System:String>
<System:String>Slower</System:String>
<System:String>Very Slow</System:String>
</ComboBox>
</DockPanel>
<Label Content="Encoding speed :" Grid.Row="2" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingSpeedTooltip}" HorizontalContentAlignment="Right"/>
<ComboBox Grid.Row="2" Grid.Column="1" SelectedValue="{Binding SelectedPreset.Settings, ConverterParameter=VideoEncodingSpeed|System.String, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=veryslow}">
<System:String>Ultra Fast</System:String>
<System:String>Super Fast</System:String>
<System:String>Very Fast</System:String>
<System:String>Faster</System:String>
<System:String>Fast</System:String>
<System:String>Medium</System:String>
<System:String>Slow</System:String>
<System:String>Slower</System:String>
<System:String>Very Slow</System:String>
</ComboBox>
<DockPanel>
<Label Content="Scale :" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="3" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="2" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P1}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
</Grid>
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="4" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
<DockPanel Grid.Row="5" Grid.Column="0" >
<Label Content="Audio" FontWeight="Bold" />
<Label Content="(AAC)" FontWeight="Light" Foreground="#004B82" />
</DockPanel>
<DockPanel>
<Label Content="Quality :" />
<controls:EncodingQualitySliderControl x:Name="EncodingQualitySlider" EncodingMode="AacVBR"
<Label Content="Quality :" Grid.Row="6" Grid.Column="0" HorizontalContentAlignment="Right"/>
<controls:EncodingQualitySliderControl Grid.Row="6" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="AacVBR"
Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=128}" />
</DockPanel>
</StackPanel>
</Grid>
</DataTemplate>
<DataTemplate x:Key="JpgSettingsDataTemplate">
<StackPanel>
<DockPanel>
<Label Content="Quality :" />
<Slider x:Name="QualitySlider" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=25}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="30" Minimum="0" Maximum="30" TickPlacement="BottomRight" SmallChange="3" LargeChange="6" TickFrequency="1" Foreground="#004B82" />
</DockPanel>
</StackPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!--Quality-->
<Label Content="Quality :" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
<Slider Grid.Row="0" Grid.Column="1" x:Name="QualitySlider" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=25}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="30" SelectionEnd="100" Minimum="0" Maximum="100" TickPlacement="BottomRight" SmallChange="5" LargeChange="15" TickFrequency="5" Foreground="#004B82" />
<!--Scale-->
<Label Content="Scale :" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="1" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="16" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2 3 4 6 8 12 16" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P1}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
<CheckBox Grid.Row="1" Grid.Column="0" Content="Clamp to lowest power of 2 size" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageClampSizePowerOf2|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
</Grid>
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
</Grid>
</DataTemplate>
<DataTemplate x:Key="PngSettingsDataTemplate">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!--Scale-->
<Label Content="Scale :" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="0" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="16" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2 3 4 6 8 12 16" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P1}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
<CheckBox Grid.Row="1" Grid.Column="0" Content="Clamp to lowest power of 2 size" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageClampSizePowerOf2|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
</Grid>
<!--Rotate-->
<Label Content="Rotate :" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
<RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
<RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
<RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
</StackPanel>
</Grid>
</DataTemplate>
<windows:ConversionSettingsTemplateSelector x:Key="ConversionSettingsSelector"
DefaultDataTemplate="{StaticResource EmptyDataTemplate}"
WavSettingsDataTemplate="{StaticResource WavSettingsDataTemplate}"
Mp3SettingsDataTemplate="{StaticResource Mp3SettingsDataTemplate}"
OggSettingsDataTemplate="{StaticResource OggSettingsDataTemplate}"
MkvSettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}"
AacSettingsDataTemplate="{StaticResource AacSettingsDataTemplate}"
JpgSettingsDataTemplate="{StaticResource JpgSettingsDataTemplate}" />
AviSettingsDataTemplate="{StaticResource AviSettingsDataTemplate}"
JpgSettingsDataTemplate="{StaticResource JpgSettingsDataTemplate}"
MkvSettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}"
Mp3SettingsDataTemplate="{StaticResource Mp3SettingsDataTemplate}"
Mp4SettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}"
OggSettingsDataTemplate="{StaticResource OggSettingsDataTemplate}"
PngSettingsDataTemplate="{StaticResource PngSettingsDataTemplate}"
WavSettingsDataTemplate="{StaticResource WavSettingsDataTemplate}" />
</Window.Resources>
<Window.Title>
<Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
@@ -206,7 +388,7 @@
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="4*"/>
<ColumnDefinition Width="3.5*"/>
</Grid.ColumnDefinitions>
<Grid x:Name="PresetListGrid" Margin="5">
@@ -243,7 +425,7 @@
<Grid Margin="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MaxWidth="240"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2.5*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
@@ -343,16 +525,16 @@
<!-- Application settings -->
<StackPanel x:Name="ApplicationSettingsPanel" Grid.Row="2" Margin="5,10,5,5">
<CheckBox x:Name="QuitAtEndCheckBox" Content="Automaticaly exit when all conversions finished" IsChecked="{Binding ApplicationSettings.ExitApplicationWhenConversionsFinished, ElementName=window, Mode=TwoWay}" />
<CheckBox x:Name="QuitAtEndCheckBox" Content="Automatically exit when all conversions finished" IsChecked="{Binding ApplicationSettings.ExitApplicationWhenConversionsFinished, ElementName=window, Mode=TwoWay}" />
<DockPanel Margin="40,0,0,5" Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=QuitAtEndCheckBox}">
<Label Content="Waiting duration :"/>
<Slider x:Name="DurationBeforeQuitSlider" Value="{Binding ApplicationSettings.DurationBetweenEndOfConversionsAndApplicationExit, ElementName=window, Mode=TwoWay}" Minimum="0" Maximum="10" SmallChange="0.1" IsSnapToTickEnabled="True" Width="250" TickFrequency="0.1"/>
<Label Content="{Binding Value, Converter={StaticResource DoubleToTimeString}, ElementName=DurationBeforeQuitSlider}"/>
</DockPanel>
<CheckBox Content="Automatically check for updates when File Converter starts" IsChecked="{Binding ApplicationSettings.CheckUpgradeAtStartup, ElementName=window, Mode=TwoWay}" />
</StackPanel>
<Button x:Name="CloseButton" Grid.Row="3" Content="Close" HorizontalAlignment="Right" Width="100" Margin="0,4,105,0" Click="CloseButton_Click" />
<Button x:Name="SaveButton" Grid.Row="3" Content="Save" HorizontalAlignment="Right" Width="100" Margin="0,4,0,0" Click="SaveButton_Click" Command="New"/>
</Grid>
</Window>
@@ -1,12 +1,11 @@
// <copyright file="SettingsWindow.xaml.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
using System.Linq;
namespace FileConverter
{
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Windows;
using System.Windows.Controls;
@@ -38,10 +37,12 @@ namespace FileConverter
{
OutputType.Ogg,
OutputType.Mp3,
OutputType.Aac,
OutputType.Aac,
OutputType.Flac,
OutputType.Wav,
OutputType.Mkv,
OutputType.Mp4,
OutputType.Avi,
OutputType.Ico,
OutputType.Jpg,
OutputType.Png,
@@ -57,7 +58,7 @@ namespace FileConverter
};
this.PostConversionActionComboBox.ItemsSource = postConversionActions;
this.InitializeCompatibleInputExtensions();
}
@@ -91,14 +92,6 @@ namespace FileConverter
}
}
private void SelectedPresetPropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == "OutputType")
{
this.OnPropertyChanged("InputCategories");
}
}
public Settings ApplicationSettings
{
get
@@ -139,6 +132,14 @@ namespace FileConverter
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
private void SelectedPresetPropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == "OutputType")
{
this.OnPropertyChanged("InputCategories");
}
}
private void OnInputTypeChecked(object sender, RoutedEventArgs e)
{
if (this.selectedPreset == null)
@@ -319,7 +320,7 @@ namespace FileConverter
private void InitializeCompatibleInputExtensions()
{
RegistryKey registryKey = Registry.CurrentUser.OpenSubKey(@"Software\FileConverter");
RegistryKey registryKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(@"Software\FileConverter");
if (registryKey == null)
{
MessageBox.Show("Can't retrieve the list of compatible input extensions. (code 0x09)", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -0,0 +1,95 @@
<Window x:Name="window" x:Class="FileConverter.Windows.UpgradeWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:FileConverter.Windows"
xmlns:fileConverter="clr-namespace:FileConverter"
xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
xmlns:xaml="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml"
mc:Ignorable="d"
Title="File Converter Updates"
WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
MinHeight="300" MinWidth="450"
Height="450" Width="450" WindowStyle="ToolWindow">
<Window.Resources>
<valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
<Style TargetType="FlowDocument" x:Key="DocumentStyle">
<Setter Property="FontFamily" Value="Segoe UI" />
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="Foreground" Value="#786C71" />
<Setter Property="Background" Value="White" />
<Setter Property="LineHeight" Value="9"/>
<Setter Property="FontSize" Value="13" />
</Style>
<Style x:Key="PageHeader" TargetType="Paragraph">
<Setter Property="FontSize" Value="24" />
<Setter Property="Foreground" Value="#1E6BB8" />
</Style>
<Style x:Key="SubHeader"
TargetType="Paragraph">
<Setter Property="FontSize"
Value="20" />
<Setter Property="Foreground"
Value="#DF3900" />
</Style>
<Style x:Key="SubHeaderSecondary"
TargetType="Paragraph">
<Setter Property="FontSize"
Value="20" />
<Setter Property="Foreground"
Value="#DF3900" />
</Style>
<xaml:Markdown x:Key="Markdown"
DocumentStyle="{StaticResource DocumentStyle}"
Heading1Style="{StaticResource PageHeader}"
Heading2Style="{StaticResource SubHeader}"
Heading3Style="{StaticResource SubHeaderSecondary}"/>
<xaml:TextToFlowDocumentConverter x:Key="TextToFlowDocumentConverter" Markdown="{StaticResource Markdown}"/>
</Window.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<!--<RowDefinition Height="{Binding Height, ElementName=ApplicationSettingsPanel, Mode=OneWay}"/>-->
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Margin="5"
Text="An update for File Converter is available. It is strongly recommended that you install it as soon as possible!" TextWrapping="Wrap"/>
<!--<Label Grid.Row="1" Margin="5"
Content="{Binding VersionDescription.LatestVersion, Converter={StaticResource ApplicationVersionToApplicationName}, ElementName=window}" FontWeight="Bold" FontSize="14.667"/>-->
<FlowDocumentScrollViewer Grid.Row="2" Margin="5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Document="{Binding ReleaseNote, Converter={StaticResource TextToFlowDocumentConverter}, ElementName=window}"/>
<Button Background="WhiteSmoke" Grid.Row="3" Padding="10,5,10,5" Margin="5" HorizontalContentAlignment="Left" Click="OnInstallButtonClick" >
<Button.Content>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="64"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Image Source="/FileConverter;component/Resources/DownloadIcon.png" Stretch="Fill"/>
<Grid Grid.Column="1" Margin="10,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Label Grid.Row="0" Content="Install when I exit File Converter" FontSize="14.667"/>
<TextBlock Grid.Row="1" Text="The update will be downloaded in background, and installed once you exit File Converter." TextWrapping="Wrap" FontSize="10.667"/>
</Grid>
</Grid>
</Button.Content>
</Button>
</Grid>
</Window>
@@ -0,0 +1,80 @@
// <copyright file="UpgradeWindow.xaml.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.Windows
{
using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using System.Windows;
using FileConverter.Annotations;
using FileConverter.Upgrade;
public partial class UpgradeWindow : Window, INotifyPropertyChanged
{
private UpgradeVersionDescription upgradeVersionDescription;
private string releaseNoteContent;
public UpgradeWindow()
{
this.InitializeComponent();
}
public event PropertyChangedEventHandler PropertyChanged;
public UpgradeVersionDescription VersionDescription
{
get
{
return this.upgradeVersionDescription;
}
set
{
this.upgradeVersionDescription = value;
Task<string> task = Helpers.GetChangeLogAsync(this.upgradeVersionDescription, this.OnChangeLogRetrieved);
this.OnPropertyChanged();
}
}
public string ReleaseNote
{
get
{
if (string.IsNullOrEmpty(this.releaseNoteContent))
{
return "###Downloading change log ...";
}
return this.releaseNoteContent;
}
set
{
this.releaseNoteContent = value;
this.OnPropertyChanged();
}
}
[NotifyPropertyChangedInvocator]
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
{
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
private void OnChangeLogRetrieved(UpgradeVersionDescription versionDescription)
{
this.ReleaseNote = versionDescription.ChangeLog;
}
private void OnInstallButtonClick(object sender, RoutedEventArgs e)
{
this.upgradeVersionDescription.NeedToUpgrade = true;
Helpers.DownloadInstallerAsync(this.upgradeVersionDescription);
this.Close();
}
}
}
+1 -1
View File
@@ -40,7 +40,7 @@ namespace FileConverter
}
}
}
catch (System.Exception exception)
catch (System.Exception)
{
throw;
}
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Magick.NET-Q16-AnyCPU" version="7.0.0.0101" targetFramework="net45" />
</packages>
@@ -133,7 +133,7 @@ namespace FileConverterExtension
{
ToolStripMenuItem subItem = new ToolStripMenuItem
{
Text = "Settings",
Text = "Configure presets...",
};
fileConverterItem.DropDownItems.Add(subItem);
@@ -46,8 +46,9 @@
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpShell">
<HintPath>..\..\Middleware\SharpShell\SharpShell.dll</HintPath>
<Reference Include="SharpShell, Version=2.2.0.0, Culture=neutral, PublicKeyToken=f14dc899472fe6fb, processorArchitecture=MSIL">
<HintPath>..\..\packages\SharpShell.2.2.0.0\lib\net40\SharpShell.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -63,7 +64,7 @@
<Compile Include="FileConverterExtension.cs" />
<Compile Include="PresetDefinition.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<ExcludeFromStyleCop>true</ExcludeFromStyleCop>
<ExcludeFromStyleCop>true</ExcludeFromStyleCop>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -82,6 +83,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\ApplicationIcon-16x16.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -92,4 +94,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SharpShell" version="2.2.0.0" targetFramework="net45" />
</packages>
+25
View File
@@ -1,5 +1,30 @@
# Change Log
## Version 0.6
- New: Possibility to encode videos using H.264 video codec and AAC audio codec in a mp4 container (more portable than mkv).
- New: Support new image input file formats: psd, tga, svg and exr.
- New: Support new video input file format: m4v.
- New: Possibility to rotate images and videos.
- New: Remove restriction on image size to convert to ico file format (it is now possible to convert all images to ico).
- New: Add "Clamp to power of 2 size" option in image conversion.
- New: Support input images encoded in 16 bits or 32 bits per color channel.
- Fixed: Issue where the installer detects the utilisation of the extension dll in explorer, ask the user to restart it and fail to do it.
- Fixed: Issue where it is impossible to delete a conversion preset defined in default settings.
- Fixed: Issue where the Windows context menu does not contain user preset after an application upgrade.
- Fixed: Issue where some registry keys remain after file converter uninstallation.
- Fixed: Issue where aac bitrate was not saved.
- Fixed: Issue where settings serialization version was not updated.
- Change: Allow the user to scale images until 1600% size (useful to scale pixel art images).
## Version 0.5
- New: Software update system. The application now checks if a new version of File Converter is available.
- New: Possibility to scale images and videos.
- New: Possibility to encode videos (avi output file format) using Xvid video codec and Mp3 audio codec.
- New: Support new video input file formats: 3gp, webm and wmv.
- New: Add a help window to explain how file converter works when you launch it without using the context menu.
- Fixed: Problem to convert images when accentuated characters were present in their path.
- Tech: Update ffmpeg version (aac encoding is not anymore experimental).
## Version 0.4
- New: Possibility to encode videos (mkv output file format) using H.264 video codec and AAC audio codec.
- New: Possibility to extract Audio CD content.
+1 -1
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileConverter", "Application\FileConverter\FileConverter.csproj", "{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}"
EndProject
-30
View File
@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<?if $(var.Platform) = x64 ?>
<?define Win64 = "yes" ?>
<?else ?>
<?define Win64 = "no" ?>
<?endif ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLFOLDER">
<Component Id="FileConverterExtension.dll" Guid="{FEF385C4-C43F-44F9-92E2-06578A8BD96E}" Win64="$(var.Win64)">
<Class Id="{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}" Context="InprocServer32" Description="FileConverterExtension.FileConverterExtension" ThreadingModel="both" ForeignServer="mscoree.dll">
<ProgId Id="FileConverterExtension.FileConverterExtension" Description="FileConverterExtension.FileConverterExtension" />
</Class>
<File Id="FileConverterExtension.dll" KeyPath="yes" Source="..\Application\FileConverterExtension\bin\$(var.Configuration)\FileConverterExtension.dll" />
<RegistryValue Root="HKCR" Key="*\shellex\ContextMenuHandlers\FileConverterExtension" Value="{af9b72b5-f4e4-44b0-a3d9-b55b748efe90}" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value="" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32\1.0.0.0" Name="Class" Value="FileConverterExtension.FileConverterExtension" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32\1.0.0.0" Name="Assembly" Value="FileConverterExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=15400b1c4b948c8a" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32\1.0.0.0" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32\1.0.0.0" Name="CodeBase" Value="file:///[#FileConverterExtension.dll]" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32" Name="Class" Value="FileConverterExtension.FileConverterExtension" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32" Name="Assembly" Value="FileConverterExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=15400b1c4b948c8a" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{AF9B72B5-F4E4-44B0-A3D9-B55B748EFE90}\InprocServer32" Name="CodeBase" Value="file:///[#FileConverterExtension.dll]" Type="string" Action="write" />
</Component>
</DirectoryRef>
</Fragment>
</Wix>
-1
View File
@@ -1 +0,0 @@
"C:\Program Files (x86)\Wix Toolset v3.9\bin\Heat.exe" file "..\Application\FileConverterExtension\bin\Release\FileConverterExtension.dll" -dr INSTALLFOLDER -srd -gg -sfrag -suid -out "Extension.wxs" -b "..\Application\FileConverterExtension\bin\Release\"
+3 -1
View File
@@ -30,7 +30,6 @@
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="Extension.wxs" />
<Compile Include="Product.wxs" />
</ItemGroup>
<ItemGroup>
@@ -49,6 +48,9 @@
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
+43 -84
View File
@@ -12,7 +12,7 @@
<!-- Upgrade documentation: http://wixtoolset.org/documentation/manual/v3/howtos/updates/major_upgrade.html -->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="0.4.0" Manufacturer="AAllard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="0.6" Manufacturer="AAllard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
<Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" />
<Icon Id="icon.ico" SourceFile="..\Resources\ApplicationIcon.ico"/>
@@ -26,12 +26,20 @@
<ComponentGroupRef Id="ProductComponents" />
</Feature>
<Feature Id="ShellExtensionFeature" Title="ShellExtension" Level="1" AllowAdvertise="no">
<ComponentRef Id="FileConverterExtension.dll" />
</Feature>
<CustomAction Id="InstallShell" FileKey="srm.exe" ExeCommand='install "[INSTALLFOLDER]\FileConverterExtension.dll" -codebase' Execute="deferred" Return="check" Impersonate="no" />
<CustomAction Id="UninstallShell" FileKey="srm.exe" ExeCommand='uninstall "[INSTALLFOLDER]\FileConverterExtension.dll"' Execute="deferred" Return="check" Impersonate="no" />
<CustomAction Id='PostInstallInit' FileKey='FileConverter.exe' ExeCommand='--post-install-init' Return='asyncNoWait' />
<InstallExecuteSequence>
<Custom Action="InstallShell" After="InstallFiles">NOT Installed</Custom>
<Custom Action="UninstallShell" Before="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
<Custom Action="PostInstallInit" After="InstallFinalize">NOT Installed</Custom>
</InstallExecuteSequence>
<UIRef Id="WixUI_InstallDir" />
<Property Id="MSIUSEREALADMINDETECTION" Value="1" />
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" /> <!-- This avoid an issue where the installer detect the utilisation of the extension dll in explorer and then, ask to the user to restart these applications. The restart fails. -->
<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="..\Resources\Installer\Banner.bmp" />
@@ -52,18 +60,42 @@
<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<!-- Resources -->
<Component Guid="{9BF0AC45-A586-41C9-BA93-6048B46DA65F}" Win64="$(var.Win64)">
<File Id="SharpShell.dll" KeyPath="yes" Source="..\Middleware\SharpShell\SharpShell.dll" />
<!-- Application -->
<Component Guid="{142FBD60-90A7-4753-95CE-7B2A2E20B785}" Win64="$(var.Win64)">
<File Id="FileConverter.exe" Source="$(var.FileConverter.TargetPath)" KeyPath="yes" />
</Component>
<!-- Extension -->
<Component Guid="{AA5EA6F7-C443-488B-8E48-7CF000B9AD2A}" Win64="$(var.Win64)">
<File Source="$(var.FileConverter.TargetPath)" KeyPath="yes" />
<File Id="FileConverterExtension.dll" KeyPath="yes" Source="..\Application\FileConverterExtension\bin\$(var.Configuration)\FileConverterExtension.dll" />
</Component>
<Component Guid="{9BF0AC45-A586-41C9-BA93-6048B46DA65F}" Win64="$(var.Win64)">
<File Id="SharpShell.dll" KeyPath="yes" Source="..\packages\SharpShell.2.2.0.0\lib\net40\SharpShell.dll" />
</Component>
<Component Guid="{EC580BEF-F962-42BD-B46D-4E4C126F2641}" Win64="$(var.Win64)">
<File Id="srm.exe" Source="..\packages\SharpShellTools.2.2.0.0\lib\srm.exe" KeyPath="yes" />
</Component>
<!-- Third parties -->
<Component Guid="{1790B82E-86BC-4B95-AA1D-9859FF3B6CA4}" Win64="$(var.Win64)">
<File Source="..\Middleware\ffmpeg.exe" KeyPath="yes" />
</Component>
<Component Guid="{C59B7F72-D8D6-47A3-B1D9-515CBC9FCE6F}" Win64="$(var.Win64)">
<File Id="Magick.NET.dll" KeyPath="yes" Source="..\Application\FileConverter\bin\$(var.Configuration)\Magick.NET-Q16-AnyCPU.dll" />
</Component>
<Component Guid="{E1B1C09C-B089-40D8-859B-0E55F640CAE1}" Win64="$(var.Win64)">
<File Id="Markdown.Xaml.dll" KeyPath="yes" Source="..\Middleware\Markdown.Xaml.dll" />
</Component>
<Component Guid="{55CD0B47-D5B0-4F0C-A54E-3E11DF345B48}" Win64="$(var.Win64)">
<File Id="Ripper.dll" KeyPath="yes" Source="..\Middleware\Ripper.dll" />
</Component>
<Component Guid="{3CE6CF1B-431C-41FD-8381-3F73EDAF7B8A}" Win64="$(var.Win64)">
<File Id="yeti.mmedia.dll" KeyPath="yes" Source="..\Middleware\yeti.mmedia.dll" />
</Component>
<!-- Configuration and documentation -->
<Component Guid="{86AEF5B3-C25B-4662-BAEF-20969D1821A5}" Win64="$(var.Win64)">
<File Source="..\Application\FileConverter\Settings.xml" KeyPath="yes" />
<File Source="..\Application\FileConverter\Settings.default.xml" KeyPath="yes" />
</Component>
<Component Guid="{A5158756-A107-4010-9E2F-3C0333F5A5F6}" Win64="$(var.Win64)">
<File Source="..\README.md" KeyPath="yes" />
@@ -74,85 +106,12 @@
<Component Guid="{6378238B-E44F-414B-A7AE-7E72CFA8616D}" Win64="$(var.Win64)">
<File Source="..\LICENSE.md" KeyPath="yes" />
</Component>
<Component Guid="{55CD0B47-D5B0-4F0C-A54E-3E11DF345B48}" Win64="$(var.Win64)">
<File Id="Ripper.dll" KeyPath="yes" Source="..\Middleware\Ripper.dll" />
</Component>
<Component Guid="{3CE6CF1B-431C-41FD-8381-3F73EDAF7B8A}" Win64="$(var.Win64)">
<File Id="yeti.mmedia.dll" KeyPath="yes" Source="..\Middleware\yeti.mmedia.dll" />
</Component>
<!-- Registry entries -->
<Component Id="RegistryEntries" Guid="{C3EF3D67-0206-4DBD-B2EA-78FF2E290093}">
<RegistryKey Root="HKCU" Key="Software\FileConverter">
<RegistryKey Root="HKCU" Key="Software\FileConverter" Action="createAndRemoveOnUninstall">
<RegistryValue Name="Path" Type="string" Value="[INSTALLFOLDER]FileConverter.exe"/>
<RegistryValue Name="CompatibleInputExtensions" Type="string" Value="aac;aiff;ape;avi;bik;bmp;cda;flac;flv;ico;jpg;jpeg;m4a;mkv;mov;mp3;mp4;ogg;png;tiff;wav;wma"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\aac">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\aiff">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\ape">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\avi">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Ogg;To Flac;To Wav;To Mp3;To Aac;To Mkv (low quality)"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\bik">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Ogg;To Flac;To Wav;To Mp3;To Aac;To Mkv (low quality)"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\bmp">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Jpg;To Ico (max 256x256)"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\cda">
<RegistryValue Name="Presets" Type="string" Value="Extract CDA to Flac;Extract CDA to Ogg;Extract CDA to Mp3"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\flac">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\flv">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\ico">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Jpg"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\jpeg">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Ico (max 256x256)"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\jpg">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Ico (max 256x256)"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\m4a">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\mkv">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\mov">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\mp3">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\mp4">
<RegistryValue Name="Presets" Type="string" Value="To Mkv;To Mkv (low quality);To Ogg;To Flac;To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\ogg">
<RegistryValue Name="Presets" Type="string" Value="To Wav;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\png">
<RegistryValue Name="Presets" Type="string" Value="To Jpg;To Ico (max 256x256)"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\tiff">
<RegistryValue Name="Presets" Type="string" Value="To Png;To Jpg;To Ico (max 256x256)"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\wav">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Flac;To Mp3;To Aac"/>
</RegistryKey>
<RegistryKey Root="HKCU" Key="Software\FileConverter\wma">
<RegistryValue Name="Presets" Type="string" Value="To Ogg;To Wav;To Mp3;To Aac"/>
<RegistryValue Name="CompatibleInputExtensions" Type="string" Value="3gp;aac;aiff;ape;avi;bik;bmp;cda;exr;flac;flv;ico;jpg;jpeg;m4a;m4v;mkv;mov;mp3;mp4;ogg;png;psd;svg;tga;tiff;wav;webm;wma;wmv"/>
</RegistryKey>
</Component>
</ComponentGroup>
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SharpShellTools" version="2.2.0.0" />
</packages>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large. Load diff
Binary file not shown.
+10 -13
View File
@@ -1,21 +1,11 @@
# File Converter
## Description
**File Converter** is a very simple tool which allows you to convert one or several file(s) from one format to another using the context menu in windows explorer.
**File Converter** is a very simple tool which allows you to convert and compress one or several file(s) using the context menu of windows explorer.
You can download it here: [www.file-converter.org](http://file-converter.org).
You can download it here: [www.file-converter.org](http://file-converter.org/?from=readme.md).
## Supported file formats
Category | Supported output formats | Compatible input formats
------------|---------------------------|----------------------------------------------------------------------------
Audio | flac, aac, ogg, mp3, wav | aiff, ape, avi, bik, cda, flac, flv, m4a, mkv, mov, mp3, mp4, ogg, wav, wma
Video | mkv | avi, bik, flv, mkv, mov
Image | png, jpg, ico | bmp, ico, jpg, jpeg, png, tiff
*Note: If your source file is a video, the conversion to an audio format will extract the audio part of the video.*
*Note 2: The mkv output file format encodes video using H.264 encoder for video and AAC encoder for audio.*
You can find more information about what's in File converter and how to use it on the [wiki](https://github.com/Tichau/FileConverter/wiki).
## Thanks
@@ -24,12 +14,19 @@ File converter uses the following middlewares:
**ffmpeg** as file conversion software.
Thanks to ffmpeg devs for this awesome open source file conversion tool. [Web site link](https://www.ffmpeg.org/)
**ImageMagick** as image edition and conversion software.
Thanks to image magick devs for this awesome open source image edition software suite. [Web site link](http://imagemagick.net/)
And thanks to dlemstra for the C# wrapper of this software. [CodePlex link](https://magick.codeplex.com/)
**SharpShell** to easily create windows context menu extensions.
Thanks to Dave Kerr for his work on SharpShell. [CodePlex link](https://sharpshell.codeplex.com/)
**Ripper** and **yeti.mmedia** for CD Audio extraction.
Thanks to Idael Cardoso for his work on CD Audio ripper. [Code project link](http://www.codeproject.com/Articles/5458/C-Sharp-Ripper)
**Markdown.XAML** for markdown rendering in the wpf application.
Thanks to Bevan Arps for his work on Markdown.XAML. [GitHub link](https://github.com/theunrepentantgeek/Markdown.XAML)
## License
File Converter is licensed under the GPL version 3 License.
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

+148
View File
@@ -0,0 +1,148 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
width="792px"
height="792px"
viewBox="0 0 792 792"
style="enable-background:new 0 0 792 792;"
xml:space="preserve"
inkscape:version="0.91 r13725"
sodipodi:docname="DownloadIcon.svg"
inkscape:export-filename="D:\Users\Adrien.Adrien-PC\Documents\GitHub\FileConverter\Resources\ApplicationIcon.png"
inkscape:export-xdpi="8.6400003"
inkscape:export-ydpi="8.6400003"><metadata
id="metadata3385"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs3383" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1288"
inkscape:window-height="745"
id="namedview3381"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="1"
inkscape:cx="191.90166"
inkscape:cy="457.15385"
inkscape:window-x="70"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer4"><sodipodi:guide
position="21.058654,403.40483"
orientation="0,1"
id="guide4315" /></sodipodi:namedview><g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Background"><circle
style="opacity:1;fill:#0171bb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4286"
cx="389.60046"
cy="396.81552"
r="250"
inkscape:export-xdpi="11.52"
inkscape:export-ydpi="11.52" /></g><g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="Pattern"
style="display:inline"><path
style="opacity:1;fill:#004b82;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 389.61583,449.76033 165.67008,134.05739 c 26.59169,-24.80671 68.12788,-66.81759 81.95332,-151.49 l -205.197,-169.24358 z"
id="path4228"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
inkscape:export-xdpi="11.52"
inkscape:export-ydpi="11.52" /><path
style="display:inline;opacity:1;fill:#004b82;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 489.67143,516.22836 88.80255,42.79772 c -29.63541,38.68967 -80.08418,69.5045 -134.68118,81.98886 L 290.26732,516.22836 Z"
id="path4228-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
inkscape:export-xdpi="11.52"
inkscape:export-ydpi="11.52" /><path
style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 347.70439,264.18465 0,85.91347 -57.27565,0 98.99495,98.99494 99.3485,-99.3485 -56.9221,0 0,-85.55991 z"
id="path3400"
inkscape:connector-curvature="0"
inkscape:export-xdpi="11.52"
inkscape:export-ydpi="11.52" /><path
style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 488.59541,515.54472 0,-26.5165 -197.98989,0 0,26.5165 z"
id="path3402"
inkscape:connector-curvature="0"
inkscape:export-xdpi="11.52"
inkscape:export-ydpi="11.52" /></g><g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Arrow"
style="display:inline" /><g
id="g3337"
transform="matrix(0.55346595,0,0,0.55346595,167.0343,189.85664)" /><g
id="g3351" /><g
id="g3353" /><g
id="g3355" /><g
id="g3357" /><g
id="g3359" /><g
id="g3361" /><g
id="g3363" /><g
id="g3365" /><g
id="g3367" /><g
id="g3369" /><g
id="g3371" /><g
id="g3373" /><g
id="g3375" /><g
id="g3377" /><g
id="g3379" /><g
inkscape:groupmode="layer"
id="layer1"
inkscape:label="Files"
style="display:inline"><g
transform="translate(491.76135,105.01435)"
id="g9" /><g
transform="translate(491.76135,105.01435)"
id="g11" /><g
transform="translate(491.76135,105.01435)"
id="g13" /><g
transform="translate(491.76135,105.01435)"
id="g15" /><g
transform="translate(491.76135,105.01435)"
id="g17" /><g
transform="translate(491.76135,105.01435)"
id="g19" /><g
transform="translate(491.76135,105.01435)"
id="g21" /><g
transform="translate(491.76135,105.01435)"
id="g23" /><g
transform="translate(491.76135,105.01435)"
id="g25" /><g
transform="translate(491.76135,105.01435)"
id="g27" /><g
transform="translate(491.76135,105.01435)"
id="g29" /><g
transform="translate(491.76135,105.01435)"
id="g31" /><g
transform="translate(491.76135,105.01435)"
id="g33" /><g
transform="translate(491.76135,105.01435)"
id="g35" /><g
transform="translate(491.76135,105.01435)"
id="g37" /></g></svg>

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 39 KiB

+4
View File
@@ -0,0 +1,4 @@
<Version>
<Latest Major="0" Minor="5" Patch="0"/>
<URL>http://github.com/Tichau/FileConverter/releases/download/v0.5/FileConverter-0.5-x64-setup.msi</URL>
</Version>