Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
64ace9c4d6 | ||
|
|
749c794771 | ||
|
|
38c2ee2a1d | ||
|
|
1853b83c8f | ||
|
|
040192f3fb | ||
|
|
ce4f18a7f4 | ||
|
|
2d455e7b4b | ||
|
|
aa7d4fa3c2 | ||
|
|
981c306e2a | ||
|
|
44d477a446 | ||
|
|
ec4d5cb81c | ||
|
|
950faaa00b | ||
|
|
5c1826e760 | ||
|
|
9f241b83fa | ||
|
|
ddc603582d | ||
|
|
420e62763c | ||
|
|
4a7a15e453 | ||
|
|
ca9bdaf474 | ||
|
|
a47ea62c83 | ||
|
|
4ff01248ad | ||
|
|
92b5629956 | ||
|
|
c9b07e7162 | ||
|
|
92c96f03e8 | ||
|
|
962f29d35a | ||
|
|
f57e9ce7ac | ||
|
|
5d328b08b7 | ||
|
|
1fdf0893de | ||
|
|
fa019b1d19 | ||
|
|
50d0008558 | ||
|
|
a1b70b1238 | ||
|
|
ec16879572 | ||
|
|
f5290b0537 | ||
|
|
5a9a00d153 | ||
|
|
b34eec5327 | ||
|
|
d24c3327f2 | ||
|
|
dc54a7eae0 | ||
|
|
83d85cb93c | ||
|
|
72305ad71f | ||
|
|
4e1999d2af | ||
|
|
91b75338c4 | ||
|
|
1513aa19df | ||
|
|
569dedcf65 | ||
|
|
cfa6757312 | ||
|
|
897c9c5fcb | ||
|
|
9ba447e122 | ||
|
|
b01d577f6b | ||
|
|
7daa49e95d | ||
|
|
8831babb8c | ||
|
|
30574c8bb1 | ||
|
|
fc000f36b2 | ||
|
|
77d33cbb95 | ||
|
|
0b3ccca685 | ||
|
|
010a68c2c0 | ||
|
|
2f1fa29b5c | ||
|
|
4e3ce764c1 | ||
|
|
831e8d31f7 | ||
|
|
ce5efaf408 | ||
|
|
b766aeb757 | ||
|
|
4acb0b38b6 | ||
|
|
f037d74645 | ||
|
|
d2fac27419 | ||
|
|
89985015b0 | ||
|
|
73e6e5d2f1 | ||
|
|
b1015cd6b5 | ||
|
|
a532db7677 | ||
|
|
4073a921ff | ||
|
|
22e03b59df | ||
|
|
9ccc7d11a9 | ||
|
|
6a559fcad8 | ||
|
|
0fe5a832c7 | ||
|
|
c71be372f9 | ||
|
|
49264646fd | ||
|
|
85d7a8ce23 | ||
|
|
85b8eee165 | ||
|
|
1d6f089466 | ||
|
|
eb80b97799 | ||
|
|
e712eb9a50 | ||
|
|
a0d4db4c71 | ||
|
|
d9da885de2 | ||
|
|
185a32727d | ||
|
|
95a5854f82 | ||
|
|
7d5cfb5109 | ||
|
|
182b195d08 | ||
|
|
ee1ff06637 | ||
|
|
9a369be509 | ||
|
|
de51973e70 | ||
|
|
12c7a3b4c2 | ||
|
|
8ebddd9f0c | ||
|
|
68ba31632a | ||
|
|
67bb44c7c9 | ||
|
|
c6059f1596 | ||
|
|
39e623411a | ||
|
|
548f04a3f0 | ||
|
|
5d7924f6f7 | ||
|
|
4ded0b0e5e | ||
|
|
a687114ded | ||
|
|
432b53ae68 | ||
|
|
9946f82bcc | ||
|
|
b2bf4b7793 | ||
|
|
c01e618c55 | ||
|
|
944565ce3b | ||
|
|
db847ef182 | ||
|
|
27be265436 | ||
|
|
4e81f4637d | ||
|
|
36645b4a12 | ||
|
|
fdc16468cc | ||
|
|
d029311217 | ||
|
|
7e8e7526e6 | ||
|
|
dfb05980e6 | ||
|
|
8d8666e1e1 | ||
|
|
61dff1f5e2 | ||
|
|
83920a2310 | ||
|
|
2fd8d86aa1 | ||
|
|
b02da10dbc | ||
|
|
342c828721 | ||
|
|
b980dcda77 | ||
|
|
aa335a7aa0 | ||
|
|
fb69d060cb | ||
|
|
c0e55398a2 | ||
|
|
10114acba7 | ||
|
|
ea522531cf | ||
|
|
89d637a1be | ||
|
|
99b3f0dd8d | ||
|
|
7e13e9a100 | ||
|
|
03f23a0cfe | ||
|
|
e6670702a5 | ||
|
|
0c6c073cea | ||
|
|
b73b62e104 | ||
|
|
271fd489cc | ||
|
|
ab34ef9c48 | ||
|
|
6f55bd85f6 | ||
|
|
064aad972e | ||
|
|
44ec6d0cf9 | ||
|
|
c13249fdc7 | ||
|
|
680a45427c | ||
|
|
fc78c264a9 | ||
|
|
5323055e9c | ||
|
|
823cec2671 | ||
|
|
a28fdef080 | ||
|
|
1586917a2c | ||
|
|
ae009e0749 | ||
|
|
8397e40e52 | ||
|
|
a6baaba462 | ||
|
|
22655e58a5 | ||
|
|
d19a8f19d0 | ||
|
|
7c2e97d6c1 | ||
|
|
1b5484f5d7 | ||
|
|
9467da8dd0 | ||
|
|
020ee655dd | ||
|
|
279c075790 | ||
|
|
1c91123ccb | ||
|
|
a38c1bb338 | ||
|
|
647f04b1ee | ||
|
|
e9035fc43f | ||
|
|
538eea34f3 | ||
|
|
17cc4c8dcf | ||
|
|
357a3b6d6c | ||
|
|
bbd893e46f | ||
|
|
04b1bbdd06 | ||
|
|
ce1ad3181e | ||
|
|
15235a6382 | ||
|
|
b3e26812f3 | ||
|
|
2bc4cbddaa | ||
|
|
e447410a1e | ||
|
|
c0d7c404b2 | ||
|
|
23dcc2067d | ||
|
|
093c5a1c6d | ||
|
|
acaba53b3f | ||
|
|
946b6fc3f4 | ||
|
|
e0beb08a09 | ||
|
|
a8741693f5 | ||
|
|
03fa599a9b | ||
|
|
4a87c62992 | ||
|
|
fe7c3d37a7 | ||
|
|
0ac9af89ec | ||
|
|
a48917614e | ||
|
|
c5aa5efca4 | ||
|
|
49520eb2f6 | ||
|
|
3ae020866d | ||
|
|
df7834dec8 | ||
|
|
666af8a37b | ||
|
|
8e1f73f745 | ||
|
|
569d4198ed | ||
|
|
73ae27644d | ||
|
|
780ca19ae3 | ||
|
|
35fa417695 | ||
|
|
6f06f2943b | ||
|
|
9d648d7975 | ||
|
|
95d141dd69 | ||
|
|
bf724d0dd3 | ||
|
|
a51d07a893 | ||
|
|
a583053379 | ||
|
|
37f976f65b |
No files matched your search
@@ -15,8 +15,6 @@
|
||||
[Dd]ebugPublic/
|
||||
[Rr]elease/
|
||||
[Rr]eleases/
|
||||
x64/
|
||||
x86/
|
||||
build/
|
||||
bld/
|
||||
[Bb]in/
|
||||
@@ -194,3 +192,9 @@ FakesAssemblies/
|
||||
|
||||
# Visual Studio 6 workspace options file
|
||||
*.opt
|
||||
|
||||
# Ignore the installer signing commands file
|
||||
Installer/Installer.sign
|
||||
|
||||
# Ignore the installer languages file because it is automatically generated
|
||||
Installer/Languages.wxs
|
||||
@@ -3,4 +3,9 @@
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
|
||||
</startup>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<probing privatePath="Languages"/>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
@@ -1,8 +1,57 @@
|
||||
<Application x:Class="FileConverter.Application"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:xaml="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml"
|
||||
xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
|
||||
xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
|
||||
StartupUri="Windows/MainWindow.xaml" ShutdownMode="OnMainWindowClose">
|
||||
<Application.Resources>
|
||||
|
||||
<!-- Converters -->
|
||||
<valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
|
||||
<generic:BoolToVisibility x:Key="BoolToVisibility"/>
|
||||
|
||||
<generic:ValueConverterGroup x:Key="InvBoolToVisibility">
|
||||
<generic:BoolInverterConverter/>
|
||||
<generic:BoolToVisibility/>
|
||||
</generic:ValueConverterGroup>
|
||||
|
||||
<!-- Markdown style -->
|
||||
<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}"/>
|
||||
</Application.Resources>
|
||||
</Application>
|
||||
@@ -1,7 +1,7 @@
|
||||
// <copyright file="Application.xaml.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
/* File Converter - This program allow you to convert file format to another.
|
||||
Copyright (C) 2015 Adrien Allard
|
||||
Copyright (C) 2016 Adrien Allard
|
||||
email: adrien.allard.pro@gmail.com
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
|
||||
@@ -30,9 +30,9 @@ namespace FileConverter
|
||||
{
|
||||
private static readonly Version Version = new Version()
|
||||
{
|
||||
Major = 0,
|
||||
Minor = 6,
|
||||
Patch = 0,
|
||||
Major = 1,
|
||||
Minor = 2,
|
||||
Patch = 1,
|
||||
};
|
||||
|
||||
private readonly List<ConversionJob> conversionJobs = new List<ConversionJob>();
|
||||
@@ -41,13 +41,15 @@ namespace FileConverter
|
||||
|
||||
private bool needToRunConversionThread;
|
||||
private bool cancelAutoExit;
|
||||
private UpgradeVersionDescription upgradeVersionDescription = null;
|
||||
|
||||
private bool isSessionEnding;
|
||||
|
||||
public Application()
|
||||
{
|
||||
this.ConvertionJobs = this.conversionJobs.AsReadOnly();
|
||||
}
|
||||
|
||||
public event EventHandler<ApplicationTerminateArgs> OnApplicationTerminate;
|
||||
|
||||
public static Version ApplicationVersion
|
||||
{
|
||||
get
|
||||
@@ -80,6 +82,12 @@ namespace FileConverter
|
||||
set;
|
||||
}
|
||||
|
||||
public UpgradeVersionDescription UpgradeVersionDescription
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public bool Verbose
|
||||
{
|
||||
get;
|
||||
@@ -89,6 +97,11 @@ namespace FileConverter
|
||||
public void CancelAutoExit()
|
||||
{
|
||||
this.cancelAutoExit = true;
|
||||
|
||||
if (this.OnApplicationTerminate != null)
|
||||
{
|
||||
this.OnApplicationTerminate.Invoke(this, new ApplicationTerminateArgs(float.NaN));
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnStartup(StartupEventArgs e)
|
||||
@@ -99,7 +112,7 @@ namespace FileConverter
|
||||
|
||||
if (this.needToRunConversionThread)
|
||||
{
|
||||
Thread fileConvertionThread = new Thread(this.ConvertFiles);
|
||||
Thread fileConvertionThread = Helpers.InstantiateThread("ConversionQueueThread", this.ConvertFiles);
|
||||
fileConvertionThread.Start();
|
||||
}
|
||||
}
|
||||
@@ -109,24 +122,24 @@ namespace FileConverter
|
||||
base.OnExit(e);
|
||||
|
||||
Debug.Log("Exit application.");
|
||||
|
||||
if (this.upgradeVersionDescription != null && this.upgradeVersionDescription.NeedToUpgrade)
|
||||
|
||||
if (!this.isSessionEnding && this.UpgradeVersionDescription != null && this.UpgradeVersionDescription.NeedToUpgrade)
|
||||
{
|
||||
Debug.Log("A new version of file converter has been found: {0}.", this.upgradeVersionDescription.LatestVersion);
|
||||
Debug.Log("A new version of file converter has been found: {0}.", this.UpgradeVersionDescription.LatestVersion);
|
||||
|
||||
if (string.IsNullOrEmpty(this.upgradeVersionDescription.InstallerPath))
|
||||
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)
|
||||
while (this.UpgradeVersionDescription.InstallerDownloadInProgress)
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
}
|
||||
|
||||
string installerPath = this.upgradeVersionDescription.InstallerPath;
|
||||
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);
|
||||
@@ -134,7 +147,7 @@ namespace FileConverter
|
||||
}
|
||||
|
||||
// Start process.
|
||||
Debug.Log("Start file converter upgrade from version {0} to {1}.", ApplicationVersion, this.upgradeVersionDescription.LatestVersion);
|
||||
Debug.Log("Start file converter upgrade from version {0} to {1}.", ApplicationVersion, this.UpgradeVersionDescription.LatestVersion);
|
||||
|
||||
System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo(installerPath)
|
||||
{
|
||||
@@ -154,12 +167,22 @@ namespace FileConverter
|
||||
Debug.Release();
|
||||
}
|
||||
|
||||
protected override void OnSessionEnding(SessionEndingCancelEventArgs e)
|
||||
{
|
||||
base.OnSessionEnding(e);
|
||||
|
||||
this.isSessionEnding = true;
|
||||
this.Shutdown();
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
#if BUILD32
|
||||
Diagnostics.Debug.Log("File Converter v" + ApplicationVersion.ToString() + " (32 bits)");
|
||||
#else
|
||||
Diagnostics.Debug.Log("File Converter v" + ApplicationVersion.ToString() + " (64 bits)");
|
||||
#endif
|
||||
|
||||
// Retrieve arguments.
|
||||
Debug.Log("Retrieve arguments...");
|
||||
string[] args = Environment.GetCommandLineArgs();
|
||||
@@ -198,6 +221,11 @@ namespace FileConverter
|
||||
for (int index = 1; index < args.Length; index++)
|
||||
{
|
||||
string argument = args[index];
|
||||
if (string.IsNullOrEmpty(argument))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (argument.StartsWith("--"))
|
||||
{
|
||||
// This is an optional parameter.
|
||||
@@ -265,9 +293,21 @@ namespace FileConverter
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.Settings.MaximumNumberOfSimultaneousConversions <= 0)
|
||||
{
|
||||
this.Settings.MaximumNumberOfSimultaneousConversions = System.Math.Max(1, Environment.ProcessorCount / 2);
|
||||
Diagnostics.Debug.Log("The number of processors on this computer is {0}. Set the default number of conversion threads to {0}", this.Settings.MaximumNumberOfSimultaneousConversions);
|
||||
}
|
||||
|
||||
this.numberOfConversionThread = this.Settings.MaximumNumberOfSimultaneousConversions;
|
||||
Diagnostics.Debug.Log("Maximum number of conversion threads: {0}", this.numberOfConversionThread);
|
||||
|
||||
// Check upgrade.
|
||||
if (this.Settings.CheckUpgradeAtStartup)
|
||||
{
|
||||
#if DEBUG
|
||||
Task<UpgradeVersionDescription> task = Upgrade.Helpers.GetLatestVersionDescriptionAsync(this.OnGetLatestVersionDescription);
|
||||
#else
|
||||
long fileTime = Registry.GetValue<long>(Registry.Keys.LastUpdateCheckDate);
|
||||
DateTime lastUpdateDateTime = DateTime.FromFileTime(fileTime);
|
||||
|
||||
@@ -276,6 +316,7 @@ namespace FileConverter
|
||||
{
|
||||
Task<UpgradeVersionDescription> task = Upgrade.Helpers.GetLatestVersionDescriptionAsync(this.OnGetLatestVersionDescription);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
ConversionPreset conversionPreset = null;
|
||||
@@ -300,8 +341,7 @@ namespace FileConverter
|
||||
{
|
||||
string inputFilePath = filePaths[index];
|
||||
ConversionJob conversionJob = ConversionJobFactory.Create(conversionPreset, inputFilePath);
|
||||
conversionJob.PrepareConversion(inputFilePath);
|
||||
|
||||
|
||||
this.conversionJobs.Add(conversionJob);
|
||||
}
|
||||
}
|
||||
@@ -317,8 +357,14 @@ namespace FileConverter
|
||||
|
||||
private void ConvertFiles()
|
||||
{
|
||||
Thread[] jobThreads = new Thread[this.numberOfConversionThread];
|
||||
// Prepare conversions.
|
||||
for (int index = 0; index < this.ConvertionJobs.Count; index++)
|
||||
{
|
||||
this.ConvertionJobs[index].PrepareConversion();
|
||||
}
|
||||
|
||||
// Convert!
|
||||
Thread[] jobThreads = new Thread[this.numberOfConversionThread];
|
||||
while (true)
|
||||
{
|
||||
// Compute conversion flags.
|
||||
@@ -355,7 +401,7 @@ namespace FileConverter
|
||||
Thread thread = jobThreads[threadIndex];
|
||||
if (thread == null || !thread.IsAlive)
|
||||
{
|
||||
jobThread = new Thread(this.ExecuteConversionJob);
|
||||
jobThread = Helpers.InstantiateThread(conversionJob.GetType().Name, this.ExecuteConversionJob);
|
||||
jobThreads[threadIndex] = jobThread;
|
||||
break;
|
||||
}
|
||||
@@ -364,6 +410,12 @@ namespace FileConverter
|
||||
if (jobThread != null)
|
||||
{
|
||||
jobThread.Start(conversionJob);
|
||||
|
||||
while (conversionJob.State == ConversionJob.ConversionState.Ready)
|
||||
{
|
||||
Debug.Log("Wait the launch of the conversion thread before launching any other thread.");
|
||||
Thread.Sleep(20);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -381,13 +433,33 @@ namespace FileConverter
|
||||
allConversionsSucceed &= this.conversionJobs[index].State == ConversionJob.ConversionState.Done;
|
||||
}
|
||||
|
||||
if (this.cancelAutoExit)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (allConversionsSucceed)
|
||||
{
|
||||
System.Threading.Thread.Sleep((int)this.Settings.DurationBetweenEndOfConversionsAndApplicationExit * 1000);
|
||||
|
||||
if (this.cancelAutoExit)
|
||||
float remainingTime = this.Settings.DurationBetweenEndOfConversionsAndApplicationExit;
|
||||
while (remainingTime > 0f)
|
||||
{
|
||||
return;
|
||||
if (this.OnApplicationTerminate != null)
|
||||
{
|
||||
this.OnApplicationTerminate.Invoke(this, new ApplicationTerminateArgs(remainingTime));
|
||||
}
|
||||
|
||||
System.Threading.Thread.Sleep(1000);
|
||||
remainingTime--;
|
||||
|
||||
if (this.cancelAutoExit)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (this.OnApplicationTerminate != null)
|
||||
{
|
||||
this.OnApplicationTerminate.Invoke(this, new ApplicationTerminateArgs(remainingTime));
|
||||
}
|
||||
|
||||
Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
|
||||
@@ -413,18 +485,9 @@ namespace FileConverter
|
||||
{
|
||||
conversionJob.StartConvertion();
|
||||
}
|
||||
catch (Exception)
|
||||
catch (Exception exception)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
|
||||
if (conversionJob.State == ConversionJob.ConversionState.Done && !System.IO.File.Exists(conversionJob.OutputFilePath))
|
||||
{
|
||||
Debug.LogError("Can't find the output file.");
|
||||
}
|
||||
else if (conversionJob.State == ConversionJob.ConversionState.Failed && System.IO.File.Exists(conversionJob.OutputFilePath))
|
||||
{
|
||||
Debug.Log("The conversion job failed but there is an output file that does exists.");
|
||||
Debug.LogError("Failure during conversion: {0}", exception.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -442,7 +505,7 @@ namespace FileConverter
|
||||
return;
|
||||
}
|
||||
|
||||
this.upgradeVersionDescription = upgradeVersionDescription;
|
||||
this.UpgradeVersionDescription = upgradeVersionDescription;
|
||||
(this.MainWindow as MainWindow).OnNewVersionReleased(upgradeVersionDescription);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
// <copyright file="ApplicationTerminateArgs.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter
|
||||
{
|
||||
public class ApplicationTerminateArgs : System.EventArgs
|
||||
{
|
||||
public ApplicationTerminateArgs(float remainingTimeBeforeTermination)
|
||||
{
|
||||
this.RemainingTimeBeforeTermination = remainingTimeBeforeTermination;
|
||||
}
|
||||
|
||||
public float RemainingTimeBeforeTermination
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
// <copyright file="CancelConversionJobCommand.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.Commands
|
||||
{
|
||||
using System;
|
||||
using System.Windows.Input;
|
||||
using FileConverter.ConversionJobs;
|
||||
|
||||
public class CancelConversionJobCommand : ICommand
|
||||
{
|
||||
private readonly ConversionJob conversionJob;
|
||||
|
||||
public CancelConversionJobCommand(ConversionJob conversionJob)
|
||||
{
|
||||
this.conversionJob = conversionJob;
|
||||
}
|
||||
|
||||
public event EventHandler CanExecuteChanged;
|
||||
|
||||
public bool CanExecute(object parameter)
|
||||
{
|
||||
if (this.conversionJob == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return this.conversionJob.IsCancelable && this.conversionJob.State == ConversionJob.ConversionState.InProgress;
|
||||
}
|
||||
|
||||
public void Execute(object parameter)
|
||||
{
|
||||
this.conversionJob?.Cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
// <copyright file="DelegateCommand.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.Commands
|
||||
{
|
||||
using System;
|
||||
using System.Windows.Input;
|
||||
|
||||
public class DelegateCommand : ICommand
|
||||
{
|
||||
private Action executeMethod;
|
||||
private Func<bool> canExecuteMethod;
|
||||
|
||||
public DelegateCommand(Action executeMethod)
|
||||
{
|
||||
if (executeMethod == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(executeMethod));
|
||||
}
|
||||
|
||||
this.executeMethod = executeMethod;
|
||||
}
|
||||
|
||||
public DelegateCommand(Action executeMethod, Func<bool> canExecuteMethod)
|
||||
{
|
||||
this.executeMethod = executeMethod;
|
||||
this.canExecuteMethod = canExecuteMethod;
|
||||
}
|
||||
|
||||
public event EventHandler CanExecuteChanged;
|
||||
|
||||
public bool CanExecute(object parameter)
|
||||
{
|
||||
if (this.canExecuteMethod != null)
|
||||
{
|
||||
return this.canExecuteMethod.Invoke();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Execute(object parameter)
|
||||
{
|
||||
this.executeMethod.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
// <copyright file="OpenUrlCommand.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.Commands
|
||||
{
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Windows.Input;
|
||||
|
||||
public class OpenUrlCommand : ICommand
|
||||
{
|
||||
public OpenUrlCommand()
|
||||
{
|
||||
}
|
||||
|
||||
public event EventHandler CanExecuteChanged;
|
||||
|
||||
public bool CanExecute(object parameter)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Execute(object parameter)
|
||||
{
|
||||
string url = parameter as string;
|
||||
if (string.IsNullOrEmpty(url))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Process.Start(url);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,9 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters" x:Name="userControl"
|
||||
xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
x:Name="userControl"
|
||||
x:Class="FileConverter.Controls.EncodingQualitySliderControl"
|
||||
mc:Ignorable="d" d:DesignWidth="300" Height="50">
|
||||
<UserControl.Resources>
|
||||
@@ -21,6 +23,6 @@
|
||||
|
||||
<Slider Grid.Column="0" x:Name="slider" Margin="0,2,0,0" VerticalAlignment="Top" Maximum="245" AutoToolTipPlacement="TopLeft" SmallChange="8" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="115" SelectionEnd="245" Minimum="65" TickPlacement="BottomRight" LargeChange="32" TickFrequency="8" Ticks="65 85 100 115 130 165 175 190 225 245" Foreground="#004B82" />
|
||||
<Label Grid.Column="1" Content="{Binding Value, Converter={StaticResource BitrateToString}, ElementName=slider, Mode=OneWay}" Width="65" />
|
||||
<Label Grid.Column="0" Grid.Row="1" Content="Recommended bitrate range in blue" Foreground="#E5004B82" FontSize="11" />
|
||||
<Label Grid.Column="0" Grid.Row="1" Content="{x:Static project:Resources.RecommendeBitrateRangeInBlue}" Foreground="#E5004B82" FontSize="11" />
|
||||
</Grid>
|
||||
</UserControl>
|
||||
@@ -9,6 +9,6 @@ namespace FileConverter.ConversionJobs
|
||||
{
|
||||
None = 0x00,
|
||||
|
||||
CdaExtraction = 0x01,
|
||||
CdDriveExtraction = 0x01,
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ namespace FileConverter.ConversionJobs
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
|
||||
using FileConverter.Commands;
|
||||
using FileConverter.Diagnostics;
|
||||
|
||||
public class ConversionJob : INotifyPropertyChanged
|
||||
@@ -14,24 +15,36 @@ namespace FileConverter.ConversionJobs
|
||||
private float progress = 0f;
|
||||
private ConversionState state = ConversionState.Unknown;
|
||||
private string errorMessage = string.Empty;
|
||||
private string initialInputPath = string.Empty;
|
||||
private string userState = string.Empty;
|
||||
private CancelConversionJobCommand cancelCommand;
|
||||
|
||||
private string initialInputPath = string.Empty;
|
||||
private int currentOuputFilePathIndex;
|
||||
|
||||
public ConversionJob()
|
||||
{
|
||||
this.State = ConversionState.Unknown;
|
||||
this.ConversionPreset = null;
|
||||
this.initialInputPath = string.Empty;
|
||||
this.InputFilePath = string.Empty;
|
||||
}
|
||||
|
||||
public ConversionJob(ConversionPreset conversionPreset) : this()
|
||||
public ConversionJob(ConversionPreset conversionPreset, string inputFilePath) : this()
|
||||
{
|
||||
if (conversionPreset == null)
|
||||
{
|
||||
throw new ArgumentNullException("conversionPreset");
|
||||
throw new ArgumentNullException(nameof(conversionPreset));
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(inputFilePath))
|
||||
{
|
||||
throw new ArgumentNullException(nameof(inputFilePath));
|
||||
}
|
||||
|
||||
this.initialInputPath = inputFilePath;
|
||||
this.InputFilePath = inputFilePath;
|
||||
this.ConversionPreset = conversionPreset;
|
||||
this.UserState = Properties.Resources.ConversionStatePrepareConversion;
|
||||
}
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
@@ -60,10 +73,27 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
public string OutputFilePath
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
get
|
||||
{
|
||||
if (this.OutputFilePaths == null || this.OutputFilePaths.Length == 0)
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
if (this.CurrentOuputFilePathIndex < 0)
|
||||
{
|
||||
return this.OutputFilePaths[0];
|
||||
}
|
||||
|
||||
if (this.CurrentOuputFilePathIndex >= this.OutputFilePaths.Length)
|
||||
{
|
||||
return this.OutputFilePaths[this.OutputFilePaths.Length - 1];
|
||||
}
|
||||
|
||||
return this.OutputFilePaths[this.CurrentOuputFilePathIndex];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public ConversionState State
|
||||
{
|
||||
get
|
||||
@@ -126,6 +156,45 @@ namespace FileConverter.ConversionJobs
|
||||
protected set;
|
||||
}
|
||||
|
||||
public CancelConversionJobCommand CancelCommand
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.cancelCommand == null)
|
||||
{
|
||||
this.cancelCommand = new CancelConversionJobCommand(this);
|
||||
}
|
||||
|
||||
return this.cancelCommand;
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsCancelable
|
||||
{
|
||||
get;
|
||||
protected set;
|
||||
}
|
||||
|
||||
protected bool CancelIsRequested
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
protected int CurrentOuputFilePathIndex
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.currentOuputFilePathIndex;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
this.currentOuputFilePathIndex = value;
|
||||
this.NotifyPropertyChanged(nameof(this.OutputFilePath));
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual InputPostConversionAction InputPostConversionAction
|
||||
{
|
||||
get
|
||||
@@ -139,90 +208,100 @@ namespace FileConverter.ConversionJobs
|
||||
}
|
||||
}
|
||||
|
||||
public virtual bool CanStartConversion(ConversionFlags conversionFlags)
|
||||
protected string[] OutputFilePaths
|
||||
{
|
||||
return true;
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public void PrepareConversion(string inputFilePath, string outputFilePath = null)
|
||||
public virtual bool CanStartConversion(ConversionFlags conversionFlags)
|
||||
{
|
||||
if (string.IsNullOrEmpty(inputFilePath))
|
||||
{
|
||||
throw new ArgumentNullException("inputFilePath");
|
||||
}
|
||||
return (conversionFlags & ConversionFlags.CdDriveExtraction) == 0;
|
||||
}
|
||||
|
||||
public void PrepareConversion(params string[] outputFilePaths)
|
||||
{
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
string extension = System.IO.Path.GetExtension(inputFilePath);
|
||||
this.InputFilePath = this.initialInputPath;
|
||||
|
||||
string extension = System.IO.Path.GetExtension(this.initialInputPath);
|
||||
extension = extension.Substring(1, extension.Length - 1);
|
||||
string extensionCategory = PathHelpers.GetExtensionCategory(extension);
|
||||
if (!PathHelpers.IsOutputTypeCompatibleWithCategory(this.ConversionPreset.OutputType, extensionCategory))
|
||||
string extensionCategory = Helpers.GetExtensionCategory(extension);
|
||||
if (!Helpers.IsOutputTypeCompatibleWithCategory(this.ConversionPreset.OutputType, extensionCategory))
|
||||
{
|
||||
this.ConversionFailed("The input file type is not compatible with the output file type.");
|
||||
this.ConversionFailed(Properties.Resources.ErrorInputTypeIncompatibleWithOutputType);
|
||||
return;
|
||||
}
|
||||
|
||||
this.initialInputPath = inputFilePath;
|
||||
this.InputFilePath = inputFilePath;
|
||||
this.OutputFilePath = outputFilePath ?? this.ConversionPreset.GenerateOutputFilePath(inputFilePath);
|
||||
|
||||
if (!PathHelpers.IsPathValid(this.OutputFilePath))
|
||||
this.OutputFilePaths = outputFilePaths;
|
||||
if (this.OutputFilePaths.Length == 0)
|
||||
{
|
||||
this.ConversionFailed("Invalid output path generated by output file path template.");
|
||||
Debug.Log(string.Format("Invalid output path generated: {0} from input: {1}.", this.OutputFilePath, this.InputFilePath));
|
||||
return;
|
||||
int outputFilesCount = this.GetOuputFilesCount();
|
||||
this.OutputFilePaths = new string[outputFilesCount];
|
||||
}
|
||||
|
||||
if (this.OutputFilePath == this.InputFilePath)
|
||||
for (int index = 0; index < this.OutputFilePaths.Length; index++)
|
||||
{
|
||||
// If the input post conversion action is to move or delete the input file, change its name in order to keep the output name intact.
|
||||
if (this.ConversionPreset.InputPostConversionAction == InputPostConversionAction.MoveInArchiveFolder ||
|
||||
this.ConversionPreset.InputPostConversionAction == InputPostConversionAction.Delete)
|
||||
if (!string.IsNullOrEmpty(this.OutputFilePaths[index]))
|
||||
{
|
||||
string inputExtension = System.IO.Path.GetExtension(this.InputFilePath);
|
||||
string pathWithoutExtension = this.InputFilePath.Substring(0, this.InputFilePath.Length - inputExtension.Length);
|
||||
this.InputFilePath = PathHelpers.GenerateUniquePath(pathWithoutExtension + "_TEMP" + inputExtension);
|
||||
System.IO.File.Move(inputFilePath, this.InputFilePath);
|
||||
// Don't generate a path if it has already been set.
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// Create output folder that doesn't exist.
|
||||
{
|
||||
StringBuilder path = new StringBuilder(this.OutputFilePath.Length);
|
||||
foreach (string directory in PathHelpers.GetDirectories(this.OutputFilePath))
|
||||
string path = this.ConversionPreset.GenerateOutputFilePath(this.initialInputPath, index + 1, this.OutputFilePaths.Length);
|
||||
|
||||
if (!PathHelpers.IsPathValid(path))
|
||||
{
|
||||
path.Append(directory);
|
||||
path.Append('\\');
|
||||
this.ConversionFailed(Properties.Resources.ErrorInvalidOutputPath);
|
||||
Debug.Log($"Invalid output path generated: {path} from input: {this.InputFilePath}.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!System.IO.Directory.Exists(path.ToString()))
|
||||
if (path == this.InputFilePath)
|
||||
{
|
||||
// If the input post conversion action is to move or delete the input file, change its name in order to keep the output name intact.
|
||||
if (this.ConversionPreset.InputPostConversionAction == InputPostConversionAction.MoveInArchiveFolder ||
|
||||
this.ConversionPreset.InputPostConversionAction == InputPostConversionAction.Delete)
|
||||
{
|
||||
try
|
||||
{
|
||||
System.IO.Directory.CreateDirectory(path.ToString());
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
this.ConversionFailed("Invalid output path generated by output file path template.");
|
||||
Debug.Log(string.Format("Can't create directories for path {0}", this.OutputFilePath));
|
||||
return;
|
||||
}
|
||||
string inputExtension = System.IO.Path.GetExtension(this.InputFilePath);
|
||||
string pathWithoutExtension = this.InputFilePath.Substring(0, this.InputFilePath.Length - inputExtension.Length);
|
||||
this.InputFilePath = PathHelpers.GenerateUniquePath(pathWithoutExtension + "_TEMP" + inputExtension);
|
||||
System.IO.File.Move(this.initialInputPath, this.InputFilePath);
|
||||
}
|
||||
}
|
||||
|
||||
// Create output folders that doesn't exist.
|
||||
if (!PathHelpers.CreateFolders(path))
|
||||
{
|
||||
this.ConversionFailed(Properties.Resources.ErrorFailToCreateOutputPathFolders);
|
||||
return;
|
||||
}
|
||||
|
||||
// Make the output path valid.
|
||||
try
|
||||
{
|
||||
path = PathHelpers.GenerateUniquePath(path, this.OutputFilePaths);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
this.ConversionFailed(Properties.Resources.ErrorFailToGenerateUniqueOutputPath);
|
||||
Debug.Log(exception.Message);
|
||||
return;
|
||||
}
|
||||
|
||||
this.OutputFilePaths[index] = path;
|
||||
}
|
||||
|
||||
// Make the output path valid.
|
||||
try
|
||||
this.CurrentOuputFilePathIndex = 0;
|
||||
|
||||
// Check if the input file is located on a cd drive.
|
||||
if (PathHelpers.IsOnCDDrive(this.InputFilePath))
|
||||
{
|
||||
this.OutputFilePath = PathHelpers.GenerateUniquePath(this.OutputFilePath);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
this.ConversionFailed("Can't generate a valid output filename.");
|
||||
Debug.Log(exception.Message);
|
||||
return;
|
||||
this.StateFlags = ConversionFlags.CdDriveExtraction;
|
||||
}
|
||||
|
||||
this.Initialize();
|
||||
@@ -234,7 +313,10 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
Debug.Log("Job initialized: Preset: '{0}' Input: {1} Output: {2}", this.ConversionPreset.Name, this.InputFilePath, this.OutputFilePath);
|
||||
|
||||
this.UserState = "In Queue";
|
||||
if (this.State != ConversionState.Failed)
|
||||
{
|
||||
this.UserState = Properties.Resources.ConversionStateInQueue;
|
||||
}
|
||||
}
|
||||
|
||||
public void StartConvertion()
|
||||
@@ -252,7 +334,7 @@ namespace FileConverter.ConversionJobs
|
||||
Debug.Log("Convert file {0} to {1}.", this.InputFilePath, this.OutputFilePath);
|
||||
|
||||
this.State = ConversionState.InProgress;
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
this.Convert();
|
||||
@@ -262,6 +344,8 @@ namespace FileConverter.ConversionJobs
|
||||
this.ConversionFailed(exception.Message);
|
||||
}
|
||||
|
||||
this.StateFlags = ConversionFlags.None;
|
||||
|
||||
if (this.State == ConversionState.Failed)
|
||||
{
|
||||
this.OnConversionFailed();
|
||||
@@ -270,6 +354,31 @@ namespace FileConverter.ConversionJobs
|
||||
{
|
||||
this.OnConversionSucceed();
|
||||
}
|
||||
|
||||
if (this.State == ConversionJob.ConversionState.Done && !this.AllOuputFilesExists())
|
||||
{
|
||||
Debug.LogError(Properties.Resources.ErrorCantFindOutputFiles);
|
||||
}
|
||||
else if (this.State == ConversionJob.ConversionState.Failed && this.AtLeastOneOuputFilesExists())
|
||||
{
|
||||
Debug.Log(Properties.Resources.ErrorConversionFailedWithOutput);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void Cancel()
|
||||
{
|
||||
if (!this.IsCancelable || this.State != ConversionState.InProgress)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
this.CancelIsRequested = true;
|
||||
this.ConversionFailed(Properties.Resources.ErrorCanceled);
|
||||
}
|
||||
|
||||
protected virtual int GetOuputFilesCount()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
protected virtual void Convert()
|
||||
@@ -284,9 +393,21 @@ namespace FileConverter.ConversionJobs
|
||||
{
|
||||
Debug.Log("Conversion Failed.");
|
||||
|
||||
if (System.IO.File.Exists(this.OutputFilePath))
|
||||
for (int index = 0; index < this.OutputFilePaths.Length; index++)
|
||||
{
|
||||
System.IO.File.Delete(this.OutputFilePath);
|
||||
string outputFilePath = this.OutputFilePaths[index];
|
||||
try
|
||||
{
|
||||
if (System.IO.File.Exists(outputFilePath))
|
||||
{
|
||||
System.IO.File.Delete(outputFilePath);
|
||||
}
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Debug.Log("Can't delete file '{0}' after conversion job failure.", outputFilePath);
|
||||
Debug.Log("An exception as been thrown: {0}.", exception.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -324,7 +445,7 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
this.Progress = 1f;
|
||||
this.State = ConversionState.Done;
|
||||
this.UserState = "Done";
|
||||
this.UserState = Properties.Resources.ConversionStateDone;
|
||||
Debug.Log("Conversion Done!");
|
||||
}
|
||||
|
||||
@@ -339,7 +460,7 @@ namespace FileConverter.ConversionJobs
|
||||
}
|
||||
|
||||
this.State = ConversionState.Failed;
|
||||
this.UserState = "Failed";
|
||||
this.UserState = Properties.Resources.ConversionStateFailed;
|
||||
this.ErrorMessage = exitingMessage;
|
||||
}
|
||||
|
||||
@@ -350,5 +471,33 @@ namespace FileConverter.ConversionJobs
|
||||
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
|
||||
private bool AllOuputFilesExists()
|
||||
{
|
||||
for (int index = 0; index < this.OutputFilePaths.Length; index++)
|
||||
{
|
||||
string outputFilePath = this.OutputFilePaths[index];
|
||||
if (!System.IO.File.Exists(outputFilePath))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool AtLeastOneOuputFilesExists()
|
||||
{
|
||||
for (int index = 0; index < this.OutputFilePaths.Length; index++)
|
||||
{
|
||||
string outputFilePath = this.OutputFilePaths[index];
|
||||
if (System.IO.File.Exists(outputFilePath))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,24 +6,50 @@ namespace FileConverter.ConversionJobs
|
||||
{
|
||||
public static ConversionJob Create(ConversionPreset conversionPreset, string inputFilePath)
|
||||
{
|
||||
string extension = System.IO.Path.GetExtension(inputFilePath);
|
||||
extension = extension.ToLowerInvariant().Substring(1, extension.Length - 1);
|
||||
if (extension == "cda")
|
||||
string inputFileExtension = System.IO.Path.GetExtension(inputFilePath);
|
||||
inputFileExtension = inputFileExtension.ToLowerInvariant().Substring(1, inputFileExtension.Length - 1);
|
||||
if (inputFileExtension == "cda")
|
||||
{
|
||||
return new ConversionJob_ExtractCDA(conversionPreset);
|
||||
return new ConversionJob_ExtractCDA(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
if (inputFileExtension == "docx" || inputFileExtension == "odt" || inputFileExtension == "doc")
|
||||
{
|
||||
return new ConversionJob_Word(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
if (inputFileExtension == "xlsx" || inputFileExtension == "ods" || inputFileExtension == "xls")
|
||||
{
|
||||
return new ConversionJob_Excel(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
if (inputFileExtension == "pptx" || inputFileExtension == "odp" || inputFileExtension == "ppt")
|
||||
{
|
||||
return new ConversionJob_PowerPoint(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
if (conversionPreset.OutputType == OutputType.Ico)
|
||||
{
|
||||
return new ConversionJob_Ico(conversionPreset);
|
||||
return new ConversionJob_Ico(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
if (PathHelpers.GetExtensionCategory(extension) == PathHelpers.InputCategoryNames.Image)
|
||||
if (conversionPreset.OutputType == OutputType.Gif)
|
||||
{
|
||||
return new ConversionJob_ImageMagick(conversionPreset);
|
||||
return new ConversionJob_Gif(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
return new ConversionJob_FFMPEG(conversionPreset);
|
||||
if (conversionPreset.OutputType == OutputType.Pdf)
|
||||
{
|
||||
return new ConversionJob_ImageMagick(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
if (Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Image ||
|
||||
Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Document)
|
||||
{
|
||||
return new ConversionJob_ImageMagick(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
return new ConversionJob_FFMPEG(conversionPreset, inputFilePath);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
// <copyright file="ConversionJob_Excel.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.ConversionJobs
|
||||
{
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using FileConverter.Diagnostics;
|
||||
|
||||
using Excel = Microsoft.Office.Interop.Excel;
|
||||
|
||||
public class ConversionJob_Excel : ConversionJob_Office
|
||||
{
|
||||
private Excel.Workbook document;
|
||||
private Excel.Application application;
|
||||
|
||||
private string intermediateFilePath = string.Empty;
|
||||
private ConversionJob pdf2ImageConversionJob = null;
|
||||
|
||||
public ConversionJob_Excel() : base()
|
||||
{
|
||||
}
|
||||
|
||||
public ConversionJob_Excel(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
}
|
||||
|
||||
protected override ApplicationName Application
|
||||
{
|
||||
get
|
||||
{
|
||||
return ApplicationName.Excel;
|
||||
}
|
||||
}
|
||||
|
||||
protected override int GetOuputFilesCount()
|
||||
{
|
||||
if (this.ConversionPreset.OutputType == OutputType.Pdf)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!this.TryLoadDocumentIfNecessary())
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
int pagesCount = 0;
|
||||
foreach (object sheet in this.document.Sheets)
|
||||
{
|
||||
Excel.Worksheet worksheet = sheet as Excel.Worksheet;
|
||||
if (worksheet != null)
|
||||
{
|
||||
pagesCount = worksheet.PageSetup.Pages.Count;
|
||||
}
|
||||
}
|
||||
|
||||
return pagesCount;
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
if (this.State == ConversionState.Failed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new System.Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
// Initialize converters.
|
||||
if (this.ConversionPreset.OutputType == OutputType.Pdf)
|
||||
{
|
||||
this.intermediateFilePath = this.OutputFilePath;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Generate intermediate file path.
|
||||
string fileName = Path.GetFileNameWithoutExtension(this.InputFilePath);
|
||||
string tempPath = Path.GetTempPath();
|
||||
this.intermediateFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + ".pdf");
|
||||
|
||||
ConversionPreset intermediatePreset = new ConversionPreset("Pdf to image", this.ConversionPreset, "pdf");
|
||||
this.pdf2ImageConversionJob = ConversionJobFactory.Create(intermediatePreset, this.intermediateFilePath);
|
||||
this.pdf2ImageConversionJob.PrepareConversion(this.OutputFilePaths);
|
||||
}
|
||||
}
|
||||
|
||||
protected override void Convert()
|
||||
{
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new System.Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
this.UserState = Properties.Resources.ConversionStateReadDocument;
|
||||
|
||||
if (!this.TryLoadDocumentIfNecessary())
|
||||
{
|
||||
this.ConversionFailed(Properties.Resources.ErrorUnableToUseMicrosoftOffice);
|
||||
return;
|
||||
}
|
||||
|
||||
// Make this document the active document.
|
||||
this.document.Activate();
|
||||
|
||||
this.UserState = Properties.Resources.ConversionStateConversion;
|
||||
|
||||
Diagnostics.Debug.Log("Convert excel document to pdf.");
|
||||
this.document.ExportAsFixedFormat(Excel.XlFixedFormatType.xlTypePDF, this.intermediateFilePath);
|
||||
|
||||
Diagnostics.Debug.Log("Close excel document '{0}'.", this.InputFilePath);
|
||||
this.document.Close(false);
|
||||
this.document = null;
|
||||
|
||||
this.ReleaseOfficeApplicationInstanceIfNeeded();
|
||||
|
||||
if (this.pdf2ImageConversionJob != null)
|
||||
{
|
||||
if (!System.IO.File.Exists(this.intermediateFilePath))
|
||||
{
|
||||
this.ConversionFailed(Properties.Resources.ErrorCantFindOutputFiles);
|
||||
return;
|
||||
}
|
||||
|
||||
Task updateProgress = this.UpdateProgress();
|
||||
|
||||
Diagnostics.Debug.Log("Convert pdf to images.");
|
||||
|
||||
this.pdf2ImageConversionJob.StartConvertion();
|
||||
|
||||
if (this.pdf2ImageConversionJob.State != ConversionState.Done)
|
||||
{
|
||||
this.ConversionFailed(this.pdf2ImageConversionJob.ErrorMessage);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.intermediateFilePath))
|
||||
{
|
||||
Diagnostics.Debug.Log("Delete intermediate file {0}.", this.intermediateFilePath);
|
||||
|
||||
File.Delete(this.intermediateFilePath);
|
||||
}
|
||||
|
||||
updateProgress.Wait();
|
||||
}
|
||||
}
|
||||
|
||||
protected override void InitializeOfficeApplicationInstanceIfNecessary()
|
||||
{
|
||||
if (this.application != null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Initialize excel application.
|
||||
Diagnostics.Debug.Log("Instantiate excel application via interop.");
|
||||
this.application = new Excel.Application
|
||||
{
|
||||
Visible = false
|
||||
};
|
||||
}
|
||||
|
||||
protected override void ReleaseOfficeApplicationInstanceIfNeeded()
|
||||
{
|
||||
if (this.application == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Diagnostics.Debug.Log("Quit excel application via interop.");
|
||||
this.application.Quit();
|
||||
this.application = null;
|
||||
}
|
||||
|
||||
private async Task UpdateProgress()
|
||||
{
|
||||
while (this.pdf2ImageConversionJob.State != ConversionState.Done &&
|
||||
this.pdf2ImageConversionJob.State != ConversionState.Failed)
|
||||
{
|
||||
if (this.pdf2ImageConversionJob != null && this.pdf2ImageConversionJob.State == ConversionState.InProgress)
|
||||
{
|
||||
this.Progress = this.pdf2ImageConversionJob.Progress;
|
||||
}
|
||||
|
||||
if (this.pdf2ImageConversionJob != null && this.pdf2ImageConversionJob.State == ConversionState.InProgress)
|
||||
{
|
||||
this.Progress = this.pdf2ImageConversionJob.Progress;
|
||||
this.UserState = this.pdf2ImageConversionJob.UserState;
|
||||
}
|
||||
|
||||
await Task.Delay(40);
|
||||
}
|
||||
}
|
||||
|
||||
private bool TryLoadDocumentIfNecessary()
|
||||
{
|
||||
try
|
||||
{
|
||||
this.InitializeOfficeApplicationInstanceIfNecessary();
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Debug.Log(exception.ToString());
|
||||
Debug.Log("Failed to initialize office application.");
|
||||
}
|
||||
|
||||
if (this.application == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (this.document == null)
|
||||
{
|
||||
Diagnostics.Debug.Log("Load excel document '{0}'.", this.InputFilePath);
|
||||
|
||||
this.document = this.application.Workbooks.Open(this.InputFilePath, System.Reflection.Missing.Value, true);
|
||||
}
|
||||
|
||||
return this.document != null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
public class ConversionJob_ExtractCDA : ConversionJob
|
||||
{
|
||||
private Ripper.CDDrive cdDrive;
|
||||
private Ripper.CDDrive diskDrive;
|
||||
private int cdaTrackNumber = -1;
|
||||
private WaveWriter waveWriter;
|
||||
private string intermediateFilePath;
|
||||
@@ -22,10 +22,12 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
public ConversionJob_ExtractCDA() : base()
|
||||
{
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
|
||||
public ConversionJob_ExtractCDA(ConversionPreset conversionPreset) : base(conversionPreset)
|
||||
public ConversionJob_ExtractCDA(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
|
||||
protected override InputPostConversionAction InputPostConversionAction
|
||||
@@ -36,9 +38,11 @@ namespace FileConverter.ConversionJobs
|
||||
}
|
||||
}
|
||||
|
||||
public override bool CanStartConversion(ConversionFlags conversionFlags)
|
||||
public override void Cancel()
|
||||
{
|
||||
return (conversionFlags & ConversionFlags.CdaExtraction) == 0;
|
||||
base.Cancel();
|
||||
|
||||
this.compressionConversionJob.Cancel();
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
@@ -54,14 +58,14 @@ namespace FileConverter.ConversionJobs
|
||||
string pathDriveLetter = PathHelpers.GetPathDriveLetter(this.InputFilePath);
|
||||
if (pathDriveLetter.Length == 0)
|
||||
{
|
||||
this.ConversionFailed("Can't retrieve input path drive letter.");
|
||||
this.ConversionFailed(Properties.Resources.ErrorFailToRetrieveInputPathDriveLetter);
|
||||
return;
|
||||
}
|
||||
|
||||
char driveLetter = pathDriveLetter[0];
|
||||
|
||||
this.cdDrive = new Ripper.CDDrive();
|
||||
this.cdDrive.CDRemoved += new EventHandler(this.CdDriveCdRemoved);
|
||||
this.diskDrive = new Ripper.CDDrive();
|
||||
this.diskDrive.CDRemoved += new EventHandler(this.CdDriveCdRemoved);
|
||||
|
||||
bool driveLetterFound = false;
|
||||
char[] driveLetters = Ripper.CDDrive.GetCDDriveLetters();
|
||||
@@ -72,7 +76,8 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
if (!driveLetterFound)
|
||||
{
|
||||
this.ConversionFailed(string.Format("Invalid drive letter {0}.", driveLetter));
|
||||
Debug.Log($"Invalid drive letter {driveLetter}.");
|
||||
this.ConversionFailed(Properties.Resources.ErrorFailToRetrieveInputPathDriveLetter);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -83,19 +88,20 @@ namespace FileConverter.ConversionJobs
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
this.ConversionFailed(string.Format("Can't retrieve the track number from input path '{0}'.", this.InputFilePath));
|
||||
Debug.Log($"Input path: '{this.InputFilePath}'.");
|
||||
this.ConversionFailed(Properties.Resources.ErrorFailToRetrieveTrackNumber);
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.cdDrive.IsOpened)
|
||||
if (this.diskDrive.IsOpened)
|
||||
{
|
||||
this.ConversionFailed(string.Format("CD drive already used."));
|
||||
this.ConversionFailed(Properties.Resources.ErrorFailToUseCDDriveOpen);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.cdDrive.Open(driveLetter))
|
||||
if (!this.diskDrive.Open(driveLetter))
|
||||
{
|
||||
this.ConversionFailed(string.Format("Fail to open cd drive {0}.", driveLetter));
|
||||
this.ConversionFailed(string.Format(Properties.Resources.ErrorFailToReadCDDrive, driveLetter));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -106,10 +112,8 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
// Sub conversion job (for compression).
|
||||
this.compressionConversionJob = ConversionJobFactory.Create(this.ConversionPreset, this.intermediateFilePath);
|
||||
this.compressionConversionJob.PrepareConversion(this.intermediateFilePath, this.OutputFilePath);
|
||||
this.compressionThread = new Thread(this.CompressAsync);
|
||||
|
||||
this.StateFlags = ConversionFlags.CdaExtraction;
|
||||
this.compressionConversionJob.PrepareConversion(this.OutputFilePath);
|
||||
this.compressionThread = Helpers.InstantiateThread("CDACompressionThread", this.CompressAsync);
|
||||
}
|
||||
|
||||
protected override void Convert()
|
||||
@@ -121,45 +125,47 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
Debug.Log("Starting CDA extraction.");
|
||||
|
||||
this.UserState = "Extraction";
|
||||
this.UserState = Properties.Resources.ConversionStateExtraction;
|
||||
|
||||
if (!this.cdDrive.IsCDReady())
|
||||
if (!this.diskDrive.IsCDReady())
|
||||
{
|
||||
this.ConversionFailed(string.Format("CD drive is not ready."));
|
||||
this.ConversionFailed(Properties.Resources.ErrorCDDriveNotReady);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.cdDrive.Refresh())
|
||||
if (!this.diskDrive.Refresh())
|
||||
{
|
||||
this.ConversionFailed(string.Format("Can't refresh CD drive data."));
|
||||
Debug.Log("Can't refresh CD drive data.");
|
||||
this.ConversionFailed(Properties.Resources.ErrorCDDriveNotReady);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.cdDrive.LockCD())
|
||||
if (!this.diskDrive.LockCD())
|
||||
{
|
||||
this.ConversionFailed(string.Format("Can't lock cd."));
|
||||
Debug.Log("Can\'t lock cd.");
|
||||
this.ConversionFailed(Properties.Resources.ErrorCDDriveNotReady);
|
||||
return;
|
||||
}
|
||||
|
||||
WaveFormat waveFormat = new WaveFormat(44100, 16, 2);
|
||||
|
||||
using (Stream waveStream = new FileStream(this.intermediateFilePath, FileMode.Create, FileAccess.Write))
|
||||
using (this.waveWriter = new WaveWriter(waveStream, waveFormat, this.cdDrive.TrackSize(this.cdaTrackNumber)))
|
||||
using (this.waveWriter = new WaveWriter(waveStream, waveFormat, this.diskDrive.TrackSize(this.cdaTrackNumber)))
|
||||
{
|
||||
this.cdDrive.ReadTrack(this.cdaTrackNumber, this.WriteWaveData, this.CdReadProgress);
|
||||
this.diskDrive.ReadTrack(this.cdaTrackNumber, this.WriteWaveData, this.CdReadProgress);
|
||||
}
|
||||
|
||||
this.waveWriter = null;
|
||||
|
||||
this.cdDrive.UnLockCD();
|
||||
this.diskDrive.UnLockCD();
|
||||
|
||||
this.cdDrive.Close();
|
||||
this.diskDrive.Close();
|
||||
|
||||
this.StateFlags = ConversionFlags.None;
|
||||
|
||||
if (!File.Exists(this.intermediateFilePath))
|
||||
{
|
||||
this.ConversionFailed("Extraction failed.");
|
||||
this.ConversionFailed(Properties.Resources.ErrorCDAExtractionFailed);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -167,7 +173,7 @@ namespace FileConverter.ConversionJobs
|
||||
Debug.Log(string.Empty);
|
||||
Debug.Log("Start compression.");
|
||||
|
||||
this.UserState = "Conversion";
|
||||
this.UserState = Properties.Resources.ConversionStateConversion;
|
||||
|
||||
this.compressionThread.Start();
|
||||
|
||||
@@ -196,6 +202,12 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
private void CdReadProgress(object sender, ReadProgressEventArgs eventArgs)
|
||||
{
|
||||
if (this.CancelIsRequested)
|
||||
{
|
||||
eventArgs.CancelRead = true;
|
||||
return;
|
||||
}
|
||||
|
||||
this.Progress = (float)eventArgs.BytesRead / (float)eventArgs.Bytes2Read;
|
||||
|
||||
eventArgs.CancelRead |= this.State != ConversionState.InProgress;
|
||||
|
||||
@@ -3,11 +3,102 @@
|
||||
namespace FileConverter.ConversionJobs
|
||||
{
|
||||
using System;
|
||||
using System.Globalization;
|
||||
|
||||
using FileConverter.Controls;
|
||||
|
||||
public partial class ConversionJob_FFMPEG
|
||||
{
|
||||
private static string Encapsulate(string optionName, string args)
|
||||
{
|
||||
if (string.IsNullOrEmpty(args))
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
return string.Format("{0} \"{1}\"", optionName, args);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Compute the argument needed to change the number of channels in an audio file.
|
||||
/// </summary>
|
||||
/// <param name="conversionPreset">The conversion preset</param>
|
||||
/// <returns>The argument string.</returns>
|
||||
/// https://trac.ffmpeg.org/wiki/AudioChannelManipulation
|
||||
private static string ComputeAudioChannelArgs(ConversionPreset conversionPreset)
|
||||
{
|
||||
string channelArgs = string.Empty;
|
||||
int channelCount = conversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioChannelCount);
|
||||
if (channelCount > 0)
|
||||
{
|
||||
channelArgs = $"-ac {channelCount}";
|
||||
}
|
||||
|
||||
return channelArgs;
|
||||
}
|
||||
|
||||
private static string ComputeTransformArgs(ConversionPreset conversionPreset)
|
||||
{
|
||||
float scaleFactor = conversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoScale);
|
||||
string scaleArgs = string.Empty;
|
||||
|
||||
if (conversionPreset.OutputType == OutputType.Mkv || conversionPreset.OutputType == OutputType.Mp4)
|
||||
{
|
||||
// This presets use h264 codec, the size of the video need to be divisible by 2.
|
||||
scaleArgs = string.Format("scale=trunc(iw*{0}/2)*2:trunc(ih*{0}/2)*2", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
|
||||
}
|
||||
else if (Math.Abs(scaleFactor - 1f) >= 0.005f)
|
||||
{
|
||||
scaleArgs = string.Format("scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
|
||||
}
|
||||
|
||||
float rotationAngleInDegrees = 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 content (scale=..., transpose=...)
|
||||
string transformArgs = string.Empty;
|
||||
if (!string.IsNullOrEmpty(scaleArgs))
|
||||
{
|
||||
transformArgs += scaleArgs;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(rotationArgs))
|
||||
{
|
||||
if (!string.IsNullOrEmpty(transformArgs))
|
||||
{
|
||||
transformArgs += ",";
|
||||
}
|
||||
|
||||
transformArgs += rotationArgs;
|
||||
}
|
||||
|
||||
return transformArgs;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert bitrate in <c>mp3</c> encoder quality index.
|
||||
/// </summary>
|
||||
@@ -105,6 +196,18 @@ namespace FileConverter.ConversionJobs
|
||||
throw new Exception("Unknown Ogg VBR bitrate.");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert video quality index to lib <c>theora</c> video quality level.
|
||||
/// </summary>
|
||||
/// <param name="quality">The quality index.</param>
|
||||
/// <returns>Returns the video quality index.</returns>
|
||||
/// The range of the video quality level is 0-10: where 10 is the highest quality/largest filesize, 0 being the lowest quality/smallest filesize.
|
||||
/// https://trac.ffmpeg.org/wiki/TheoraVorbisEncodingGuide
|
||||
private int OGVTheoraQualityToQualityIndex(int quality)
|
||||
{
|
||||
return quality;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert encoding mode setting to <c>ffmpeg</c> argument option.
|
||||
/// </summary>
|
||||
@@ -173,35 +276,35 @@ namespace FileConverter.ConversionJobs
|
||||
/// </summary>
|
||||
/// <param name="encodingSpeed">The encoding speed.</param>
|
||||
/// <returns>The H264 preset.</returns>
|
||||
private string H264EncodingSpeedToPreset(string encodingSpeed)
|
||||
private string H264EncodingSpeedToPreset(VideoEncodingSpeed encodingSpeed)
|
||||
{
|
||||
switch (encodingSpeed)
|
||||
{
|
||||
case "Ultra Fast":
|
||||
case VideoEncodingSpeed.UltraFast:
|
||||
return "ultrafast";
|
||||
|
||||
case "Super Fast":
|
||||
case VideoEncodingSpeed.SuperFast:
|
||||
return "superfast";
|
||||
|
||||
case "Very Fast":
|
||||
case VideoEncodingSpeed.VeryFast:
|
||||
return "veryfast";
|
||||
|
||||
case "Faster":
|
||||
case VideoEncodingSpeed.Faster:
|
||||
return "faster";
|
||||
|
||||
case "Fast":
|
||||
case VideoEncodingSpeed.Fast:
|
||||
return "fast";
|
||||
|
||||
case "Medium":
|
||||
case VideoEncodingSpeed.Medium:
|
||||
return "medium";
|
||||
|
||||
case "Slow":
|
||||
case VideoEncodingSpeed.Slow:
|
||||
return "slow";
|
||||
|
||||
case "Slower":
|
||||
case VideoEncodingSpeed.Slower:
|
||||
return "slower";
|
||||
|
||||
case "Very Slow":
|
||||
case VideoEncodingSpeed.VerySlow:
|
||||
return "veryslow";
|
||||
}
|
||||
|
||||
@@ -263,5 +366,17 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
throw new Exception("Unknown VBR bitrate.");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert video quality index to H264 constant rate factor.
|
||||
/// </summary>
|
||||
/// <param name="quality">The quality index.</param>
|
||||
/// <returns>Returns the H264 constant rate factor.</returns>
|
||||
/// The range of the quantizer scale is 0-63: lower values mean better quality.
|
||||
/// https://trac.ffmpeg.org/wiki/Encode/VP9
|
||||
private int WebmQualityToCRF(int quality)
|
||||
{
|
||||
return 63 - quality;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace FileConverter.ConversionJobs
|
||||
{
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
@@ -20,14 +21,18 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
private ProcessStartInfo ffmpegProcessStartInfo;
|
||||
|
||||
private List<FFMpegPass> ffmpegArgumentStringByPass = new List<FFMpegPass>();
|
||||
|
||||
public ConversionJob_FFMPEG() : base()
|
||||
{
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
|
||||
public ConversionJob_FFMPEG(ConversionPreset conversionPreset) : base(conversionPreset)
|
||||
public ConversionJob_FFMPEG(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
|
||||
|
||||
protected virtual string FfmpegPath
|
||||
{
|
||||
get
|
||||
@@ -51,7 +56,7 @@ namespace FileConverter.ConversionJobs
|
||||
string ffmpegPath = this.FfmpegPath;
|
||||
if (!System.IO.File.Exists(ffmpegPath))
|
||||
{
|
||||
this.ConversionFailed("Can't find ffmpeg executable. You should try to reinstall the application.");
|
||||
this.ConversionFailed(Properties.Resources.ErrorCantFindFFMPEG);
|
||||
Diagnostics.Debug.Log("Can't find ffmpeg executable ({0}). Try to reinstall the application.", ffmpegPath);
|
||||
return;
|
||||
}
|
||||
@@ -63,15 +68,27 @@ namespace FileConverter.ConversionJobs
|
||||
this.ffmpegProcessStartInfo.RedirectStandardOutput = true;
|
||||
this.ffmpegProcessStartInfo.RedirectStandardError = true;
|
||||
|
||||
string arguments = string.Empty;
|
||||
this.FillFFMpegArgumentsList();
|
||||
}
|
||||
|
||||
protected virtual void FillFFMpegArgumentsList()
|
||||
{
|
||||
// This option are necessary to be able to read metadata on Windows. src: http://jonhall.info/how_to/create_id3_tags_using_ffmpeg
|
||||
const string metadataArgs = "-id3v2_version 3 -write_id3v1 1";
|
||||
|
||||
switch (this.ConversionPreset.OutputType)
|
||||
{
|
||||
case OutputType.Aac:
|
||||
{
|
||||
string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
|
||||
|
||||
// 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}", this.AACBitrateToQualityIndex(audioEncodingBitrate));
|
||||
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
string encoderArgs = $"-c:a aac -q:a {this.AACBitrateToQualityIndex(audioEncodingBitrate)} {channelArgs} {metadataArgs}";
|
||||
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -82,75 +99,64 @@ namespace FileConverter.ConversionJobs
|
||||
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)
|
||||
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
|
||||
|
||||
string audioArgs = "-an";
|
||||
if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
|
||||
{
|
||||
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 += "\"";
|
||||
audioArgs = string.Format("-c:a libmp3lame -qscale:a {0}", this.MP3VBRBitrateToQualityIndex(audioEncodingBitrate));
|
||||
}
|
||||
|
||||
// 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);
|
||||
string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
|
||||
string encoderArgs = $"-c:v mpeg4 -vtag xvid -qscale:v {this.MPEG4QualityToQualityIndex(videoEncodingQuality)} {audioArgs} {videoFilteringArgs} {metadataArgs}";
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case OutputType.Flac:
|
||||
{
|
||||
string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
|
||||
|
||||
// http://taer-naguur.blogspot.fr/2013/11/flac-audio-encoding-with-ffmpeg.html
|
||||
string encoderArgs = string.Format("-compression_level 12");
|
||||
string encoderArgs = $"-compression_level 12 {channelArgs} {metadataArgs}";
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case OutputType.Gif:
|
||||
{
|
||||
// http://blog.pkh.me/p/21-high-quality-gif-with-ffmpeg.html
|
||||
string fileName = Path.GetFileName(this.InputFilePath);
|
||||
string tempPath = Path.GetTempPath();
|
||||
string paletteFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + " - palette.png");
|
||||
|
||||
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
|
||||
|
||||
// fps.
|
||||
int framesPerSecond = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoFramesPerSecond);
|
||||
if (!string.IsNullOrEmpty(transformArgs))
|
||||
{
|
||||
transformArgs += ",";
|
||||
}
|
||||
|
||||
transformArgs += string.Format("fps={0}", framesPerSecond);
|
||||
|
||||
// Generate palette.
|
||||
string encoderArgs = string.Format("-vf \"{0},palettegen\"", transformArgs);
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, paletteFilePath, encoderArgs);
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass("Indexing colors", arguments, paletteFilePath));
|
||||
|
||||
// Create gif.
|
||||
encoderArgs = string.Format("-i \"{0}\" -lavfi \"{1},paletteuse\"", paletteFilePath, transformArgs);
|
||||
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -158,7 +164,9 @@ namespace FileConverter.ConversionJobs
|
||||
case OutputType.Ico:
|
||||
{
|
||||
string encoderArgs = string.Empty;
|
||||
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -176,34 +184,40 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
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);
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case OutputType.Mp3:
|
||||
{
|
||||
string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
|
||||
|
||||
string encoderArgs = string.Empty;
|
||||
EncodingMode encodingMode = this.ConversionPreset.GetSettingsValue<EncodingMode>(ConversionPreset.ConversionSettingKeys.AudioEncodingMode);
|
||||
int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
|
||||
switch (encodingMode)
|
||||
{
|
||||
case EncodingMode.Mp3VBR:
|
||||
encoderArgs = string.Format("-codec:a libmp3lame -q:a {0}", this.MP3VBRBitrateToQualityIndex(encodingQuality));
|
||||
encoderArgs = $"-codec:a libmp3lame -q:a {this.MP3VBRBitrateToQualityIndex(encodingQuality)} {channelArgs} {metadataArgs}";
|
||||
break;
|
||||
|
||||
case EncodingMode.Mp3CBR:
|
||||
encoderArgs = string.Format("-codec:a libmp3lame -b:a {0}k", encodingQuality);
|
||||
encoderArgs = $"-codec:a libmp3lame -b:a {encodingQuality}k {channelArgs} {metadataArgs}";
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
break;
|
||||
|
||||
case OutputType.Mkv:
|
||||
case OutputType.Mp4:
|
||||
@@ -211,77 +225,65 @@ namespace FileConverter.ConversionJobs
|
||||
// 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);
|
||||
VideoEncodingSpeed videoEncodingSpeed = this.ConversionPreset.GetSettingsValue<VideoEncodingSpeed>(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed);
|
||||
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)
|
||||
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
|
||||
string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
|
||||
|
||||
string audioArgs = "-an";
|
||||
if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
|
||||
{
|
||||
scaleArgs = string.Format("scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
|
||||
audioArgs = $"-c:a aac -qscale:a {this.AACBitrateToQualityIndex(audioEncodingBitrate)} {metadataArgs}";
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
string encoderArgs = string.Format(
|
||||
"-c:v libx264 -preset {0} -crf {1} {2} {3}",
|
||||
this.H264EncodingSpeedToPreset(videoEncodingSpeed),
|
||||
this.H264QualityToCRF(videoEncodingQuality),
|
||||
audioArgs,
|
||||
videoFilteringArgs);
|
||||
|
||||
// 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;
|
||||
}
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
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);
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case OutputType.Ogg:
|
||||
{
|
||||
string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
|
||||
|
||||
int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
|
||||
string encoderArgs = string.Format("-codec:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(encodingQuality));
|
||||
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
string encoderArgs = $"-vn -codec:a libvorbis -qscale:a {this.OGGVBRBitrateToQualityIndex(encodingQuality)} {channelArgs} {metadataArgs}";
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case OutputType.Ogv:
|
||||
{
|
||||
// https://trac.ffmpeg.org/wiki/TheoraVorbisEncodingGuide
|
||||
int videoEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoQuality);
|
||||
int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
|
||||
|
||||
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
|
||||
string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
|
||||
|
||||
string audioArgs = "-an";
|
||||
if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
|
||||
{
|
||||
audioArgs = $"-codec:a libvorbis -qscale:a {this.OGGVBRBitrateToQualityIndex(audioEncodingBitrate)}";
|
||||
}
|
||||
|
||||
string encoderArgs = $"-codec:v libtheora -qscale:v {this.OGVTheoraQualityToQualityIndex(videoEncodingQuality)} {audioArgs} {videoFilteringArgs} {metadataArgs}";
|
||||
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -298,32 +300,84 @@ namespace FileConverter.ConversionJobs
|
||||
// http://www.howtogeek.com/203979/is-the-png-format-lossless-since-it-has-a-compression-parameter/
|
||||
string encoderArgs = string.Format("-compression_level 100 {0}", scaleArgs);
|
||||
|
||||
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case OutputType.Wav:
|
||||
{
|
||||
string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
|
||||
|
||||
EncodingMode encodingMode = this.ConversionPreset.GetSettingsValue<EncodingMode>(ConversionPreset.ConversionSettingKeys.AudioEncodingMode);
|
||||
string encoderArgs = string.Format("-acodec {0}", this.WAVEncodingToCodecArgument(encodingMode));
|
||||
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
string encoderArgs = $"-acodec {this.WAVEncodingToCodecArgument(encodingMode)} {channelArgs} {metadataArgs}";
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case OutputType.Webm:
|
||||
{
|
||||
// https://trac.ffmpeg.org/wiki/Encode/VP9
|
||||
int videoEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoQuality);
|
||||
int audioEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
|
||||
|
||||
string encodingArgs = string.Empty;
|
||||
if (videoEncodingQuality == 63)
|
||||
{
|
||||
// Replace maximum quality settings by lossless compression.
|
||||
encodingArgs = $"-lossless 1 {metadataArgs}";
|
||||
}
|
||||
else
|
||||
{
|
||||
encodingArgs = $"-crf {this.WebmQualityToCRF(videoEncodingQuality)} -b:v 0 {metadataArgs}";
|
||||
}
|
||||
|
||||
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
|
||||
string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
|
||||
|
||||
string audioArgs = "-an";
|
||||
if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
|
||||
{
|
||||
audioArgs = string.Format("-c:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(audioEncodingQuality));
|
||||
}
|
||||
|
||||
string encoderArgs = string.Format(
|
||||
"-c:v libvpx-vp9 {0} {1} {2}",
|
||||
encodingArgs,
|
||||
audioArgs,
|
||||
videoFilteringArgs);
|
||||
|
||||
string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
|
||||
|
||||
this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new NotImplementedException("Converter not implemented for output file type " + this.ConversionPreset.OutputType);
|
||||
throw new NotImplementedException("Converter not implemented for output file type " +
|
||||
this.ConversionPreset.OutputType);
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(arguments))
|
||||
if (this.ffmpegArgumentStringByPass.Count == 0)
|
||||
{
|
||||
throw new Exception("Invalid ffmpeg process arguments.");
|
||||
throw new Exception("No ffmpeg arguments generated.");
|
||||
}
|
||||
|
||||
this.ffmpegProcessStartInfo.Arguments = arguments;
|
||||
for (int index = 0; index < this.ffmpegArgumentStringByPass.Count; index++)
|
||||
{
|
||||
if (string.IsNullOrEmpty(this.ffmpegArgumentStringByPass[index].Arguments))
|
||||
{
|
||||
throw new Exception("Invalid ffmpeg process arguments.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
protected override void Convert()
|
||||
{
|
||||
if (this.ConversionPreset == null)
|
||||
@@ -331,37 +385,63 @@ namespace FileConverter.ConversionJobs
|
||||
throw new Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
this.UserState = "Conversion";
|
||||
|
||||
Diagnostics.Debug.Log("Execute command: {0} {1}.", this.ffmpegProcessStartInfo.FileName, this.ffmpegProcessStartInfo.Arguments);
|
||||
Diagnostics.Debug.Log(string.Empty);
|
||||
|
||||
try
|
||||
for (int index = 0; index < this.ffmpegArgumentStringByPass.Count; index++)
|
||||
{
|
||||
using (Process exeProcess = Process.Start(this.ffmpegProcessStartInfo))
|
||||
FFMpegPass currentPass = this.ffmpegArgumentStringByPass[index];
|
||||
|
||||
this.UserState = currentPass.Name;
|
||||
this.ffmpegProcessStartInfo.Arguments = currentPass.Arguments;
|
||||
|
||||
Diagnostics.Debug.Log("Execute command: {0} {1}.", this.ffmpegProcessStartInfo.FileName, this.ffmpegProcessStartInfo.Arguments);
|
||||
Diagnostics.Debug.Log(string.Empty);
|
||||
|
||||
try
|
||||
{
|
||||
using (StreamReader reader = exeProcess.StandardError)
|
||||
using (Process exeProcess = Process.Start(this.ffmpegProcessStartInfo))
|
||||
{
|
||||
while (!reader.EndOfStream)
|
||||
using (StreamReader reader = exeProcess.StandardError)
|
||||
{
|
||||
string result = reader.ReadLine();
|
||||
while (!reader.EndOfStream)
|
||||
{
|
||||
if (this.CancelIsRequested && !exeProcess.HasExited)
|
||||
{
|
||||
exeProcess.Kill();
|
||||
}
|
||||
|
||||
this.ParseFFMPEGOutput(result);
|
||||
string result = reader.ReadLine();
|
||||
|
||||
Diagnostics.Debug.Log("ffmpeg output: {0}", result);
|
||||
this.ParseFFMPEGOutput(result);
|
||||
|
||||
Diagnostics.Debug.Log("ffmpeg output: {0}", result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
exeProcess.WaitForExit();
|
||||
exeProcess.WaitForExit();
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
this.ConversionFailed(Properties.Resources.ErrorFailedToLaunchFFMPEG);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
this.ConversionFailed("Failed to launch FFMPEG process.");
|
||||
throw;
|
||||
}
|
||||
|
||||
Diagnostics.Debug.Log(string.Empty);
|
||||
|
||||
// Clean intermediate files.
|
||||
for (int index = 0; index < this.ffmpegArgumentStringByPass.Count; index++)
|
||||
{
|
||||
FFMpegPass currentPass = this.ffmpegArgumentStringByPass[index];
|
||||
|
||||
if (string.IsNullOrEmpty(currentPass.FileToDelete))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
Diagnostics.Debug.Log("Delete intermediate file {0}.", currentPass.FileToDelete);
|
||||
|
||||
File.Delete(currentPass.FileToDelete);
|
||||
}
|
||||
}
|
||||
|
||||
private void ParseFFMPEGOutput(string input)
|
||||
@@ -378,26 +458,58 @@ namespace FileConverter.ConversionJobs
|
||||
return;
|
||||
}
|
||||
|
||||
match = this.progressRegex.Match(input);
|
||||
if (match.Success && match.Groups.Count >= 7)
|
||||
if (this.fileDuration.Ticks > 0)
|
||||
{
|
||||
int size = int.Parse(match.Groups[1].Value);
|
||||
int hours = int.Parse(match.Groups[2].Value);
|
||||
int minutes = int.Parse(match.Groups[3].Value);
|
||||
int seconds = int.Parse(match.Groups[4].Value);
|
||||
int milliseconds = int.Parse(match.Groups[5].Value);
|
||||
float bitrate = 0f;
|
||||
float.TryParse(match.Groups[6].Value, out bitrate);
|
||||
match = this.progressRegex.Match(input);
|
||||
if (match.Success && match.Groups.Count >= 7)
|
||||
{
|
||||
int size = int.Parse(match.Groups[1].Value);
|
||||
int hours = int.Parse(match.Groups[2].Value);
|
||||
int minutes = int.Parse(match.Groups[3].Value);
|
||||
int seconds = int.Parse(match.Groups[4].Value);
|
||||
int milliseconds = int.Parse(match.Groups[5].Value) * 10;
|
||||
float bitrate = 0f;
|
||||
float.TryParse(match.Groups[6].Value, out bitrate);
|
||||
|
||||
this.actualConvertedDuration = new TimeSpan(0, hours, minutes, seconds, milliseconds);
|
||||
this.actualConvertedDuration = new TimeSpan(0, hours, minutes, seconds, milliseconds);
|
||||
|
||||
this.Progress = this.actualConvertedDuration.Ticks / (float)this.fileDuration.Ticks;
|
||||
return;
|
||||
this.Progress = this.actualConvertedDuration.Ticks / (float)this.fileDuration.Ticks;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (input.Contains("Exiting.") || input.Contains("Error") || input.Contains("Unsupported dimensions") || input.Contains("No such file or directory"))
|
||||
{
|
||||
this.ConversionFailed(input);
|
||||
if (input.StartsWith("Error while decoding stream") && input.EndsWith("Invalid data found when processing input"))
|
||||
{
|
||||
// It is normal for a transport stream to start with a broken frame.
|
||||
// https://trac.ffmpeg.org/ticket/1622
|
||||
}
|
||||
else
|
||||
{
|
||||
this.ConversionFailed(input);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct FFMpegPass
|
||||
{
|
||||
public string Name;
|
||||
public string Arguments;
|
||||
public string FileToDelete;
|
||||
|
||||
public FFMpegPass(string name, string arguments, string fileToDelete)
|
||||
{
|
||||
this.Name = name;
|
||||
this.Arguments = arguments;
|
||||
this.FileToDelete = fileToDelete;
|
||||
}
|
||||
|
||||
public FFMpegPass(string arguments)
|
||||
{
|
||||
this.Name = "Conversion";
|
||||
this.Arguments = arguments;
|
||||
this.FileToDelete = string.Empty;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,131 @@
|
||||
// <copyright file="ConversionJob_Gif.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.ConversionJobs
|
||||
{
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
public class ConversionJob_Gif : ConversionJob
|
||||
{
|
||||
private string intermediateFilePath = string.Empty;
|
||||
private ConversionJob pngConversionJob = null;
|
||||
private ConversionJob gifConversionJob = null;
|
||||
|
||||
public ConversionJob_Gif(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
|
||||
public override void Cancel()
|
||||
{
|
||||
base.Cancel();
|
||||
|
||||
this.pngConversionJob.Cancel();
|
||||
this.gifConversionJob.Cancel();
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
string extension = System.IO.Path.GetExtension(this.InputFilePath);
|
||||
extension = extension.ToLowerInvariant().Substring(1, extension.Length - 1);
|
||||
|
||||
string inputFilePath = string.Empty;
|
||||
|
||||
// If the output is an image start to convert it into png before send it to ffmpeg.
|
||||
if (Helpers.GetExtensionCategory(extension) == Helpers.InputCategoryNames.Image && extension != "png")
|
||||
{
|
||||
// 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 gif conversion.
|
||||
ConversionPreset intermediatePreset = new ConversionPreset("To compatible image", OutputType.Png, this.ConversionPreset.InputTypes.ToArray());
|
||||
this.pngConversionJob = ConversionJobFactory.Create(intermediatePreset, this.InputFilePath);
|
||||
this.pngConversionJob.PrepareConversion(this.intermediateFilePath);
|
||||
|
||||
inputFilePath = this.intermediateFilePath;
|
||||
}
|
||||
else
|
||||
{
|
||||
inputFilePath = this.InputFilePath;
|
||||
}
|
||||
|
||||
// Convert png file into ico.
|
||||
this.gifConversionJob = new ConversionJob_FFMPEG(this.ConversionPreset, inputFilePath);
|
||||
this.gifConversionJob.PrepareConversion(this.OutputFilePath);
|
||||
}
|
||||
|
||||
protected override void Convert()
|
||||
{
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
Task updateProgress = this.UpdateProgress();
|
||||
|
||||
if (this.pngConversionJob != null)
|
||||
{
|
||||
this.UserState = Properties.Resources.ConversionStateReadIntputImage;
|
||||
|
||||
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 gif.");
|
||||
this.gifConversionJob.StartConvertion();
|
||||
|
||||
if (this.gifConversionJob.State != ConversionState.Done)
|
||||
{
|
||||
this.ConversionFailed(this.gifConversionJob.ErrorMessage);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.intermediateFilePath))
|
||||
{
|
||||
Diagnostics.Debug.Log("Delete intermediate file {0}.", this.intermediateFilePath);
|
||||
|
||||
File.Delete(this.intermediateFilePath);
|
||||
}
|
||||
|
||||
updateProgress.Wait();
|
||||
}
|
||||
|
||||
private async Task UpdateProgress()
|
||||
{
|
||||
while (this.gifConversionJob.State != ConversionState.Done &&
|
||||
this.gifConversionJob.State != ConversionState.Failed)
|
||||
{
|
||||
if (this.pngConversionJob != null && this.pngConversionJob.State == ConversionState.InProgress)
|
||||
{
|
||||
this.Progress = this.pngConversionJob.Progress;
|
||||
}
|
||||
|
||||
if (this.gifConversionJob != null && this.gifConversionJob.State == ConversionState.InProgress)
|
||||
{
|
||||
this.Progress = this.gifConversionJob.Progress;
|
||||
this.UserState = this.gifConversionJob.UserState;
|
||||
}
|
||||
|
||||
await Task.Delay(40);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,8 +11,17 @@ namespace FileConverter.ConversionJobs
|
||||
private ConversionJob pngConversionJob;
|
||||
private ConversionJob icoConversionJob;
|
||||
|
||||
public ConversionJob_Ico(ConversionPreset conversionPreset) : base(conversionPreset)
|
||||
public ConversionJob_Ico(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
|
||||
public override void Cancel()
|
||||
{
|
||||
base.Cancel();
|
||||
|
||||
this.pngConversionJob.Cancel();
|
||||
this.icoConversionJob.Cancel();
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
@@ -34,11 +43,11 @@ namespace FileConverter.ConversionJobs
|
||||
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);
|
||||
this.pngConversionJob.PrepareConversion(this.intermediateFilePath);
|
||||
|
||||
// Convert png file into ico.
|
||||
this.icoConversionJob = new ConversionJob_FFMPEG(this.ConversionPreset);
|
||||
this.icoConversionJob.PrepareConversion(this.intermediateFilePath, this.OutputFilePath);
|
||||
this.icoConversionJob = new ConversionJob_FFMPEG(this.ConversionPreset, this.intermediateFilePath);
|
||||
this.icoConversionJob.PrepareConversion(this.OutputFilePath);
|
||||
}
|
||||
|
||||
protected override void Convert()
|
||||
|
||||
@@ -9,24 +9,53 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
public class ConversionJob_ImageMagick : ConversionJob
|
||||
{
|
||||
private const float BaseDpiForPdfConversion = 200f;
|
||||
|
||||
private bool isInputFilePdf;
|
||||
private int pageCount;
|
||||
|
||||
public ConversionJob_ImageMagick() : base()
|
||||
{
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
|
||||
public ConversionJob_ImageMagick(ConversionPreset conversionPreset) : base(conversionPreset)
|
||||
public ConversionJob_ImageMagick(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
string applicationDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
|
||||
MagickNET.SetGhostscriptDirectory(applicationDirectory);
|
||||
|
||||
this.isInputFilePdf = System.IO.Path.GetExtension(this.InputFilePath).ToLowerInvariant() == ".pdf";
|
||||
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new Exception("The conversion preset must be valid.");
|
||||
}
|
||||
}
|
||||
|
||||
protected override int GetOuputFilesCount()
|
||||
{
|
||||
if (System.IO.Path.GetExtension(this.InputFilePath).ToLowerInvariant() == ".pdf")
|
||||
{
|
||||
using (MagickImageCollection images = new MagickImageCollection())
|
||||
{
|
||||
MagickReadSettings settings = new MagickReadSettings();
|
||||
settings.Density = new Density(1, 1);
|
||||
images.Read(this.InputFilePath);
|
||||
|
||||
return images.Count;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
protected override void Convert()
|
||||
{
|
||||
if (this.ConversionPreset == null)
|
||||
@@ -34,11 +63,68 @@ namespace FileConverter.ConversionJobs
|
||||
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);
|
||||
this.CurrentOuputFilePathIndex = 0;
|
||||
|
||||
if (this.isInputFilePdf)
|
||||
{
|
||||
this.ConvertPdf();
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pageCount = 1;
|
||||
using (MagickImage image = new MagickImage(this.InputFilePath))
|
||||
{
|
||||
Debug.Log("Load image {0} succeed.", this.InputFilePath);
|
||||
|
||||
this.ConvertImage(image);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void ConvertPdf()
|
||||
{
|
||||
MagickReadSettings settings = new MagickReadSettings();
|
||||
|
||||
float dpi = BaseDpiForPdfConversion;
|
||||
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
|
||||
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
|
||||
{
|
||||
Debug.Log("Apply scale factor: {0}%.", scaleFactor * 100);
|
||||
|
||||
dpi *= scaleFactor;
|
||||
}
|
||||
|
||||
Debug.Log("Density: {0}dpi.", dpi);
|
||||
settings.Density = new Density(dpi);
|
||||
|
||||
this.UserState = Properties.Resources.ConversionStateReadDocument;
|
||||
|
||||
using (MagickImageCollection images = new MagickImageCollection())
|
||||
{
|
||||
// Add all the pages of the pdf file to the collection
|
||||
images.Read(this.InputFilePath, settings);
|
||||
Debug.Log("Load pdf {0} succeed.", this.InputFilePath);
|
||||
|
||||
this.pageCount = images.Count;
|
||||
|
||||
this.UserState = Properties.Resources.ConversionStateConversion;
|
||||
|
||||
foreach (MagickImage image in images)
|
||||
{
|
||||
Debug.Log("Write page {0}/{1}.", this.CurrentOuputFilePathIndex + 1, this.pageCount);
|
||||
this.ConvertImage(image, true);
|
||||
|
||||
this.CurrentOuputFilePathIndex++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void ConvertImage(MagickImage image, bool ignoreScale = false)
|
||||
{
|
||||
image.Progress += this.Image_Progress;
|
||||
|
||||
if (!ignoreScale && this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageScale))
|
||||
{
|
||||
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
|
||||
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
|
||||
{
|
||||
@@ -46,7 +132,10 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
image.Scale(new Percentage(scaleFactor * 100f));
|
||||
}
|
||||
}
|
||||
|
||||
if (this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageRotation))
|
||||
{
|
||||
float rotateAngleInDegrees = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageRotation);
|
||||
if (Math.Abs(rotateAngleInDegrees - 0f) >= 0.05f)
|
||||
{
|
||||
@@ -54,13 +143,16 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
image.Rotate(rotateAngleInDegrees);
|
||||
}
|
||||
}
|
||||
|
||||
if (this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2))
|
||||
{
|
||||
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)
|
||||
while (size * 2 <= referenceSize)
|
||||
{
|
||||
size *= 2;
|
||||
}
|
||||
@@ -69,7 +161,10 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
image.Scale(size, size);
|
||||
}
|
||||
}
|
||||
|
||||
if (this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageMaximumSize))
|
||||
{
|
||||
int maximumSize = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageMaximumSize);
|
||||
if (maximumSize > 0)
|
||||
{
|
||||
@@ -80,32 +175,48 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
case OutputType.Pdf:
|
||||
Debug.Log("Density: {0}dpi.", BaseDpiForPdfConversion);
|
||||
image.Density = new Density(BaseDpiForPdfConversion);
|
||||
break;
|
||||
|
||||
case OutputType.Webp:
|
||||
image.Quality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
|
||||
break;
|
||||
|
||||
default:
|
||||
this.ConversionFailed(string.Format(Properties.Resources.ErrorUnsupportedOutputFormat, 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;
|
||||
if (this.CancelIsRequested)
|
||||
{
|
||||
eventArgs.Cancel = true;
|
||||
return;
|
||||
}
|
||||
|
||||
float alreadyCompletedPages = this.CurrentOuputFilePathIndex / (float)this.pageCount;
|
||||
this.Progress = alreadyCompletedPages + ((float)eventArgs.Progress.ToDouble() / (100f * this.pageCount));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
// <copyright file="ConversionJob_Office.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.ConversionJobs
|
||||
{
|
||||
public abstract class ConversionJob_Office : ConversionJob
|
||||
{
|
||||
protected ConversionJob_Office() : base()
|
||||
{
|
||||
}
|
||||
|
||||
protected ConversionJob_Office(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
}
|
||||
|
||||
public enum ApplicationName
|
||||
{
|
||||
None,
|
||||
|
||||
Word,
|
||||
Excel,
|
||||
PowerPoint
|
||||
}
|
||||
|
||||
protected abstract ApplicationName Application
|
||||
{
|
||||
get;
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
if (!Helpers.IsMicrosoftOfficeApplicationAvailable(this.Application))
|
||||
{
|
||||
switch (this.Application)
|
||||
{
|
||||
case ApplicationName.Word:
|
||||
this.ConversionFailed(Properties.Resources.ErrorMicrosoftWordIsNotAvailable);
|
||||
return;
|
||||
|
||||
case ApplicationName.PowerPoint:
|
||||
this.ConversionFailed(Properties.Resources.ErrorMicrosoftPowerPointIsNotAvailable);
|
||||
return;
|
||||
|
||||
case ApplicationName.Excel:
|
||||
this.ConversionFailed(Properties.Resources.ErrorMicrosoftExcelIsNotAvailable);
|
||||
return;
|
||||
|
||||
default:
|
||||
this.ConversionFailed(Properties.Resources.ErrorMicrosoftOfficeIsNotAvailable);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnConversionFailed()
|
||||
{
|
||||
base.OnConversionFailed();
|
||||
|
||||
this.ReleaseOfficeApplicationInstanceIfNeeded();
|
||||
}
|
||||
|
||||
protected abstract void InitializeOfficeApplicationInstanceIfNecessary();
|
||||
|
||||
protected abstract void ReleaseOfficeApplicationInstanceIfNeeded();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,214 @@
|
||||
// <copyright file="ConversionJob_PowerPoint.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.ConversionJobs
|
||||
{
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using FileConverter.Diagnostics;
|
||||
using Microsoft.Office.Core;
|
||||
|
||||
using PowerPoint = Microsoft.Office.Interop.PowerPoint;
|
||||
|
||||
public class ConversionJob_PowerPoint : ConversionJob_Office
|
||||
{
|
||||
private PowerPoint.Presentation document;
|
||||
private PowerPoint.Application application;
|
||||
|
||||
private string intermediateFilePath = string.Empty;
|
||||
private ConversionJob pdf2ImageConversionJob = null;
|
||||
|
||||
public ConversionJob_PowerPoint() : base()
|
||||
{
|
||||
}
|
||||
|
||||
public ConversionJob_PowerPoint(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
}
|
||||
|
||||
protected override ApplicationName Application
|
||||
{
|
||||
get
|
||||
{
|
||||
return ApplicationName.PowerPoint;
|
||||
}
|
||||
}
|
||||
|
||||
protected override int GetOuputFilesCount()
|
||||
{
|
||||
if (this.ConversionPreset.OutputType == OutputType.Pdf)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!this.TryLoadDocumentIfNecessary())
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
int pagesCount = this.document.Slides.Count;
|
||||
return pagesCount;
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
if (this.State == ConversionState.Failed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new System.Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
// Initialize converters.
|
||||
if (this.ConversionPreset.OutputType == OutputType.Pdf)
|
||||
{
|
||||
this.intermediateFilePath = this.OutputFilePath;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Generate intermediate file path.
|
||||
string fileName = Path.GetFileNameWithoutExtension(this.InputFilePath);
|
||||
string tempPath = Path.GetTempPath();
|
||||
this.intermediateFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + ".pdf");
|
||||
|
||||
ConversionPreset intermediatePreset = new ConversionPreset("Pdf to image", this.ConversionPreset, "pdf");
|
||||
this.pdf2ImageConversionJob = ConversionJobFactory.Create(intermediatePreset, this.intermediateFilePath);
|
||||
this.pdf2ImageConversionJob.PrepareConversion(this.OutputFilePaths);
|
||||
}
|
||||
}
|
||||
|
||||
protected override void Convert()
|
||||
{
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new System.Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
this.UserState = Properties.Resources.ConversionStateReadDocument;
|
||||
|
||||
if (!this.TryLoadDocumentIfNecessary())
|
||||
{
|
||||
this.ConversionFailed(Properties.Resources.ErrorUnableToUseMicrosoftOffice);
|
||||
return;
|
||||
}
|
||||
|
||||
this.UserState = Properties.Resources.ConversionStateConversion;
|
||||
|
||||
Diagnostics.Debug.Log("Convert PowerPoint document to pdf.");
|
||||
this.document.ExportAsFixedFormat(this.intermediateFilePath, PowerPoint.PpFixedFormatType.ppFixedFormatTypePDF);
|
||||
|
||||
Diagnostics.Debug.Log("Close PowerPoint document '{0}'.", this.InputFilePath);
|
||||
this.document.Close();
|
||||
this.document = null;
|
||||
|
||||
this.ReleaseOfficeApplicationInstanceIfNeeded();
|
||||
|
||||
if (this.pdf2ImageConversionJob != null)
|
||||
{
|
||||
if (!System.IO.File.Exists(this.intermediateFilePath))
|
||||
{
|
||||
this.ConversionFailed(Properties.Resources.ErrorCantFindOutputFiles);
|
||||
return;
|
||||
}
|
||||
|
||||
Task updateProgress = this.UpdateProgress();
|
||||
|
||||
Diagnostics.Debug.Log("Convert pdf to images.");
|
||||
|
||||
this.pdf2ImageConversionJob.StartConvertion();
|
||||
|
||||
if (this.pdf2ImageConversionJob.State != ConversionState.Done)
|
||||
{
|
||||
this.ConversionFailed(this.pdf2ImageConversionJob.ErrorMessage);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.intermediateFilePath))
|
||||
{
|
||||
Diagnostics.Debug.Log("Delete intermediate file {0}.", this.intermediateFilePath);
|
||||
|
||||
File.Delete(this.intermediateFilePath);
|
||||
}
|
||||
|
||||
updateProgress.Wait();
|
||||
}
|
||||
}
|
||||
|
||||
protected override void InitializeOfficeApplicationInstanceIfNecessary()
|
||||
{
|
||||
if (this.application != null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Initialize PowerPoint application.
|
||||
Diagnostics.Debug.Log("Instantiate PowerPoint application via interop.");
|
||||
this.application = new PowerPoint.Application();
|
||||
}
|
||||
|
||||
protected override void ReleaseOfficeApplicationInstanceIfNeeded()
|
||||
{
|
||||
if (this.application == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Diagnostics.Debug.Log("Quit PowerPoint application via interop.");
|
||||
this.application.Quit();
|
||||
this.application = null;
|
||||
}
|
||||
|
||||
private async Task UpdateProgress()
|
||||
{
|
||||
while (this.pdf2ImageConversionJob.State != ConversionState.Done &&
|
||||
this.pdf2ImageConversionJob.State != ConversionState.Failed)
|
||||
{
|
||||
if (this.pdf2ImageConversionJob != null && this.pdf2ImageConversionJob.State == ConversionState.InProgress)
|
||||
{
|
||||
this.Progress = this.pdf2ImageConversionJob.Progress;
|
||||
}
|
||||
|
||||
if (this.pdf2ImageConversionJob != null && this.pdf2ImageConversionJob.State == ConversionState.InProgress)
|
||||
{
|
||||
this.Progress = this.pdf2ImageConversionJob.Progress;
|
||||
this.UserState = this.pdf2ImageConversionJob.UserState;
|
||||
}
|
||||
|
||||
await Task.Delay(40);
|
||||
}
|
||||
}
|
||||
|
||||
private bool TryLoadDocumentIfNecessary()
|
||||
{
|
||||
try
|
||||
{
|
||||
this.InitializeOfficeApplicationInstanceIfNecessary();
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Debug.Log(exception.ToString());
|
||||
Debug.Log("Failed to initialize office application.");
|
||||
}
|
||||
|
||||
if (this.application == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (this.document == null)
|
||||
{
|
||||
Diagnostics.Debug.Log("Load PowerPoint document '{0}'.", this.InputFilePath);
|
||||
|
||||
this.document = this.application.Presentations.Open(this.InputFilePath, ReadOnly: MsoTriState.msoTrue, WithWindow: MsoTriState.msoFalse);
|
||||
}
|
||||
|
||||
return this.document != null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,220 @@
|
||||
// <copyright file="ConversionJob_Word.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.ConversionJobs
|
||||
{
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using FileConverter.Diagnostics;
|
||||
|
||||
using Word = Microsoft.Office.Interop.Word;
|
||||
|
||||
public class ConversionJob_Word : ConversionJob_Office
|
||||
{
|
||||
private Word.Document document;
|
||||
private Word.Application application;
|
||||
|
||||
private string intermediateFilePath = string.Empty;
|
||||
private ConversionJob pdf2ImageConversionJob = null;
|
||||
|
||||
public ConversionJob_Word() : base()
|
||||
{
|
||||
}
|
||||
|
||||
public ConversionJob_Word(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
}
|
||||
|
||||
protected override ApplicationName Application
|
||||
{
|
||||
get
|
||||
{
|
||||
return ApplicationName.Word;
|
||||
}
|
||||
}
|
||||
|
||||
protected override int GetOuputFilesCount()
|
||||
{
|
||||
if (this.ConversionPreset.OutputType == OutputType.Pdf)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!this.TryLoadDocumentIfNecessary())
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
int pagesCount = this.document.ComputeStatistics(Word.WdStatistic.wdStatisticPages);
|
||||
|
||||
return pagesCount;
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
if (this.State == ConversionState.Failed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new System.Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
// Initialize converters.
|
||||
if (this.ConversionPreset.OutputType == OutputType.Pdf)
|
||||
{
|
||||
this.intermediateFilePath = this.OutputFilePath;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Generate intermediate file path.
|
||||
string fileName = Path.GetFileNameWithoutExtension(this.InputFilePath);
|
||||
string tempPath = Path.GetTempPath();
|
||||
this.intermediateFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + ".pdf");
|
||||
|
||||
ConversionPreset intermediatePreset = new ConversionPreset("Pdf to image", this.ConversionPreset, "pdf");
|
||||
this.pdf2ImageConversionJob = ConversionJobFactory.Create(intermediatePreset, this.intermediateFilePath);
|
||||
this.pdf2ImageConversionJob.PrepareConversion(this.OutputFilePaths);
|
||||
}
|
||||
}
|
||||
|
||||
protected override void Convert()
|
||||
{
|
||||
if (this.ConversionPreset == null)
|
||||
{
|
||||
throw new System.Exception("The conversion preset must be valid.");
|
||||
}
|
||||
|
||||
this.UserState = Properties.Resources.ConversionStateReadDocument;
|
||||
|
||||
if (!this.TryLoadDocumentIfNecessary())
|
||||
{
|
||||
this.ConversionFailed(Properties.Resources.ErrorUnableToUseMicrosoftOffice);
|
||||
return;
|
||||
}
|
||||
|
||||
// Make this document the active document.
|
||||
this.document.Activate();
|
||||
|
||||
this.UserState = Properties.Resources.ConversionStateConversion;
|
||||
|
||||
Diagnostics.Debug.Log("Convert word document to pdf.");
|
||||
this.document.ExportAsFixedFormat(this.intermediateFilePath, Word.WdExportFormat.wdExportFormatPDF);
|
||||
|
||||
Diagnostics.Debug.Log("Close word document '{0}'.", this.InputFilePath);
|
||||
this.document.Close(Word.WdSaveOptions.wdDoNotSaveChanges);
|
||||
this.document = null;
|
||||
|
||||
this.ReleaseOfficeApplicationInstanceIfNeeded();
|
||||
|
||||
if (this.pdf2ImageConversionJob != null)
|
||||
{
|
||||
if (!System.IO.File.Exists(this.intermediateFilePath))
|
||||
{
|
||||
this.ConversionFailed(Properties.Resources.ErrorCantFindOutputFiles);
|
||||
return;
|
||||
}
|
||||
|
||||
Task updateProgress = this.UpdateProgress();
|
||||
|
||||
Diagnostics.Debug.Log("Convert pdf to images.");
|
||||
|
||||
this.pdf2ImageConversionJob.StartConvertion();
|
||||
|
||||
if (this.pdf2ImageConversionJob.State != ConversionState.Done)
|
||||
{
|
||||
this.ConversionFailed(this.pdf2ImageConversionJob.ErrorMessage);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.intermediateFilePath))
|
||||
{
|
||||
Diagnostics.Debug.Log("Delete intermediate file {0}.", this.intermediateFilePath);
|
||||
|
||||
File.Delete(this.intermediateFilePath);
|
||||
}
|
||||
|
||||
updateProgress.Wait();
|
||||
}
|
||||
}
|
||||
|
||||
protected override void InitializeOfficeApplicationInstanceIfNecessary()
|
||||
{
|
||||
if (this.application != null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Initialize word application.
|
||||
Diagnostics.Debug.Log("Instantiate word application via interop.");
|
||||
this.application = new Microsoft.Office.Interop.Word.Application
|
||||
{
|
||||
Visible = false
|
||||
};
|
||||
}
|
||||
|
||||
protected override void ReleaseOfficeApplicationInstanceIfNeeded()
|
||||
{
|
||||
if (this.application == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Diagnostics.Debug.Log("Quit word application via interop.");
|
||||
this.application.Quit();
|
||||
this.application = null;
|
||||
}
|
||||
|
||||
private async Task UpdateProgress()
|
||||
{
|
||||
while (this.pdf2ImageConversionJob.State != ConversionState.Done &&
|
||||
this.pdf2ImageConversionJob.State != ConversionState.Failed)
|
||||
{
|
||||
if (this.pdf2ImageConversionJob != null && this.pdf2ImageConversionJob.State == ConversionState.InProgress)
|
||||
{
|
||||
this.Progress = this.pdf2ImageConversionJob.Progress;
|
||||
}
|
||||
|
||||
if (this.pdf2ImageConversionJob != null && this.pdf2ImageConversionJob.State == ConversionState.InProgress)
|
||||
{
|
||||
this.Progress = this.pdf2ImageConversionJob.Progress;
|
||||
this.UserState = this.pdf2ImageConversionJob.UserState;
|
||||
}
|
||||
|
||||
await Task.Delay(40);
|
||||
}
|
||||
}
|
||||
|
||||
private bool TryLoadDocumentIfNecessary()
|
||||
{
|
||||
try
|
||||
{
|
||||
this.InitializeOfficeApplicationInstanceIfNecessary();
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Debug.Log(exception.ToString());
|
||||
Debug.Log("Failed to initialize office application.");
|
||||
}
|
||||
|
||||
if (this.application == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (this.document == null)
|
||||
{
|
||||
Diagnostics.Debug.Log("Load word document '{0}'.", this.InputFilePath);
|
||||
|
||||
this.document = this.application.Documents.Open(this.InputFilePath, System.Reflection.Missing.Value, true);
|
||||
}
|
||||
|
||||
return this.document != null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
// // <copyright file="VideoEncodingSpeed.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.ConversionJobs
|
||||
{
|
||||
public enum VideoEncodingSpeed
|
||||
{
|
||||
UltraFast,
|
||||
SuperFast,
|
||||
VeryFast,
|
||||
Faster,
|
||||
Fast,
|
||||
Medium,
|
||||
Slow,
|
||||
Slower,
|
||||
VerySlow,
|
||||
}
|
||||
}
|
||||
@@ -24,14 +24,13 @@ namespace FileConverter
|
||||
private InputPostConversionAction inputPostConversionAction;
|
||||
private ConversionSettings settings = new ConversionSettings();
|
||||
private string outputFileNameTemplate;
|
||||
private FileNameConverter outputFileNameConverter = new FileNameConverter();
|
||||
|
||||
public ConversionPreset()
|
||||
{
|
||||
this.Name = "New Preset";
|
||||
this.Name = Properties.Resources.DefaultPresetName;
|
||||
}
|
||||
|
||||
public ConversionPreset(string name, OutputType outputType, string[] inputTypes)
|
||||
public ConversionPreset(string name, OutputType outputType, params string[] inputTypes)
|
||||
{
|
||||
this.Name = name;
|
||||
this.OutputType = outputType;
|
||||
@@ -42,7 +41,7 @@ namespace FileConverter
|
||||
this.outputFileNameTemplate = "(p)(f)";
|
||||
}
|
||||
|
||||
public ConversionPreset(string name, ConversionPreset source)
|
||||
public ConversionPreset(string name, ConversionPreset source, params string[] additionalInputTypes)
|
||||
{
|
||||
this.Name = name;
|
||||
this.OutputType = source.outputType;
|
||||
@@ -52,6 +51,11 @@ namespace FileConverter
|
||||
inputTypeList.AddRange(source.inputTypes);
|
||||
}
|
||||
|
||||
if (additionalInputTypes != null)
|
||||
{
|
||||
inputTypeList.AddRange(additionalInputTypes);
|
||||
}
|
||||
|
||||
this.InputTypes = inputTypeList;
|
||||
|
||||
this.outputFileNameTemplate = source.OutputFileNameTemplate;
|
||||
@@ -96,6 +100,13 @@ namespace FileConverter
|
||||
}
|
||||
}
|
||||
|
||||
[XmlAttribute]
|
||||
public bool IsDefaultSettings
|
||||
{
|
||||
get;
|
||||
set;
|
||||
} = false;
|
||||
|
||||
[XmlElement]
|
||||
public List<string> InputTypes
|
||||
{
|
||||
@@ -171,7 +182,7 @@ namespace FileConverter
|
||||
}
|
||||
}
|
||||
|
||||
this.OnPropertyChanged("Settings");
|
||||
this.OnPropertyChanged(nameof(this.Settings));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -195,7 +206,7 @@ namespace FileConverter
|
||||
{
|
||||
get
|
||||
{
|
||||
return "Conversion Archives";
|
||||
return Properties.Resources.ConversionArchives;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -294,20 +305,20 @@ namespace FileConverter
|
||||
}
|
||||
|
||||
this.inputTypes.Add(inputType);
|
||||
this.OnPropertyChanged("InputTypes");
|
||||
this.OnPropertyChanged(nameof(this.InputTypes));
|
||||
}
|
||||
|
||||
public void RemoveInputType(string inputType)
|
||||
{
|
||||
if (this.inputTypes.Remove(inputType))
|
||||
{
|
||||
this.OnPropertyChanged("InputTypes");
|
||||
this.OnPropertyChanged(nameof(this.InputTypes));
|
||||
}
|
||||
}
|
||||
|
||||
public string GenerateOutputFilePath(string inputFilePath)
|
||||
public string GenerateOutputFilePath(string inputFilePath, int numberIndex, int numberMax)
|
||||
{
|
||||
return (string)this.outputFileNameConverter.Convert(new object[] { inputFilePath, this.OutputType, this.OutputFileNameTemplate }, typeof(string), null, null);
|
||||
return PathHelpers.GenerateFilePathFromTemplate(inputFilePath, this.OutputType, this.OutputFileNameTemplate, numberIndex, numberMax);
|
||||
}
|
||||
|
||||
public void SetSettingsValue(string settingsKey, string value)
|
||||
@@ -334,7 +345,7 @@ namespace FileConverter
|
||||
|
||||
this.settings[settingsKey] = value;
|
||||
|
||||
this.OnPropertyChanged("Settings");
|
||||
this.OnPropertyChanged(nameof(this.Settings));
|
||||
}
|
||||
|
||||
public string GetSettingsValue(string settingsKey)
|
||||
@@ -370,6 +381,11 @@ namespace FileConverter
|
||||
return (T)System.Convert.ChangeType(settingsValue, type);
|
||||
}
|
||||
|
||||
public bool IsRelevantSetting(string settingsKey)
|
||||
{
|
||||
return this.Settings.ContainsKey(settingsKey);
|
||||
}
|
||||
|
||||
[NotifyPropertyChangedInvocator]
|
||||
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
|
||||
{
|
||||
@@ -386,8 +402,8 @@ namespace FileConverter
|
||||
for (int index = 0; index < this.inputTypes.Count; index++)
|
||||
{
|
||||
string inputType = this.inputTypes[index];
|
||||
string inputCategory = PathHelpers.GetExtensionCategory(inputType);
|
||||
if (!PathHelpers.IsOutputTypeCompatibleWithCategory(this.OutputType, inputCategory))
|
||||
string inputCategory = Helpers.GetExtensionCategory(inputType);
|
||||
if (!Helpers.IsOutputTypeCompatibleWithCategory(this.OutputType, inputCategory))
|
||||
{
|
||||
this.RemoveInputType(inputType);
|
||||
index--;
|
||||
@@ -395,131 +411,86 @@ namespace FileConverter
|
||||
}
|
||||
}
|
||||
|
||||
private bool IsRelevantSetting(string settingsKey)
|
||||
private void InitializeDefaultSettings(OutputType outputType)
|
||||
{
|
||||
switch (this.OutputType)
|
||||
this.settings.Clear();
|
||||
|
||||
switch (outputType)
|
||||
{
|
||||
// Audio
|
||||
case OutputType.Aac:
|
||||
switch (settingsKey)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
|
||||
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;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case OutputType.Mp3:
|
||||
switch (settingsKey)
|
||||
{
|
||||
case ConversionPreset.ConversionSettingKeys.AudioEncodingMode:
|
||||
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
|
||||
return true;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
|
||||
break;
|
||||
|
||||
case OutputType.Ogg:
|
||||
switch (settingsKey)
|
||||
{
|
||||
case ConversionPreset.ConversionSettingKeys.AudioBitrate:
|
||||
return true;
|
||||
}
|
||||
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
|
||||
break;
|
||||
|
||||
case OutputType.Png:
|
||||
switch (settingsKey)
|
||||
{
|
||||
case ConversionPreset.ConversionSettingKeys.ImageScale:
|
||||
case ConversionPreset.ConversionSettingKeys.ImageRotation:
|
||||
case ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2:
|
||||
case ConversionPreset.ConversionSettingKeys.ImageMaximumSize:
|
||||
return true;
|
||||
}
|
||||
|
||||
case OutputType.Mp3:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Mp3VBR.ToString(), true);
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
|
||||
break;
|
||||
|
||||
case OutputType.Wav:
|
||||
switch (settingsKey)
|
||||
{
|
||||
case ConversionPreset.ConversionSettingKeys.AudioEncodingMode:
|
||||
return true;
|
||||
}
|
||||
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Wav16.ToString(), true);
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
|
||||
break;
|
||||
|
||||
default:
|
||||
Debug.LogError("Relevant settings '{1}' are not define for output type {0}.", this.OutputType, settingsKey);
|
||||
// Video
|
||||
case OutputType.Avi:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
|
||||
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;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private void InitializeDefaultSettings(OutputType outputType)
|
||||
{
|
||||
switch (outputType)
|
||||
{
|
||||
case OutputType.Aac:
|
||||
case OutputType.Mkv:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
|
||||
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.Ico:
|
||||
case OutputType.Flac:
|
||||
case OutputType.Mp4:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
|
||||
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.Ogv:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "7");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160");
|
||||
break;
|
||||
|
||||
case OutputType.Webm:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "40");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
|
||||
break;
|
||||
|
||||
// Images
|
||||
case OutputType.Gif:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoFramesPerSecond, "15");
|
||||
break;
|
||||
|
||||
case OutputType.Png:
|
||||
@@ -537,47 +508,26 @@ namespace FileConverter
|
||||
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");
|
||||
case OutputType.Webp:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "40");
|
||||
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.Mkv:
|
||||
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");
|
||||
case OutputType.Ico:
|
||||
break;
|
||||
|
||||
case OutputType.Mp3:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Mp3VBR.ToString(), true);
|
||||
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;
|
||||
|
||||
case OutputType.Wav:
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Wav16.ToString(), true);
|
||||
// Documents
|
||||
case OutputType.Pdf:
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new System.Exception("Missing default settings for type " + outputType);
|
||||
}
|
||||
|
||||
this.OnPropertyChanged("Settings");
|
||||
this.OnPropertyChanged(nameof(this.Settings));
|
||||
}
|
||||
|
||||
private void InitializeSettingsValue(string settingsKey, string value, bool force = false)
|
||||
@@ -631,7 +581,7 @@ namespace FileConverter
|
||||
|
||||
case "OutputFileNameTemplate":
|
||||
{
|
||||
string sampleOutputFilePath = this.GenerateOutputFilePath(FileConverter.Properties.Resources.OuputFileNameTemplateSample);
|
||||
string sampleOutputFilePath = this.GenerateOutputFilePath(FileConverter.Properties.Resources.OuputFileNameTemplateSample, 1, 3);
|
||||
if (string.IsNullOrEmpty(sampleOutputFilePath))
|
||||
{
|
||||
return "The output filename template must produce a non empty result.";
|
||||
@@ -725,6 +675,7 @@ namespace FileConverter
|
||||
{
|
||||
public const string AudioEncodingMode = "AudioEncodingMode";
|
||||
public const string AudioBitrate = "AudioBitrate";
|
||||
public const string AudioChannelCount = "AudioChannelCount";
|
||||
public const string ImageQuality = "ImageQuality";
|
||||
public const string ImageScale = "ImageScale";
|
||||
public const string ImageRotation = "ImageRotation";
|
||||
@@ -734,6 +685,10 @@ namespace FileConverter
|
||||
public const string VideoEncodingSpeed = "VideoEncodingSpeed";
|
||||
public const string VideoScale = "VideoScale";
|
||||
public const string VideoRotation = "VideoRotation";
|
||||
public const string VideoFramesPerSecond = "VideoFramesPerSecond";
|
||||
|
||||
public const string EnableAudio = "EnableAudio";
|
||||
public const string EnableVideo = "EnableVideo";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,9 +5,9 @@ namespace FileConverter.Diagnostics
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Windows;
|
||||
|
||||
public static class Debug
|
||||
@@ -22,7 +22,7 @@ namespace FileConverter.Diagnostics
|
||||
|
||||
// Delete old diagnostics folder (1 day).
|
||||
DateTime expirationDate = DateTime.Now.Subtract(new TimeSpan(1, 0, 0, 0));
|
||||
string[] diagnosticsDirectories = Directory.GetDirectories(path, "Diagnostics.*");
|
||||
string[] diagnosticsDirectories = Directory.GetDirectories(path, "Diagnostics-*");
|
||||
for (int index = 0; index < diagnosticsDirectories.Length; index++)
|
||||
{
|
||||
string directory = diagnosticsDirectories[index];
|
||||
@@ -33,7 +33,9 @@ namespace FileConverter.Diagnostics
|
||||
}
|
||||
}
|
||||
|
||||
Debug.diagnosticsFolderPath = Path.Combine(path, "Diagnostics." + Process.GetCurrentProcess().Id);
|
||||
string diagnosticsFolderName = $"Diagnostics-{DateTime.Now.Hour}h{DateTime.Now.Minute}m{DateTime.Now.Second}s";
|
||||
|
||||
Debug.diagnosticsFolderPath = Path.Combine(path, diagnosticsFolderName);
|
||||
Debug.diagnosticsFolderPath = PathHelpers.GenerateUniquePath(Debug.diagnosticsFolderPath);
|
||||
Directory.CreateDirectory(Debug.diagnosticsFolderPath);
|
||||
}
|
||||
@@ -52,12 +54,14 @@ namespace FileConverter.Diagnostics
|
||||
{
|
||||
DiagnosticsData diagnosticsData;
|
||||
|
||||
int threadId = System.Threading.Thread.CurrentThread.ManagedThreadId;
|
||||
Thread currentThread = System.Threading.Thread.CurrentThread;
|
||||
int threadId = currentThread.ManagedThreadId;
|
||||
lock (Debug.diagnosticsDataById)
|
||||
{
|
||||
if (!Debug.diagnosticsDataById.TryGetValue(threadId, out diagnosticsData))
|
||||
{
|
||||
diagnosticsData = new DiagnosticsData(Debug.threadCount > 0 ? string.Format("Thread {0}", Debug.threadCount) : "Application");
|
||||
string threadName = Debug.threadCount > 0 ? $"{currentThread.Name} ({Debug.threadCount})" : "Application";
|
||||
diagnosticsData = new DiagnosticsData(threadName);
|
||||
diagnosticsData.Initialize(Debug.diagnosticsFolderPath, threadId);
|
||||
Debug.diagnosticsDataById.Add(threadId, diagnosticsData);
|
||||
Debug.threadCount++;
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace FileConverter.Diagnostics
|
||||
|
||||
public void Log(string message, params object[] arguments)
|
||||
{
|
||||
string log = string.Format(message, arguments);
|
||||
string log = arguments.Length > 0 ? string.Format(message, arguments) : message;
|
||||
|
||||
this.logMessages.Add(log);
|
||||
this.logFileWriter.WriteLine(log);
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DefineConstants>TRACE;DEBUG</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -36,6 +36,7 @@
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<OutputPath>bin\x64\Debug\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
@@ -44,32 +45,56 @@
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>Resources\ApplicationIcon.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\x86\Debug\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG;BUILD32</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
||||
<OutputPath>bin\x86\Release\</OutputPath>
|
||||
<DefineConstants>TRACE;BUILD32</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</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>
|
||||
<HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.2.900\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="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Office.Interop.PowerPoint, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</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">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\Middleware\Ripper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Deployment" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Printing" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.Xaml">
|
||||
<RequiredTargetFramework>4.0</RequiredTargetFramework>
|
||||
</Reference>
|
||||
@@ -78,6 +103,10 @@
|
||||
<Reference Include="WindowsBase" />
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="WpfAnimatedGif, Version=1.4.14.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\WpfAnimatedGif.1.4.14\lib\net\WpfAnimatedGif.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="yeti.mmedia">
|
||||
<HintPath>..\..\Middleware\yeti.mmedia.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -87,37 +116,59 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</ApplicationDefinition>
|
||||
<Compile Include="ApplicationTerminateArgs.cs" />
|
||||
<Compile Include="Commands\DelegateCommand.cs" />
|
||||
<Compile Include="Commands\OpenUrlCommand.cs" />
|
||||
<Compile Include="Controls\EncodingQualitySliderControl.xaml.cs">
|
||||
<DependentUpon>EncodingQualitySliderControl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Commands\CancelConversionJobCommand.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionFlags.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_Office.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_PowerPoint.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_ExtractCDA.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJobFactory.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_FFMPEG.Converters.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_FFMPEG.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_Gif.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_Ico.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_Excel.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_Word.cs" />
|
||||
<Compile Include="ConversionJobs\ConversionJob_ImageMagick.cs" />
|
||||
<Compile Include="ConversionJobs\VideoEncodingSpeed.cs" />
|
||||
<Compile Include="ConversionPreset\ConversionSettingsOverride.cs" />
|
||||
<Compile Include="ConversionPreset\ConversionSettings.cs" />
|
||||
<Compile Include="Diagnostics\DiagnosticsData.cs" />
|
||||
<Compile Include="Controls\EncodingMode.cs" />
|
||||
<Compile Include="ConversionPreset\IConversionSettings.cs" />
|
||||
<Compile Include="Helpers.cs" />
|
||||
<Compile Include="InputPostConversionAction.cs" />
|
||||
<Compile Include="IXmlSerializable.cs" />
|
||||
<Compile Include="PathHelpers.cs" />
|
||||
<Compile Include="Properties\Resources.fr.Designer.cs">
|
||||
<DependentUpon>Resources.fr.resx</DependentUpon>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<ExcludeFromStyleCop>True</ExcludeFromStyleCop>
|
||||
</Compile>
|
||||
<Compile Include="Properties\Resources.en.Designer.cs">
|
||||
<DependentUpon>Resources.en.resx</DependentUpon>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<ExcludeFromStyleCop>True</ExcludeFromStyleCop>
|
||||
</Compile>
|
||||
<Compile Include="Registry.cs" />
|
||||
<Compile Include="Settings.Migration.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\OutputTypeEnumToViewModel.cs" />
|
||||
<Compile Include="ValueConverters\BitrateToString.cs" />
|
||||
<Compile Include="ValueConverters\FileNameConverter.cs" />
|
||||
<Compile Include="ValueConverters\Generic\ObjectToLocalizedString.cs" />
|
||||
<Compile Include="ValueConverters\Generic\CultureInfoToStringConverter.cs" />
|
||||
<Compile Include="ValueConverters\Generic\BoolToVisibility.cs" />
|
||||
<Compile Include="ValueConverters\ConversionSettingsToString.cs" />
|
||||
<Compile Include="ValueConverters\Generic\BoolInverterConverter.cs" />
|
||||
@@ -125,6 +176,7 @@
|
||||
<Compile Include="ValueConverters\Generic\EqualsConverter.cs" />
|
||||
<Compile Include="ValueConverters\Generic\CollectionContainsElementToBool.cs" />
|
||||
<Compile Include="ValueConverters\Generic\FormatStringConverter.cs" />
|
||||
<Compile Include="ValueConverters\Generic\ValueToString.cs" />
|
||||
<Compile Include="ValueConverters\Generic\StringToValueType.cs" />
|
||||
<Compile Include="ValueConverters\InputTypesToBool.cs" />
|
||||
<Compile Include="Settings.cs" />
|
||||
@@ -140,6 +192,7 @@
|
||||
<Compile Include="Windows\ConversionSettingsTemplateSelector.cs" />
|
||||
<Compile Include="Windows\InputExtension.cs" />
|
||||
<Compile Include="Windows\InputExtensionCategory.cs" />
|
||||
<Compile Include="Windows\OutputTypeViewModel.cs" />
|
||||
<Compile Include="Windows\SettingsWindow.xaml.cs">
|
||||
<DependentUpon>SettingsWindow.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -203,6 +256,10 @@
|
||||
<DependentUpon>Settings.settings</DependentUpon>
|
||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
||||
</Compile>
|
||||
<EmbeddedResource Include="Properties\Resources.fr.resx">
|
||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.fr.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Properties\Resources.en.resx">
|
||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.en.Designer.cs</LastGenOutput>
|
||||
@@ -210,6 +267,7 @@
|
||||
<EmbeddedResource Include="Properties\Resources.resx">
|
||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<None Include="packages.config" />
|
||||
<None Include="Properties\Settings.settings">
|
||||
@@ -219,7 +277,7 @@
|
||||
<AppDesigner Include="Properties\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
<None Include="app.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\ApplicationIcon.png" />
|
||||
@@ -231,12 +289,45 @@
|
||||
<Resource Include="Resources\DownloadIcon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\ContextMenuScreenshot.png" />
|
||||
<Resource Include="Resources\CancelIcon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\SuccessIcon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\FailIcon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\GitHub-Icon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\GitHub-Issue-Icon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\GitHub-Documentation-Icon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Pledge-icon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\FileConverterUsage.gif" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Settings-Icon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\WebSite-Icon.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>
|
||||
<PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
|
||||
copy /Y "$(SolutionDir)Middleware\gs\x86\gsdll32.dll" "$(TargetDir)gsdll32.dll"
|
||||
copy /Y "$(SolutionDir)Middleware\gs\x86\gswin32c.exe" "$(TargetDir)gswin32c.exe"
|
||||
copy /Y "$(ProjectDir)Settings.default.xml" "$(TargetDir)Settings.default.xml"
|
||||
robocopy $(TargetDir) $(TargetDir)\Languages "$(TargetName).resources.dll" /CREATE /S /XD Languages /IS /IT /NFL /NDL /NJH /NJS /NC /NS /NP
|
||||
if %25errorlevel%25 leq 1 exit 0 else exit %25errorlevel%25
|
||||
robocopy $(TargetDir) $(TargetDir)\Languages "$(TargetName).resources.dll" /MOVE /S /XD Languages /XL /IS /IT /NFL /NDL /NJH /NJS /NC /NS /NP
|
||||
if %25errorlevel%25 leq 1 exit 0 else exit %25errorlevel%25</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.
|
||||
|
||||
@@ -0,0 +1,256 @@
|
||||
// // <copyright file="Helpers.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.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
|
||||
using FileConverter.ConversionJobs;
|
||||
using Microsoft.Win32;
|
||||
|
||||
public static class Helpers
|
||||
{
|
||||
public static IEnumerable<CultureInfo> GetSupportedCultures()
|
||||
{
|
||||
// Get all cultures.
|
||||
CultureInfo[] cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
|
||||
|
||||
// Find the location where application installed.
|
||||
string exeLocation = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path));
|
||||
|
||||
// Return all culture for which satellite folder found with culture code.
|
||||
return cultures.Where(cultureInfo => Directory.Exists(Path.Combine(exeLocation, "Languages", cultureInfo.Name)));
|
||||
}
|
||||
|
||||
public static string GetExtensionCategory(string extension)
|
||||
{
|
||||
switch (extension)
|
||||
{
|
||||
case "aac":
|
||||
case "aiff":
|
||||
case "ape":
|
||||
case "cda":
|
||||
case "flac":
|
||||
case "mp3":
|
||||
case "m4a":
|
||||
case "oga":
|
||||
case "ogg":
|
||||
case "wav":
|
||||
case "wma":
|
||||
return InputCategoryNames.Audio;
|
||||
|
||||
case "3gp":
|
||||
case "avi":
|
||||
case "bik":
|
||||
case "flv":
|
||||
case "m4v":
|
||||
case "mp4":
|
||||
case "mpeg":
|
||||
case "mov":
|
||||
case "mkv":
|
||||
case "ogv":
|
||||
case "vob":
|
||||
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":
|
||||
case "webp":
|
||||
return InputCategoryNames.Image;
|
||||
|
||||
case "gif":
|
||||
return InputCategoryNames.AnimatedImage;
|
||||
|
||||
case "pdf":
|
||||
case "doc":
|
||||
case "docx":
|
||||
case "ppt":
|
||||
case "pptx":
|
||||
case "odp":
|
||||
case "ods":
|
||||
case "odt":
|
||||
case "xls":
|
||||
case "xlsx":
|
||||
return InputCategoryNames.Document;
|
||||
}
|
||||
|
||||
return InputCategoryNames.Misc;
|
||||
}
|
||||
|
||||
public static bool IsOutputTypeCompatibleWithCategory(OutputType outputType, string category)
|
||||
{
|
||||
if (category == InputCategoryNames.Misc)
|
||||
{
|
||||
// Misc category contains unsorted input extensions, so we consider that they are compatible to be tolerant.
|
||||
return true;
|
||||
}
|
||||
|
||||
switch (outputType)
|
||||
{
|
||||
case OutputType.Aac:
|
||||
case OutputType.Flac:
|
||||
case OutputType.Mp3:
|
||||
case OutputType.Ogg:
|
||||
case OutputType.Wav:
|
||||
return category == InputCategoryNames.Audio || category == InputCategoryNames.Video;
|
||||
|
||||
case OutputType.Avi:
|
||||
case OutputType.Mkv:
|
||||
case OutputType.Mp4:
|
||||
case OutputType.Ogv:
|
||||
case OutputType.Webm:
|
||||
return category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
|
||||
|
||||
case OutputType.Ico:
|
||||
case OutputType.Jpg:
|
||||
case OutputType.Png:
|
||||
case OutputType.Webp:
|
||||
return category == InputCategoryNames.Image || category == InputCategoryNames.Document;
|
||||
|
||||
case OutputType.Gif:
|
||||
return category == InputCategoryNames.Image || category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
|
||||
|
||||
case OutputType.Pdf:
|
||||
return category == InputCategoryNames.Image || category == InputCategoryNames.Document;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static Thread InstantiateThread(string name, ThreadStart threadStart)
|
||||
{
|
||||
Application application = Application.Current as Application;
|
||||
CultureInfo currentCulture = application?.Settings?.ApplicationLanguage;
|
||||
|
||||
Thread thread = new Thread(threadStart);
|
||||
thread.Name = name;
|
||||
|
||||
if (currentCulture != null)
|
||||
{
|
||||
thread.CurrentCulture = currentCulture;
|
||||
thread.CurrentUICulture = currentCulture;
|
||||
}
|
||||
|
||||
return thread;
|
||||
}
|
||||
|
||||
public static Thread InstantiateThread(string name, ParameterizedThreadStart parameterizedThreadStart)
|
||||
{
|
||||
Application application = Application.Current as Application;
|
||||
CultureInfo currentCulture = application?.Settings?.ApplicationLanguage;
|
||||
|
||||
Thread thread = new Thread(parameterizedThreadStart);
|
||||
thread.Name = name;
|
||||
|
||||
if (currentCulture != null)
|
||||
{
|
||||
thread.CurrentCulture = currentCulture;
|
||||
thread.CurrentUICulture = currentCulture;
|
||||
}
|
||||
|
||||
return thread;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Check whether Microsoft office is available or not.
|
||||
/// </summary>
|
||||
/// <returns>Returns true if Office is installed on the computer.</returns>
|
||||
/// source: http://stackoverflow.com/questions/3266675/how-to-detect-installed-version-of-ms-office/3267832#3267832
|
||||
/// source: http://www.codeproject.com/Articles/26520/Getting-Office-s-Version
|
||||
public static bool IsMicrosoftOfficeApplicationAvailable(ConversionJobs.ConversionJob_Office.ApplicationName application)
|
||||
{
|
||||
string registryKeyPattern = @"Software\Microsoft\Windows\CurrentVersion\App Paths\";
|
||||
switch (application)
|
||||
{
|
||||
case ConversionJob_Office.ApplicationName.Word:
|
||||
registryKeyPattern += "winword.exe";
|
||||
break;
|
||||
|
||||
case ConversionJob_Office.ApplicationName.PowerPoint:
|
||||
registryKeyPattern += "powerpnt.exe";
|
||||
break;
|
||||
|
||||
case ConversionJob_Office.ApplicationName.Excel:
|
||||
registryKeyPattern += "excel.exe";
|
||||
break;
|
||||
|
||||
case ConversionJob_Office.ApplicationName.None:
|
||||
return false;
|
||||
}
|
||||
|
||||
// Looks inside CURRENT_USER.
|
||||
RegistryKey winwordKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(registryKeyPattern, false);
|
||||
if (winwordKey != null)
|
||||
{
|
||||
string winwordPath = winwordKey.GetValue(string.Empty).ToString();
|
||||
if (!string.IsNullOrEmpty(winwordPath))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// If not found, looks inside LOCAL_MACHINE.
|
||||
winwordKey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(registryKeyPattern, false);
|
||||
if (winwordKey != null)
|
||||
{
|
||||
string winwordPath = winwordKey.GetValue(string.Empty).ToString();
|
||||
if (!string.IsNullOrEmpty(winwordPath))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public static ConversionJob_Office.ApplicationName GetOfficeApplicationCompatibleWithExtension(string extension)
|
||||
{
|
||||
switch (extension)
|
||||
{
|
||||
case "doc":
|
||||
case "docx":
|
||||
case "odt":
|
||||
return ConversionJob_Office.ApplicationName.Word;
|
||||
|
||||
case "ppt":
|
||||
case "pptx":
|
||||
case "odp":
|
||||
return ConversionJob_Office.ApplicationName.PowerPoint;
|
||||
|
||||
case "ods":
|
||||
case "xls":
|
||||
case "xlsx":
|
||||
return ConversionJob_Office.ApplicationName.Excel;
|
||||
}
|
||||
|
||||
return ConversionJob_Office.ApplicationName.None;
|
||||
}
|
||||
|
||||
public static class InputCategoryNames
|
||||
{
|
||||
public const string Audio = "Audio";
|
||||
public const string Video = "Video";
|
||||
public const string Image = "Image";
|
||||
public const string AnimatedImage = "Animated Image";
|
||||
public const string Document = "Document";
|
||||
|
||||
public const string Misc = "Misc";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,13 +9,18 @@ namespace FileConverter
|
||||
Aac,
|
||||
Avi,
|
||||
Flac,
|
||||
Gif,
|
||||
Ico,
|
||||
Jpg,
|
||||
Mkv,
|
||||
Mp3,
|
||||
Mp4,
|
||||
Ogg,
|
||||
Ogv,
|
||||
Pdf,
|
||||
Png,
|
||||
Wav,
|
||||
Webm,
|
||||
Webp,
|
||||
}
|
||||
}
|
||||
@@ -2,16 +2,20 @@
|
||||
|
||||
namespace FileConverter
|
||||
{
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
using FileConverter.Diagnostics;
|
||||
|
||||
public static class PathHelpers
|
||||
{
|
||||
private static Regex driveLetterRegex = new Regex(@"[a-zA-Z]:\\");
|
||||
private static Regex cdaTrackNumberRegex = new Regex(@"[a-zA-Z]:\\Track([0-9]+)\.cda");
|
||||
private static Regex pathRegex = new Regex(@"^[a-zA-Z]:\\(?:[^\\/:*?""<>|\r\n]+\\)*[^\.\\/:*?""<>|\r\n][^\\/:*?""<>|\r\n]*$");
|
||||
private static Regex pathRegex = new Regex(@"^(?:\\\\[^\\/:*?""<>|\r\n]+\\|[a-zA-Z]:\\)(?:[^\\/:*?""<>|\r\n]+\\)*[^\.\\/:*?""<>|\r\n][^\\/:*?""<>|\r\n]*$");
|
||||
private static Regex filenameRegex = new Regex(@"[^\\]*", RegexOptions.RightToLeft);
|
||||
private static Regex directoryRegex = new Regex(@"(?:([^\\]*)\\)*");
|
||||
private static Regex directoryRegex = new Regex(@"^(?<drive>\\\\[^\\/:*?""""<>|\r\n]+\\|[A-Za-z]:\\)(?:(?<folders>[^\\]*)\\)*");
|
||||
|
||||
public static bool IsPathDriveLetterValid(string path)
|
||||
{
|
||||
@@ -23,6 +27,28 @@ namespace FileConverter
|
||||
return PathHelpers.driveLetterRegex.Match(path).Groups[0].Value;
|
||||
}
|
||||
|
||||
public static bool IsOnCDDrive(string path)
|
||||
{
|
||||
string pathDriveLetter = GetPathDriveLetter(path);
|
||||
if (string.IsNullOrEmpty(pathDriveLetter))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
char driveLetter = pathDriveLetter[0];
|
||||
|
||||
char[] driveLetters = Ripper.CDDrive.GetCDDriveLetters();
|
||||
for (int index = 0; index < driveLetters.Length; index++)
|
||||
{
|
||||
if (driveLetters[index] == driveLetter)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public static int GetCDATrackNumber(string path)
|
||||
{
|
||||
Match match = PathHelpers.cdaTrackNumberRegex.Match(path);
|
||||
@@ -41,112 +67,75 @@ namespace FileConverter
|
||||
Match filenameMatch = matchCollection.Count > 0 ? matchCollection[0] : null;
|
||||
return filenameMatch?.Groups[0].Value;
|
||||
}
|
||||
|
||||
|
||||
public static string GetDrive(string path)
|
||||
{
|
||||
MatchCollection matchCollection = PathHelpers.directoryRegex.Matches(path);
|
||||
Match match = matchCollection.Count > 0 ? matchCollection[0] : null;
|
||||
|
||||
Group matchGroup = match?.Groups["drive"];
|
||||
return matchGroup?.Captures[0].Value;
|
||||
}
|
||||
|
||||
public static IEnumerable<string> GetDirectories(string path)
|
||||
{
|
||||
MatchCollection matchCollection = PathHelpers.directoryRegex.Matches(path);
|
||||
Match match = matchCollection.Count > 0 ? matchCollection[0] : null;
|
||||
if (match == null || match.Groups.Count < 2)
|
||||
|
||||
Group matchGroup = match?.Groups["folders"];
|
||||
if (matchGroup == null)
|
||||
{
|
||||
yield break;
|
||||
}
|
||||
|
||||
Group matchGroup = match.Groups[1];
|
||||
for (int index = 0; index < matchGroup.Captures.Count; index++)
|
||||
{
|
||||
yield return matchGroup.Captures[index].Value;
|
||||
}
|
||||
}
|
||||
|
||||
public static string GenerateUniquePath(string path)
|
||||
public static string GenerateUniquePath(string path, params string[] blacklist)
|
||||
{
|
||||
string baseExtension = System.IO.Path.GetExtension(path);
|
||||
string basePath = path.Substring(0, path.Length - baseExtension.Length);
|
||||
int index = 2;
|
||||
while (System.IO.File.Exists(path))
|
||||
while (System.IO.File.Exists(path) ||
|
||||
(blacklist != null && System.Array.Exists(blacklist, match => match == path)))
|
||||
{
|
||||
path = string.Format("{0} ({1}){2}", basePath, index, baseExtension);
|
||||
path = $"{basePath} ({index}){baseExtension}";
|
||||
index++;
|
||||
}
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
public static string GetExtensionCategory(string extension)
|
||||
public static bool CreateFolders(string filePath)
|
||||
{
|
||||
switch (extension)
|
||||
// Create output folders that doesn't already exist.
|
||||
StringBuilder path = new StringBuilder(filePath.Length);
|
||||
string drive = PathHelpers.GetDrive(filePath);
|
||||
path.Append(drive);
|
||||
|
||||
foreach (string directory in PathHelpers.GetDirectories(filePath))
|
||||
{
|
||||
case "aac":
|
||||
case "aiff":
|
||||
case "ape":
|
||||
case "cda":
|
||||
case "flac":
|
||||
case "mp3":
|
||||
case "m4a":
|
||||
case "ogg":
|
||||
case "wav":
|
||||
case "wma":
|
||||
return InputCategoryNames.Audio;
|
||||
path.Append(directory);
|
||||
path.Append('\\');
|
||||
|
||||
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;
|
||||
if (!System.IO.Directory.Exists(path.ToString()))
|
||||
{
|
||||
try
|
||||
{
|
||||
System.IO.Directory.CreateDirectory(path.ToString());
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
Debug.Log(string.Format("Can't create directories for path {0}", filePath));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return InputCategoryNames.Misc;
|
||||
}
|
||||
|
||||
public static bool IsOutputTypeCompatibleWithCategory(OutputType outputType, string category)
|
||||
{
|
||||
if (category == InputCategoryNames.Misc)
|
||||
{
|
||||
// Misc category contains unsorted input extensions, so we consider that they are compatible to be tolerant.
|
||||
return true;
|
||||
}
|
||||
|
||||
switch (outputType)
|
||||
{
|
||||
case OutputType.Aac:
|
||||
case OutputType.Flac:
|
||||
case OutputType.Mp3:
|
||||
case OutputType.Ogg:
|
||||
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:
|
||||
case OutputType.Png:
|
||||
case OutputType.Jpg:
|
||||
return category == InputCategoryNames.Image;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static string GetUserDataFolderPath()
|
||||
@@ -162,12 +151,78 @@ namespace FileConverter
|
||||
return path;
|
||||
}
|
||||
|
||||
public static class InputCategoryNames
|
||||
public static string GenerateFilePathFromTemplate(string inputFilePath, OutputType outputFileExtension, string outputFilePathTemplate, int numberIndex, int numberMax)
|
||||
{
|
||||
public const string Audio = "Audio";
|
||||
public const string Video = "Video";
|
||||
public const string Image = "Image";
|
||||
public const string Misc = "Misc";
|
||||
if (string.IsNullOrEmpty(inputFilePath))
|
||||
{
|
||||
return "Invalid input file path (argument 0).";
|
||||
}
|
||||
|
||||
string inputExtension = System.IO.Path.GetExtension(inputFilePath).Substring(1);
|
||||
string inputPathWithoutExtension = inputFilePath.Substring(0, inputFilePath.Length - inputExtension.Length - 1);
|
||||
string outputExtension = outputFileExtension.ToString().ToLowerInvariant();
|
||||
|
||||
if (string.IsNullOrEmpty(outputFilePathTemplate))
|
||||
{
|
||||
// Default output path.
|
||||
return inputPathWithoutExtension + "." + outputExtension;
|
||||
}
|
||||
|
||||
string fileName = System.IO.Path.GetFileName(inputPathWithoutExtension);
|
||||
string parentDirectory = System.IO.Path.GetDirectoryName(inputPathWithoutExtension);
|
||||
if (!parentDirectory.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString()))
|
||||
{
|
||||
parentDirectory += System.IO.Path.DirectorySeparatorChar;
|
||||
}
|
||||
|
||||
string[] directories = parentDirectory.Substring(0, parentDirectory.Length - 1).Split(System.IO.Path.DirectorySeparatorChar);
|
||||
|
||||
// Generate output path from template.
|
||||
string outputPath = outputFilePathTemplate;
|
||||
|
||||
outputPath = outputPath.Replace("(path)", parentDirectory);
|
||||
outputPath = outputPath.Replace("(p)", parentDirectory);
|
||||
|
||||
outputPath = outputPath.Replace("(filename)", fileName);
|
||||
outputPath = outputPath.Replace("(f)", fileName);
|
||||
outputPath = outputPath.Replace("(F)", fileName.ToUpperInvariant());
|
||||
|
||||
outputPath = outputPath.Replace("(outputext)", outputExtension);
|
||||
outputPath = outputPath.Replace("(o)", outputExtension);
|
||||
outputPath = outputPath.Replace("(O)", outputExtension.ToUpperInvariant());
|
||||
|
||||
outputPath = outputPath.Replace("(inputext)", inputExtension);
|
||||
outputPath = outputPath.Replace("(i)", inputExtension);
|
||||
outputPath = outputPath.Replace("(I)", inputExtension.ToUpperInvariant());
|
||||
|
||||
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) + "\\";
|
||||
outputPath = outputPath.Replace("(p:m)", myMusicFolder);
|
||||
outputPath = outputPath.Replace("(p:music)", myMusicFolder);
|
||||
|
||||
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) + "\\";
|
||||
outputPath = outputPath.Replace("(p:p)", myPictureFolder);
|
||||
outputPath = outputPath.Replace("(p:pictures)", myPictureFolder);
|
||||
|
||||
for (int index = 0; index < directories.Length; index++)
|
||||
{
|
||||
outputPath = outputPath.Replace(string.Format("(d{0})", directories.Length - index - 1), directories[index]);
|
||||
outputPath = outputPath.Replace(string.Format("(D{0})", directories.Length - index - 1), directories[index].ToUpperInvariant());
|
||||
}
|
||||
|
||||
outputPath = outputPath.Replace("(n:i)", numberIndex.ToString());
|
||||
outputPath = outputPath.Replace("(n:c)", numberMax.ToString());
|
||||
|
||||
outputPath += "." + outputExtension;
|
||||
|
||||
return outputPath;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ using System.Windows;
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("FileConverter")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2014")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2016")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
|
||||
@@ -117,15 +117,147 @@
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="About" xml:space="preserve">
|
||||
<value>About</value>
|
||||
</data>
|
||||
<data name="ActionWhenConversionSucceedDescription" xml:space="preserve">
|
||||
<value>Allow you to chose what you want to do with your input files if the conversion succeed</value>
|
||||
</data>
|
||||
<data name="ActionWhenConversionSucceedTitle" xml:space="preserve">
|
||||
<value>Action when conversion succeed</value>
|
||||
</data>
|
||||
<data name="AddNewPreset" xml:space="preserve">
|
||||
<value>Add new preset (duplicate selected preset)</value>
|
||||
</data>
|
||||
<data name="Application" xml:space="preserve">
|
||||
<value>Application</value>
|
||||
</data>
|
||||
<data name="AudioTitle" xml:space="preserve">
|
||||
<value>Audio</value>
|
||||
</data>
|
||||
<data name="AutomaticallyCheckForUpdates" xml:space="preserve">
|
||||
<value>Automatically check for updates when File Converter starts</value>
|
||||
</data>
|
||||
<data name="AutomaticallyExitWhenAllConversionsFinished" xml:space="preserve">
|
||||
<value>Automatically exit when all conversions finished</value>
|
||||
</data>
|
||||
<data name="ClampToLowestPowerOfTwoSize" xml:space="preserve">
|
||||
<value>Clamp to lowest power of 2 size</value>
|
||||
</data>
|
||||
<data name="Close" xml:space="preserve">
|
||||
<value>Close</value>
|
||||
</data>
|
||||
<data name="ConversionPresets" xml:space="preserve">
|
||||
<value>Conversion Presets</value>
|
||||
</data>
|
||||
<data name="ConversionQueueTitle" xml:space="preserve">
|
||||
<value>Files to convert</value>
|
||||
</data>
|
||||
<data name="ConvertedFrom" xml:space="preserve">
|
||||
<value>Converted from</value>
|
||||
</data>
|
||||
<data name="Diagnostics" xml:space="preserve">
|
||||
<value>Logs</value>
|
||||
</data>
|
||||
<data name="DiagnosticsButtonTitle" xml:space="preserve">
|
||||
<value>Logs</value>
|
||||
</data>
|
||||
<data name="DocumentationButtonDescription" xml:space="preserve">
|
||||
<value>Open documentation</value>
|
||||
</data>
|
||||
<data name="DonateButtonTitle" xml:space="preserve">
|
||||
<value>Donate</value>
|
||||
</data>
|
||||
<data name="DonateDescription" xml:space="preserve">
|
||||
<value>Don't forget to reward my work if you like it :)</value>
|
||||
</data>
|
||||
<data name="DownloadAndInstallButtonDescription" xml:space="preserve">
|
||||
<value>The update will be downloaded in background, and installed once you exit File Converter.</value>
|
||||
</data>
|
||||
<data name="DownloadAndInstallButtonTitle" xml:space="preserve">
|
||||
<value>Install when I exit File Converter</value>
|
||||
</data>
|
||||
<data name="Encoding" xml:space="preserve">
|
||||
<value>Encoding :</value>
|
||||
</data>
|
||||
<data name="EncodingSpeed" xml:space="preserve">
|
||||
<value>Encoding speed :</value>
|
||||
</data>
|
||||
<data name="FileConverterStartHelp1" xml:space="preserve">
|
||||
<value>File Converter is a shell extension.</value>
|
||||
</data>
|
||||
<data name="FileConverterStartHelp2" xml:space="preserve">
|
||||
<value>That means it is integrated into the Windows explorer.</value>
|
||||
</data>
|
||||
<data name="FileNameTemplate" xml:space="preserve">
|
||||
<value>File name template</value>
|
||||
</data>
|
||||
<data name="FramesPerSecond" xml:space="preserve">
|
||||
<value>Frames per second :</value>
|
||||
</data>
|
||||
<data name="GitHubButtonDescription" xml:space="preserve">
|
||||
<value>Open GitHub project page</value>
|
||||
</data>
|
||||
<data name="Help" xml:space="preserve">
|
||||
<value>help ?</value>
|
||||
</data>
|
||||
<data name="InputExample" xml:space="preserve">
|
||||
<value>Input example</value>
|
||||
</data>
|
||||
<data name="InputFormats" xml:space="preserve">
|
||||
<value>Input formats</value>
|
||||
</data>
|
||||
<data name="InputPostConversionActionDeleteName" xml:space="preserve">
|
||||
<value>Delete</value>
|
||||
</data>
|
||||
<data name="InputPostConversionActionMoveInArchiveFolderName" xml:space="preserve">
|
||||
<value>Move in an archive folder</value>
|
||||
</data>
|
||||
<data name="InputPostConversionActionNoneName" xml:space="preserve">
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="InstallButtonDescription" xml:space="preserve">
|
||||
<value>The update has been downloaded. Exit File Converter and install the update now.</value>
|
||||
</data>
|
||||
<data name="InstallButtonTitle" xml:space="preserve">
|
||||
<value>Install when I exit File Converter</value>
|
||||
</data>
|
||||
<data name="IssueButtonDescription" xml:space="preserve">
|
||||
<value>Report an issue</value>
|
||||
</data>
|
||||
<data name="MoveDownSelectedPreset" xml:space="preserve">
|
||||
<value>Move down selected preset</value>
|
||||
</data>
|
||||
<data name="MoveUpSelectedPreset" xml:space="preserve">
|
||||
<value>Move up selected preset</value>
|
||||
</data>
|
||||
<data name="Mp3CbrDescription" xml:space="preserve">
|
||||
<value>Constant bitrate encoding</value>
|
||||
</data>
|
||||
<data name="Mp3VbrDescription" xml:space="preserve">
|
||||
<value>Variable bitrate encoding</value>
|
||||
</data>
|
||||
<data name="NinetyDegreesRotationTitle" xml:space="preserve">
|
||||
<value>90°</value>
|
||||
</data>
|
||||
<data name="NinetyDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>90° counter clockwise rotation</value>
|
||||
</data>
|
||||
<data name="Ok" xml:space="preserve">
|
||||
<value>Ok</value>
|
||||
</data>
|
||||
<data name="OneEightyDegreesRotationTitle" xml:space="preserve">
|
||||
<value>180°</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>
|
||||
<data name="OutputExample" xml:space="preserve">
|
||||
<value>Output</value>
|
||||
</data>
|
||||
<data name="OutputFilePathTemplateHelp" xml:space="preserve">
|
||||
<value>(p): input file path
|
||||
(f): input filename
|
||||
@@ -134,24 +266,282 @@
|
||||
(d0): input parent folder
|
||||
(d1): input sub parent folder
|
||||
...
|
||||
use maj for uppercase version
|
||||
(n:i): page number index
|
||||
(n:c): total page count
|
||||
|
||||
Special paths:
|
||||
(p:d): my documents path
|
||||
(p:m): my music path
|
||||
(p:v): my videos path
|
||||
(p:p): my pictures path</value>
|
||||
(p:p): my pictures path
|
||||
|
||||
use maj for uppercase version</value>
|
||||
</data>
|
||||
<data name="OutputFormat" xml:space="preserve">
|
||||
<value>Output format</value>
|
||||
</data>
|
||||
<data name="Preset" xml:space="preserve">
|
||||
<value>Preset</value>
|
||||
</data>
|
||||
<data name="PresetName" xml:space="preserve">
|
||||
<value>Preset Name</value>
|
||||
</data>
|
||||
<data name="Quality" xml:space="preserve">
|
||||
<value>Quality :</value>
|
||||
</data>
|
||||
<data name="RecommendeBitrateRangeInBlue" xml:space="preserve">
|
||||
<value>Recommended bitrate range in blue</value>
|
||||
</data>
|
||||
<data name="RemoveSelectedPreset" xml:space="preserve">
|
||||
<value>Remove selected preset</value>
|
||||
</data>
|
||||
<data name="Rotate" xml:space="preserve">
|
||||
<value>Rotate :</value>
|
||||
</data>
|
||||
<data name="Save" xml:space="preserve">
|
||||
<value>Save</value>
|
||||
</data>
|
||||
<data name="Scale" xml:space="preserve">
|
||||
<value>Scale :</value>
|
||||
</data>
|
||||
<data name="SeeChangeLog" xml:space="preserve">
|
||||
<value>See change log ...</value>
|
||||
</data>
|
||||
<data name="Settings" xml:space="preserve">
|
||||
<value>File Converter Settings</value>
|
||||
</data>
|
||||
<data name="SettingsButtonTitle" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
</data>
|
||||
<data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
|
||||
<value>270°</value>
|
||||
</data>
|
||||
<data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>90° clockwise rotation</value>
|
||||
</data>
|
||||
<data name="UpgradeAvailable" xml:space="preserve">
|
||||
<value>An update for File Converter is available. It is strongly recommended that you install it as soon as possible!</value>
|
||||
</data>
|
||||
<data name="UpgradeDownloadInProgress" xml:space="preserve">
|
||||
<value>Upgrade download in progress...</value>
|
||||
</data>
|
||||
<data name="UpgradeWindowTitle" xml:space="preserve">
|
||||
<value>File Converter Updates</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="VideoEncodingSpeedFasterName" xml:space="preserve">
|
||||
<value>Faster</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedFastName" xml:space="preserve">
|
||||
<value>Fast</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedMediumName" xml:space="preserve">
|
||||
<value>Medium</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedSlowerName" xml:space="preserve">
|
||||
<value>Slower</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedSlowName" xml:space="preserve">
|
||||
<value>Slow</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedSuperFastName" xml:space="preserve">
|
||||
<value>Super Fast</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="VideoEncodingSpeedUltraFastName" xml:space="preserve">
|
||||
<value>Ultra Fast</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedVeryFastName" xml:space="preserve">
|
||||
<value>Very Fast</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedVerySlowName" xml:space="preserve">
|
||||
<value>Very Slow</value>
|
||||
</data>
|
||||
<data name="VideoTitle" xml:space="preserve">
|
||||
<value>Video</value>
|
||||
</data>
|
||||
<data name="Wav16bitsDescription" xml:space="preserve">
|
||||
<value>PCM signed 16-bit little-endian</value>
|
||||
</data>
|
||||
<data name="Wav24bitsDescription" xml:space="preserve">
|
||||
<value>PCM signed 24-bit little-endian</value>
|
||||
</data>
|
||||
<data name="Wav32bitsDescription" xml:space="preserve">
|
||||
<value>PCM signed 32-bit little-endian</value>
|
||||
</data>
|
||||
<data name="Wav8bitsDescription" xml:space="preserve">
|
||||
<value>PCM signed 8-bit little-endian</value>
|
||||
</data>
|
||||
<data name="ZeroDegreesRotationTitle" xml:space="preserve">
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="ZeroDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>No rotation</value>
|
||||
</data>
|
||||
<data name="ConversionStateConversion" xml:space="preserve">
|
||||
<value>Conversion</value>
|
||||
</data>
|
||||
<data name="ConversionStateDone" xml:space="preserve">
|
||||
<value>Done</value>
|
||||
</data>
|
||||
<data name="ConversionStateExtraction" xml:space="preserve">
|
||||
<value>Extraction</value>
|
||||
</data>
|
||||
<data name="ConversionStateFailed" xml:space="preserve">
|
||||
<value>Failed</value>
|
||||
</data>
|
||||
<data name="ConversionStateInQueue" xml:space="preserve">
|
||||
<value>In queue</value>
|
||||
</data>
|
||||
<data name="ConversionStateReadIntputImage" xml:space="preserve">
|
||||
<value>Read input image</value>
|
||||
</data>
|
||||
<data name="ConversionStateReadDocument" xml:space="preserve">
|
||||
<value>Read document</value>
|
||||
</data>
|
||||
<data name="StringAnimatedImageName" xml:space="preserve">
|
||||
<value>Animated Image</value>
|
||||
</data>
|
||||
<data name="StringAudioName" xml:space="preserve">
|
||||
<value>Audio</value>
|
||||
</data>
|
||||
<data name="StringDocumentName" xml:space="preserve">
|
||||
<value>Document</value>
|
||||
</data>
|
||||
<data name="StringImageName" xml:space="preserve">
|
||||
<value>Image</value>
|
||||
</data>
|
||||
<data name="StringVideoName" xml:space="preserve">
|
||||
<value>Video</value>
|
||||
</data>
|
||||
<data name="ExitWaitingDuration" xml:space="preserve">
|
||||
<value>Waiting duration before application exit</value>
|
||||
</data>
|
||||
<data name="Language" xml:space="preserve">
|
||||
<value>Language</value>
|
||||
</data>
|
||||
<data name="MaximumNumberOfSimultaneousConversions" xml:space="preserve">
|
||||
<value>Maximum number of simultaneous conversions</value>
|
||||
</data>
|
||||
<data name="DefaultPresetName" xml:space="preserve">
|
||||
<value>New preset</value>
|
||||
</data>
|
||||
<data name="DownloadingChangeLog" xml:space="preserve">
|
||||
<value>###Downloading change log ...</value>
|
||||
</data>
|
||||
<data name="ConversionArchives" xml:space="preserve">
|
||||
<value>Conversion Archives</value>
|
||||
</data>
|
||||
<data name="ErrorCanceled" xml:space="preserve">
|
||||
<value>Canceled.</value>
|
||||
</data>
|
||||
<data name="ErrorCantFindFFMPEG" xml:space="preserve">
|
||||
<value>Fail to find ffmpeg executable. You should try to reinstall the application.</value>
|
||||
</data>
|
||||
<data name="ErrorCDAExtractionFailed" xml:space="preserve">
|
||||
<value>Audio CD track extraction failed</value>
|
||||
</data>
|
||||
<data name="ErrorCDDriveNotReady" xml:space="preserve">
|
||||
<value>CD drive is not ready.</value>
|
||||
</data>
|
||||
<data name="ErrorFailedToLaunchFFMPEG" xml:space="preserve">
|
||||
<value>Fail to launch ffmpeg.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToCreateOutputPathFolders" xml:space="preserve">
|
||||
<value>Fail to create output path folders.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToGenerateUniqueOutputPath" xml:space="preserve">
|
||||
<value>Fail to generate a unique output file path.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToReadCDDrive" xml:space="preserve">
|
||||
<value>Fail to read cd drive '{0}'.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToRetrieveInputPathDriveLetter" xml:space="preserve">
|
||||
<value>Fail to retrieve input path drive letter.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToRetrieveTrackNumber" xml:space="preserve">
|
||||
<value>Fail to retrieve track number from the cda input path.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToUseCDDriveOpen" xml:space="preserve">
|
||||
<value>Fail to use the CD drive because it is oppened.</value>
|
||||
</data>
|
||||
<data name="ErrorInputTypeIncompatibleWithOutputType" xml:space="preserve">
|
||||
<value>The input file type is not compatible with the selected output file type.</value>
|
||||
</data>
|
||||
<data name="ErrorInvalidOutputPath" xml:space="preserve">
|
||||
<value>Invalid output path generated by output file path template.</value>
|
||||
</data>
|
||||
<data name="ErrorUnsupportedOutputFormat" xml:space="preserve">
|
||||
<value>Unsupported output format '{0}'.</value>
|
||||
</data>
|
||||
<data name="ChannelCountTitle" xml:space="preserve">
|
||||
<value>Channel count :</value>
|
||||
</data>
|
||||
<data name="ChannelCountTooltip" xml:space="preserve">
|
||||
<value>Change the number of channels of the input file.</value>
|
||||
</data>
|
||||
<data name="MonoOption" xml:space="preserve">
|
||||
<value>Mono</value>
|
||||
</data>
|
||||
<data name="SameChannelCountOption" xml:space="preserve">
|
||||
<value>Same than input file</value>
|
||||
</data>
|
||||
<data name="StereoOption" xml:space="preserve">
|
||||
<value>Stereo</value>
|
||||
</data>
|
||||
<data name="FileConverterStartHelp3" xml:space="preserve">
|
||||
<value>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 online documentation to see the list of compatible file formats).</value>
|
||||
</data>
|
||||
<data name="LicenceHeader1" xml:space="preserve">
|
||||
<value>**This program is free software**.</value>
|
||||
</data>
|
||||
<data name="LicenceHeader2" xml:space="preserve">
|
||||
<value>You can redistribute it and/or modify it under the terms of the GNU General Public License.</value>
|
||||
</data>
|
||||
<data name="LicenceHeader3" xml:space="preserve">
|
||||
<value>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.</value>
|
||||
</data>
|
||||
<data name="ApplicationIsTerminating" xml:space="preserve">
|
||||
<value>The application is terminating.</value>
|
||||
</data>
|
||||
<data name="ApplicationWillTerminateInMultipleSeconds" xml:space="preserve">
|
||||
<value>The application will automatically terminate in {0} seconds.</value>
|
||||
</data>
|
||||
<data name="ApplicationWillTerminateInOneSecond" xml:space="preserve">
|
||||
<value>The application will automatically terminate in 1 second.</value>
|
||||
</data>
|
||||
<data name="StringMiscName" xml:space="preserve">
|
||||
<value>Misc</value>
|
||||
</data>
|
||||
<data name="ErrorCantFindOutputFiles" xml:space="preserve">
|
||||
<value>Can't find the output file(s).</value>
|
||||
</data>
|
||||
<data name="ErrorConversionFailedWithOutput" xml:space="preserve">
|
||||
<value>The conversion job failed but there is an output file that does exists.</value>
|
||||
</data>
|
||||
<data name="ConversionStatePrepareConversion" xml:space="preserve">
|
||||
<value>Prepare conversion</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftOfficeIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft Office must be installed in order to convert Office documents.</value>
|
||||
</data>
|
||||
<data name="ErrorUnableToUseMicrosoftOffice" xml:space="preserve">
|
||||
<value>Fail to open document with Microsoft Office (check if your licence/installation are valid).</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftExcelIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft Excel must be installed in order to convert Excel documents.</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftPowerPointIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft PowerPoint must be installed in order to convert PowerPoint documents.</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftWordIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft Word must be installed in order to convert Word documents.</value>
|
||||
</data>
|
||||
<data name="WebsiteButtonDescription" xml:space="preserve">
|
||||
<value>Open File Converter website</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -0,0 +1,565 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="About" xml:space="preserve">
|
||||
<value>A propos</value>
|
||||
</data>
|
||||
<data name="ActionWhenConversionSucceedDescription" xml:space="preserve">
|
||||
<value>Cette option vous permet de choisir ce que vous souhaitez faire du fichier d'origine après une conversion réussie</value>
|
||||
<comment>Allow you to chose what you want to do with your input files if the conversion succeed</comment>
|
||||
</data>
|
||||
<data name="ActionWhenConversionSucceedTitle" xml:space="preserve">
|
||||
<value>Action après conversion réussie</value>
|
||||
</data>
|
||||
<data name="AddNewPreset" xml:space="preserve">
|
||||
<value>Ajoute un nouveau preset (duplique le preset selectionné)</value>
|
||||
</data>
|
||||
<data name="Application" xml:space="preserve">
|
||||
<value>Application</value>
|
||||
</data>
|
||||
<data name="AudioTitle" xml:space="preserve">
|
||||
<value>Audio</value>
|
||||
</data>
|
||||
<data name="AutomaticallyCheckForUpdates" xml:space="preserve">
|
||||
<value>Vérifier automatiquement les mises à jour au démarage de File Converter</value>
|
||||
<comment>Automatically check for updates when File Converter starts</comment>
|
||||
</data>
|
||||
<data name="AutomaticallyExitWhenAllConversionsFinished" xml:space="preserve">
|
||||
<value>Terminer File Converter lorsque toutes les conversions ont réussies</value>
|
||||
</data>
|
||||
<data name="ClampToLowestPowerOfTwoSize" xml:space="preserve">
|
||||
<value>Ajuster à la taille en puissance de 2 la plus proche</value>
|
||||
</data>
|
||||
<data name="Close" xml:space="preserve">
|
||||
<value>Fermer</value>
|
||||
</data>
|
||||
<data name="ConversionPresets" xml:space="preserve">
|
||||
<value>Presets de conversion</value>
|
||||
</data>
|
||||
<data name="ConversionQueueTitle" xml:space="preserve">
|
||||
<value>Fichiers à convertir</value>
|
||||
</data>
|
||||
<data name="ConvertedFrom" xml:space="preserve">
|
||||
<value>Converti depuis</value>
|
||||
</data>
|
||||
<data name="Diagnostics" xml:space="preserve">
|
||||
<value>Historique d'activité</value>
|
||||
</data>
|
||||
<data name="DiagnosticsButtonTitle" xml:space="preserve">
|
||||
<value>Historique d'activité</value>
|
||||
</data>
|
||||
<data name="DocumentationButtonDescription" xml:space="preserve">
|
||||
<value>Ouvrir la documentation</value>
|
||||
</data>
|
||||
<data name="DonateButtonTitle" xml:space="preserve">
|
||||
<value>Faire un don</value>
|
||||
</data>
|
||||
<data name="DonateDescription" xml:space="preserve">
|
||||
<value>N'oubliez pas de récompenser mon travail si vous l'apréciez :)</value>
|
||||
</data>
|
||||
<data name="DownloadAndInstallButtonDescription" xml:space="preserve">
|
||||
<value>La mise à jour sera téléchargé en tache de fond et sera installé à la fermeture de File Converter.</value>
|
||||
<comment>The update will be downloaded in background, and installed once you exit File Converter.</comment>
|
||||
</data>
|
||||
<data name="DownloadAndInstallButtonTitle" xml:space="preserve">
|
||||
<value>Installer lorsque je quitte File Converter</value>
|
||||
<comment>Install when I exit File Converter</comment>
|
||||
</data>
|
||||
<data name="Encoding" xml:space="preserve">
|
||||
<value>Encodage :</value>
|
||||
</data>
|
||||
<data name="EncodingSpeed" xml:space="preserve">
|
||||
<value>Vitesse d'encodage :</value>
|
||||
</data>
|
||||
<data name="FileConverterStartHelp1" xml:space="preserve">
|
||||
<value>File Converter est une extension.</value>
|
||||
</data>
|
||||
<data name="FileConverterStartHelp2" xml:space="preserve">
|
||||
<value>Cela signifie qu'il est intégré dans l'explorateur Windows.</value>
|
||||
<comment>That means it is integrated into the Windows explorer.</comment>
|
||||
</data>
|
||||
<data name="FileConverterStartHelp3" xml:space="preserve">
|
||||
<value>Pour utiliser File Converter, ouvrez l'explorateur et faites un clic droit sur le ou les fichier(s) que vous souhaitez convertir pour faire apparaitre le menu contextuel ou vous trouverez File Converter (visitez la documentation en ligne pour connaître la liste des extensions de fichiers compatibles).</value>
|
||||
<comment>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 online documentation to see the list of compatible file formats).</comment>
|
||||
</data>
|
||||
<data name="FileNameTemplate" xml:space="preserve">
|
||||
<value>Modèle de nom de fichier</value>
|
||||
</data>
|
||||
<data name="FramesPerSecond" xml:space="preserve">
|
||||
<value>Images par seconde :</value>
|
||||
</data>
|
||||
<data name="GitHubButtonDescription" xml:space="preserve">
|
||||
<value>Ouvrir la page de projet GitHub</value>
|
||||
</data>
|
||||
<data name="Help" xml:space="preserve">
|
||||
<value>aide ?</value>
|
||||
</data>
|
||||
<data name="InputExample" xml:space="preserve">
|
||||
<value>Example de chemin d'origine</value>
|
||||
</data>
|
||||
<data name="InputFormats" xml:space="preserve">
|
||||
<value>Formats compatibles</value>
|
||||
</data>
|
||||
<data name="InputPostConversionActionDeleteName" xml:space="preserve">
|
||||
<value>Supprimer</value>
|
||||
</data>
|
||||
<data name="InputPostConversionActionMoveInArchiveFolderName" xml:space="preserve">
|
||||
<value>Déplacer dans un dossier d'archive</value>
|
||||
</data>
|
||||
<data name="InputPostConversionActionNoneName" xml:space="preserve">
|
||||
<value>Aucune</value>
|
||||
</data>
|
||||
<data name="InstallButtonDescription" xml:space="preserve">
|
||||
<value>La mise à jour a été téléchargé. Quitte File Conveter et installe la mise à jour maintenant.</value>
|
||||
<comment>The update has been downloaded. Exit File Converter and install the update now.</comment>
|
||||
</data>
|
||||
<data name="InstallButtonTitle" xml:space="preserve">
|
||||
<value>Installer quand je quitte File Converter</value>
|
||||
<comment>Install when I exit File Converter</comment>
|
||||
</data>
|
||||
<data name="IssueButtonDescription" xml:space="preserve">
|
||||
<value>Signaler un problème</value>
|
||||
</data>
|
||||
<data name="MoveDownSelectedPreset" xml:space="preserve">
|
||||
<value>Déplace le preset selectionné vers le bas</value>
|
||||
</data>
|
||||
<data name="MoveUpSelectedPreset" xml:space="preserve">
|
||||
<value>Déplace le preset selectionné vers le haut</value>
|
||||
</data>
|
||||
<data name="Mp3CbrDescription" xml:space="preserve">
|
||||
<value>Taux d'encodage constant</value>
|
||||
</data>
|
||||
<data name="Mp3VbrDescription" xml:space="preserve">
|
||||
<value>Taux d'encodage variable</value>
|
||||
</data>
|
||||
<data name="NinetyDegreesRotationTitle" xml:space="preserve">
|
||||
<value>90°</value>
|
||||
</data>
|
||||
<data name="NinetyDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>rotation de 90° dans le sens antihoraire</value>
|
||||
</data>
|
||||
<data name="Ok" xml:space="preserve">
|
||||
<value>Ok</value>
|
||||
</data>
|
||||
<data name="OneEightyDegreesRotationTitle" xml:space="preserve">
|
||||
<value>180°</value>
|
||||
</data>
|
||||
<data name="OneEightyDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>rotation de 180°</value>
|
||||
</data>
|
||||
<data name="OuputFileNameTemplateSample" xml:space="preserve">
|
||||
<value>C:\Musique\Artiste\Album\Chanson.wav</value>
|
||||
</data>
|
||||
<data name="OutputExample" xml:space="preserve">
|
||||
<value>Destination</value>
|
||||
</data>
|
||||
<data name="OutputFilePathTemplateHelp" xml:space="preserve">
|
||||
<value>(p): chemin du fichier d'origine
|
||||
(f): nom du fichier d'origine
|
||||
(o): extension du fichier de destination
|
||||
(i): extension du fichier d'origine
|
||||
(d0): dossier parent du fichier d'origine
|
||||
(d1): parent du dossier parent du fichier d'origine
|
||||
...
|
||||
(n:i): index du numéro de page
|
||||
(n:c): nombre total de pages
|
||||
|
||||
Chemin spéciaux:
|
||||
(p:d): chemin vers mes documents
|
||||
(p:m): chemin vers ma musique
|
||||
(p:v): chemin vers mes vidéos
|
||||
(p:p): chemin vers mes images
|
||||
|
||||
utilisez maj pour une version en majuscules</value>
|
||||
</data>
|
||||
<data name="OutputFormat" xml:space="preserve">
|
||||
<value>Format de destination</value>
|
||||
</data>
|
||||
<data name="Preset" xml:space="preserve">
|
||||
<value>Preset</value>
|
||||
</data>
|
||||
<data name="PresetName" xml:space="preserve">
|
||||
<value>Nom du preset</value>
|
||||
</data>
|
||||
<data name="Quality" xml:space="preserve">
|
||||
<value>Qualité :</value>
|
||||
</data>
|
||||
<data name="RecommendeBitrateRangeInBlue" xml:space="preserve">
|
||||
<value>Taux recommandés en bleu</value>
|
||||
</data>
|
||||
<data name="RemoveSelectedPreset" xml:space="preserve">
|
||||
<value>Supprime le preset selectionné</value>
|
||||
</data>
|
||||
<data name="Rotate" xml:space="preserve">
|
||||
<value>Rotation :</value>
|
||||
</data>
|
||||
<data name="Save" xml:space="preserve">
|
||||
<value>Enregistrer</value>
|
||||
</data>
|
||||
<data name="Scale" xml:space="preserve">
|
||||
<value>Echelle :</value>
|
||||
</data>
|
||||
<data name="SeeChangeLog" xml:space="preserve">
|
||||
<value>Voir les changements ...</value>
|
||||
</data>
|
||||
<data name="Settings" xml:space="preserve">
|
||||
<value>Configuration de File Converter</value>
|
||||
</data>
|
||||
<data name="SettingsButtonTitle" xml:space="preserve">
|
||||
<value>Configuration</value>
|
||||
</data>
|
||||
<data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
|
||||
<value>270°</value>
|
||||
</data>
|
||||
<data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>rotation de 90° dans le sens horaire</value>
|
||||
</data>
|
||||
<data name="UpgradeAvailable" xml:space="preserve">
|
||||
<value>Une mise à jour de File Converter est disponible. Il est vivement recommandé de l'installer dès que possible!</value>
|
||||
<comment>An update for File Converter is available. It is strongly recommended that you install it as soon as possible!</comment>
|
||||
</data>
|
||||
<data name="UpgradeDownloadInProgress" xml:space="preserve">
|
||||
<value>Téléchargement de la mise à jour en cours...</value>
|
||||
</data>
|
||||
<data name="UpgradeWindowTitle" xml:space="preserve">
|
||||
<value>Mise à jour de File Converter</value>
|
||||
</data>
|
||||
<data name="VideoEncodingQualityTooltip" xml:space="preserve">
|
||||
<value>Défini le rapport 'poid du fichier' contre 'qualité vidéo'. Une valeur basse donnera un fichier plus léger, une valeur haute une meilleur qualité vidéo.</value>
|
||||
<comment>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.</comment>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedFasterName" xml:space="preserve">
|
||||
<value>Très Rapide</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedFastName" xml:space="preserve">
|
||||
<value>Rapide</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedMediumName" xml:space="preserve">
|
||||
<value>Normal</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedSlowerName" xml:space="preserve">
|
||||
<value>Très Lent</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedSlowName" xml:space="preserve">
|
||||
<value>Lent</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedSuperFastName" xml:space="preserve">
|
||||
<value>Super Rapide</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedTooltip" xml:space="preserve">
|
||||
<value>Défini le ratio 'poid du fichier' contre 'temps de compression'. Une compression lente donnera un fichier plus léger (pour la même qualité vidéo) qu'une compression rapide.</value>
|
||||
<comment>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.</comment>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedUltraFastName" xml:space="preserve">
|
||||
<value>Ultra Rapide</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedVeryFastName" xml:space="preserve">
|
||||
<value>Très Très Rapide</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedVerySlowName" xml:space="preserve">
|
||||
<value>Très Très Lent</value>
|
||||
</data>
|
||||
<data name="VideoTitle" xml:space="preserve">
|
||||
<value>Vidéo</value>
|
||||
</data>
|
||||
<data name="Wav16bitsDescription" xml:space="preserve">
|
||||
<value>PCM signé 16-bit little-endian</value>
|
||||
</data>
|
||||
<data name="Wav24bitsDescription" xml:space="preserve">
|
||||
<value>PCM signé 24-bit little-endian</value>
|
||||
</data>
|
||||
<data name="Wav32bitsDescription" xml:space="preserve">
|
||||
<value>PCM signé 32-bit little-endian</value>
|
||||
</data>
|
||||
<data name="Wav8bitsDescription" xml:space="preserve">
|
||||
<value>PCM signé gned 8-bit little-endian</value>
|
||||
</data>
|
||||
<data name="ZeroDegreesRotationTitle" xml:space="preserve">
|
||||
<value>Aucune</value>
|
||||
</data>
|
||||
<data name="ZeroDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>Aucune rotation</value>
|
||||
</data>
|
||||
<data name="ConversionStateConversion" xml:space="preserve">
|
||||
<value>Conversion</value>
|
||||
</data>
|
||||
<data name="ConversionStateDone" xml:space="preserve">
|
||||
<value>Réussi</value>
|
||||
</data>
|
||||
<data name="ConversionStateExtraction" xml:space="preserve">
|
||||
<value>Extraction</value>
|
||||
</data>
|
||||
<data name="ConversionStateFailed" xml:space="preserve">
|
||||
<value>Echec</value>
|
||||
</data>
|
||||
<data name="ConversionStateInQueue" xml:space="preserve">
|
||||
<value>En attente</value>
|
||||
</data>
|
||||
<data name="ConversionStateReadIntputImage" xml:space="preserve">
|
||||
<value>Lecture de l'image d'origine</value>
|
||||
</data>
|
||||
<data name="ConversionStateReadDocument" xml:space="preserve">
|
||||
<value>Lecture du document</value>
|
||||
</data>
|
||||
<data name="StringAnimatedImageName" xml:space="preserve">
|
||||
<value>Image Animée</value>
|
||||
</data>
|
||||
<data name="StringAudioName" xml:space="preserve">
|
||||
<value>Audio</value>
|
||||
</data>
|
||||
<data name="StringDocumentName" xml:space="preserve">
|
||||
<value>Document</value>
|
||||
</data>
|
||||
<data name="StringImageName" xml:space="preserve">
|
||||
<value>Image</value>
|
||||
</data>
|
||||
<data name="StringVideoName" xml:space="preserve">
|
||||
<value>Vidéo</value>
|
||||
</data>
|
||||
<data name="ExitWaitingDuration" xml:space="preserve">
|
||||
<value>Temps d'attente avant l'arret de l'application</value>
|
||||
</data>
|
||||
<data name="Language" xml:space="preserve">
|
||||
<value>Langue</value>
|
||||
</data>
|
||||
<data name="MaximumNumberOfSimultaneousConversions" xml:space="preserve">
|
||||
<value>Nombre maximum de conversions simultanées</value>
|
||||
</data>
|
||||
<data name="DefaultPresetName" xml:space="preserve">
|
||||
<value>Nouveau preset</value>
|
||||
</data>
|
||||
<data name="DownloadingChangeLog" xml:space="preserve">
|
||||
<value>###Téléchargement des notes de mise à jour ...</value>
|
||||
</data>
|
||||
<data name="ConversionArchives" xml:space="preserve">
|
||||
<value>Archives de conversions</value>
|
||||
</data>
|
||||
<data name="ErrorCanceled" xml:space="preserve">
|
||||
<value>Annulé.</value>
|
||||
</data>
|
||||
<data name="ErrorCantFindFFMPEG" xml:space="preserve">
|
||||
<value>L'exécutable ffmpeg n'a pas été trouvé. Vous pouvez essayer de réinstaller l'application pour corriger le problème.</value>
|
||||
</data>
|
||||
<data name="ErrorCDAExtractionFailed" xml:space="preserve">
|
||||
<value>Echec de l'extraction de la piste audio.</value>
|
||||
</data>
|
||||
<data name="ErrorCDDriveNotReady" xml:space="preserve">
|
||||
<value>Le lecteur CD n'est pas prêt.</value>
|
||||
</data>
|
||||
<data name="ErrorFailedToLaunchFFMPEG" xml:space="preserve">
|
||||
<value>Ffmpeg n'a pas pu être lancé.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToCreateOutputPathFolders" xml:space="preserve">
|
||||
<value>Les dossiers de destination n'ont pas pu être créés.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToGenerateUniqueOutputPath" xml:space="preserve">
|
||||
<value>La génération d'un chemin de destination unique a échoué.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToReadCDDrive" xml:space="preserve">
|
||||
<value>Impossible de lire le lecteur cd '{0}'.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToRetrieveInputPathDriveLetter" xml:space="preserve">
|
||||
<value>Impossible de récupérer la lettre du disque du chemin d'origine.</value>
|
||||
<comment>Fail to retrieve input path drive letter.</comment>
|
||||
</data>
|
||||
<data name="ErrorFailToRetrieveTrackNumber" xml:space="preserve">
|
||||
<value>Impossible de récupérer le numéro de piste à partir du chemin d'origine.</value>
|
||||
<comment>Fail to retrieve track number from the cda input path.</comment>
|
||||
</data>
|
||||
<data name="ErrorFailToUseCDDriveOpen" xml:space="preserve">
|
||||
<value>Impossible d'utiliser le lecteur CD car il est ouvert.</value>
|
||||
</data>
|
||||
<data name="ErrorInputTypeIncompatibleWithOutputType" xml:space="preserve">
|
||||
<value>Le type du fichier d'origine n'est pas compatible avec le type de fichier de destination selectionné.</value>
|
||||
<comment>The input file type is not compatible with the selected output file type.</comment>
|
||||
</data>
|
||||
<data name="ErrorInvalidOutputPath" xml:space="preserve">
|
||||
<value>Le chemin de destination généré par le modèle de nom de fichier est invalide.</value>
|
||||
<comment>Invalid output path generated by output file path template.</comment>
|
||||
</data>
|
||||
<data name="ErrorUnsupportedOutputFormat" xml:space="preserve">
|
||||
<value>Format de fichier de destination non supporté '{0}'.</value>
|
||||
</data>
|
||||
<data name="ChannelCountTitle" xml:space="preserve">
|
||||
<value>Nombre de canaux :</value>
|
||||
</data>
|
||||
<data name="ChannelCountTooltip" xml:space="preserve">
|
||||
<value>Change le nombre de canaux du fichier d'origine</value>
|
||||
</data>
|
||||
<data name="MonoOption" xml:space="preserve">
|
||||
<value>Mono</value>
|
||||
</data>
|
||||
<data name="SameChannelCountOption" xml:space="preserve">
|
||||
<value>Identique au fichier d'origine</value>
|
||||
</data>
|
||||
<data name="StereoOption" xml:space="preserve">
|
||||
<value>Stéréo</value>
|
||||
</data>
|
||||
<data name="LicenceHeader1" xml:space="preserve">
|
||||
<value>**Ce programme est gratuit**.</value>
|
||||
<comment>**This program is free software**.</comment>
|
||||
</data>
|
||||
<data name="LicenceHeader2" xml:space="preserve">
|
||||
<value>Vous pouvez le redistribuer et/ou le modifier selon les termes de la licence GNU General Public Licence.</value>
|
||||
<comment>You can redistribute it and/or modify it under the terms of the GNU General Public License.</comment>
|
||||
</data>
|
||||
<data name="LicenceHeader3" xml:space="preserve">
|
||||
<value>Ce programme est distribué dans l'espoir d'être utile, mais SANS AUCUNE GARANTIE. Voir la GNU General Public Licence (disponible dans le dossier d'installation: `LICENCE.md`) pour plus de détails.</value>
|
||||
<comment>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.</comment>
|
||||
</data>
|
||||
<data name="ApplicationIsTerminating" xml:space="preserve">
|
||||
<value>Fermeture de l'application.</value>
|
||||
</data>
|
||||
<data name="ApplicationWillTerminateInMultipleSeconds" xml:space="preserve">
|
||||
<value>L'application se fermera automatiquement dans {0} secondes.</value>
|
||||
</data>
|
||||
<data name="ApplicationWillTerminateInOneSecond" xml:space="preserve">
|
||||
<value>L'application se fermera automatiquement dans 1 seconde.</value>
|
||||
</data>
|
||||
<data name="StringMiscName" xml:space="preserve">
|
||||
<value>Autre</value>
|
||||
</data>
|
||||
<data name="ErrorCantFindOutputFiles" xml:space="preserve">
|
||||
<value>Les fichiers n'ont pas pu être converti.</value>
|
||||
</data>
|
||||
<data name="ErrorConversionFailedWithOutput" xml:space="preserve">
|
||||
<value>Des fichiers sont présents malgré l'echec de la conversion.</value>
|
||||
</data>
|
||||
<data name="ConversionStatePrepareConversion" xml:space="preserve">
|
||||
<value>Préparation</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftOfficeIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft Office doit être installé pour pouvoir convertir les documents Office.</value>
|
||||
</data>
|
||||
<data name="ErrorUnableToUseMicrosoftOffice" xml:space="preserve">
|
||||
<value>Impossible d'ouvrir le document avec Microsoft Office (vérifiez que la licence/l'installation sont valides).</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftExcelIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft Excel doit être installé pour pouvoir convertir les documents Excel.</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftPowerPointIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft PowerPoint doit être installé pour pouvoir convertir les documents PowerPoint.</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftWordIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft Word doit être installé pour pouvoir convertir les documents Word.</value>
|
||||
</data>
|
||||
<data name="WebsiteButtonDescription" xml:space="preserve">
|
||||
<value>Ouvrir le site web de File Converter</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -117,15 +117,150 @@
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="About" xml:space="preserve">
|
||||
<value>About</value>
|
||||
</data>
|
||||
<data name="ActionWhenConversionSucceedDescription" xml:space="preserve">
|
||||
<value>Allow you to chose what you want to do with your input files if the conversion succeed</value>
|
||||
</data>
|
||||
<data name="ActionWhenConversionSucceedTitle" xml:space="preserve">
|
||||
<value>Action when conversion succeed</value>
|
||||
</data>
|
||||
<data name="AddNewPreset" xml:space="preserve">
|
||||
<value>Add new preset (duplicate selected preset)</value>
|
||||
</data>
|
||||
<data name="Application" xml:space="preserve">
|
||||
<value>Application</value>
|
||||
</data>
|
||||
<data name="AudioTitle" xml:space="preserve">
|
||||
<value>Audio</value>
|
||||
</data>
|
||||
<data name="AutomaticallyCheckForUpdates" xml:space="preserve">
|
||||
<value>Automatically check for updates when File Converter starts</value>
|
||||
</data>
|
||||
<data name="AutomaticallyExitWhenAllConversionsFinished" xml:space="preserve">
|
||||
<value>Automatically exit when all conversions finished</value>
|
||||
</data>
|
||||
<data name="ClampToLowestPowerOfTwoSize" xml:space="preserve">
|
||||
<value>Clamp to lowest power of 2 size</value>
|
||||
</data>
|
||||
<data name="Close" xml:space="preserve">
|
||||
<value>Close</value>
|
||||
</data>
|
||||
<data name="ConversionPresets" xml:space="preserve">
|
||||
<value>Conversion Presets</value>
|
||||
</data>
|
||||
<data name="ConversionQueueTitle" xml:space="preserve">
|
||||
<value>Files to convert</value>
|
||||
</data>
|
||||
<data name="ConvertedFrom" xml:space="preserve">
|
||||
<value>Converted from</value>
|
||||
</data>
|
||||
<data name="Diagnostics" xml:space="preserve">
|
||||
<value>Logs</value>
|
||||
</data>
|
||||
<data name="DiagnosticsButtonTitle" xml:space="preserve">
|
||||
<value>Logs</value>
|
||||
</data>
|
||||
<data name="DocumentationButtonDescription" xml:space="preserve">
|
||||
<value>Open documentation</value>
|
||||
</data>
|
||||
<data name="DonateButtonTitle" xml:space="preserve">
|
||||
<value>Donate</value>
|
||||
</data>
|
||||
<data name="DonateDescription" xml:space="preserve">
|
||||
<value>Don't forget to reward my work if you like it :)</value>
|
||||
</data>
|
||||
<data name="DownloadAndInstallButtonDescription" xml:space="preserve">
|
||||
<value>The update will be downloaded in background, and installed once you exit File Converter.</value>
|
||||
</data>
|
||||
<data name="DownloadAndInstallButtonTitle" xml:space="preserve">
|
||||
<value>Install when I exit File Converter</value>
|
||||
</data>
|
||||
<data name="Encoding" xml:space="preserve">
|
||||
<value>Encoding :</value>
|
||||
</data>
|
||||
<data name="EncodingSpeed" xml:space="preserve">
|
||||
<value>Encoding speed :</value>
|
||||
</data>
|
||||
<data name="FileConverterStartHelp1" xml:space="preserve">
|
||||
<value>File Converter is a shell extension.</value>
|
||||
</data>
|
||||
<data name="FileConverterStartHelp2" xml:space="preserve">
|
||||
<value>That means it is integrated into the Windows explorer.</value>
|
||||
</data>
|
||||
<data name="FileConverterStartHelp3" xml:space="preserve">
|
||||
<value>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).</value>
|
||||
</data>
|
||||
<data name="FileNameTemplate" xml:space="preserve">
|
||||
<value>File name template</value>
|
||||
</data>
|
||||
<data name="FramesPerSecond" xml:space="preserve">
|
||||
<value>Frames per second :</value>
|
||||
</data>
|
||||
<data name="GitHubButtonDescription" xml:space="preserve">
|
||||
<value>Open GitHub project page</value>
|
||||
</data>
|
||||
<data name="Help" xml:space="preserve">
|
||||
<value>help ?</value>
|
||||
</data>
|
||||
<data name="InputExample" xml:space="preserve">
|
||||
<value>Input example</value>
|
||||
</data>
|
||||
<data name="InputFormats" xml:space="preserve">
|
||||
<value>Input formats</value>
|
||||
</data>
|
||||
<data name="InputPostConversionActionDeleteName" xml:space="preserve">
|
||||
<value>Delete</value>
|
||||
</data>
|
||||
<data name="InputPostConversionActionMoveInArchiveFolderName" xml:space="preserve">
|
||||
<value>Move in an archive folder</value>
|
||||
</data>
|
||||
<data name="InputPostConversionActionNoneName" xml:space="preserve">
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="InstallButtonDescription" xml:space="preserve">
|
||||
<value>The update has been downloaded. Exit File Converter and install the update now.</value>
|
||||
</data>
|
||||
<data name="InstallButtonTitle" xml:space="preserve">
|
||||
<value>Install when I exit File Converter</value>
|
||||
</data>
|
||||
<data name="IssueButtonDescription" xml:space="preserve">
|
||||
<value>Report an issue</value>
|
||||
</data>
|
||||
<data name="MoveDownSelectedPreset" xml:space="preserve">
|
||||
<value>Move down selected preset</value>
|
||||
</data>
|
||||
<data name="MoveUpSelectedPreset" xml:space="preserve">
|
||||
<value>Move up selected preset</value>
|
||||
</data>
|
||||
<data name="Mp3CbrDescription" xml:space="preserve">
|
||||
<value>Constant bitrate encoding</value>
|
||||
</data>
|
||||
<data name="Mp3VbrDescription" xml:space="preserve">
|
||||
<value>Variable bitrate encoding</value>
|
||||
</data>
|
||||
<data name="NinetyDegreesRotationTitle" xml:space="preserve">
|
||||
<value>90°</value>
|
||||
</data>
|
||||
<data name="NinetyDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>90° counter clockwise rotation</value>
|
||||
</data>
|
||||
<data name="Ok" xml:space="preserve">
|
||||
<value>Ok</value>
|
||||
</data>
|
||||
<data name="OneEightyDegreesRotationTitle" xml:space="preserve">
|
||||
<value>180°</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>
|
||||
<data name="OutputExample" xml:space="preserve">
|
||||
<value>Output</value>
|
||||
</data>
|
||||
<data name="OutputFilePathTemplateHelp" xml:space="preserve">
|
||||
<value>(p): input file path
|
||||
(f): input filename
|
||||
@@ -134,24 +269,279 @@
|
||||
(d0): input parent folder
|
||||
(d1): input sub parent folder
|
||||
...
|
||||
use maj for uppercase version
|
||||
(n:i): page number index
|
||||
(n:c): total page count
|
||||
|
||||
Special paths:
|
||||
(p:d): my documents path
|
||||
(p:m): my music path
|
||||
(p:v): my videos path
|
||||
(p:p): my pictures path</value>
|
||||
(p:p): my pictures path
|
||||
|
||||
use maj for uppercase version</value>
|
||||
</data>
|
||||
<data name="OutputFormat" xml:space="preserve">
|
||||
<value>Output format</value>
|
||||
</data>
|
||||
<data name="Preset" xml:space="preserve">
|
||||
<value>Preset</value>
|
||||
</data>
|
||||
<data name="PresetName" xml:space="preserve">
|
||||
<value>Preset Name</value>
|
||||
</data>
|
||||
<data name="Quality" xml:space="preserve">
|
||||
<value>Quality :</value>
|
||||
</data>
|
||||
<data name="RecommendeBitrateRangeInBlue" xml:space="preserve">
|
||||
<value>Recommended bitrate range in blue</value>
|
||||
</data>
|
||||
<data name="RemoveSelectedPreset" xml:space="preserve">
|
||||
<value>Remove selected preset</value>
|
||||
</data>
|
||||
<data name="Rotate" xml:space="preserve">
|
||||
<value>Rotate :</value>
|
||||
</data>
|
||||
<data name="Save" xml:space="preserve">
|
||||
<value>Save</value>
|
||||
</data>
|
||||
<data name="Scale" xml:space="preserve">
|
||||
<value>Scale :</value>
|
||||
</data>
|
||||
<data name="SeeChangeLog" xml:space="preserve">
|
||||
<value>See change log ...</value>
|
||||
</data>
|
||||
<data name="Settings" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
</data>
|
||||
<data name="SettingsButtonTitle" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
</data>
|
||||
<data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
|
||||
<value>270°</value>
|
||||
</data>
|
||||
<data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>90° clockwise rotation</value>
|
||||
</data>
|
||||
<data name="UpgradeAvailable" xml:space="preserve">
|
||||
<value>An update for File Converter is available. It is strongly recommended that you install it as soon as possible!</value>
|
||||
</data>
|
||||
<data name="UpgradeDownloadInProgress" xml:space="preserve">
|
||||
<value>Upgrade download in progress...</value>
|
||||
</data>
|
||||
<data name="UpgradeWindowTitle" xml:space="preserve">
|
||||
<value>File Converter Updates</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="VideoEncodingSpeedFasterName" xml:space="preserve">
|
||||
<value>Faster</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedFastName" xml:space="preserve">
|
||||
<value>Fast</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedMediumName" xml:space="preserve">
|
||||
<value>Medium</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedSlowerName" xml:space="preserve">
|
||||
<value>Slower</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedSlowName" xml:space="preserve">
|
||||
<value>Slow</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedSuperFastName" xml:space="preserve">
|
||||
<value>Super Fast</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="VideoEncodingSpeedUltraFastName" xml:space="preserve">
|
||||
<value>Ultra Fast</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedVeryFastName" xml:space="preserve">
|
||||
<value>Very Fast</value>
|
||||
</data>
|
||||
<data name="VideoEncodingSpeedVerySlowName" xml:space="preserve">
|
||||
<value>Very Slow</value>
|
||||
</data>
|
||||
<data name="VideoTitle" xml:space="preserve">
|
||||
<value>Video</value>
|
||||
</data>
|
||||
<data name="Wav16bitsDescription" xml:space="preserve">
|
||||
<value>PCM signed 16-bit little-endian</value>
|
||||
</data>
|
||||
<data name="Wav24bitsDescription" xml:space="preserve">
|
||||
<value>PCM signed 24-bit little-endian</value>
|
||||
</data>
|
||||
<data name="Wav32bitsDescription" xml:space="preserve">
|
||||
<value>PCM signed 32-bit little-endian</value>
|
||||
</data>
|
||||
<data name="Wav8bitsDescription" xml:space="preserve">
|
||||
<value>PCM signed 8-bit little-endian</value>
|
||||
</data>
|
||||
<data name="ZeroDegreesRotationTitle" xml:space="preserve">
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="ZeroDegreesRotationTooltip" xml:space="preserve">
|
||||
<value>No rotation</value>
|
||||
</data>
|
||||
<data name="ConversionStateConversion" xml:space="preserve">
|
||||
<value>Conversion</value>
|
||||
</data>
|
||||
<data name="ConversionStateDone" xml:space="preserve">
|
||||
<value>Done</value>
|
||||
</data>
|
||||
<data name="ConversionStateExtraction" xml:space="preserve">
|
||||
<value>Extraction</value>
|
||||
</data>
|
||||
<data name="ConversionStateFailed" xml:space="preserve">
|
||||
<value>Failed</value>
|
||||
</data>
|
||||
<data name="ConversionStateInQueue" xml:space="preserve">
|
||||
<value>In queue</value>
|
||||
</data>
|
||||
<data name="ConversionStateReadIntputImage" xml:space="preserve">
|
||||
<value>Read input image</value>
|
||||
</data>
|
||||
<data name="ConversionStateReadDocument" xml:space="preserve">
|
||||
<value>Read document</value>
|
||||
</data>
|
||||
<data name="StringAnimatedImageName" xml:space="preserve">
|
||||
<value>Animated Image</value>
|
||||
</data>
|
||||
<data name="StringAudioName" xml:space="preserve">
|
||||
<value>Audio</value>
|
||||
</data>
|
||||
<data name="StringDocumentName" xml:space="preserve">
|
||||
<value>Document</value>
|
||||
</data>
|
||||
<data name="StringImageName" xml:space="preserve">
|
||||
<value>Image</value>
|
||||
</data>
|
||||
<data name="StringVideoName" xml:space="preserve">
|
||||
<value>Video</value>
|
||||
</data>
|
||||
<data name="ExitWaitingDuration" xml:space="preserve">
|
||||
<value>Waiting duration before application exit</value>
|
||||
</data>
|
||||
<data name="Language" xml:space="preserve">
|
||||
<value>Language</value>
|
||||
</data>
|
||||
<data name="MaximumNumberOfSimultaneousConversions" xml:space="preserve">
|
||||
<value>Maximum number of simultaneous conversions</value>
|
||||
</data>
|
||||
<data name="DefaultPresetName" xml:space="preserve">
|
||||
<value>New preset</value>
|
||||
</data>
|
||||
<data name="DownloadingChangeLog" xml:space="preserve">
|
||||
<value>###Downloading change log ...</value>
|
||||
</data>
|
||||
<data name="ConversionArchives" xml:space="preserve">
|
||||
<value>Conversion Archives</value>
|
||||
</data>
|
||||
<data name="ErrorCanceled" xml:space="preserve">
|
||||
<value>Canceled.</value>
|
||||
</data>
|
||||
<data name="ErrorCantFindFFMPEG" xml:space="preserve">
|
||||
<value>Fail to find ffmpeg executable. You should try to reinstall the application.</value>
|
||||
</data>
|
||||
<data name="ErrorCDAExtractionFailed" xml:space="preserve">
|
||||
<value>Audio CD track extraction failed.</value>
|
||||
</data>
|
||||
<data name="ErrorCDDriveNotReady" xml:space="preserve">
|
||||
<value>CD drive is not ready.</value>
|
||||
</data>
|
||||
<data name="ErrorFailedToLaunchFFMPEG" xml:space="preserve">
|
||||
<value>Fail to launch ffmpeg.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToCreateOutputPathFolders" xml:space="preserve">
|
||||
<value>Fail to create output path folders.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToGenerateUniqueOutputPath" xml:space="preserve">
|
||||
<value>Fail to generate a unique output file path.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToReadCDDrive" xml:space="preserve">
|
||||
<value>Fail to read cd drive '{0}'.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToRetrieveInputPathDriveLetter" xml:space="preserve">
|
||||
<value>Fail to retrieve input path drive letter.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToRetrieveTrackNumber" xml:space="preserve">
|
||||
<value>Fail to retrieve track number from the cda input path.</value>
|
||||
</data>
|
||||
<data name="ErrorFailToUseCDDriveOpen" xml:space="preserve">
|
||||
<value>Fail to use the CD drive because it is oppened.</value>
|
||||
</data>
|
||||
<data name="ErrorInputTypeIncompatibleWithOutputType" xml:space="preserve">
|
||||
<value>The input file type is not compatible with the selected output file type.</value>
|
||||
</data>
|
||||
<data name="ErrorInvalidOutputPath" xml:space="preserve">
|
||||
<value>Invalid output path generated by output file path template.</value>
|
||||
</data>
|
||||
<data name="ErrorUnsupportedOutputFormat" xml:space="preserve">
|
||||
<value>Unsupported output format '{0}'.</value>
|
||||
</data>
|
||||
<data name="ChannelCountTitle" xml:space="preserve">
|
||||
<value>Channel count :</value>
|
||||
</data>
|
||||
<data name="ChannelCountTooltip" xml:space="preserve">
|
||||
<value>Change the number of channels of the input file.</value>
|
||||
</data>
|
||||
<data name="MonoOption" xml:space="preserve">
|
||||
<value>Mono</value>
|
||||
</data>
|
||||
<data name="SameChannelCountOption" xml:space="preserve">
|
||||
<value>Same than input file</value>
|
||||
</data>
|
||||
<data name="StereoOption" xml:space="preserve">
|
||||
<value>Stereo</value>
|
||||
</data>
|
||||
<data name="LicenceHeader1" xml:space="preserve">
|
||||
<value>**This program is free software**.</value>
|
||||
</data>
|
||||
<data name="LicenceHeader2" xml:space="preserve">
|
||||
<value>You can redistribute it and/or modify it under the terms of the GNU General Public License.</value>
|
||||
</data>
|
||||
<data name="LicenceHeader3" xml:space="preserve">
|
||||
<value>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.</value>
|
||||
</data>
|
||||
<data name="ApplicationIsTerminating" xml:space="preserve">
|
||||
<value>The application is terminating.</value>
|
||||
</data>
|
||||
<data name="ApplicationWillTerminateInMultipleSeconds" xml:space="preserve">
|
||||
<value>The application will automatically terminate in {0} seconds.</value>
|
||||
</data>
|
||||
<data name="ApplicationWillTerminateInOneSecond" xml:space="preserve">
|
||||
<value>The application will automatically terminate in 1 second.</value>
|
||||
</data>
|
||||
<data name="StringMiscName" xml:space="preserve">
|
||||
<value>Misc</value>
|
||||
</data>
|
||||
<data name="ErrorCantFindOutputFiles" xml:space="preserve">
|
||||
<value>Can't find the output file(s).</value>
|
||||
</data>
|
||||
<data name="ErrorConversionFailedWithOutput" xml:space="preserve">
|
||||
<value>The conversion job failed but there is an output file that does exists.</value>
|
||||
</data>
|
||||
<data name="ConversionStatePrepareConversion" xml:space="preserve">
|
||||
<value>Prepare conversion</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftOfficeIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft Office must be installed in order to convert Office documents.</value>
|
||||
</data>
|
||||
<data name="ErrorUnableToUseMicrosoftOffice" xml:space="preserve">
|
||||
<value>Fail to open document with Microsoft Office (check if your licence/installation is valid).</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftExcelIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft Excel must be installed in order to convert Excel documents.</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftPowerPointIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft PowerPoint must be installed in order to convert PowerPoint documents.</value>
|
||||
</data>
|
||||
<data name="ErrorMicrosoftWordIsNotAvailable" xml:space="preserve">
|
||||
<value>Microsoft Word must be installed in order to convert Word documents.</value>
|
||||
</data>
|
||||
<data name="WebsiteButtonDescription" xml:space="preserve">
|
||||
<value>Open File Converter website</value>
|
||||
</data>
|
||||
</root>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 551 B |
|
After Width: | Height: | Size: 376 KiB |
|
After Width: | Height: | Size: 625 B |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
@@ -0,0 +1,59 @@
|
||||
// // <copyright file="Settings.Migration.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter
|
||||
{
|
||||
using System;
|
||||
|
||||
using FileConverter.ConversionJobs;
|
||||
|
||||
public partial class Settings
|
||||
{
|
||||
private static void MigrateSettingsToCurrentVersion(Settings settings)
|
||||
{
|
||||
int settingsVersion = settings.SerializationVersion;
|
||||
|
||||
// Migrate conversion settings.
|
||||
if (settings.ConversionPresets != null)
|
||||
{
|
||||
foreach (ConversionPreset conversionPreset in settings.ConversionPresets)
|
||||
{
|
||||
Settings.MigrateConversionPresetToCurrentVersion(conversionPreset, settingsVersion);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void MigrateConversionPresetToCurrentVersion(ConversionPreset preset, int settingsVersion)
|
||||
{
|
||||
if (settingsVersion <= 2)
|
||||
{
|
||||
// Migrate video encoding speed.
|
||||
string videoEncodingSpeed = preset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed);
|
||||
if (videoEncodingSpeed != null)
|
||||
{
|
||||
VideoEncodingSpeed encodingSpeed;
|
||||
if (!Enum.TryParse(videoEncodingSpeed, out encodingSpeed))
|
||||
{
|
||||
switch (videoEncodingSpeed)
|
||||
{
|
||||
case "Ultra Fast":
|
||||
preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, VideoEncodingSpeed.UltraFast.ToString());
|
||||
break;
|
||||
|
||||
case "Super Fast":
|
||||
preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, VideoEncodingSpeed.SuperFast.ToString());
|
||||
break;
|
||||
|
||||
case "Very Fast":
|
||||
preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, VideoEncodingSpeed.VeryFast.ToString());
|
||||
break;
|
||||
|
||||
case "Very Slow":
|
||||
preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, VideoEncodingSpeed.VerySlow.ToString());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,17 +3,20 @@
|
||||
namespace FileConverter
|
||||
{
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
public partial class Settings : IXmlSerializable
|
||||
{
|
||||
public const int Version = 1;
|
||||
public const int Version = 3;
|
||||
|
||||
private bool exitApplicationWhenConversionsFinished = true;
|
||||
private float durationBetweenEndOfConversionsAndApplicationExit = 3f;
|
||||
private ObservableCollection<ConversionPreset> conversionPresets = new ObservableCollection<ConversionPreset>();
|
||||
private bool checkUpgradeAtStartup = true;
|
||||
private CultureInfo applicationLanguage;
|
||||
private int maximumNumberOfSimultaneousConversions;
|
||||
|
||||
[XmlAttribute]
|
||||
public int SerializationVersion
|
||||
@@ -22,6 +25,57 @@ namespace FileConverter
|
||||
set;
|
||||
} = Version;
|
||||
|
||||
[XmlIgnore]
|
||||
public CultureInfo ApplicationLanguage
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.applicationLanguage;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.applicationLanguage != null && this.applicationLanguage.Equals(value))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
this.applicationLanguage = value;
|
||||
if (this.applicationLanguage != null)
|
||||
{
|
||||
System.Threading.Thread.CurrentThread.CurrentCulture = this.applicationLanguage;
|
||||
System.Threading.Thread.CurrentThread.CurrentUICulture = this.applicationLanguage;
|
||||
}
|
||||
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
[XmlElement]
|
||||
public string ApplicationLanguageName
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.ApplicationLanguage == null)
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
return this.ApplicationLanguage.Name;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (string.IsNullOrEmpty(value))
|
||||
{
|
||||
this.ApplicationLanguage = null;
|
||||
return;
|
||||
}
|
||||
|
||||
this.ApplicationLanguage = CultureInfo.GetCultureInfo(value);
|
||||
}
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
public ObservableCollection<ConversionPreset> ConversionPresets
|
||||
{
|
||||
@@ -67,6 +121,21 @@ namespace FileConverter
|
||||
}
|
||||
}
|
||||
|
||||
[XmlElement]
|
||||
public int MaximumNumberOfSimultaneousConversions
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.maximumNumberOfSimultaneousConversions;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
this.maximumNumberOfSimultaneousConversions = value;
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
[XmlElement("ConversionPreset")]
|
||||
public ConversionPreset[] SerializableConversionPresets
|
||||
{
|
||||
@@ -107,6 +176,35 @@ namespace FileConverter
|
||||
{
|
||||
this.ConversionPresets[index].OnDeserializationComplete();
|
||||
}
|
||||
|
||||
// Initialize application if it was not deserialized from the settings.
|
||||
if (this.ApplicationLanguage == null)
|
||||
{
|
||||
CultureInfo bestCandidate = null;
|
||||
CultureInfo currentUICulture = System.Threading.Thread.CurrentThread.CurrentUICulture;
|
||||
foreach (CultureInfo culture in Helpers.GetSupportedCultures())
|
||||
{
|
||||
if (culture.Equals(currentUICulture))
|
||||
{
|
||||
bestCandidate = culture;
|
||||
break;
|
||||
}
|
||||
else if (culture.Equals(currentUICulture.Parent))
|
||||
{
|
||||
bestCandidate = culture;
|
||||
}
|
||||
}
|
||||
|
||||
if (bestCandidate != null)
|
||||
{
|
||||
this.ApplicationLanguage = bestCandidate;
|
||||
}
|
||||
else
|
||||
{
|
||||
Diagnostics.Debug.Log("Can't find supported culture info for culture {0}. Fallback to default culture.", currentUICulture);
|
||||
this.ApplicationLanguage = CultureInfo.GetCultureInfo("en");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -129,10 +129,27 @@ namespace FileConverter
|
||||
System.IO.File.Delete(userFilePath);
|
||||
}
|
||||
|
||||
if (userSettings != null && userSettings.SerializationVersion != Version)
|
||||
if (userSettings != null)
|
||||
{
|
||||
Diagnostics.Debug.Log("File converter settings has been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
|
||||
userSettings.SerializationVersion = Version;
|
||||
if (userSettings.SerializationVersion != Version)
|
||||
{
|
||||
Settings.MigrateSettingsToCurrentVersion(userSettings);
|
||||
|
||||
Diagnostics.Debug.Log("File converter settings have been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
|
||||
userSettings.SerializationVersion = Version;
|
||||
}
|
||||
|
||||
// Remove default settings.
|
||||
if (userSettings.ConversionPresets != null)
|
||||
{
|
||||
for (int index = userSettings.ConversionPresets.Count - 1; index >= 0; index--)
|
||||
{
|
||||
if (userSettings.ConversionPresets[index].IsDefaultSettings)
|
||||
{
|
||||
userSettings.ConversionPresets.RemoveAt(index);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,6 +191,8 @@ namespace FileConverter
|
||||
|
||||
if (userSettings != null && userSettings.SerializationVersion != Version)
|
||||
{
|
||||
Settings.MigrateSettingsToCurrentVersion(userSettings);
|
||||
|
||||
Diagnostics.Debug.Log("File converter settings has been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
|
||||
userSettings.SerializationVersion = Version;
|
||||
userSettings.Save();
|
||||
@@ -464,11 +483,11 @@ namespace FileConverter
|
||||
|
||||
private Settings Merge(Settings settings)
|
||||
{
|
||||
if (settings == null)
|
||||
if (settings == null || settings.conversionPresets == null)
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
for (int index = 0; index < settings.conversionPresets.Count; index++)
|
||||
{
|
||||
ConversionPreset conversionPreset = settings.conversionPresets[index];
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
<?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">
|
||||
<Settings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SerializationVersion="3">
|
||||
<ExitApplicationWhenConversionsFinished>true</ExitApplicationWhenConversionsFinished>
|
||||
<DurationBetweenEndOfConversionsAndApplicationExit>3</DurationBetweenEndOfConversionsAndApplicationExit>
|
||||
<ConversionPreset Name="To Mkv" OutputType="Mkv">
|
||||
<MaximumNumberOfSimultaneousConversions>2</MaximumNumberOfSimultaneousConversions>
|
||||
<ConversionPreset Name="To Mkv" OutputType="Mkv" IsDefaultSettings="true">
|
||||
<InputTypes>3gp</InputTypes>
|
||||
<InputTypes>avi</InputTypes>
|
||||
<InputTypes>bik</InputTypes>
|
||||
@@ -11,9 +12,13 @@
|
||||
<InputTypes>mkv</InputTypes>
|
||||
<InputTypes>mov</InputTypes>
|
||||
<InputTypes>mp4</InputTypes>
|
||||
<InputTypes>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>gif</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<Settings Key="VideoQuality" Value="30" />
|
||||
<Settings Key="VideoEncodingSpeed" Value="Medium" />
|
||||
<Settings Key="VideoScale" Value="1" />
|
||||
@@ -21,7 +26,7 @@
|
||||
<Settings Key="AudioBitrate" Value="155" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Mp4" OutputType="Mp4">
|
||||
<ConversionPreset Name="To Mp4" OutputType="Mp4" IsDefaultSettings="true">
|
||||
<InputTypes>avi</InputTypes>
|
||||
<InputTypes>bik</InputTypes>
|
||||
<InputTypes>flv</InputTypes>
|
||||
@@ -32,7 +37,11 @@
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>m4v</InputTypes>
|
||||
<InputTypes>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>gif</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<Settings Key="VideoQuality" Value="30" />
|
||||
<Settings Key="VideoEncodingSpeed" Value="Medium" />
|
||||
<Settings Key="VideoScale" Value="1" />
|
||||
@@ -40,18 +49,22 @@
|
||||
<Settings Key="AudioBitrate" Value="155" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Mp4 (low quality)" OutputType="Mp4">
|
||||
<ConversionPreset Name="To Mp4 (low quality)" OutputType="Mp4" IsDefaultSettings="true">
|
||||
<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>3gp</InputTypes>
|
||||
<InputTypes>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>m4v</InputTypes>
|
||||
<InputTypes>gif</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<Settings Key="VideoQuality" Value="20" />
|
||||
<Settings Key="VideoEncodingSpeed" Value="Medium" />
|
||||
<Settings Key="VideoScale" Value="1" />
|
||||
@@ -59,18 +72,22 @@
|
||||
<Settings Key="AudioBitrate" Value="96" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Mp4 (rotate left)" OutputType="Mp4">
|
||||
<ConversionPreset Name="To Mp4 (rotate left)" OutputType="Mp4" IsDefaultSettings="true">
|
||||
<InputTypes>gif</InputTypes>
|
||||
<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>3gp</InputTypes>
|
||||
<InputTypes>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>m4v</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<Settings Key="VideoQuality" Value="30" />
|
||||
<Settings Key="VideoEncodingSpeed" Value="Medium" />
|
||||
<Settings Key="VideoScale" Value="1" />
|
||||
@@ -78,7 +95,7 @@
|
||||
<Settings Key="AudioBitrate" Value="155" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Mp4 (rotate right)" OutputType="Mp4">
|
||||
<ConversionPreset Name="To Mp4 (rotate right)" OutputType="Mp4" IsDefaultSettings="true">
|
||||
<InputTypes>avi</InputTypes>
|
||||
<InputTypes>bik</InputTypes>
|
||||
<InputTypes>flv</InputTypes>
|
||||
@@ -89,7 +106,11 @@
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>m4v</InputTypes>
|
||||
<InputTypes>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>gif</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<Settings Key="VideoQuality" Value="30" />
|
||||
<Settings Key="VideoEncodingSpeed" Value="Medium" />
|
||||
<Settings Key="VideoScale" Value="1" />
|
||||
@@ -97,7 +118,7 @@
|
||||
<Settings Key="AudioBitrate" Value="155" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Avi" OutputType="Avi">
|
||||
<ConversionPreset Name="To Webm" OutputType="Webm" IsDefaultSettings="true">
|
||||
<InputTypes>avi</InputTypes>
|
||||
<InputTypes>bik</InputTypes>
|
||||
<InputTypes>flv</InputTypes>
|
||||
@@ -108,142 +129,62 @@
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>m4v</InputTypes>
|
||||
<InputTypes>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>gif</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<Settings Key="AudioBitrate" Value="160" />
|
||||
<Settings Key="VideoQuality" Value="40" />
|
||||
<Settings Key="VideoScale" Value="1" />
|
||||
<Settings Key="VideoRotation" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Ogv" OutputType="Ogv" IsDefaultSettings="true">
|
||||
<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>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>gif</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<Settings Key="VideoQuality" Value="8" />
|
||||
<Settings Key="VideoScale" Value="1" />
|
||||
<Settings Key="VideoRotation" Value="0" />
|
||||
<Settings Key="AudioBitrate" Value="160" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Avi" OutputType="Avi" IsDefaultSettings="true">
|
||||
<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>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>gif</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<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">
|
||||
<ConversionPreset Name="To Gif" OutputType="Gif" IsDefaultSettings="true">
|
||||
<InputTypes>bmp</InputTypes>
|
||||
<InputTypes>exr</InputTypes>
|
||||
<InputTypes>ico</InputTypes>
|
||||
@@ -255,6 +196,253 @@
|
||||
<InputTypes>tga</InputTypes>
|
||||
<InputTypes>tiff</InputTypes>
|
||||
<InputTypes>xcf</InputTypes>
|
||||
<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>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>gif</InputTypes>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="VideoScale" Value="1" />
|
||||
<Settings Key="VideoRotation" Value="0" />
|
||||
<Settings Key="VideoFramesPerSecond" Value="15" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Gif (low quality)" OutputType="Gif" IsDefaultSettings="true">
|
||||
<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>
|
||||
<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>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>gif</InputTypes>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="VideoScale" Value="0,75" />
|
||||
<Settings Key="VideoRotation" Value="0" />
|
||||
<Settings Key="VideoFramesPerSecond" Value="10" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Ogg" OutputType="Ogg" IsDefaultSettings="true">
|
||||
<InputTypes>aac</InputTypes>
|
||||
<InputTypes>aiff</InputTypes>
|
||||
<InputTypes>ape</InputTypes>
|
||||
<InputTypes>flac</InputTypes>
|
||||
<InputTypes>m4a</InputTypes>
|
||||
<InputTypes>mp3</InputTypes>
|
||||
<InputTypes>wma</InputTypes>
|
||||
<InputTypes>wav</InputTypes>
|
||||
<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>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>webm</InputTypes>
|
||||
<InputTypes>wmv</InputTypes>
|
||||
<InputTypes>oga</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioBitrate" Value="160" />
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Flac" OutputType="Flac" IsDefaultSettings="true">
|
||||
<InputTypes>wav</InputTypes>
|
||||
<InputTypes>ape</InputTypes>
|
||||
<InputTypes>wma</InputTypes>
|
||||
<InputTypes>aiff</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Wav" OutputType="Wav" IsDefaultSettings="true">
|
||||
<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>
|
||||
<InputTypes>oga</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>mpeg</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioEncodingMode" Value="Wav16" />
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Mp3" OutputType="Mp3" IsDefaultSettings="true">
|
||||
<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>
|
||||
<InputTypes>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>oga</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
|
||||
<Settings Key="AudioBitrate" Value="190" />
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Aac" OutputType="Aac" IsDefaultSettings="true">
|
||||
<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>
|
||||
<InputTypes>mpeg</InputTypes>
|
||||
<InputTypes>ogv</InputTypes>
|
||||
<InputTypes>oga</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioBitrate" Value="128" />
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="Extract DVD to Mp4" OutputType="Mp4" IsDefaultSettings="true">
|
||||
<InputTypes>vob</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<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:v)DVD Extraction\(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="Extract DVD to Mkv" OutputType="Mkv" IsDefaultSettings="true">
|
||||
<InputTypes>vob</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="EnableAudio" Value="True" />
|
||||
<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:v)DVD Extraction\(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="Extract DVD to Flac" OutputType="Flac" IsDefaultSettings="true">
|
||||
<InputTypes>vob</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p:m)DVD Extraction\(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="Extract DVD to Ogg" OutputType="Ogg" IsDefaultSettings="true">
|
||||
<InputTypes>vob</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioBitrate" Value="192" />
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p:m)DVD Extraction\(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="Extract DVD to Mp3" OutputType="Mp3" IsDefaultSettings="true">
|
||||
<InputTypes>vob</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
|
||||
<Settings Key="AudioBitrate" Value="225" />
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p:m)DVD Extraction\(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="Extract CDA to Flac" OutputType="Flac" IsDefaultSettings="true">
|
||||
<InputTypes>cda</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="Extract CDA to Ogg" OutputType="Ogg" IsDefaultSettings="true">
|
||||
<InputTypes>cda</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioBitrate" Value="192" />
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="Extract CDA to Mp3" OutputType="Mp3" IsDefaultSettings="true">
|
||||
<InputTypes>cda</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="AudioEncodingMode" Value="Mp3VBR" />
|
||||
<Settings Key="AudioBitrate" Value="225" />
|
||||
<Settings Key="AudioChannelCount" Value="0" />
|
||||
<OutputFileNameTemplate>(p:m)CDA Extraction\(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Png" OutputType="Png" IsDefaultSettings="true">
|
||||
<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>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="ImageScale" Value="1" />
|
||||
<Settings Key="ImageRotation" Value="0" />
|
||||
@@ -262,7 +450,26 @@
|
||||
<Settings Key="ImageMaximumSize" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To small Png (25%)" OutputType="Png">
|
||||
<ConversionPreset Name="To Png (paged)" OutputType="Png" IsDefaultSettings="true">
|
||||
<InputTypes>xcf</InputTypes>
|
||||
<InputTypes>doc</InputTypes>
|
||||
<InputTypes>docx</InputTypes>
|
||||
<InputTypes>odp</InputTypes>
|
||||
<InputTypes>ods</InputTypes>
|
||||
<InputTypes>odt</InputTypes>
|
||||
<InputTypes>pdf</InputTypes>
|
||||
<InputTypes>ppt</InputTypes>
|
||||
<InputTypes>pptx</InputTypes>
|
||||
<InputTypes>xls</InputTypes>
|
||||
<InputTypes>xlsx</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) (n:i) of (n:c)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Webp" OutputType="Webp" IsDefaultSettings="true">
|
||||
<InputTypes>bmp</InputTypes>
|
||||
<InputTypes>exr</InputTypes>
|
||||
<InputTypes>ico</InputTypes>
|
||||
@@ -274,6 +481,28 @@
|
||||
<InputTypes>tga</InputTypes>
|
||||
<InputTypes>tiff</InputTypes>
|
||||
<InputTypes>xcf</InputTypes>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="ImageQuality" Value="40" />
|
||||
<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" IsDefaultSettings="true">
|
||||
<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>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="ImageScale" Value="0,25" />
|
||||
<Settings Key="ImageRotation" Value="0" />
|
||||
@@ -281,7 +510,7 @@
|
||||
<Settings Key="ImageMaximumSize" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)-small</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Png (rotate left)" OutputType="Png">
|
||||
<ConversionPreset Name="To Png (rotate left)" OutputType="Png" IsDefaultSettings="true">
|
||||
<InputTypes>bmp</InputTypes>
|
||||
<InputTypes>exr</InputTypes>
|
||||
<InputTypes>ico</InputTypes>
|
||||
@@ -292,6 +521,7 @@
|
||||
<InputTypes>svg</InputTypes>
|
||||
<InputTypes>tga</InputTypes>
|
||||
<InputTypes>tiff</InputTypes>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="ImageScale" Value="1" />
|
||||
<Settings Key="ImageRotation" Value="90" />
|
||||
@@ -299,7 +529,7 @@
|
||||
<Settings Key="ImageMaximumSize" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Png (rotate right)" OutputType="Png">
|
||||
<ConversionPreset Name="To Png (rotate right)" OutputType="Png" IsDefaultSettings="true">
|
||||
<InputTypes>bmp</InputTypes>
|
||||
<InputTypes>exr</InputTypes>
|
||||
<InputTypes>ico</InputTypes>
|
||||
@@ -310,6 +540,7 @@
|
||||
<InputTypes>svg</InputTypes>
|
||||
<InputTypes>tga</InputTypes>
|
||||
<InputTypes>tiff</InputTypes>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="ImageScale" Value="1" />
|
||||
<Settings Key="ImageRotation" Value="270" />
|
||||
@@ -317,7 +548,7 @@
|
||||
<Settings Key="ImageMaximumSize" Value="0" />
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Jpg" OutputType="Jpg">
|
||||
<ConversionPreset Name="To Jpg" OutputType="Jpg" IsDefaultSettings="true">
|
||||
<InputTypes>bmp</InputTypes>
|
||||
<InputTypes>exr</InputTypes>
|
||||
<InputTypes>ico</InputTypes>
|
||||
@@ -329,14 +560,16 @@
|
||||
<InputTypes>tga</InputTypes>
|
||||
<InputTypes>tiff</InputTypes>
|
||||
<InputTypes>xcf</InputTypes>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<Settings Key="ImageQuality" Value="40" />
|
||||
<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 Ico" OutputType="Ico">
|
||||
<ConversionPreset Name="To Ico" OutputType="Ico" IsDefaultSettings="true">
|
||||
<InputTypes>bmp</InputTypes>
|
||||
<InputTypes>exr</InputTypes>
|
||||
<InputTypes>ico</InputTypes>
|
||||
@@ -348,6 +581,31 @@
|
||||
<InputTypes>tga</InputTypes>
|
||||
<InputTypes>tiff</InputTypes>
|
||||
<InputTypes>xcf</InputTypes>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
<ConversionPreset Name="To Pdf" OutputType="Pdf" IsDefaultSettings="true">
|
||||
<InputTypes>bmp</InputTypes>
|
||||
<InputTypes>exr</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>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputTypes>doc</InputTypes>
|
||||
<InputTypes>docx</InputTypes>
|
||||
<InputTypes>odp</InputTypes>
|
||||
<InputTypes>ods</InputTypes>
|
||||
<InputTypes>odt</InputTypes>
|
||||
<InputTypes>ppt</InputTypes>
|
||||
<InputTypes>pptx</InputTypes>
|
||||
<InputTypes>xls</InputTypes>
|
||||
<InputTypes>xlsx</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
|
||||
@@ -6,7 +6,6 @@ namespace FileConverter.Upgrade
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Xml;
|
||||
using System.Xml.Serialization;
|
||||
@@ -14,18 +13,24 @@ namespace FileConverter.Upgrade
|
||||
public static class Helpers
|
||||
{
|
||||
#if DEBUG
|
||||
private const string BaseURI = "https://raw.githubusercontent.com/Tichau/FileConverter/development/";
|
||||
private const string BaseURI = "http://raw.githubusercontent.com/Tichau/FileConverter/development/";
|
||||
#else
|
||||
private const string BaseURI = "https://raw.githubusercontent.com/Tichau/FileConverter/master/";
|
||||
private const string BaseURI = "http://raw.githubusercontent.com/Tichau/FileConverter/master/";
|
||||
#endif
|
||||
|
||||
private static WebClient webClient = new WebClient();
|
||||
private static UpgradeVersionDescription currentlyDownloadedVersionDescription;
|
||||
|
||||
public delegate void OnUpgradeOperationCompletedEventHandler(UpgradeVersionDescription upgradeVersionDescription);
|
||||
|
||||
public static async Task<UpgradeVersionDescription> GetLatestVersionDescriptionAsync(OnUpgradeOperationCompletedEventHandler onGetCompleteDelegate = null)
|
||||
{
|
||||
#if BUILD32
|
||||
Uri uri = new Uri(Helpers.BaseURI + "version (x86).xml");
|
||||
#else
|
||||
Uri uri = new Uri(Helpers.BaseURI + "version.xml");
|
||||
#endif
|
||||
|
||||
Stream stream = await Helpers.webClient.OpenReadTaskAsync(uri);
|
||||
|
||||
UpgradeVersionDescription upgradeVersionDescription = null;
|
||||
@@ -64,7 +69,7 @@ namespace FileConverter.Upgrade
|
||||
{
|
||||
if (upgradeVersionDescription == null)
|
||||
{
|
||||
throw new ArgumentNullException("upgradeVersionDescription");
|
||||
throw new ArgumentNullException(nameof(upgradeVersionDescription));
|
||||
}
|
||||
|
||||
Uri uri = new Uri(Helpers.BaseURI + "CHANGELOG.md");
|
||||
@@ -87,21 +92,18 @@ namespace FileConverter.Upgrade
|
||||
return upgradeVersionDescription.ChangeLog;
|
||||
}
|
||||
|
||||
public static void DownloadInstallerAsync(UpgradeVersionDescription upgradeVersionDescription)
|
||||
public static async Task 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");
|
||||
}
|
||||
|
||||
if (Helpers.currentlyDownloadedVersionDescription != null)
|
||||
{
|
||||
throw new Exception("The installer download is currently in progress.");
|
||||
}
|
||||
|
||||
Uri uri = new Uri(upgradeVersionDescription.InstallerURL);
|
||||
|
||||
string fileName = "FileConverter-setup.msi";
|
||||
@@ -121,10 +123,34 @@ namespace FileConverter.Upgrade
|
||||
|
||||
upgradeVersionDescription.InstallerPath = installerPath;
|
||||
upgradeVersionDescription.InstallerDownloadInProgress = true;
|
||||
upgradeVersionDescription.InstallerDownloadProgress = 0;
|
||||
|
||||
Helpers.webClient.DownloadFile(uri, installerPath);
|
||||
Helpers.currentlyDownloadedVersionDescription = upgradeVersionDescription;
|
||||
|
||||
upgradeVersionDescription.InstallerDownloadInProgress = false;
|
||||
Helpers.webClient.DownloadProgressChanged += Helpers.WebClient_DownloadProgressChanged;
|
||||
Helpers.webClient.DownloadFileCompleted += Helpers.WebClient_DownloadFileCompleted;
|
||||
Task downloadTask = Helpers.webClient.DownloadFileTaskAsync(uri, installerPath);
|
||||
}
|
||||
|
||||
private static void WebClient_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
|
||||
{
|
||||
Helpers.webClient.DownloadProgressChanged -= WebClient_DownloadProgressChanged;
|
||||
Helpers.webClient.DownloadFileCompleted -= WebClient_DownloadFileCompleted;
|
||||
|
||||
if (Helpers.currentlyDownloadedVersionDescription != null)
|
||||
{
|
||||
Helpers.currentlyDownloadedVersionDescription.InstallerDownloadProgress = 100;
|
||||
Helpers.currentlyDownloadedVersionDescription.InstallerDownloadInProgress = false;
|
||||
Helpers.currentlyDownloadedVersionDescription = null;
|
||||
}
|
||||
}
|
||||
|
||||
private static void WebClient_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs eventArgs)
|
||||
{
|
||||
if (Helpers.currentlyDownloadedVersionDescription != null)
|
||||
{
|
||||
Helpers.currentlyDownloadedVersionDescription.InstallerDownloadProgress = eventArgs.ProgressPercentage;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,24 +2,33 @@
|
||||
|
||||
namespace FileConverter
|
||||
{
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
public class UpgradeVersionDescription
|
||||
using FileConverter.Annotations;
|
||||
|
||||
public class UpgradeVersionDescription : INotifyPropertyChanged
|
||||
{
|
||||
private int installerDownloadProgress;
|
||||
private bool installerDownloadInProgress;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
[XmlElement("Latest")]
|
||||
public Version LatestVersion
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
[XmlElement("URL")]
|
||||
public string InstallerURL
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
[XmlIgnore]
|
||||
public string ChangeLog
|
||||
{
|
||||
@@ -37,8 +46,53 @@ namespace FileConverter
|
||||
[XmlIgnore]
|
||||
public bool InstallerDownloadInProgress
|
||||
{
|
||||
get;
|
||||
set;
|
||||
get
|
||||
{
|
||||
return this.installerDownloadInProgress;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
this.installerDownloadInProgress = value;
|
||||
this.OnPropertyChanged();
|
||||
this.OnPropertyChanged(nameof(this.InstallerDownloadDone));
|
||||
this.OnPropertyChanged(nameof(this.InstallerDownloadNotStarted));
|
||||
}
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
public int InstallerDownloadProgress
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.installerDownloadProgress;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
this.installerDownloadProgress = value;
|
||||
this.OnPropertyChanged();
|
||||
this.OnPropertyChanged(nameof(this.InstallerDownloadDone));
|
||||
this.OnPropertyChanged(nameof(this.InstallerDownloadNotStarted));
|
||||
}
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
public bool InstallerDownloadDone
|
||||
{
|
||||
get
|
||||
{
|
||||
return !this.InstallerDownloadInProgress && this.InstallerDownloadProgress == 100;
|
||||
}
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
public bool InstallerDownloadNotStarted
|
||||
{
|
||||
get
|
||||
{
|
||||
return !this.InstallerDownloadInProgress && this.InstallerDownloadProgress == 0;
|
||||
}
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
@@ -47,5 +101,11 @@ namespace FileConverter
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
[NotifyPropertyChangedInvocator]
|
||||
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
|
||||
{
|
||||
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -24,69 +24,7 @@ namespace FileConverter.ValueConverters
|
||||
OutputType outputFileExtension = (OutputType)values[1];
|
||||
string outputFileTemplate = values[2] as string;
|
||||
|
||||
if (inputFilePath == null)
|
||||
{
|
||||
return "Invalid input file path (argument 0).";
|
||||
}
|
||||
|
||||
string inputExtension = System.IO.Path.GetExtension(inputFilePath).Substring(1);
|
||||
string inputPathWithoutExtension = inputFilePath.Substring(0, inputFilePath.Length - inputExtension.Length - 1);
|
||||
string outputExtension = outputFileExtension.ToString().ToLowerInvariant();
|
||||
|
||||
if (outputFileTemplate == null)
|
||||
{
|
||||
// Default output path.
|
||||
return inputPathWithoutExtension + "." + outputExtension;
|
||||
}
|
||||
|
||||
string fileName = System.IO.Path.GetFileName(inputPathWithoutExtension);
|
||||
string parentDirectory = System.IO.Path.GetDirectoryName(inputPathWithoutExtension);
|
||||
string[] directories = parentDirectory.Split(System.IO.Path.DirectorySeparatorChar);
|
||||
parentDirectory += System.IO.Path.DirectorySeparatorChar;
|
||||
|
||||
// Generate output path from template.
|
||||
string outputPath = outputFileTemplate;
|
||||
|
||||
outputPath = outputPath.Replace("(path)", parentDirectory);
|
||||
outputPath = outputPath.Replace("(p)", parentDirectory);
|
||||
|
||||
outputPath = outputPath.Replace("(filename)", fileName);
|
||||
outputPath = outputPath.Replace("(f)", fileName);
|
||||
outputPath = outputPath.Replace("(F)", fileName.ToUpperInvariant());
|
||||
|
||||
outputPath = outputPath.Replace("(outputext)", outputExtension);
|
||||
outputPath = outputPath.Replace("(o)", outputExtension);
|
||||
outputPath = outputPath.Replace("(O)", outputExtension.ToUpperInvariant());
|
||||
|
||||
outputPath = outputPath.Replace("(inputext)", inputExtension);
|
||||
outputPath = outputPath.Replace("(i)", inputExtension);
|
||||
outputPath = outputPath.Replace("(I)", inputExtension.ToUpperInvariant());
|
||||
|
||||
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) + "\\";
|
||||
outputPath = outputPath.Replace("(p:m)", myMusicFolder);
|
||||
outputPath = outputPath.Replace("(p:music)", myMusicFolder);
|
||||
|
||||
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) + "\\";
|
||||
outputPath = outputPath.Replace("(p:p)", myPictureFolder);
|
||||
outputPath = outputPath.Replace("(p:pictures)", myPictureFolder);
|
||||
|
||||
for (int index = 0; index < directories.Length; index++)
|
||||
{
|
||||
outputPath = outputPath.Replace(string.Format("(d{0})", directories.Length - index - 1), directories[index]);
|
||||
outputPath = outputPath.Replace(string.Format("(D{0})", directories.Length - index - 1), directories[index].ToUpperInvariant());
|
||||
}
|
||||
|
||||
outputPath += "." + outputExtension;
|
||||
|
||||
return outputPath;
|
||||
return PathHelpers.GenerateFilePathFromTemplate(inputFilePath, outputFileExtension, outputFileTemplate, 1, 3);
|
||||
}
|
||||
|
||||
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
// <copyright file="CultureInfoToStringConverter.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 CultureInfoToStringConverter : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
CultureInfo cultureInfo = value as CultureInfo;
|
||||
if (cultureInfo == null)
|
||||
{
|
||||
throw new System.ArgumentException("The object must be a culture info instance.");
|
||||
}
|
||||
|
||||
string nativeName = cultureInfo.NativeName;
|
||||
if (string.IsNullOrEmpty(nativeName))
|
||||
{
|
||||
return cultureInfo.Name;
|
||||
}
|
||||
|
||||
if (nativeName.Length == 1)
|
||||
{
|
||||
return nativeName.ToUpper(cultureInfo);
|
||||
}
|
||||
|
||||
return nativeName.Substring(0, 1).ToUpper(cultureInfo) + nativeName.Substring(1, nativeName.Length - 1);
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
// <copyright file="ObjectToLocalizedString.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 ObjectToLocalizedString : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
if (value == null)
|
||||
{
|
||||
throw new System.ArgumentNullException("value.");
|
||||
}
|
||||
|
||||
string stringValue = value.ToString();
|
||||
string typeName = value.GetType().Name;
|
||||
|
||||
string localizationKey = $"{typeName}{stringValue}Name";
|
||||
localizationKey = localizationKey.Replace(" ", string.Empty);
|
||||
|
||||
string resource = Properties.Resources.ResourceManager.GetString(localizationKey);
|
||||
if (resource == null)
|
||||
{
|
||||
return localizationKey;
|
||||
}
|
||||
|
||||
return resource;
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,7 @@ namespace FileConverter.ValueConverters.Generic
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
return value?.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
// <copyright file="ValueToString.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 ValueToString : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
return value?.ToString();
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
// <copyright file="OutputTypeEnumToViewModel.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.ValueConverters
|
||||
{
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Windows.Data;
|
||||
|
||||
using FileConverter.Windows;
|
||||
|
||||
public class OutputTypeEnumToViewModel : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
if (!(value is OutputType))
|
||||
{
|
||||
throw new ArgumentException("The value must be an output type value.");
|
||||
}
|
||||
|
||||
OutputType outputType = (OutputType)value;
|
||||
|
||||
return SettingsWindow.OutputTypeViewModels.FirstOrDefault(match => match.Type == outputType);
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
OutputTypeViewModel outputTypeViewModel = value as OutputTypeViewModel;
|
||||
if (outputTypeViewModel == null)
|
||||
{
|
||||
return OutputType.None;
|
||||
}
|
||||
|
||||
return outputTypeViewModel.Type;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,22 +3,23 @@
|
||||
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">
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
xmlns:gif="http://wpfanimatedgif.codeplex.com"
|
||||
mc:Ignorable="d" Icon="/FileConverter;component/Resources/ApplicationIcon.ico" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="NoResize"
|
||||
Width="640" Height="545">
|
||||
<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 Margin="5" VerticalAlignment="Center">
|
||||
<TextBlock Margin="0,0,0,4" Text="{x:Static project:Resources.FileConverterStartHelp1}" TextWrapping="Wrap" FontWeight="Bold" FontSize="13.333"/>
|
||||
<TextBlock Text="{x:Static project:Resources.FileConverterStartHelp2}" TextWrapping="Wrap"/>
|
||||
<TextBlock Text="{x:Static project:Resources.FileConverterStartHelp3}" TextWrapping="Wrap" />
|
||||
<Image Margin="0,7,0,7" HorizontalAlignment="Left" Height="Auto" VerticalAlignment="Top" Width="Auto"
|
||||
gif:ImageBehavior.AnimatedSource="/FileConverter;component/Resources/FileConverterUsage.gif"
|
||||
Stretch="Fill"/>
|
||||
<Button Content="{x:Static project:Resources.Ok}" Height="28" Click="OkButton_Click"/>
|
||||
</StackPanel>
|
||||
</Window>
|
||||
@@ -19,6 +19,12 @@ namespace FileConverter.Windows
|
||||
set;
|
||||
}
|
||||
|
||||
public DataTemplate FlacSettingsDataTemplate
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public DataTemplate WavSettingsDataTemplate
|
||||
{
|
||||
get;
|
||||
@@ -43,12 +49,24 @@ namespace FileConverter.Windows
|
||||
set;
|
||||
}
|
||||
|
||||
public DataTemplate OgvSettingsDataTemplate
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public DataTemplate AacSettingsDataTemplate
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public DataTemplate GifSettingsDataTemplate
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public DataTemplate JpgSettingsDataTemplate
|
||||
{
|
||||
get;
|
||||
@@ -67,6 +85,18 @@ namespace FileConverter.Windows
|
||||
set;
|
||||
}
|
||||
|
||||
public DataTemplate WebmSettingsDataTemplate
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public DataTemplate WebpSettingsDataTemplate
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public override DataTemplate SelectTemplate(object item, DependencyObject container)
|
||||
{
|
||||
if (item == null)
|
||||
@@ -84,6 +114,12 @@ namespace FileConverter.Windows
|
||||
case OutputType.Avi:
|
||||
return this.AviSettingsDataTemplate;
|
||||
|
||||
case OutputType.Flac:
|
||||
return this.FlacSettingsDataTemplate;
|
||||
|
||||
case OutputType.Gif:
|
||||
return this.GifSettingsDataTemplate;
|
||||
|
||||
case OutputType.Jpg:
|
||||
return this.JpgSettingsDataTemplate;
|
||||
|
||||
@@ -99,11 +135,20 @@ namespace FileConverter.Windows
|
||||
case OutputType.Ogg:
|
||||
return this.OggSettingsDataTemplate;
|
||||
|
||||
case OutputType.Ogv:
|
||||
return this.OgvSettingsDataTemplate;
|
||||
|
||||
case OutputType.Png:
|
||||
return this.PngSettingsDataTemplate;
|
||||
|
||||
case OutputType.Wav:
|
||||
return this.WavSettingsDataTemplate;
|
||||
|
||||
case OutputType.Webm:
|
||||
return this.WebmSettingsDataTemplate;
|
||||
|
||||
case OutputType.Webp:
|
||||
return this.WebpSettingsDataTemplate;
|
||||
}
|
||||
|
||||
return this.DefaultDataTemplate;
|
||||
|
||||
@@ -3,17 +3,20 @@
|
||||
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:diagnostics="clr-namespace:FileConverter.Diagnostics"
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
xmlns:local="clr-namespace:FileConverter"
|
||||
mc:Ignorable="d"
|
||||
Title="Diagnostics" Height="600" Width="800" Icon="/FileConverter;component/Resources/ApplicationIcon.ico">
|
||||
Height="600" Width="800" Icon="/FileConverter;component/Resources/ApplicationIcon.ico">
|
||||
<Window.Title>
|
||||
<Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
|
||||
</Window.Title>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="30" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Label Grid.Row="0" Content="Logs" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold" />
|
||||
<Label Grid.Row="0" Content="{x:Static project:Resources.Diagnostics}" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold" />
|
||||
|
||||
<TabControl Grid.Row="1" Margin="5" ItemsSource="{Binding Path=(diagnostics:Debug.Data), Mode=OneWay}">
|
||||
<TabControl.ItemTemplate>
|
||||
|
||||
@@ -4,16 +4,48 @@ namespace FileConverter
|
||||
{
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Windows.Media;
|
||||
|
||||
using FileConverter.Annotations;
|
||||
using FileConverter.ConversionJobs;
|
||||
|
||||
public class InputExtension : INotifyPropertyChanged
|
||||
{
|
||||
private readonly Brush defaultBrush = new SolidColorBrush(Color.FromRgb(0, 0, 0));
|
||||
private readonly Brush errorBrush = new SolidColorBrush(Color.FromRgb(255, 65, 0));
|
||||
|
||||
private string name;
|
||||
private Brush foregroundBrush;
|
||||
private string toolTip;
|
||||
|
||||
public InputExtension(string name)
|
||||
{
|
||||
this.Name = name;
|
||||
|
||||
ConversionJob_Office.ApplicationName officeApplication = Helpers.GetOfficeApplicationCompatibleWithExtension(name);
|
||||
|
||||
if (officeApplication == ConversionJob_Office.ApplicationName.None || Helpers.IsMicrosoftOfficeApplicationAvailable(officeApplication))
|
||||
{
|
||||
this.ForegroundBrush = this.defaultBrush;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.ForegroundBrush = this.errorBrush;
|
||||
switch (officeApplication)
|
||||
{
|
||||
case ConversionJob_Office.ApplicationName.Word:
|
||||
this.ToolTip = Properties.Resources.ErrorMicrosoftWordIsNotAvailable;
|
||||
break;
|
||||
|
||||
case ConversionJob_Office.ApplicationName.PowerPoint:
|
||||
this.ToolTip = Properties.Resources.ErrorMicrosoftPowerPointIsNotAvailable;
|
||||
break;
|
||||
|
||||
case ConversionJob_Office.ApplicationName.Excel:
|
||||
this.ToolTip = Properties.Resources.ErrorMicrosoftExcelIsNotAvailable;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
@@ -32,6 +64,34 @@ namespace FileConverter
|
||||
}
|
||||
}
|
||||
|
||||
public Brush ForegroundBrush
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.foregroundBrush;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
this.foregroundBrush = value;
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
public string ToolTip
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.toolTip;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
this.toolTip = value;
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
[NotifyPropertyChangedInvocator]
|
||||
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
|
||||
{
|
||||
|
||||
@@ -4,11 +4,19 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:FileConverter"
|
||||
xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
|
||||
xmlns:conversionJobs="clr-namespace:FileConverter.ConversionJobs" mc:Ignorable="d" x:Class="FileConverter.MainWindow"
|
||||
x:Name="FileConverterMainWindow" Height="500" Width="950" MinHeight="250" MinWidth="450" WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico">
|
||||
xmlns:conversionJobs="clr-namespace:FileConverter.ConversionJobs"
|
||||
xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
mc:Ignorable="d" x:Class="FileConverter.MainWindow"
|
||||
x:Name="FileConverterMainWindow" Height="500" Width="950" MinHeight="250" MinWidth="500" WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico">
|
||||
<Window.Resources>
|
||||
<valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
|
||||
<valueConverters:ConversionStateToBrush x:Key="ConversionStateToColor" />
|
||||
|
||||
<generic:ValueConverterGroup x:Key="EnumEqualsToVisibility">
|
||||
<generic:ValueToString/>
|
||||
<generic:EqualsConverter/>
|
||||
<generic:BoolToVisibility/>
|
||||
</generic:ValueConverterGroup>
|
||||
</Window.Resources>
|
||||
<Window.Title>
|
||||
<Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
|
||||
@@ -16,28 +24,36 @@
|
||||
|
||||
<Grid Margin="10">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="30" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Grid Grid.Row="0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="100" />
|
||||
<ColumnDefinition Width="100" />
|
||||
<ColumnDefinition Width="120" />
|
||||
<ColumnDefinition Width="120" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Label x:Name="Title" Grid.Column="0" Content="Files to convert" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold"/>
|
||||
<Button x:Name="DiagnosticsButton" Grid.Column="1" Content="Logs" Margin="3,3" Click="DiagnosticsButton_OnClick"/>
|
||||
<Button x:Name="SettingsButton" Grid.Column="2" Content="Settings" Margin="3,3" Click="SettingsButton_OnClick"/>
|
||||
<DockPanel Grid.Column="0">
|
||||
<Label Content="{x:Static project:Resources.ConversionQueueTitle}" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold"/>
|
||||
<Label Content="{Binding InformationMessage, ElementName=FileConverterMainWindow}" VerticalAlignment="Top" Height="30" FontSize="13.333" HorizontalAlignment="Right"/>
|
||||
</DockPanel>
|
||||
<Button x:Name="DiagnosticsButton" Grid.Column="1" Content="{x:Static project:Resources.DiagnosticsButtonTitle}" Margin="3,3" Click="DiagnosticsButton_OnClick"/>
|
||||
<Button x:Name="SettingsButton" Grid.Column="2" Content="{x:Static project:Resources.SettingsButtonTitle}" Margin="3,3" Click="SettingsButton_OnClick"/>
|
||||
</Grid>
|
||||
|
||||
<ScrollViewer x:Name="ScrollViewer" Grid.Row="1" VerticalScrollBarVisibility="Auto" CanContentScroll="True">
|
||||
<ItemsControl x:Name="ConverterJobsList">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<DockPanel Background="{Binding State, ConverterParameter=Background, Converter={StaticResource ConversionStateToColor}}" Margin="0,4">
|
||||
<Grid Margin="10">
|
||||
<Grid Background="{Binding State, ConverterParameter=Background, Converter={StaticResource ConversionStateToColor}}" Margin="0,4">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="70"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Grid Margin="10" Grid.Column="0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="20" />
|
||||
<RowDefinition Height="Auto" />
|
||||
@@ -51,7 +67,7 @@
|
||||
|
||||
<StackPanel Grid.Row="1" Grid.Column="0" Margin="10,0,0,0">
|
||||
<WrapPanel>
|
||||
<TextBlock Text="Converted from " FontSize="11" FontStyle="Italic" />
|
||||
<TextBlock Text="{x:Static project:Resources.ConvertedFrom}" FontSize="11" FontStyle="Italic" Margin="0,0,5,0" />
|
||||
<TextBlock Text="{Binding InputFilePath}" FontSize="11" FontStyle="Italic" />
|
||||
</WrapPanel>
|
||||
<TextBlock Text="{Binding ErrorMessage}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToColor}}" />
|
||||
@@ -61,7 +77,15 @@
|
||||
|
||||
<ProgressBar Grid.Row="1" Grid.Column="1" Height="18" Width="Auto" Minimum="0" Maximum="1" SmallChange="0.001" Value="{Binding Progress, Mode=OneWay}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToColor}}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" MinWidth="100" LargeChange="0.1" />
|
||||
</Grid>
|
||||
</DockPanel>
|
||||
|
||||
<Button Margin="5" Grid.Column="1" Background="WhiteSmoke" Foreground="#FF3E3E3E" Visibility="{Binding State, Converter={StaticResource EnumEqualsToVisibility}, ConverterParameter=|InProgress|Collapsed}" Command="{Binding CancelCommand}" ToolTip="Cancel">
|
||||
<Button.Content>
|
||||
<Image Source="/FileConverter;component/Resources/CancelIcon.png" Width="48" Height="48" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
<Image Margin="5" Grid.Column="1" Source="/FileConverter;component/Resources/SuccessIcon.png" Width="48" Height="48" Visibility="{Binding State, Converter={StaticResource EnumEqualsToVisibility}, ConverterParameter=|Done|Collapsed}"/>
|
||||
<Image Margin="5" Grid.Column="1" Source="/FileConverter;component/Resources/FailIcon.png" Width="48" Height="48" Visibility="{Binding State, Converter={StaticResource EnumEqualsToVisibility}, ConverterParameter=|Failed|Collapsed}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
<ItemsControl.DataContext>
|
||||
|
||||
@@ -15,12 +15,16 @@ namespace FileConverter
|
||||
private SettingsWindow settingsWindow;
|
||||
private UpgradeWindow upgradeWindow;
|
||||
|
||||
private string informationMessage;
|
||||
|
||||
public MainWindow()
|
||||
{
|
||||
this.InitializeComponent();
|
||||
|
||||
Application application = Application.Current as Application;
|
||||
|
||||
application.OnApplicationTerminate += this.Application_OnApplicationTerminate;
|
||||
|
||||
this.ConverterJobsList.ItemsSource = application.ConvertionJobs;
|
||||
|
||||
if (application.HideMainWindow)
|
||||
@@ -42,6 +46,20 @@ namespace FileConverter
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
public string InformationMessage
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.informationMessage;
|
||||
}
|
||||
|
||||
private set
|
||||
{
|
||||
this.informationMessage = value;
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
public void OnNewVersionReleased(UpgradeVersionDescription upgradeVersionDescription)
|
||||
{
|
||||
this.ShowUpgradeWindow();
|
||||
@@ -58,6 +76,20 @@ namespace FileConverter
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnClosing(CancelEventArgs eventArgs)
|
||||
{
|
||||
base.OnClosing(eventArgs);
|
||||
|
||||
Application application = Application.Current as Application;
|
||||
|
||||
if (application.UpgradeVersionDescription != null && application.UpgradeVersionDescription.NeedToUpgrade && !application.UpgradeVersionDescription.InstallerDownloadDone)
|
||||
{
|
||||
eventArgs.Cancel = true;
|
||||
this.ShowUpgradeWindow();
|
||||
this.upgradeWindow.VersionDescription = application.UpgradeVersionDescription;
|
||||
}
|
||||
}
|
||||
|
||||
private void SettingsButton_OnClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
this.ShowSettingsWindow();
|
||||
@@ -112,14 +144,55 @@ namespace FileConverter
|
||||
{
|
||||
return;
|
||||
}
|
||||
else
|
||||
else if (this.upgradeWindow == null)
|
||||
{
|
||||
this.upgradeWindow = new UpgradeWindow();
|
||||
this.upgradeWindow.Closed += this.UpgradeWindow_Closed;
|
||||
}
|
||||
|
||||
|
||||
Application application = Application.Current as Application;
|
||||
application?.CancelAutoExit();
|
||||
this.upgradeWindow.Show();
|
||||
}
|
||||
|
||||
private void UpgradeWindow_Closed(object sender, System.EventArgs e)
|
||||
{
|
||||
Application application = Application.Current as Application;
|
||||
|
||||
if (this.IsVisible)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (application.UpgradeVersionDescription != null && application.UpgradeVersionDescription.NeedToUpgrade && application.UpgradeVersionDescription.InstallerDownloadDone)
|
||||
{
|
||||
this.Close();
|
||||
}
|
||||
}
|
||||
|
||||
private void Application_OnApplicationTerminate(object sender, ApplicationTerminateArgs eventArgs)
|
||||
{
|
||||
if (float.IsNaN(eventArgs.RemainingTimeBeforeTermination))
|
||||
{
|
||||
this.InformationMessage = string.Empty;
|
||||
return;
|
||||
}
|
||||
|
||||
int remaingingSeconds = (int)eventArgs.RemainingTimeBeforeTermination;
|
||||
|
||||
if (remaingingSeconds >= 2)
|
||||
{
|
||||
this.InformationMessage = string.Format(Properties.Resources.ApplicationWillTerminateInMultipleSeconds, remaingingSeconds);
|
||||
}
|
||||
else if (remaingingSeconds == 1)
|
||||
{
|
||||
this.InformationMessage = Properties.Resources.ApplicationWillTerminateInOneSecond;
|
||||
}
|
||||
|
||||
if (remaingingSeconds <= 0)
|
||||
{
|
||||
this.InformationMessage = Properties.Resources.ApplicationIsTerminating;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
// <copyright file="OutputTypeViewModel.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.Windows
|
||||
{
|
||||
public class OutputTypeViewModel
|
||||
{
|
||||
public OutputTypeViewModel(OutputType type)
|
||||
{
|
||||
this.Type = type;
|
||||
this.Category = Helpers.GetExtensionCategory(type.ToString().ToLowerInvariant());
|
||||
}
|
||||
|
||||
public OutputType Type
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public string Category
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public override bool Equals(object other)
|
||||
{
|
||||
OutputTypeViewModel outputTypeViewModel = other as OutputTypeViewModel;
|
||||
|
||||
return outputTypeViewModel?.Type == this.Type;
|
||||
}
|
||||
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return this.Type.GetHashCode();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,13 +5,18 @@ namespace FileConverter
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Input;
|
||||
|
||||
using FileConverter.Annotations;
|
||||
using FileConverter.Commands;
|
||||
using FileConverter.ConversionJobs;
|
||||
using FileConverter.Windows;
|
||||
using Microsoft.Win32;
|
||||
|
||||
/// <summary>
|
||||
@@ -24,47 +29,79 @@ namespace FileConverter
|
||||
private Settings settings;
|
||||
|
||||
private InputExtensionCategory[] inputCategories;
|
||||
private string releaseNoteContent;
|
||||
|
||||
private OpenUrlCommand openUrlCommand;
|
||||
private DelegateCommand getChangeLogContentCommand;
|
||||
private bool displaySeeChangeLogLink = true;
|
||||
|
||||
public SettingsWindow()
|
||||
{
|
||||
this.SupportedCultures = Helpers.GetSupportedCultures().Where(cultureInfo => cultureInfo.IsNeutralCulture).ToArray();
|
||||
|
||||
this.InitializeComponent();
|
||||
|
||||
Application application = Application.Current as Application;
|
||||
this.ApplicationSettings = application.Settings;
|
||||
this.PresetList.ItemsSource = this.settings.ConversionPresets;
|
||||
|
||||
OutputType[] outputTypes = new[]
|
||||
{
|
||||
OutputType.Ogg,
|
||||
OutputType.Mp3,
|
||||
OutputType.Aac,
|
||||
OutputType.Flac,
|
||||
OutputType.Wav,
|
||||
OutputType.Mkv,
|
||||
OutputType.Mp4,
|
||||
OutputType.Avi,
|
||||
OutputType.Ico,
|
||||
OutputType.Jpg,
|
||||
OutputType.Png,
|
||||
};
|
||||
|
||||
this.OutputFormats.ItemsSource = outputTypes;
|
||||
|
||||
InputPostConversionAction[] postConversionActions = new[]
|
||||
{
|
||||
InputPostConversionAction.None,
|
||||
InputPostConversionAction.MoveInArchiveFolder,
|
||||
InputPostConversionAction.Delete,
|
||||
};
|
||||
|
||||
this.PostConversionActionComboBox.ItemsSource = postConversionActions;
|
||||
|
||||
ListCollectionView collectionView = new ListCollectionView(new List<OutputTypeViewModel>(SettingsWindow.OutputTypeViewModels));
|
||||
collectionView.GroupDescriptions.Add(new PropertyGroupDescription("Category"));
|
||||
|
||||
this.OutputFormats.ItemsSource = collectionView;
|
||||
|
||||
this.InitializeCompatibleInputExtensions();
|
||||
}
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
public event System.EventHandler<System.EventArgs> OnSettingsWindowHide;
|
||||
public event EventHandler<EventArgs> OnSettingsWindowHide;
|
||||
|
||||
public static OutputTypeViewModel[] OutputTypeViewModels => new[]
|
||||
{
|
||||
new OutputTypeViewModel(OutputType.Ogg),
|
||||
new OutputTypeViewModel(OutputType.Mp3),
|
||||
new OutputTypeViewModel(OutputType.Aac),
|
||||
new OutputTypeViewModel(OutputType.Flac),
|
||||
new OutputTypeViewModel(OutputType.Wav),
|
||||
new OutputTypeViewModel(OutputType.Mkv),
|
||||
new OutputTypeViewModel(OutputType.Mp4),
|
||||
new OutputTypeViewModel(OutputType.Ogv),
|
||||
new OutputTypeViewModel(OutputType.Webm),
|
||||
new OutputTypeViewModel(OutputType.Avi),
|
||||
new OutputTypeViewModel(OutputType.Png),
|
||||
new OutputTypeViewModel(OutputType.Jpg),
|
||||
new OutputTypeViewModel(OutputType.Webp),
|
||||
new OutputTypeViewModel(OutputType.Ico),
|
||||
new OutputTypeViewModel(OutputType.Gif),
|
||||
new OutputTypeViewModel(OutputType.Pdf),
|
||||
};
|
||||
|
||||
public ICommand OpenUrlCommand
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.openUrlCommand == null)
|
||||
{
|
||||
this.openUrlCommand = new OpenUrlCommand();
|
||||
}
|
||||
|
||||
return this.openUrlCommand;
|
||||
}
|
||||
}
|
||||
|
||||
public ICommand GetChangeLogContentCommand
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.getChangeLogContentCommand == null)
|
||||
{
|
||||
this.getChangeLogContentCommand = new DelegateCommand(this.DownloadChangeLogAction);
|
||||
}
|
||||
|
||||
return this.getChangeLogContentCommand;
|
||||
}
|
||||
}
|
||||
|
||||
public ConversionPreset SelectedPreset
|
||||
{
|
||||
@@ -88,7 +125,7 @@ namespace FileConverter
|
||||
}
|
||||
|
||||
this.OnPropertyChanged();
|
||||
this.OnPropertyChanged("InputCategories");
|
||||
this.OnPropertyChanged(nameof(this.InputCategories));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -118,7 +155,7 @@ namespace FileConverter
|
||||
for (int index = 0; index < this.inputCategories.Length; index++)
|
||||
{
|
||||
InputExtensionCategory category = this.inputCategories[index];
|
||||
if (this.SelectedPreset == null || PathHelpers.IsOutputTypeCompatibleWithCategory(this.SelectedPreset.OutputType, category.Name))
|
||||
if (this.SelectedPreset == null || Helpers.IsOutputTypeCompatibleWithCategory(this.SelectedPreset.OutputType, category.Name))
|
||||
{
|
||||
yield return category;
|
||||
}
|
||||
@@ -126,17 +163,91 @@ namespace FileConverter
|
||||
}
|
||||
}
|
||||
|
||||
public CultureInfo[] SupportedCultures
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public InputPostConversionAction[] InputPostConversionActions => new[]
|
||||
{
|
||||
InputPostConversionAction.None,
|
||||
InputPostConversionAction.MoveInArchiveFolder,
|
||||
InputPostConversionAction.Delete,
|
||||
};
|
||||
|
||||
public VideoEncodingSpeed[] VideoEncodingSpeeds => new[]
|
||||
{
|
||||
VideoEncodingSpeed.UltraFast,
|
||||
VideoEncodingSpeed.SuperFast,
|
||||
VideoEncodingSpeed.VeryFast,
|
||||
VideoEncodingSpeed.Faster,
|
||||
VideoEncodingSpeed.Fast,
|
||||
VideoEncodingSpeed.Medium,
|
||||
VideoEncodingSpeed.Slow,
|
||||
VideoEncodingSpeed.Slower,
|
||||
VideoEncodingSpeed.VerySlow,
|
||||
};
|
||||
|
||||
public string AboutSectionContent
|
||||
{
|
||||
get
|
||||
{
|
||||
string content = Properties.Resources.LicenceHeader1 + "\n";
|
||||
content += Properties.Resources.LicenceHeader2 + "\n\n";
|
||||
content += Properties.Resources.LicenceHeader3 + "\n\n";
|
||||
content += this.releaseNoteContent;
|
||||
return content;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
this.releaseNoteContent = value;
|
||||
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
public bool DisplaySeeChangeLogLink
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.displaySeeChangeLogLink;
|
||||
}
|
||||
|
||||
private set
|
||||
{
|
||||
this.displaySeeChangeLogLink = value;
|
||||
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
[NotifyPropertyChangedInvocator]
|
||||
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
|
||||
{
|
||||
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
|
||||
private void DownloadChangeLogAction()
|
||||
{
|
||||
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||
Upgrade.Helpers.GetChangeLogAsync(new UpgradeVersionDescription(), this.OnChangeLogRetrieved);
|
||||
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||
this.AboutSectionContent = Properties.Resources.DownloadingChangeLog;
|
||||
this.DisplaySeeChangeLogLink = false;
|
||||
}
|
||||
|
||||
private void OnChangeLogRetrieved(UpgradeVersionDescription description)
|
||||
{
|
||||
this.AboutSectionContent = description.ChangeLog;
|
||||
}
|
||||
|
||||
private void SelectedPresetPropertyChanged(object sender, PropertyChangedEventArgs e)
|
||||
{
|
||||
if (e.PropertyName == "OutputType")
|
||||
{
|
||||
this.OnPropertyChanged("InputCategories");
|
||||
this.OnPropertyChanged(nameof(this.InputCategories));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -237,12 +348,12 @@ namespace FileConverter
|
||||
private void AddPresetButton_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Application application = Application.Current as Application;
|
||||
string presetName = "New preset";
|
||||
string presetName = Properties.Resources.DefaultPresetName;
|
||||
int index = 1;
|
||||
while (application.Settings.ConversionPresets.Any(match => match.Name == presetName))
|
||||
{
|
||||
index++;
|
||||
presetName = string.Format("New preset ({0})", index);
|
||||
presetName = $"{Properties.Resources.DefaultPresetName} ({index})";
|
||||
}
|
||||
|
||||
ConversionPreset newPreset = null;
|
||||
@@ -340,7 +451,7 @@ namespace FileConverter
|
||||
for (int index = 0; index < compatibleInputExtensions.Length; index++)
|
||||
{
|
||||
string compatibleInputExtension = compatibleInputExtensions[index];
|
||||
string extensionCategory = PathHelpers.GetExtensionCategory(compatibleInputExtension);
|
||||
string extensionCategory = Helpers.GetExtensionCategory(compatibleInputExtension);
|
||||
InputExtensionCategory category = categories.Find(match => match.Name == extensionCategory);
|
||||
if (category == null)
|
||||
{
|
||||
@@ -352,7 +463,7 @@ namespace FileConverter
|
||||
}
|
||||
|
||||
this.inputCategories = categories.ToArray();
|
||||
this.OnPropertyChanged("InputCategories");
|
||||
this.OnPropertyChanged(nameof(this.InputCategories));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,76 +3,32 @@
|
||||
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"
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
mc:Ignorable="d"
|
||||
Title="File Converter Updates"
|
||||
Title="{x:Static project:Resources.UpgradeWindowTitle}"
|
||||
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"/>-->
|
||||
Text="{x:Static project:Resources.UpgradeAvailable}" TextWrapping="Wrap"/>
|
||||
|
||||
<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" >
|
||||
<!-- Download button -->
|
||||
<Button Background="WhiteSmoke" Grid.Row="3" Padding="10,5,10,5" Margin="5" HorizontalContentAlignment="Left" Command="{Binding DownloadInstallerCommand, ElementName=window}"
|
||||
Visibility="{Binding VersionDescription.InstallerDownloadNotStarted, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=window}">
|
||||
<Button.Content>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -85,8 +41,49 @@
|
||||
<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"/>
|
||||
<Label Grid.Row="0" Content="{x:Static project:Resources.DownloadAndInstallButtonTitle}" FontSize="14.667"/>
|
||||
<TextBlock Grid.Row="1" Text="{x:Static project:Resources.DownloadAndInstallButtonDescription}" TextWrapping="Wrap" FontSize="10.667"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
<!-- Download in progress -->
|
||||
<Grid Grid.Row="3" Margin="5"
|
||||
Visibility="{Binding VersionDescription.InstallerDownloadInProgress, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=window}">
|
||||
<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="{x:Static project:Resources.UpgradeDownloadInProgress}" FontSize="14.667"/>
|
||||
<ProgressBar Grid.Row="1" Margin="5" Height="30" Foreground="#004B82" Minimum="0" Maximum="100"
|
||||
Value="{Binding VersionDescription.InstallerDownloadProgress, ElementName=window}"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<!-- Install button -->
|
||||
<Button Background="WhiteSmoke" Grid.Row="3" Padding="10,5,10,5" Margin="5" HorizontalContentAlignment="Left" Command="{Binding LaunchInstallerCommand, ElementName=window}"
|
||||
Visibility="{Binding VersionDescription.InstallerDownloadDone, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=window}">
|
||||
<Button.Content>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="64"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Image Source="/FileConverter;component/Resources/ApplicationIcon.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="{x:Static project:Resources.InstallButtonTitle}" FontSize="14.667"/>
|
||||
<TextBlock Grid.Row="1" Text="{x:Static project:Resources.InstallButtonDescription}" TextWrapping="Wrap" FontSize="10.667"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Button.Content>
|
||||
|
||||
@@ -6,8 +6,10 @@ namespace FileConverter.Windows
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Input;
|
||||
|
||||
using FileConverter.Annotations;
|
||||
using FileConverter.Commands;
|
||||
using FileConverter.Upgrade;
|
||||
|
||||
public partial class UpgradeWindow : Window, INotifyPropertyChanged
|
||||
@@ -15,6 +17,9 @@ namespace FileConverter.Windows
|
||||
private UpgradeVersionDescription upgradeVersionDescription;
|
||||
private string releaseNoteContent;
|
||||
|
||||
private DelegateCommand downloadInstallerCommand;
|
||||
private DelegateCommand launchInstallerCommand;
|
||||
|
||||
public UpgradeWindow()
|
||||
{
|
||||
this.InitializeComponent();
|
||||
@@ -22,6 +27,32 @@ namespace FileConverter.Windows
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
public ICommand DownloadInstallerCommand
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.downloadInstallerCommand == null)
|
||||
{
|
||||
this.downloadInstallerCommand = new DelegateCommand(this.ExecuteDownloadInstallerCommand);
|
||||
}
|
||||
|
||||
return this.downloadInstallerCommand;
|
||||
}
|
||||
}
|
||||
|
||||
public ICommand LaunchInstallerCommand
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.launchInstallerCommand == null)
|
||||
{
|
||||
this.launchInstallerCommand = new DelegateCommand(this.ExecuteLaunchInstallerCommand);
|
||||
}
|
||||
|
||||
return this.launchInstallerCommand;
|
||||
}
|
||||
}
|
||||
|
||||
public UpgradeVersionDescription VersionDescription
|
||||
{
|
||||
get
|
||||
@@ -38,14 +69,14 @@ namespace FileConverter.Windows
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public string ReleaseNote
|
||||
{
|
||||
get
|
||||
{
|
||||
if (string.IsNullOrEmpty(this.releaseNoteContent))
|
||||
{
|
||||
return "###Downloading change log ...";
|
||||
return Properties.Resources.DownloadingChangeLog;
|
||||
}
|
||||
|
||||
return this.releaseNoteContent;
|
||||
@@ -58,7 +89,7 @@ namespace FileConverter.Windows
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[NotifyPropertyChangedInvocator]
|
||||
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
|
||||
{
|
||||
@@ -70,10 +101,15 @@ namespace FileConverter.Windows
|
||||
this.ReleaseNote = versionDescription.ChangeLog;
|
||||
}
|
||||
|
||||
private void OnInstallButtonClick(object sender, RoutedEventArgs e)
|
||||
private void ExecuteDownloadInstallerCommand()
|
||||
{
|
||||
this.upgradeVersionDescription.NeedToUpgrade = true;
|
||||
Helpers.DownloadInstallerAsync(this.upgradeVersionDescription);
|
||||
this.Hide();
|
||||
}
|
||||
|
||||
private void ExecuteLaunchInstallerCommand()
|
||||
{
|
||||
this.Close();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Magick.NET-Q16-AnyCPU" version="7.0.0.0101" targetFramework="net45" />
|
||||
<package id="Magick.NET-Q16-AnyCPU" version="7.0.2.900" targetFramework="net45" />
|
||||
<package id="WpfAnimatedGif" version="1.4.14" targetFramework="net45" />
|
||||
</packages>
|
||||
@@ -1,5 +1,64 @@
|
||||
# Change Log
|
||||
|
||||
## Version 1.2.1
|
||||
- Fixed: Issue where audio file tags were not copied in a format readable by Windows.
|
||||
- Fixed: Issue where the default language was set to french (github issue #6).
|
||||
- Fixed: Issue where the size of a pdf generated from images was not consistent.
|
||||
- Change: Small improvements of File Converter application and installer interface thanks to TheAresjej (github issues #7 and #8).
|
||||
|
||||
## Version 1.2
|
||||
- New: Possibility to convert Word documents (docx, odt and doc) to pdf and images (this feature is only available if you have Microsoft Word installed).
|
||||
- New: Possibility to convert Excel documents (xlsx, ods and xls) to pdf and images (this feature is only available if you have Microsoft Excel installed).
|
||||
- New: Possibility to convert PowerPoint documents (pptx, odp and ppt) to pdf and images (this feature is only available if you have Microsoft PowerPoint installed).
|
||||
- New: Possibility to convert images and documents to webp format.
|
||||
- New: Support new image input format: webp.
|
||||
- New: Add the possibility to cancel image, CDA extraction and gif conversions.
|
||||
- Fixed: Issue where multiple conversion jobs were created for the same file resulting in an error message.
|
||||
- Tech: Improve application performances on startup.
|
||||
- Tech: Improve diagnostics.
|
||||
|
||||
## Version 1.1
|
||||
- New: Localization system. File Converter can now be translated in multiple languages. The default language is the same than your OS language (if available).
|
||||
- New: Add the possibility to choose the application language in the application settings.
|
||||
- New: Add french localization.
|
||||
- New: Possibility to convert a Pdf file into image files (one image per page).
|
||||
- New: Possibility to convert an image into a Pdf file.
|
||||
- New: Possibility to encode videos using theora video codec and Ogg vorbis audio codec in a ogv container.
|
||||
- New: Possibility to change the number of channels of an audio file (stereo -> mono, 5.1 -> stereo, ...).
|
||||
- New: Improve the application upgrade UI. If you quit the application during the upgrade downloading, you will now see the download progress.
|
||||
- New: File converter is now available for Windows 32 bits systems (download the x86 installer).
|
||||
- New: Add an application option to choose the maximum number of simultaneous conversions.
|
||||
- Change: Improve the application help start page (when you launch File Converter directly from the executable) with an animated picture.
|
||||
- Change: Improve the output type dropdown visualization (splitting it by categories).
|
||||
- Fixed: Issue where it was impossible to rotate an image for the output types: jpg and png.
|
||||
|
||||
## Version 1.0
|
||||
- New: File Converter is now certified by Microsoft Authenticode.
|
||||
- New: Add an about section that contains information on the software development (change log, documentation link, report issue link).
|
||||
- New: Split conversion preset settings and application settings to improve ergonomy.
|
||||
- New: Add help shortcuts in the conversion preset edition interface that links directly to the corresponding documentation page.
|
||||
- New: Add shortcuts in start menu.
|
||||
- New: Create a donation campaign on Pledgie and linked it in the about section.
|
||||
- Fixed: Issue with Avast antivirus where File Converter and Windows explorer was frozen when the user tried to use File Converter.
|
||||
- Fixed: Issue where it was impossible to convert files from a network path.
|
||||
|
||||
## Version 0.7
|
||||
- New: Possibility to encode videos using VP9 video codec and Ogg vorbis audio codec in a webm container.
|
||||
- New: Possibility to convert videos and images to gif.
|
||||
- New: Possibility to convert gif files to videos.
|
||||
- New: Possibility to remove audio from video files (mkv, mp4, avi and webm output file formats).
|
||||
- New: Add feedback to indicate that the application will automatically terminate (after conversions) (github issue #1).
|
||||
- New: Support new video input formats: ogv and mpeg.
|
||||
- New: Support new audio input format: oga.
|
||||
- New: Possibility to cancel some conversion jobs (gif/cda and image conversion jobs are not cancelable for now).
|
||||
- Fixed: Issue where video can't be compressed using H.264 codec (mp4 or mkv presets) when its size (width or height) is not divisible by 2 (append a lot when the user tries to scale a video) (github issue #2).
|
||||
- Fixed: Issue where "Clamp to power of 2 size" option didn't work well with images that already have a power of 2 size.
|
||||
- Fixed: Issue where conversion progress was not updated correctly (for converters based on ffmpeg).
|
||||
- Fixed: Issue where converting a video into the ogg format did not extract audio in an ogg file correctly.
|
||||
- Fixed: Issue where simultaneous read on the same CD drive was performed when files from differents conversions come from the same drive (other than cda extraction preset).
|
||||
- Fixed: Issue where the path generator was unable to create a valid path if the input file was at the root of a drive.
|
||||
- Tech: Annotate the conversion presets to know if there are default preset or user preset in order to improve the upgrade process.
|
||||
|
||||
## 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.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.24720.0
|
||||
VisualStudioVersion = 14.0.25123.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileConverter", "Application\FileConverter\FileConverter.csproj", "{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}"
|
||||
EndProject
|
||||
@@ -11,44 +11,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileConverterExtension", "A
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.Build.0 = Release|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.Build.0 = Release|Any CPU
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.Build.0 = Debug|x64
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.Build.0 = Debug|x86
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.ActiveCfg = Release|x64
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.Build.0 = Release|x64
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.ActiveCfg = Release|x86
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.Build.0 = Release|x86
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x64.Build.0 = Debug|x64
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x86.Build.0 = Debug|x86
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x64.ActiveCfg = Release|x64
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x64.Build.0 = Release|x64
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x86.ActiveCfg = Release|x86
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x86.Build.0 = Release|x86
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ABSTRACT_ACCESSORHOLDER_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForBuiltInTypes/@EntryValue">UseExplicitType</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForOtherTypes/@EntryValue">UseExplicitType</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForSimpleTypes/@EntryValue">UseExplicitType</s:String>
|
||||
@@ -20,6 +21,42 @@
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=MethodPropertyEvent/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue"><Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE_005FFOR_005FJS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue"><Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/UpdatesManger/IsDownloadUpdateDataAllowed/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>
|
||||
@@ -6,7 +6,7 @@
|
||||
<ProductVersion>3.9</ProductVersion>
|
||||
<ProjectGuid>f14673df-df38-44b4-ab1d-99a59182c24c</ProjectGuid>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>Installer</OutputName>
|
||||
<OutputName>FileConverter-setup</OutputName>
|
||||
<OutputType>Package</OutputType>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
@@ -30,6 +30,7 @@
|
||||
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Languages.wxs" />
|
||||
<Compile Include="Product.wxs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
@@ -39,6 +40,14 @@
|
||||
</WixExtension>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Application\FileConverterExtension\FileConverterExtension.csproj">
|
||||
<Name>FileConverterExtension</Name>
|
||||
<Project>{0c44ca69-42d6-4357-bdfd-83069d1aba2f}</Project>
|
||||
<Private>True</Private>
|
||||
<DoNotHarvest>True</DoNotHarvest>
|
||||
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
|
||||
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Application\FileConverter\FileConverter.csproj">
|
||||
<Name>FileConverter</Name>
|
||||
<Project>{d27a76d2-43e4-43cc-9da3-334b0b46f4e5}</Project>
|
||||
@@ -52,6 +61,11 @@
|
||||
<Content Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" />
|
||||
<!-- congigure the project to sign the installer. Comment this line to produce an unsigned installer. -->
|
||||
<Import Project=".\Installer.sign" />
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>"C:\Program Files (x86)\WiX Toolset v3.10\bin\heat.exe" dir "$(SolutionDir)Application\FileConverter\$(OutDir)Languages" -gg -template fragment -cg "Languages" -dr "INSTALLFOLDER" -var "var.FileConverter.TargetDir" -out "$(ProjectDir)Languages.wxs"</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Wix.targets.
|
||||
|
||||
@@ -5,31 +5,37 @@
|
||||
<?define Win64 = "yes" ?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
|
||||
<?else ?>
|
||||
<?define ProductName = "File Converter" ?>
|
||||
<?define ProductName = "File Converter (32 bit)" ?>
|
||||
<?define Win64 = "no" ?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
|
||||
<?endif ?>
|
||||
|
||||
<!-- 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.6" Manufacturer="AAllard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
|
||||
<Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" />
|
||||
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.2.1" Manufacturer="Adrien Allard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
|
||||
<?if $(var.Platform) = x64 ?>
|
||||
<Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" />
|
||||
<?else ?>
|
||||
<Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
|
||||
<?endif ?>
|
||||
|
||||
<Icon Id="icon.ico" SourceFile="..\Resources\ApplicationIcon.ico"/>
|
||||
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
|
||||
|
||||
<SetProperty Id="ARPINSTALLLOCATION" Value="[ApplicationFolder]" After="CostFinalize" />
|
||||
|
||||
<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
|
||||
|
||||
<Media Id="1" Cabinet="CabFile.cab" EmbedCab="yes" />
|
||||
|
||||
<Feature Id="ProductFeature" Title="Installer" Level="1">
|
||||
<ComponentGroupRef Id="ProductComponents" />
|
||||
<Feature Id="Application" Title="Installer" Level="1">
|
||||
<ComponentGroupRef Id="ProductComponents" />
|
||||
<ComponentGroupRef Id="Languages" />
|
||||
</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' />
|
||||
|
||||
<CustomAction Id='PostInstallInit' FileKey='FileConverter.exe' ExeCommand='--post-install-init' Return='asyncWait' />
|
||||
|
||||
<InstallExecuteSequence>
|
||||
<Custom Action="InstallShell" After="InstallFiles">NOT Installed</Custom>
|
||||
<Custom Action="UninstallShell" Before="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
|
||||
@@ -40,7 +46,7 @@
|
||||
<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" />
|
||||
<WixVariable Id="WixUIDialogBmp" Value="..\Resources\Installer\UI.bmp" />
|
||||
@@ -55,6 +61,9 @@
|
||||
<Directory Id="$(var.PlatformProgramFilesFolder)">
|
||||
<Directory Id="INSTALLFOLDER" Name="File Converter" />
|
||||
</Directory>
|
||||
<Directory Id="ProgramMenuFolder">
|
||||
<Directory Id="ApplicationStartMenuShortcut" Name="File Converter"/>
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Fragment>
|
||||
|
||||
@@ -62,40 +71,62 @@
|
||||
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
|
||||
<!-- Application -->
|
||||
<Component Guid="{142FBD60-90A7-4753-95CE-7B2A2E20B785}" Win64="$(var.Win64)">
|
||||
<File Id="FileConverter.exe" Source="$(var.FileConverter.TargetPath)" KeyPath="yes" />
|
||||
<File Id="FileConverter.exe" Source="$(var.FileConverter.TargetPath)" KeyPath="yes" Checksum="yes">
|
||||
<Shortcut Id="ApplicationStartMenuShortcut" Directory="ApplicationStartMenuShortcut" Advertise="yes" WorkingDirectory="INSTALLDIR"
|
||||
Name="File Converter" Description="Convert and compress everything in 2 clicks!" Icon="Icon.exe">
|
||||
<Icon Id="Icon.exe" SourceFile="$(var.FileConverter.TargetPath)" />
|
||||
</Shortcut>
|
||||
<Shortcut Id="ApplicationSettingsStartMenuShortcut" Directory="ApplicationStartMenuShortcut" Advertise="yes" WorkingDirectory="INSTALLDIR"
|
||||
Name="File Converter Settings" Description="Configure the conversion and compression presets" Arguments="--settings" Icon="SettingsIcon.exe">
|
||||
<Icon Id="SettingsIcon.exe" SourceFile="$(var.FileConverter.TargetPath)" />
|
||||
</Shortcut>
|
||||
</File>
|
||||
<RemoveFolder Id='RemoveStartMenuDir' Directory='ApplicationStartMenuShortcut' On='uninstall' />
|
||||
</Component>
|
||||
<Component Guid="{1B14FF2D-C82D-4425-A447-DED14CCBEA5C}" Win64="$(var.Win64)">
|
||||
<File Id="FileConverter.exe.config" Source="$(var.FileConverter.TargetDir)FileConverter.exe.config" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
|
||||
<!-- Extension -->
|
||||
<Component Guid="{AA5EA6F7-C443-488B-8E48-7CF000B9AD2A}" Win64="$(var.Win64)">
|
||||
<File Id="FileConverterExtension.dll" KeyPath="yes" Source="..\Application\FileConverterExtension\bin\$(var.Configuration)\FileConverterExtension.dll" />
|
||||
<File Id="FileConverterExtension.dll" Source="$(var.FileConverterExtension.TargetDir)FileConverterExtension.dll" KeyPath="yes" Checksum="yes" />
|
||||
</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" />
|
||||
<File Id="SharpShell.dll" Source="$(var.FileConverterExtension.TargetDir)SharpShell.dll" KeyPath="yes" Checksum="yes"/>
|
||||
</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" />
|
||||
<File Id="srm.exe" Source="..\packages\SharpShellTools.2.2.0.0\lib\srm.exe" KeyPath="yes" Checksum="yes"/>
|
||||
</Component>
|
||||
|
||||
<!-- Third parties -->
|
||||
<Component Guid="{1790B82E-86BC-4B95-AA1D-9859FF3B6CA4}" Win64="$(var.Win64)">
|
||||
<File Source="..\Middleware\ffmpeg.exe" KeyPath="yes" />
|
||||
<File Source="$(var.FileConverter.TargetDir)ffmpeg.exe" KeyPath="yes" Checksum="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" />
|
||||
<File Id="Magick.NET.dll" Source="$(var.FileConverter.TargetDir)Magick.NET-Q16-AnyCPU.dll" KeyPath="yes" Checksum="yes"/>
|
||||
</Component>
|
||||
<Component Guid="{C28EDCA8-AE86-4672-8B14-6686AC35F5E6}" Win64="$(var.Win64)">
|
||||
<File Id="gsdll64.dll" Source="$(var.FileConverter.TargetDir)gsdll32.dll" KeyPath="yes" Checksum="yes"/>
|
||||
</Component>
|
||||
<Component Guid="{6AC1B233-477A-42CF-8F6F-87CA22295BE0}" Win64="$(var.Win64)">
|
||||
<File Id="gswin64c.exe" Source="$(var.FileConverter.TargetDir)gswin32c.exe" KeyPath="yes" Checksum="yes"/>
|
||||
</Component>
|
||||
<Component Guid="{E1B1C09C-B089-40D8-859B-0E55F640CAE1}" Win64="$(var.Win64)">
|
||||
<File Id="Markdown.Xaml.dll" KeyPath="yes" Source="..\Middleware\Markdown.Xaml.dll" />
|
||||
<File Id="Markdown.Xaml.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)Markdown.Xaml.dll" Checksum="yes"/>
|
||||
</Component>
|
||||
<Component Guid="{55CD0B47-D5B0-4F0C-A54E-3E11DF345B48}" Win64="$(var.Win64)">
|
||||
<File Id="Ripper.dll" KeyPath="yes" Source="..\Middleware\Ripper.dll" />
|
||||
<File Id="Ripper.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)Ripper.dll" Checksum="yes"/>
|
||||
</Component>
|
||||
<Component Guid="{3CE6CF1B-431C-41FD-8381-3F73EDAF7B8A}" Win64="$(var.Win64)">
|
||||
<File Id="yeti.mmedia.dll" KeyPath="yes" Source="..\Middleware\yeti.mmedia.dll" />
|
||||
<File Id="yeti.mmedia.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)yeti.mmedia.dll" Checksum="yes"/>
|
||||
</Component>
|
||||
<Component Guid="{0FC2EE41-35DB-49B1-8FD6-77E57254A6A5}" Win64="$(var.Win64)">
|
||||
<File Id="WpfAnimatedGif.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)WpfAnimatedGif.dll" Checksum="yes"/>
|
||||
</Component>
|
||||
|
||||
<!-- Configuration and documentation -->
|
||||
<Component Guid="{86AEF5B3-C25B-4662-BAEF-20969D1821A5}" Win64="$(var.Win64)">
|
||||
<File Source="..\Application\FileConverter\Settings.default.xml" KeyPath="yes" />
|
||||
<File Source="$(var.FileConverter.ProjectDir)\Settings.default.xml" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Guid="{A5158756-A107-4010-9E2F-3C0333F5A5F6}" Win64="$(var.Win64)">
|
||||
<File Source="..\README.md" KeyPath="yes" />
|
||||
@@ -109,9 +140,9 @@
|
||||
|
||||
<!-- Registry entries -->
|
||||
<Component Id="RegistryEntries" Guid="{C3EF3D67-0206-4DBD-B2EA-78FF2E290093}">
|
||||
<RegistryKey Root="HKCU" Key="Software\FileConverter" Action="createAndRemoveOnUninstall">
|
||||
<RegistryKey Root="HKCU" Key="Software\FileConverter" ForceDeleteOnUninstall="yes">
|
||||
<RegistryValue Name="Path" Type="string" Value="[INSTALLFOLDER]FileConverter.exe"/>
|
||||
<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"/>
|
||||
<RegistryValue Name="CompatibleInputExtensions" Type="string" Value="3gp;aac;aiff;ape;avi;bik;bmp;cda;doc;docx;exr;flac;flv;gif;ico;jpg;jpeg;m4a;m4v;mkv;mov;mp3;mp4;mpeg;odp;ods;odt;oga;ogg;ogv;pdf;png;ppt;pptx;psd;svg;tga;tiff;vob;wav;webm;webp;wma;wmv;xls;xlsx"/>
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
</ComponentGroup>
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
|
||||
You can download it here: [www.file-converter.org](http://file-converter.org/?from=readme.md).
|
||||
|
||||
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).
|
||||
You can find more information about what's in File converter and how to use it on the [wiki](http://github.com/Tichau/FileConverter/wiki).
|
||||
|
||||
You can help this project by contributing on [Github](http://github.com/Tichau/FileConverter/) or by making a donation on [Pledgie](http://pledgie.com/campaigns/31615) :).
|
||||
|
||||
## Thanks
|
||||
|
||||
@@ -18,6 +20,9 @@ Thanks to ffmpeg devs for this awesome open source file conversion tool. [Web si
|
||||
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/)
|
||||
|
||||
**Ghostscript** as pdf edition software.
|
||||
Thanks to ghostscript devs. [Download link](http://www.ghostscript.com/download/gsdnld.html)
|
||||
|
||||
**SharpShell** to easily create windows context menu extensions.
|
||||
Thanks to Dave Kerr for his work on SharpShell. [CodePlex link](https://sharpshell.codeplex.com/)
|
||||
|
||||
@@ -25,7 +30,10 @@ Thanks to Dave Kerr for his work on SharpShell. [CodePlex link](https://sharpshe
|
||||
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)
|
||||
Thanks to Bevan Arps for his work on Markdown.XAML. [GitHub link](http://github.com/theunrepentantgeek/Markdown.XAML)
|
||||
|
||||
**WpfAnimatedGif** for animated gif rendering in the wpf application.
|
||||
Thanks to Thomas Levesque for his work on WpfAnimatedGif. [GitHub link](http://github.com/XamlAnimatedGif/WpfAnimatedGif)
|
||||
|
||||
## License
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 294 KiB After Width: | Height: | Size: 117 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
@@ -0,0 +1,9 @@
|
||||
# File Converter Colors
|
||||
|
||||
Color | Code | Description
|
||||
------------|-----------|-------------------------------
|
||||
Blue | #0171BB | File Converter main color
|
||||
Dark Blue | #004B82 | File Converter main dark color
|
||||
Red | #FF4100 | Error
|
||||
Red | #DF3900 | Title
|
||||
Grey | #786C71 | Light text
|
||||
@@ -0,0 +1,506 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<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"
|
||||
viewBox="0 0 829.99998 880.00003"
|
||||
stroke-miterlimit="10"
|
||||
id="svg2"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="File Converter Compatible File Formats.svg"
|
||||
width="830"
|
||||
height="880"
|
||||
style="fill:none;stroke:none;stroke-linecap:square;stroke-miterlimit:10">
|
||||
<metadata
|
||||
id="metadata189">
|
||||
<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></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs187" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1289"
|
||||
inkscape:window-height="745"
|
||||
id="namedview185"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.30590438"
|
||||
inkscape:cx="364.38846"
|
||||
inkscape:cy="385.74146"
|
||||
inkscape:window-x="69"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg2" />
|
||||
<clipPath
|
||||
id="p.0">
|
||||
<path
|
||||
d="m 0,0 728.7769,0 0,771.4829 L 0,771.4829 0,0 Z"
|
||||
id="path5"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:nonzero" />
|
||||
</clipPath>
|
||||
<g
|
||||
clip-path="url(#p.0)"
|
||||
id="g7"
|
||||
transform="matrix(1.1388945,0,0,1.1406604,0,2.849438e-5)">
|
||||
<path
|
||||
d="m 0,0 728.7769,0 0,771.4829 -728.7769,0 z"
|
||||
id="path9"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 364.37796,-0.00656168 364.37796,0 0,771.49610168 -364.37796,0 z"
|
||||
id="path11"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#0171bb;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 0,0 364.37796,0 0,771.49603 -364.37796,0 z"
|
||||
id="path13"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 51.44882,33.925198 236.91339,0 0,87.307082 -236.91339,0 z"
|
||||
id="path15"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#0171bb;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 57.53806,33.925198 226.4252,0 0,40.37795 -226.4252,0 z"
|
||||
id="path17"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 153.67464,60.845196 -0.98438,-3.234375 -4.95312,0 -0.98438,3.234375 -3.09375,0 4.78125,-13.625 3.51563,0 4.8125,13.625 -3.09375,0 z m -1.67188,-5.640625 q -1.35937,-4.390625 -1.53125,-4.953125 -0.17187,-0.578125 -0.25,-0.921875 -0.3125,1.1875 -1.75,5.875 l 3.53125,0 z m 13.3561,5.640625 -0.375,-1.328125 -0.15625,0 q -0.45313,0.71875 -1.29688,1.125 -0.82812,0.390625 -1.89062,0.390625 -1.82813,0 -2.76563,-0.96875 -0.92187,-0.984375 -0.92187,-2.828125 l 0,-6.765625 2.84375,0 0,6.0625 q 0,1.125 0.39062,1.6875 0.40625,0.5625 1.26563,0.5625 1.1875,0 1.71875,-0.796875 0.53125,-0.796875 0.53125,-2.640625 l 0,-4.875 2.82812,0 0,10.375 -2.17187,0 z m 8.19888,0.1875 q -1.82812,0 -2.875,-1.421875 -1.03125,-1.421875 -1.03125,-3.9375 0,-2.546875 1.0625,-3.96875 1.0625,-1.421875 2.92188,-1.421875 1.95312,0 2.98437,1.515625 l 0.0937,0 q -0.21875,-1.15625 -0.21875,-2.0625 l 0,-3.328125 2.84375,0 0,14.4375 -2.17187,0 -0.54688,-1.34375 -0.125,0 q -0.95312,1.53125 -2.9375,1.53125 z m 1,-2.25 q 1.07813,0 1.57813,-0.625 0.51562,-0.640625 0.5625,-2.15625 l 0,-0.3125 q 0,-1.65625 -0.51563,-2.375 -0.51562,-0.734375 -1.67187,-0.734375 -0.95313,0 -1.48438,0.8125 -0.51562,0.796875 -0.51562,2.328125 0,1.53125 0.53125,2.296875 0.53125,0.765625 1.51562,0.765625 z m 7.39966,-10.984375 q 0,-1.390625 1.54687,-1.390625 1.53125,0 1.53125,1.390625 0,0.65625 -0.39062,1.03125 -0.375,0.359375 -1.14063,0.359375 -1.54687,0 -1.54687,-1.390625 z m 2.95312,13.046875 -2.82812,0 0,-10.375 2.82812,0 0,10.375 z m 5.11532,-5.203125 q 0,1.53125 0.5,2.328125 0.51562,0.78125 1.65625,0.78125 1.125,0 1.625,-0.78125 0.5,-0.78125 0.5,-2.328125 0,-1.546875 -0.5,-2.3125 -0.5,-0.765625 -1.64063,-0.765625 -1.14062,0 -1.64062,0.765625 -0.5,0.765625 -0.5,2.3125 z m 7.17187,0 q 0,2.53125 -1.34375,3.96875 -1.32812,1.421875 -3.70312,1.421875 -1.5,0 -2.64063,-0.65625 -1.14062,-0.65625 -1.75,-1.875 -0.60937,-1.234375 -0.60937,-2.859375 0,-2.546875 1.3125,-3.953125 1.32812,-1.40625 3.73437,-1.40625 1.5,0 2.64063,0.65625 1.14062,0.640625 1.75,1.859375 0.60937,1.203125 0.60937,2.84375 z"
|
||||
id="path19"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 57.53806,74.30315 226.4252,0 0,46.92914 -226.4252,0 z"
|
||||
id="path21"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 74.43568,89.025024 q 0.578125,0 1.03125,0.3125 0.453125,0.3125 0.71875,0.90625 l 0.0625,0 0.421875,-1.09375 0.8125,0 -1.484375,6.953125 -0.84375,0 0.171875,-1.328125 -0.04687,0 q -1.140625,1.453125 -2.40625,1.453125 -0.875,0 -1.375,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.328125 0.453125,-2.453125 0.453125,-1.125 1.234375,-1.765625 0.796875,-0.640625 1.75,-0.640625 z m -1.21875,6.328125 q 0.625,0 1.234375,-0.59375 0.609375,-0.59375 0.984375,-1.53125 0.390625,-0.9375 0.390625,-1.890625 0,-0.65625 -0.359375,-1.03125 -0.359375,-0.390625 -0.9375,-0.390625 -0.65625,0 -1.234375,0.546875 -0.5625,0.546875 -0.890625,1.484375 -0.3125,0.921875 -0.3125,1.953125 0,0.734375 0.296875,1.09375 0.296875,0.359375 0.828125,0.359375 z m 8.748367,-6.328125 q 0.578125,0 1.03125,0.3125 0.453125,0.3125 0.71875,0.90625 l 0.0625,0 0.421875,-1.09375 0.8125,0 -1.484375,6.953125 -0.84375,0 0.171875,-1.328125 -0.04687,0 q -1.140625,1.453125 -2.40625,1.453125 -0.875,0 -1.375,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.328125 0.453125,-2.453125 0.453125,-1.125 1.234375,-1.765625 0.796875,-0.640625 1.75,-0.640625 z m -1.21875,6.328125 q 0.625,0 1.234375,-0.59375 0.609375,-0.59375 0.984375,-1.53125 0.390625,-0.9375 0.390625,-1.890625 0,-0.65625 -0.359375,-1.03125 -0.359375,-0.390625 -0.9375,-0.390625 -0.65625,0 -1.234375,0.546875 -0.5625,0.546875 -0.890625,1.484375 -0.3125,0.921875 -0.3125,1.953125 0,0.734375 0.296875,1.09375 0.296875,0.359375 0.828125,0.359375 z m 7.904617,0.875 q -1.234375,0 -1.921875,-0.671875 -0.671875,-0.6875 -0.671875,-1.921875 0,-1.265625 0.46875,-2.34375 0.46875,-1.078125 1.296875,-1.671875 0.828125,-0.59375 1.859375,-0.59375 0.875,0 1.703125,0.3125 l -0.296875,0.90625 q -0.765625,-0.328125 -1.390625,-0.328125 -0.703125,0 -1.296875,0.484375 -0.59375,0.484375 -0.921875,1.359375 -0.328125,0.859375 -0.328125,1.875 0,0.8125 0.421875,1.265625 0.421875,0.453125 1.15625,0.453125 0.46875,0 0.875,-0.125 0.40625,-0.140625 0.796875,-0.3125 l 0,0.921875 q -0.796875,0.390625 -1.75,0.390625 z m 4.62526,-1.640625 0.04687,0.15625 q -0.703125,1.484375 -1.703125,3.03125 l -0.828125,0 q 0.8125,-1.8125 1.296875,-3.1875 l 1.1875,0 z m 8.882816,-5.5625 q 0.57812,0 1.03125,0.3125 0.45312,0.3125 0.71875,0.90625 l 0.0625,0 0.42187,-1.09375 0.8125,0 -1.48437,6.953125 -0.84375,0 0.17187,-1.328125 -0.0469,0 q -1.14063,1.453125 -2.40625,1.453125 -0.875004,0 -1.375004,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.328125 0.453125,-2.453125 0.453125,-1.125 1.234379,-1.765625 0.79687,-0.640625 1.75,-0.640625 z m -1.21875,6.328125 q 0.625,0 1.23437,-0.59375 0.60938,-0.59375 0.98438,-1.53125 0.39062,-0.9375 0.39062,-1.890625 0,-0.65625 -0.35937,-1.03125 -0.35938,-0.390625 -0.9375,-0.390625 -0.65625,0 -1.23438,0.546875 -0.5625,0.546875 -0.89062,1.484375 -0.312504,0.921875 -0.312504,1.953125 0,0.734375 0.296874,1.09375 0.29688,0.359375 0.82813,0.359375 z m 6.12336,0.75 -1.0625,0 1.48438,-6.953125 1.0625,0 -1.48438,6.953125 z m 0.71875,-8.734375 q 0,-0.359375 0.20313,-0.578125 0.20312,-0.234375 0.53125,-0.234375 0.5625,0 0.5625,0.578125 0,0.34375 -0.21875,0.59375 -0.21875,0.234375 -0.48438,0.234375 -0.26562,0 -0.4375,-0.15625 -0.15625,-0.15625 -0.15625,-0.4375 z m 0.5716,11.859375 q -0.4375,0 -0.79688,-0.140625 l 0,-0.890625 q 0.40625,0.140625 0.70313,0.140625 0.48437,0 0.75,-0.390625 0.26562,-0.390625 0.42187,-1.125 l 1.4375,-6.875 -1.21875,0 0.0781,-0.421875 1.3125,-0.421875 0.14062,-0.625 q 0.29688,-1.28125 0.8125,-1.796875 0.51563,-0.53125 1.53125,-0.53125 0.25,0 0.60938,0.07813 0.375,0.07813 0.57812,0.15625 l -0.26562,0.828125 q -0.48438,-0.1875 -0.875,-0.1875 -0.54688,0 -0.84375,0.3125 -0.29688,0.296875 -0.48438,1.125 l -0.15625,0.6875 1.51563,0 -0.15625,0.796875 -1.51563,0 -1.46875,6.96875 q -0.25,1.203125 -0.76562,1.75 -0.51563,0.5625 -1.34375,0.5625 z m 4.17155,0 q -0.4375,0 -0.79687,-0.140625 l 0,-0.890625 q 0.40625,0.140625 0.70312,0.140625 0.48438,0 0.75,-0.390625 0.26563,-0.390625 0.42188,-1.125 l 1.4375,-6.875 -1.21875,0 0.0781,-0.421875 1.3125,-0.421875 0.14063,-0.625 q 0.29687,-1.28125 0.8125,-1.796875 0.51562,-0.53125 1.53125,-0.53125 0.25,0 0.60937,0.07813 0.375,0.07813 0.57813,0.15625 l -0.26563,0.828125 q -0.48437,-0.1875 -0.875,-0.1875 -0.54687,0 -0.84375,0.3125 -0.29687,0.296875 -0.48437,1.125 l -0.15625,0.6875 1.51562,0 -0.15625,0.796875 -1.51562,0 -1.46875,6.96875 q -0.25,1.203125 -0.76563,1.75 -0.51562,0.5625 -1.34375,0.5625 z m 6.67156,-4.640625 0.0469,0.15625 q -0.70312,1.484375 -1.70312,3.03125 l -0.82813,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 8.88282,-5.5625 q 0.57812,0 1.03125,0.3125 0.45312,0.3125 0.71875,0.90625 l 0.0625,0 0.42187,-1.09375 0.8125,0 -1.48437,6.953125 -0.84375,0 0.17187,-1.328125 -0.0469,0 q -1.14064,1.453125 -2.40626,1.453125 -0.875,0 -1.375,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.328125 0.45312,-2.453125 0.45313,-1.125 1.23438,-1.765625 0.79687,-0.640625 1.75001,-0.640625 z m -1.21876,6.328125 q 0.625,0 1.23438,-0.59375 0.60938,-0.59375 0.98438,-1.53125 0.39062,-0.9375 0.39062,-1.890625 0,-0.65625 -0.Line truncated
|
||||
id="path23"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 117.60178,105.05627 q 1.20312,0 1.90625,0.71875 0.70312,0.70313 0.70312,1.95313 0,1.20312 -0.46875,2.26562 -0.45312,1.0625 -1.23437,1.64063 -0.78125,0.57812 -1.76563,0.57812 -1.21875,0 -1.90625,-0.71875 -0.6875,-0.71875 -0.6875,-1.96875 0,-1.20312 0.45313,-2.26562 0.46875,-1.0625 1.25,-1.625 0.79687,-0.57813 1.75,-0.57813 z m 1.5,2.53125 q 0,-0.73437 -0.40625,-1.1875 -0.39063,-0.45312 -1.0625,-0.45312 -0.6875,0 -1.25,0.46875 -0.54688,0.46875 -0.84375,1.3125 -0.29688,0.82812 -0.29688,1.85937 0,0.82813 0.39063,1.28125 0.40625,0.45313 1.17187,0.45313 0.65625,0 1.17188,-0.45313 0.53125,-0.46875 0.82812,-1.32812 0.29688,-0.85938 0.29688,-1.95313 z m 8.8838,-2.4375 -0.15625,0.67188 -1.34375,0.15625 q 0.26563,0.39062 0.26563,1 0,1.21875 -0.75,1.9375 -0.73438,0.71875 -1.96875,0.71875 -0.35938,0 -0.53125,-0.0469 -0.89063,0.32813 -0.89063,0.82813 0,0.26562 0.20313,0.35937 0.21875,0.0781 0.625,0.125 l 0.73437,0.0781 q 1.15625,0.14062 1.67188,0.5625 0.51562,0.42187 0.51562,1.23437 0,1.17188 -0.9375,1.8125 -0.92187,0.64063 -2.59375,0.64063 -1.23437,0 -1.9375,-0.46875 -0.70312,-0.46875 -0.70312,-1.3125 0,-0.67188 0.46875,-1.17188 0.45312,-0.48437 1.46875,-0.8125 -0.48438,-0.26562 -0.48438,-0.78125 0,-0.4375 0.3125,-0.75 0.32813,-0.3125 0.90625,-0.57812 -0.40625,-0.20313 -0.65625,-0.59375 -0.25,-0.40625 -0.25,-0.9375 0,-1.23438 0.75,-2.01563 0.76563,-0.78125 1.95313,-0.78125 0.48437,0 0.96875,0.125 l 2.35937,0 z m -6.76562,8.1875 q 0,0.5 0.40625,0.78125 0.42187,0.28125 1.23437,0.28125 1.15625,0 1.79688,-0.40625 0.65625,-0.40625 0.65625,-1.14062 0,-0.39063 -0.34375,-0.625 -0.34375,-0.21875 -1.15625,-0.3125 l -1.01563,-0.0937 q -0.76562,0.15625 -1.17187,0.54687 -0.40625,0.40625 -0.40625,0.96875 z m 1.76562,-5.54687 q 0,0.53125 0.28125,0.8125 0.29688,0.28125 0.79688,0.28125 0.5,0 0.875,-0.26563 0.375,-0.26562 0.57812,-0.71875 0.20313,-0.46875 0.20313,-1.01562 0,-0.53125 -0.28125,-0.79688 -0.28125,-0.28125 -0.79688,-0.28125 -0.5,0 -0.875,0.26563 -0.35937,0.25 -0.57812,0.71875 -0.20313,0.45312 -0.20313,1 z m 8.7552,-2.76563 q 0.57813,0 1.03125,0.3125 0.45313,0.3125 0.71875,0.90625 l 0.0625,0 0.42188,-1.09375 0.8125,0 -1.48438,6.95313 -0.84375,0 0.17188,-1.32813 -0.0469,0 q -1.14062,1.45313 -2.40625,1.45313 -0.875,0 -1.375,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.32813 0.45313,-2.45313 0.45312,-1.125 1.23437,-1.76562 0.79688,-0.64063 1.75,-0.64063 z m -1.21875,6.32813 q 0.625,0 1.23438,-0.59375 0.60937,-0.59375 0.98437,-1.53125 0.39063,-0.9375 0.39063,-1.89063 0,-0.65625 -0.35938,-1.03125 -0.35937,-0.39062 -0.9375,-0.39062 -0.65625,0 -1.23437,0.54687 -0.5625,0.54688 -0.89063,1.48438 -0.3125,0.92187 -0.3125,1.95312 0,0.73438 0.29688,1.09375 0.29687,0.35938 0.82812,0.35938 z m 6.52962,-0.76563 0.0469,0.15625 q -0.70313,1.48438 -1.70313,3.03125 l -0.82812,0 q 0.8125,-1.8125 1.29687,-3.1875 l 1.1875,0 z m 8.89844,-5.53125 q 1.20312,0 1.90625,0.71875 0.70312,0.70313 0.70312,1.95313 0,1.20312 -0.46875,2.26562 -0.45312,1.0625 -1.23437,1.64063 -0.78125,0.57812 -1.76563,0.57812 -1.21875,0 -1.90625,-0.71875 -0.6875,-0.71875 -0.6875,-1.96875 0,-1.20312 0.45313,-2.26562 0.46875,-1.0625 1.25,-1.625 0.79687,-0.57813 1.75,-0.57813 z m 1.5,2.53125 q 0,-0.73437 -0.40625,-1.1875 -0.39063,-0.45312 -1.0625,-0.45312 -0.6875,0 -1.25,0.46875 -0.54688,0.46875 -0.84375,1.3125 -0.29688,0.82812 -0.29688,1.85937 0,0.82813 0.39063,1.28125 0.40625,0.45313 1.17187,0.45313 0.65625,0 1.17188,-0.45313 0.53125,-0.46875 0.82812,-1.32812 0.29688,-0.85938 0.29688,-1.95313 z m 8.8838,-2.4375 -0.15625,0.67188 -1.34375,0.15625 q 0.26563,0.39062 0.26563,1 0,1.21875 -0.75,1.9375 -0.73438,0.71875 -1.96875,0.71875 -0.35938,0 -0.53125,-0.0469 -0.89063,0.32813 -0.89063,0.82813 0,0.26562 0.20313,0.35937 0.21875,0.0781 0.625,0.125 l 0.73437,0.0781 q 1.15625,0.14062 1.67188,0.5625 0.51562,0.42187 0.51562,1.23437 0,1.17188 -0.9375,1.8125 -0.92187,0.64063 -2.59375,0.64063 -1.23437,0 -1.9375,-0.46875 -0.70312,-0.46875 -0.70312,-1.3125 0,-0.67188 0.46875,-1.17188 0.45312,-0.48437 1.46875,-0.8125 -0.48438,-0.26562 -0.48438,-0.78125 0,-0.4375 0.3125,-0.75 0.32813,-0.3125 0.90625,-0.57812 -0.40625,-0.20313 -0.65625,-0.59375 -0.25,-0.40625 -0.25,-0.9375 0,-1.23438 0.75,-2.01563 0.76563,-0.78125 1.95313,-0.78125 0.48437,0 0.96875,0.125 l 2.35937,0 z m -6.76562,8.1875 q 0,0.5 0.40625,0.78125 0.42187,0.28125 1.23437,0.28125 1.15625,0 1.79688,-0.40625 0.65625,-0.40625 0.65625,-1.14062 0,-0.39063 -0.34375,-0.625 -0.34375,-0.21875 -1.15625,-0.3125 l -1.01563,-0.0937 q -0.76562,0.15625 -1.17187,0.54687 -0.40625,0.40625 -0.40625,0.96875 z m 1.76562,-5.54687 q 0,0.53125 0.28125,0.8125 0.29688,0.28125 0.79688,0.28125 0.5,0 0.875,-0.26563 0.375,-0.26562 0.57812,-0.71875 0.20313,-0.46875 0.20313,-1.01562 0,-0.53125 -0.28125,-0.79688 -0.28125,-0.28125 -0.79688,-0.28125 -0.5,0 -0.875,0.26563 -0.35937,0.25 -0.57812,0.71875 -0.20313,0.45312 -0.20313,1 z m 11.67708,-2.64063 -0.15625,0.67188 -1.34375,0.15625 q 0.26562,0.39062 0.26562,1 0,1.21875 -0.75,1.9375 -0.73437,0.71875 -1.96875,0.71875 Line truncated
|
||||
id="path25"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 443.9685,40.06168 236.91339,0 0,75.02362 -236.91339,0 z"
|
||||
id="path27"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 449.2126,40.069553 226.42523,0 0,40.377956 -226.42523,0 z"
|
||||
id="path29"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 545.3492,66.989555 -0.98438,-3.234379 -4.95312,0 -0.98438,3.234379 -3.09375,0 4.78125,-13.625004 3.51563,0 4.8125,13.625004 -3.09375,0 z m -1.67188,-5.640629 q -1.35937,-4.390625 -1.53125,-4.953125 -0.17187,-0.578125 -0.25,-0.921875 -0.3125,1.1875 -1.75,5.875 l 3.53125,0 z m 13.35608,5.640629 -0.375,-1.328125 -0.15625,0 q -0.45312,0.71875 -1.29687,1.125 -0.82813,0.390625 -1.89063,0.390625 -1.82812,0 -2.76562,-0.96875 -0.92188,-0.984375 -0.92188,-2.828129 l 0,-6.765625 2.84375,0 0,6.0625 q 0,1.125 0.39063,1.687504 0.40625,0.5625 1.26562,0.5625 1.1875,0 1.71875,-0.796875 0.53125,-0.796879 0.53125,-2.640629 l 0,-4.875 2.82813,0 0,10.375004 -2.17188,0 z m 8.19892,0.1875 q -1.82813,0 -2.875,-1.421875 -1.03125,-1.421875 -1.03125,-3.937504 0,-2.546875 1.0625,-3.96875 1.0625,-1.421875 2.92187,-1.421875 1.95313,0 2.98438,1.515625 l 0.0937,0 q -0.21875,-1.15625 -0.21875,-2.0625 l 0,-3.328125 2.84375,0 0,14.437504 -2.17188,0 -0.54687,-1.34375 -0.125,0 q -0.95313,1.53125 -2.9375,1.53125 z m 1,-2.25 q 1.07812,0 1.57812,-0.625 0.51563,-0.640629 0.5625,-2.156254 l 0,-0.3125 q 0,-1.65625 -0.51562,-2.375 -0.51563,-0.734375 -1.67188,-0.734375 -0.95312,0 -1.48437,0.8125 -0.51563,0.796875 -0.51563,2.328125 0,1.53125 0.53125,2.296879 0.53125,0.765625 1.51563,0.765625 z m 7.39966,-10.984379 q 0,-1.390625 1.54687,-1.390625 1.53125,0 1.53125,1.390625 0,0.65625 -0.39062,1.03125 -0.375,0.359375 -1.14063,0.359375 -1.54687,0 -1.54687,-1.390625 z m 2.95312,13.046879 -2.82812,0 0,-10.375004 2.82812,0 0,10.375004 z m 5.1153,-5.203129 q 0,1.53125 0.5,2.328129 0.51562,0.78125 1.65625,0.78125 1.125,0 1.625,-0.78125 0.5,-0.781254 0.5,-2.328129 0,-1.546875 -0.5,-2.3125 -0.5,-0.765625 -1.64063,-0.765625 -1.14062,0 -1.64062,0.765625 -0.5,0.765625 -0.5,2.3125 z m 7.17187,0 q 0,2.531254 -1.34375,3.968754 -1.32812,1.421875 -3.70312,1.421875 -1.5,0 -2.64063,-0.65625 -1.14062,-0.65625 -1.75,-1.875 -0.60937,-1.234379 -0.60937,-2.859379 0,-2.546875 1.3125,-3.953125 1.32812,-1.40625 3.73437,-1.40625 1.5,0 2.64063,0.65625 1.14062,0.640625 1.75,1.859375 0.60937,1.203125 0.60937,2.84375 z"
|
||||
id="path31"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 449.2126,80.44751 226.42523,0 0,34.64567 -226.42523,0 z"
|
||||
id="path33"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 492.00452,105.37251 q -0.4375,0 -0.79687,-0.14063 l 0,-0.89062 q 0.40625,0.14062 0.70312,0.14062 0.48438,0 0.75,-0.39062 0.26563,-0.39063 0.42188,-1.125 l 1.4375,-6.875005 -1.21875,0 0.0781,-0.421875 1.3125,-0.421875 0.14063,-0.625 q 0.29687,-1.28125 0.8125,-1.796875 0.51562,-0.53125 1.53125,-0.53125 0.25,0 0.60937,0.07813 0.375,0.07813 0.57813,0.15625 l -0.26563,0.828125 q -0.48437,-0.1875 -0.875,-0.1875 -0.54687,0 -0.84375,0.3125 -0.29687,0.296875 -0.48437,1.125 l -0.15625,0.6875 1.51562,0 -0.15625,0.796875 -1.51562,0 -1.46875,6.96876 q -0.25,1.20312 -0.76563,1.75 -0.51562,0.5625 -1.34375,0.5625 z m 6.24969,-3.125 -1.0625,0 2.10938,-9.875005 1.0625,0 -2.10938,9.875005 z m 6.02472,-7.07813 q 0.57813,0 1.03125,0.3125 0.45313,0.3125 0.71875,0.90625 l 0.0625,0 0.42188,-1.09375 0.8125,0 -1.48438,6.95313 -0.84375,0 0.17188,-1.32813 -0.0469,0 q -1.14062,1.45313 -2.40625,1.45313 -0.875,0 -1.375,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.32813 0.45313,-2.45313 0.45312,-1.125 1.23437,-1.765625 0.79688,-0.640625 1.75,-0.640625 z m -1.21875,6.32813 q 0.625,0 1.23438,-0.59375 0.60937,-0.59375 0.98437,-1.531255 0.39063,-0.9375 0.39063,-1.890625 0,-0.65625 -0.35938,-1.03125 -0.35937,-0.390625 -0.9375,-0.390625 -0.65625,0 -1.23437,0.546875 -0.5625,0.546875 -0.89063,1.484375 -0.3125,0.921875 -0.3125,1.953125 0,0.73438 0.29688,1.09375 0.29687,0.35938 0.82812,0.35938 z m 7.90461,0.875 q -1.23438,0 -1.92188,-0.67188 -0.67187,-0.6875 -0.67187,-1.921875 0,-1.265625 0.46875,-2.34375 0.46875,-1.078125 1.29687,-1.671875 0.82813,-0.59375 1.85938,-0.59375 0.875,0 1.70312,0.3125 l -0.29687,0.90625 q -0.76563,-0.328125 -1.39063,-0.328125 -0.70312,0 -1.29687,0.484375 -0.59375,0.484375 -0.92188,1.359375 -0.32812,0.859375 -0.32812,1.875 0,0.812505 0.42187,1.265625 0.42188,0.45313 1.15625,0.45313 0.46875,0 0.875,-0.125 0.40625,-0.14063 0.79688,-0.3125 l 0,0.92187 q -0.79688,0.39063 -1.75,0.39063 z m 4.62524,-1.64063 0.0469,0.15625 q -0.70312,1.48438 -1.70312,3.03125 l -0.82813,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 8.88281,-5.5625 q 0.57813,0 1.03125,0.3125 0.45313,0.3125 0.71875,0.90625 l 0.0625,0 0.42188,-1.09375 0.8125,0 -1.48438,6.95313 -0.84375,0 0.17188,-1.32813 -0.0469,0 q -1.14062,1.45313 -2.40625,1.45313 -0.875,0 -1.375,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.32813 0.45313,-2.45313 0.45312,-1.125 1.23437,-1.765625 0.79688,-0.640625 1.75,-0.640625 z m -1.21875,6.32813 q 0.625,0 1.23438,-0.59375 0.60937,-0.59375 0.98437,-1.531255 0.39063,-0.9375 0.39063,-1.890625 0,-0.65625 -0.35938,-1.03125 -0.35937,-0.390625 -0.9375,-0.390625 -0.65625,0 -1.23437,0.546875 -0.5625,0.546875 -0.89063,1.484375 -0.3125,0.921875 -0.3125,1.953125 0,0.73438 0.29688,1.09375 0.29687,0.35938 0.82812,0.35938 z m 8.74842,-6.32813 q 0.57812,0 1.03125,0.3125 0.45312,0.3125 0.71875,0.90625 l 0.0625,0 0.42187,-1.09375 0.8125,0 -1.48437,6.95313 -0.84375,0 0.17187,-1.32813 -0.0469,0 q -1.14063,1.45313 -2.40625,1.45313 -0.875,0 -1.375,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.32813 0.45312,-2.45313 0.45313,-1.125 1.23438,-1.765625 0.79687,-0.640625 1.75,-0.640625 z m -1.21875,6.32813 q 0.625,0 1.23437,-0.59375 0.60938,-0.59375 0.98438,-1.531255 0.39062,-0.9375 0.39062,-1.890625 0,-0.65625 -0.35937,-1.03125 -0.35938,-0.390625 -0.9375,-0.390625 -0.65625,0 -1.23438,0.546875 -0.5625,0.546875 -0.89062,1.484375 -0.3125,0.921875 -0.3125,1.953125 0,0.73438 0.29687,1.09375 0.29688,0.35938 0.82813,0.35938 z m 7.9046,0.875 q -1.23438,0 -1.92188,-0.67188 -0.67187,-0.6875 -0.67187,-1.921875 0,-1.265625 0.46875,-2.34375 0.46875,-1.078125 1.29687,-1.671875 0.82813,-0.59375 1.85938,-0.59375 0.875,0 1.70312,0.3125 l -0.29687,0.90625 q -0.76563,-0.328125 -1.39063,-0.328125 -0.70312,0 -1.29687,0.484375 -0.59375,0.484375 -0.92188,1.359375 -0.32812,0.859375 -0.32812,1.875 0,0.812505 0.42187,1.265625 0.42188,0.45313 1.15625,0.45313 0.46875,0 0.875,-0.125 0.40625,-0.14063 0.79688,-0.3125 l 0,0.92187 q -0.79688,0.39063 -1.75,0.39063 z m 4.62524,-1.64063 0.0469,0.15625 q -0.70313,1.48438 -1.70313,3.03125 l -0.82812,0 q 0.8125,-1.8125 1.29687,-3.1875 l 1.1875,0 z m 8.89844,-5.53125 q 1.20312,0 1.90625,0.71875 0.70312,0.703125 0.70312,1.953125 0,1.203125 -0.46875,2.265625 -0.45312,1.0625 -1.23437,1.64063 -0.78125,0.57812 -1.76563,0.57812 -1.21875,0 -1.90625,-0.71875 -0.6875,-0.71875 -0.6875,-1.96875 0,-1.203125 0.45313,-2.265625 0.46875,-1.0625 1.25,-1.625 0.79687,-0.578125 1.75,-0.578125 z m 1.5,2.53125 q 0,-0.734375 -0.40625,-1.1875 -0.39063,-0.453125 -1.0625,-0.453125 -0.6875,0 -1.25,0.46875 -0.54688,0.46875 -0.84375,1.3125 -0.29688,0.828125 -0.29688,1.859375 0,0.82813 0.39063,1.28125 0.40625,0.45313 1.17187,0.45313 0.65625,0 1.17188,-0.45313 0.53125,-0.46875 0.82812,-1.328125 0.29688,-0.859375 0.29688,-1.953125 z m 8.88379,-2.4375 -0.15625,0.671875 -1.34375,0.15625 q 0.26562,0.390625 0.26562,1 0,1.21875 -0.75,1.9375 -0.73437,0.71875 -1.96875,0.71875 -0.35937,0 -0.53125,-0.04687 -0.89062,0.328135 -0.89062,0.828135 0,0.26562 0.20312,0.35937 0.21875,0.0781 0.625,0.125 l 0.73438,Line truncated
|
||||
id="path35"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 443.9685,353.6614 236.91339,0 0,75.02362 -236.91339,0 z"
|
||||
id="path37"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 449.2126,353.6614 226.42523,0 0,40.37796 -226.42523,0 z"
|
||||
id="path39"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 495.6842,380.58142 -0.98438,-3.23438 -4.95312,0 -0.98438,3.23438 -3.09375,0 4.78125,-13.625 3.51563,0 4.8125,13.625 -3.09375,0 z m -1.67188,-5.64063 q -1.35937,-4.39062 -1.53125,-4.95312 -0.17187,-0.57813 -0.25,-0.92188 -0.3125,1.1875 -1.75,5.875 l 3.53125,0 z m 15.59046,5.64063 -2.82813,0 0,-6.0625 q 0,-1.125 -0.40625,-1.67188 -0.39062,-0.5625 -1.26562,-0.5625 -1.1875,0 -1.71875,0.79688 -0.53125,0.78125 -0.53125,2.625 l 0,4.875 -2.82813,0 0,-10.375 2.15625,0 0.39063,1.32812 0.15625,0 q 0.46875,-0.75 1.29687,-1.125 0.82813,-0.39062 1.89063,-0.39062 1.8125,0 2.75,0.98437 0.9375,0.96875 0.9375,2.8125 l 0,6.76563 z m 2.55829,-13.04688 q 0,-1.39062 1.54687,-1.39062 1.53125,0 1.53125,1.39062 0,0.65625 -0.39062,1.03125 -0.375,0.35938 -1.14063,0.35938 -1.54687,0 -1.54687,-1.39063 z m 2.95312,13.04688 -2.82812,0 0,-10.375 2.82812,0 0,10.375 z m 12.14655,0 -2.82813,0 0,-6.0625 q 0,-1.125 -0.375,-1.67188 -0.375,-0.5625 -1.17187,-0.5625 -1.09375,0 -1.59375,0.79688 -0.48438,0.79687 -0.48438,2.625 l 0,4.875 -2.82812,0 0,-10.375 2.15625,0 0.39062,1.32812 0.15625,0 q 0.42188,-0.71875 1.20313,-1.10937 0.78125,-0.40625 1.8125,-0.40625 2.32812,0 3.15625,1.51562 l 0.25,0 q 0.40625,-0.71875 1.21875,-1.10937 0.8125,-0.40625 1.84375,-0.40625 1.75,0 2.65625,0.90625 0.90625,0.89062 0.90625,2.89062 l 0,6.76563 -2.82813,0 0,-6.0625 q 0,-1.125 -0.39062,-1.67188 -0.375,-0.5625 -1.17188,-0.5625 -1.04687,0 -1.5625,0.75 -0.51562,0.73438 -0.51562,2.34375 l 0,5.20313 z m 15.63171,0 -0.54687,-1.40625 -0.0781,0 q -0.71875,0.89062 -1.48437,1.25 -0.75,0.34375 -1.95313,0.34375 -1.5,0 -2.35937,-0.84375 -0.85938,-0.85938 -0.85938,-2.4375 0,-1.65625 1.15625,-2.4375 1.15625,-0.78125 3.48438,-0.875 l 1.79687,-0.0469 0,-0.45312 q 0,-1.57813 -1.60937,-1.57813 -1.25,0 -2.92188,0.75 l -0.9375,-1.92187 q 1.78125,-0.92188 3.96875,-0.92188 2.09375,0 3.20313,0.90625 1.10937,0.90625 1.10937,2.76563 l 0,6.90625 -1.96875,0 z m -0.84375,-4.8125 -1.09375,0.0469 q -1.23437,0.0312 -1.84375,0.4375 -0.59375,0.40625 -0.59375,1.25 0,1.1875 1.375,1.1875 0.98438,0 1.5625,-0.5625 0.59375,-0.5625 0.59375,-1.5 l 0,-0.85937 z m 9.89343,2.75 q 0.73438,0 1.78125,-0.32813 l 0,2.10938 q -1.0625,0.46875 -2.60937,0.46875 -1.6875,0 -2.46875,-0.85938 -0.76563,-0.85937 -0.76563,-2.57812 l 0,-5 -1.35937,0 0,-1.1875 1.5625,-0.95313 0.8125,-2.1875 1.8125,0 0,2.20313 2.90625,0 0,2.125 -2.90625,0 0,5 q 0,0.60937 0.32812,0.90625 0.34375,0.28125 0.90625,0.28125 z m 8.02021,-6.48438 q -0.90625,0 -1.42188,0.57813 -0.5,0.5625 -0.57812,1.60937 l 3.96875,0 q -0.0156,-1.04687 -0.54688,-1.60937 -0.51562,-0.57813 -1.42187,-0.57813 z m 0.39062,8.73438 q -2.5,0 -3.90625,-1.375 -1.40625,-1.39063 -1.40625,-3.92188 0,-2.60937 1.29688,-4.03125 1.29687,-1.42187 3.60937,-1.42187 2.1875,0 3.40625,1.25 1.23438,1.25 1.23438,3.45312 l 0,1.375 -6.6875,0 q 0.0469,1.20313 0.71875,1.89063 0.67187,0.67187 1.875,0.67187 0.9375,0 1.76562,-0.1875 0.84375,-0.20312 1.75,-0.625 l 0,2.1875 q -0.75,0.375 -1.59375,0.54688 -0.84375,0.1875 -2.0625,0.1875 z m 9.61627,0 q -1.82812,0 -2.875,-1.42188 -1.03125,-1.42187 -1.03125,-3.9375 0,-2.54687 1.0625,-3.96875 1.0625,-1.42187 2.92188,-1.42187 1.95312,0 2.98437,1.51562 l 0.0937,0 q -0.21875,-1.15625 -0.21875,-2.0625 l 0,-3.32812 2.84375,0 0,14.4375 -2.17187,0 -0.54688,-1.34375 -0.125,0 q -0.95312,1.53125 -2.9375,1.53125 z m 1,-2.25 q 1.07813,0 1.57813,-0.625 0.51562,-0.64063 0.5625,-2.15625 l 0,-0.3125 q 0,-1.65625 -0.51563,-2.375 -0.51562,-0.73438 -1.67187,-0.73438 -0.95313,0 -1.48438,0.8125 -0.51562,0.79688 -0.51562,2.32813 0,1.53125 0.53125,2.29687 0.53125,0.76563 1.51562,0.76563 z m 12.58967,2.0625 0,-13.5625 2.875,0 0,13.5625 -2.875,0 z m 15.2387,0 -2.82812,0 0,-6.0625 q 0,-1.125 -0.375,-1.67188 -0.375,-0.5625 -1.17188,-0.5625 -1.09375,0 -1.59375,0.79688 -0.48437,0.79687 -0.48437,2.625 l 0,4.875 -2.82813,0 0,-10.375 2.15625,0 0.39063,1.32812 0.15625,0 q 0.42187,-0.71875 1.20312,-1.10937 0.78125,-0.40625 1.8125,-0.40625 2.32813,0 3.15625,1.51562 l 0.25,0 q 0.40625,-0.71875 1.21875,-1.10937 0.8125,-0.40625 1.84375,-0.40625 1.75,0 2.65625,0.90625 0.90625,0.89062 0.90625,2.89062 l 0,6.76563 -2.82812,0 0,-6.0625 q 0,-1.125 -0.39063,-1.67188 -0.375,-0.5625 -1.17187,-0.5625 -1.04688,0 -1.5625,0.75 -0.51563,0.73438 -0.51563,2.34375 l 0,5.20313 z m 15.63172,0 -0.54688,-1.40625 -0.0781,0 q -0.71875,0.89062 -1.48438,1.25 -0.75,0.34375 -1.95312,0.34375 -1.5,0 -2.35938,-0.84375 -0.85937,-0.85938 -0.85937,-2.4375 0,-1.65625 1.15625,-2.4375 1.15625,-0.78125 3.48437,-0.875 l 1.79688,-0.0469 0,-0.45312 q 0,-1.57813 -1.60938,-1.57813 -1.25,0 -2.92187,0.75 l -0.9375,-1.92187 q 1.78125,-0.92188 3.96875,-0.92188 2.09375,0 3.20312,0.90625 1.10938,0.90625 1.10938,2.76563 l 0,6.90625 -1.96875,0 z m -0.84375,-4.8125 -1.09375,0.0469 q -1.23438,0.0312 -1.84375,0.4375 -0.59375,0.40625 -0.59375,1.25 0,1.1875 1.375,1.1875 0.98437,0 1.5625,-0.5625 0.59375,-0.5625 0.59375,-1.5 l 0,-0.85937 z m 14.54968,-5.5625 0,1.4375 -1.625,0.42187 q 0.4375,0.6875 0.4375,1.5625 0,1.67188 -1.17187,2.60938 -1Line truncated
|
||||
id="path41"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 449.2126,394.03937 226.42523,0 0,34.64566 -226.42523,0 z"
|
||||
id="path43"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 562.2932,408.88623 -0.15625,0.67187 -1.34375,0.15625 q 0.26562,0.39063 0.26562,1 0,1.21875 -0.75,1.9375 -0.73437,0.71875 -1.96875,0.71875 -0.35937,0 -0.53125,-0.0469 -0.89062,0.32812 -0.89062,0.82812 0,0.26563 0.20312,0.35938 0.21875,0.0781 0.625,0.125 l 0.73438,0.0781 q 1.15625,0.14063 1.67187,0.5625 0.51563,0.42188 0.51563,1.23438 0,1.17187 -0.9375,1.8125 -0.92188,0.64062 -2.59375,0.64062 -1.23438,0 -1.9375,-0.46875 -0.70313,-0.46875 -0.70313,-1.3125 0,-0.67187 0.46875,-1.17187 0.45313,-0.48438 1.46875,-0.8125 -0.48437,-0.26563 -0.48437,-0.78125 0,-0.4375 0.3125,-0.75 0.32812,-0.3125 0.90625,-0.57813 -0.40625,-0.20312 -0.65625,-0.59375 -0.25,-0.40625 -0.25,-0.9375 0,-1.23437 0.75,-2.01562 0.76562,-0.78125 1.95312,-0.78125 0.48438,0 0.96875,0.125 l 2.35938,0 z m -6.76563,8.1875 q 0,0.5 0.40625,0.78125 0.42188,0.28125 1.23438,0.28125 1.15625,0 1.79687,-0.40625 0.65625,-0.40625 0.65625,-1.14063 0,-0.39062 -0.34375,-0.625 -0.34375,-0.21875 -1.15625,-0.3125 l -1.01562,-0.0937 q -0.76563,0.15625 -1.17188,0.54688 -0.40625,0.40625 -0.40625,0.96875 z m 1.76563,-5.54688 q 0,0.53125 0.28125,0.8125 0.29687,0.28125 0.79687,0.28125 0.5,0 0.875,-0.26562 0.375,-0.26563 0.57813,-0.71875 0.20312,-0.46875 0.20312,-1.01563 0,-0.53125 -0.28125,-0.79687 -0.28125,-0.28125 -0.79687,-0.28125 -0.5,0 -0.875,0.26562 -0.35938,0.25 -0.57813,0.71875 -0.20312,0.45313 -0.20312,1 z m 6.13019,4.3125 -1.0625,0 1.48437,-6.95312 1.0625,0 -1.48437,6.95312 z m 0.71875,-8.73437 q 0,-0.35938 0.20312,-0.57813 0.20313,-0.23437 0.53125,-0.23437 0.5625,0 0.5625,0.57812 0,0.34375 -0.21875,0.59375 -0.21875,0.23438 -0.48437,0.23438 -0.26563,0 -0.4375,-0.15625 -0.15625,-0.15625 -0.15625,-0.4375 z m 0.57159,11.85937 q -0.4375,0 -0.79687,-0.14062 l 0,-0.89063 q 0.40625,0.14063 0.70312,0.14063 0.48438,0 0.75,-0.39063 0.26563,-0.39062 0.42188,-1.125 l 1.4375,-6.875 -1.21875,0 0.0781,-0.42187 1.3125,-0.42188 0.14063,-0.625 q 0.29687,-1.28125 0.8125,-1.79687 0.51562,-0.53125 1.53125,-0.53125 0.25,0 0.60937,0.0781 0.375,0.0781 0.57813,0.15625 l -0.26563,0.82813 q -0.48437,-0.1875 -0.875,-0.1875 -0.54687,0 -0.84375,0.3125 -0.29687,0.29687 -0.48437,1.125 l -0.15625,0.6875 1.51562,0 -0.15625,0.79687 -1.51562,0 -1.46875,6.96875 q -0.25,1.20313 -0.76563,1.75 -0.51562,0.5625 -1.34375,0.5625 z"
|
||||
id="path45"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 52.293964,189.76247 236.913376,0 0,102.67717 -236.913376,0 z"
|
||||
id="path47"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#0171bb;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 57.53806,189.76247 226.4252,0 0,40.37796 -226.4252,0 z"
|
||||
id="path49"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 154.08945,203.11996 2.90625,0 -4.60938,13.5625 -3.125,0 -4.60937,-13.5625 2.90625,0 2.54687,8.0625 q 0.21875,0.71875 0.4375,1.67187 0.23438,0.95313 0.28125,1.32813 0.10938,-0.85938 0.70313,-3 l 2.5625,-8.0625 z m 4.04662,0.51562 q 0,-1.39062 1.54687,-1.39062 1.53125,0 1.53125,1.39062 0,0.65625 -0.39062,1.03125 -0.375,0.35938 -1.14063,0.35938 -1.54687,0 -1.54687,-1.39063 z m 2.95312,13.04688 -2.82812,0 0,-10.375 2.82812,0 0,10.375 z m 6.14656,0.1875 q -1.82812,0 -2.875,-1.42188 -1.03125,-1.42187 -1.03125,-3.9375 0,-2.54687 1.0625,-3.96875 1.0625,-1.42187 2.92188,-1.42187 1.95312,0 2.98437,1.51562 l 0.0937,0 q -0.21875,-1.15625 -0.21875,-2.0625 l 0,-3.32812 2.84375,0 0,14.4375 -2.17187,0 -0.54688,-1.34375 -0.125,0 q -0.95312,1.53125 -2.9375,1.53125 z m 1,-2.25 q 1.07813,0 1.57813,-0.625 0.51562,-0.64063 0.5625,-2.15625 l 0,-0.3125 q 0,-1.65625 -0.51563,-2.375 -0.51562,-0.73438 -1.67187,-0.73438 -0.95313,0 -1.48438,0.8125 -0.51562,0.79688 -0.51562,2.32813 0,1.53125 0.53125,2.29687 0.53125,0.76563 1.51562,0.76563 z m 11.82153,-6.48438 q -0.90625,0 -1.42187,0.57813 -0.5,0.5625 -0.57813,1.60937 l 3.96875,0 q -0.0156,-1.04687 -0.54687,-1.60937 -0.51563,-0.57813 -1.42188,-0.57813 z m 0.39063,8.73438 q -2.5,0 -3.90625,-1.375 -1.40625,-1.39063 -1.40625,-3.92188 0,-2.60937 1.29687,-4.03125 1.29688,-1.42187 3.60938,-1.42187 2.1875,0 3.40625,1.25 1.23437,1.25 1.23437,3.45312 l 0,1.375 -6.6875,0 q 0.0469,1.20313 0.71875,1.89063 0.67188,0.67187 1.875,0.67187 0.9375,0 1.76563,-0.1875 0.84375,-0.20312 1.75,-0.625 l 0,2.1875 q -0.75,0.375 -1.59375,0.54688 -0.84375,0.1875 -2.0625,0.1875 z m 8.58499,-5.39063 q 0,1.53125 0.5,2.32813 0.51563,0.78125 1.65625,0.78125 1.125,0 1.625,-0.78125 0.5,-0.78125 0.5,-2.32813 0,-1.54687 -0.5,-2.3125 -0.5,-0.76562 -1.64062,-0.76562 -1.14063,0 -1.64063,0.76562 -0.5,0.76563 -0.5,2.3125 z m 7.17188,0 q 0,2.53125 -1.34375,3.96875 -1.32813,1.42188 -3.70313,1.42188 -1.5,0 -2.64062,-0.65625 -1.14063,-0.65625 -1.75,-1.875 -0.60938,-1.23438 -0.60938,-2.85938 0,-2.54687 1.3125,-3.95312 1.32813,-1.40625 3.73438,-1.40625 1.5,0 2.64062,0.65625 1.14063,0.64062 1.75,1.85937 0.60938,1.20313 0.60938,2.84375 z"
|
||||
id="path51"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 58.3832,230.14043 226.4252,0 0,62.29921 -226.4252,0 z"
|
||||
id="path53"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 89.96303,244.58104 q 0,1 -0.640625,1.6875 -0.640625,0.6875 -1.78125,0.89062 l 0,0.0469 q 0.796875,0.15625 1.234375,0.6875 0.453125,0.53125 0.453125,1.3125 0,0.84375 -0.390625,1.5 -0.390625,0.64062 -1.15625,1 -0.75,0.35937 -1.78125,0.35937 -1.34375,0 -2.453125,-0.5 l 0,-1.04687 q 0.59375,0.3125 1.265625,0.48437 0.671875,0.17188 1.203125,0.17188 1.03125,0 1.59375,-0.5 0.578125,-0.51563 0.578125,-1.39063 0,-0.82812 -0.5,-1.25 -0.5,-0.4375 -1.390625,-0.4375 l -0.84375,0 0.203125,-0.90625 0.875,0 q 1.046875,0 1.734375,-0.54687 0.703125,-0.5625 0.703125,-1.45313 0,-0.57812 -0.375,-0.92187 -0.359375,-0.34375 -0.984375,-0.34375 -0.515625,0 -1,0.17187 -0.484375,0.17188 -1.109375,0.59375 l -0.515625,-0.75 q 1.25,-0.90625 2.703125,-0.90625 1.125,0 1.75,0.54688 0.625,0.54687 0.625,1.5 z m 7.512756,0.40625 -0.15625,0.67187 -1.34375,0.15625 q 0.265625,0.39063 0.265625,1 0,1.21875 -0.75,1.9375 -0.734375,0.71875 -1.96875,0.71875 -0.359375,0 -0.53125,-0.0469 -0.890625,0.32812 -0.890625,0.82812 0,0.26563 0.203125,0.35938 0.21875,0.0781 0.625,0.125 l 0.734375,0.0781 q 1.15625,0.14063 1.671875,0.5625 0.515625,0.42188 0.515625,1.23438 0,1.17187 -0.9375,1.8125 -0.921875,0.64062 -2.59375,0.64062 -1.234375,0 -1.9375,-0.46875 -0.703125,-0.46875 -0.703125,-1.3125 0,-0.67187 0.46875,-1.17187 0.453125,-0.48438 1.46875,-0.8125 -0.484375,-0.26563 -0.484375,-0.78125 0,-0.4375 0.3125,-0.75 0.328125,-0.3125 0.90625,-0.57813 -0.40625,-0.20312 -0.65625,-0.59375 -0.25,-0.40625 -0.25,-0.9375 0,-1.23437 0.75,-2.01562 0.765625,-0.78125 1.953125,-0.78125 0.484375,0 0.96875,0.125 l 2.359375,0 z m -6.765625,8.1875 q 0,0.5 0.40625,0.78125 0.421875,0.28125 1.234375,0.28125 1.15625,0 1.796875,-0.40625 0.65625,-0.40625 0.65625,-1.14063 0,-0.39062 -0.34375,-0.625 -0.34375,-0.21875 -1.15625,-0.3125 l -1.015625,-0.0937 q -0.765625,0.15625 -1.171875,0.54688 -0.40625,0.40625 -0.40625,0.96875 z m 1.765625,-5.54688 q 0,0.53125 0.28125,0.8125 0.296875,0.28125 0.796875,0.28125 0.5,0 0.875,-0.26562 0.375,-0.26563 0.578125,-0.71875 0.203125,-0.46875 0.203125,-1.01563 0,-0.53125 -0.28125,-0.79687 -0.28125,-0.28125 -0.796875,-0.28125 -0.5,0 -0.875,0.26562 -0.359375,0.25 -0.578125,0.71875 -0.203125,0.45313 -0.203125,1 z m 8.145824,4.4375 q -0.60937,0 -1.078121,-0.3125 -0.453125,-0.32812 -0.71875,-0.89062 l -0.0625,0 -0.01563,0.23437 q -0.01563,0.17188 -0.07813,0.45313 -0.04687,0.28125 -0.71875,3.51562 l -1.046875,0 2.125,-10.07812 0.890625,0 -0.171875,1.32812 0.04687,0 q 1.140626,-1.45312 2.359376,-1.45312 0.875,0 1.375,0.625 0.5,0.625 0.5,1.73437 0,1.34375 -0.4375,2.46875 -0.4375,1.125 -1.21875,1.75 -0.76562,0.625 -1.75,0.625 z m 1.1875,-6.3125 q -0.60937,0 -1.25,0.60938 -0.624996,0.59375 -0.999996,1.51562 -0.359375,0.90625 -0.359375,1.85938 0,0.70312 0.34375,1.07812 0.359375,0.375 1.015621,0.375 0.64063,0 1.17188,-0.51562 0.54687,-0.51563 0.875,-1.46875 0.32812,-0.95313 0.32812,-2.01563 0,-1.4375 -1.125,-1.4375 z m 4.89544,4.67188 0.0469,0.15625 q -0.70312,1.48437 -1.70312,3.03125 l -0.82813,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 8.88281,-5.5625 q 0.57812,0 1.03125,0.3125 0.45312,0.3125 0.71875,0.90625 l 0.0625,0 0.42187,-1.09375 0.8125,0 -1.48437,6.95312 -0.84375,0 0.17187,-1.32812 -0.0469,0 q -1.14063,1.45312 -2.40625,1.45312 -0.875,0 -1.375,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.32812 0.45312,-2.45312 0.45313,-1.125 1.23438,-1.76563 0.79687,-0.64062 1.75,-0.64062 z m -1.21875,6.32812 q 0.625,0 1.23437,-0.59375 0.60938,-0.59375 0.98438,-1.53125 0.39062,-0.9375 0.39062,-1.89062 0,-0.65625 -0.35937,-1.03125 -0.35938,-0.39063 -0.9375,-0.39063 -0.65625,0 -1.23438,0.54688 -0.5625,0.54687 -0.89062,1.48437 -0.3125,0.92188 -0.3125,1.95313 0,0.73437 0.29687,1.09375 0.29688,0.35937 0.82813,0.35937 z m 6.10774,0.75 -0.79687,-6.95312 1.0625,0 0.40625,3.89062 q 0.15625,1.64063 0.15625,2.29688 l 0.0312,0 q 0.8125,-1.75 1.14062,-2.35938 l 2.0625,-3.82812 1.125,0 -3.75,6.95312 -1.4375,0 z m 6.17207,0 -1.0625,0 1.48438,-6.95312 1.0625,0 -1.48438,6.95312 z m 0.71875,-8.73437 q 0,-0.35938 0.20313,-0.57813 0.20312,-0.23437 0.53125,-0.23437 0.5625,0 0.5625,0.57812 0,0.34375 -0.21875,0.59375 -0.21875,0.23438 -0.48438,0.23438 -0.26562,0 -0.4375,-0.15625 -0.15625,-0.15625 -0.15625,-0.4375 z m 3.0716,7.21875 0.0469,0.15625 q -0.70312,1.48437 -1.70312,3.03125 l -0.82813,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 8.27344,1.64062 q -0.60938,0 -1.07813,-0.3125 -0.46875,-0.32812 -0.70312,-0.89062 l -0.0625,0 -0.4375,1.07812 -0.79688,0 2.09375,-9.875 1.0625,0 q -0.3125,1.53125 -0.5,2.35938 -0.17187,0.8125 -0.46875,1.89062 l 0.0469,0 q 0.59375,-0.73437 1.17187,-1.09375 0.57813,-0.35937 1.1875,-0.35937 0.89063,0 1.39063,0.64062 0.5,0.625 0.5,1.71875 0,1.32813 -0.4375,2.45313 -0.42188,1.125 -1.20313,1.76562 -0.78125,0.625 -1.76562,0.625 z m 1.1875,-6.3125 q -0.60938,0 -1.25,0.60938 -0.625,0.59375 -1,1.51562 -0.35938,0.90625 -0.35938,1.85938 0,0.70312 0.34375,1.07812 0.35938,0.375 1.01563,0.375 0.64062,0 1.17187,-0.51562 0.54688,-0.51563 0.875,-1.46875 0.32813,-0.953Line truncated
|
||||
id="path55"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 76.97759,267.94043 0.9375,-4.39063 q 0.109375,-0.59375 0.109375,-0.85937 0,-0.4375 -0.203125,-0.6875 -0.1875,-0.25 -0.65625,-0.25 -0.546875,0 -1.046875,0.39062 -0.5,0.375 -0.890625,1.07813 -0.375,0.70312 -0.59375,1.70312 l -0.640625,3.01563 -1.0625,0 1.484375,-6.95313 0.890625,0 -0.140625,1.28125 0.0625,0 q 0.546875,-0.75 1.09375,-1.07812 0.546875,-0.32813 1.140625,-0.32813 0.71875,0 1.09375,0.40625 0.390625,0.40625 0.46875,1.15625 l 0.04687,0 q 0.546875,-0.79687 1.15625,-1.17187 0.625,-0.39063 1.25,-0.39063 0.796875,0 1.234375,0.4375 0.453125,0.42188 0.453125,1.25 0,0.42188 -0.140625,1.125 l -0.921875,4.26563 -1.078125,0 0.9375,-4.39063 q 0.140625,-0.65625 0.140625,-0.92187 0,-0.40625 -0.21875,-0.64063 -0.21875,-0.23437 -0.6875,-0.23437 -0.515625,0 -1.03125,0.375 -0.5,0.35937 -0.875,1.04687 -0.375,0.67188 -0.578125,1.59375 l -0.671875,3.17188 -1.0625,0 z m 11.279312,-7.04688 q 1.203125,0 1.90625,0.71875 0.703125,0.70313 0.703125,1.95313 0,1.20312 -0.46875,2.26562 -0.453125,1.0625 -1.234375,1.64063 -0.78125,0.57812 -1.765625,0.57812 -1.21875,0 -1.90625,-0.71875 -0.6875,-0.71875 -0.6875,-1.96875 0,-1.20312 0.453125,-2.26562 0.46875,-1.0625 1.25,-1.625 0.796875,-0.57813 1.75,-0.57813 z m 1.5,2.53125 q 0,-0.73437 -0.40625,-1.1875 -0.390625,-0.45312 -1.0625,-0.45312 -0.6875,0 -1.25,0.46875 -0.546875,0.46875 -0.84375,1.3125 -0.296875,0.82812 -0.296875,1.85937 0,0.82813 0.390625,1.28125 0.40625,0.45313 1.171875,0.45313 0.65625,0 1.171875,-0.45313 0.53125,-0.46875 0.828125,-1.32812 0.296875,-0.85938 0.296875,-1.95313 z m 3.321304,4.51563 -0.796875,-6.95313 1.0625,0 0.40625,3.89063 q 0.15625,1.64062 0.15625,2.29687 l 0.03125,0 q 0.8125,-1.75 1.140625,-2.35937 l 2.0625,-3.82813 1.125,0 -3.75,6.95313 -1.4375,0 z m 6.578324,-1.51563 0.04687,0.15625 q -0.703125,1.48438 -1.703125,3.03125 l -0.828125,0 q 0.8125,-1.8125 1.296875,-3.1875 l 1.1875,0 z m 9.24219,1.51563 0.9375,-4.39063 q 0.10937,-0.59375 0.10937,-0.85937 0,-0.4375 -0.20312,-0.6875 -0.1875,-0.25 -0.65625,-0.25 -0.54688,0 -1.04688,0.39062 -0.5,0.375 -0.89062,1.07813 -0.375,0.70312 -0.59375,1.70312 l -0.64063,3.01563 -1.0625,0 1.48438,-6.95313 0.89062,0 -0.14062,1.28125 0.0625,0 q 0.54687,-0.75 1.09375,-1.07812 0.54687,-0.32813 1.14062,-0.32813 0.71875,0 1.09375,0.40625 0.39063,0.40625 0.46875,1.15625 l 0.0469,0 q 0.54687,-0.79687 1.15625,-1.17187 0.625,-0.39063 1.25,-0.39063 0.79687,0 1.23437,0.4375 0.45313,0.42188 0.45313,1.25 0,0.42188 -0.14063,1.125 l -0.92187,4.26563 -1.07813,0 0.9375,-4.39063 q 0.14063,-0.65625 0.14063,-0.92187 0,-0.40625 -0.21875,-0.64063 -0.21875,-0.23437 -0.6875,-0.23437 -0.51563,0 -1.03125,0.375 -0.5,0.35937 -0.875,1.04687 -0.375,0.67188 -0.57813,1.59375 l -0.67187,3.17188 -1.0625,0 z m 10.65431,0.125 q -0.60938,0 -1.07813,-0.3125 -0.45312,-0.32813 -0.71875,-0.89063 l -0.0625,0 -0.0156,0.23438 q -0.0156,0.17187 -0.0781,0.45312 -0.0469,0.28125 -0.71875,3.51563 l -1.04687,0 2.125,-10.07813 0.89062,0 -0.17187,1.32813 0.0469,0 q 1.14063,-1.45313 2.35938,-1.45313 0.875,0 1.375,0.625 0.5,0.625 0.5,1.73438 0,1.34375 -0.4375,2.46875 -0.4375,1.125 -1.21875,1.75 -0.76563,0.625 -1.75,0.625 z m 1.1875,-6.3125 q -0.60938,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.35938,0.90625 -0.35938,1.85937 0,0.70313 0.34375,1.07813 0.35938,0.375 1.01563,0.375 0.64062,0 1.17187,-0.51563 0.54688,-0.51562 0.875,-1.46875 0.32813,-0.95312 0.32813,-2.01562 0,-1.4375 -1.125,-1.4375 z m 9.81731,4.0625 -1.46875,0 -0.45312,2.125 -1.04688,0 0.46875,-2.125 -4.15625,0 0.17187,-1 5.29688,-6.20313 1.25,0 -1.3125,6.23438 1.46875,0 -0.21875,0.96875 z m -2.29687,-0.96875 q 0.29687,-1.39063 0.5,-2.35938 0.20312,-0.98437 0.73437,-2.82812 l -0.0469,0 q -0.10938,0.1875 -0.42188,0.60937 -0.3125,0.42188 -0.45312,0.60938 l -3.39063,3.96875 3.07813,0 z m 4.71588,1.57812 0.0469,0.15625 q -0.70312,1.48438 -1.70312,3.03125 l -0.82813,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 9.24219,1.51563 0.9375,-4.39063 q 0.10937,-0.59375 0.10937,-0.85937 0,-0.4375 -0.20312,-0.6875 -0.1875,-0.25 -0.65625,-0.25 -0.54688,0 -1.04688,0.39062 -0.5,0.375 -0.89062,1.07813 -0.375,0.70312 -0.59375,1.70312 l -0.64063,3.01563 -1.0625,0 1.48438,-6.95313 0.89062,0 -0.14062,1.28125 0.0625,0 q 0.54687,-0.75 1.09375,-1.07812 0.54687,-0.32813 1.14062,-0.32813 0.71875,0 1.09375,0.40625 0.39063,0.40625 0.46875,1.15625 l 0.0469,0 q 0.54687,-0.79687 1.15625,-1.17187 0.625,-0.39063 1.25,-0.39063 0.79687,0 1.23437,0.4375 0.45313,0.42188 0.45313,1.25 0,0.42188 -0.14063,1.125 l -0.92187,4.26563 -1.07813,0 0.9375,-4.39063 q 0.14063,-0.65625 0.14063,-0.92187 0,-0.40625 -0.21875,-0.64063 -0.21875,-0.23437 -0.6875,-0.23437 -0.51563,0 -1.03125,0.375 -0.5,0.35937 -0.875,1.04687 -0.375,0.67188 -0.57813,1.59375 l -0.67187,3.17188 -1.0625,0 z m 10.65431,0.125 q -0.60938,0 -1.07813,-0.3125 -0.45312,-0.32813 -0.71875,-0.89063 l -0.0625,0 -0.0156,0.23438 q -0.0156,0.17187 -0.0781,0.45312 -0.0469,0.28125 -0.71875,3.51563 l -1.04687,0 2.125,-10.07813 0.89062,0 -0.17187,1.32813 0.0469,0 q 1.14063,-1.45313 2.35938,-1.45Line truncated
|
||||
id="path57"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 163.21053,283.94043 -0.20313,-3.82813 q -0.0312,-0.59375 -0.0312,-1.07812 l 0,-1 -0.0625,0 -0.3125,0.75 -0.53125,1.20312 -1.84375,3.95313 -1.28125,0 -0.26562,-6.95313 1.03125,0 0.10937,3.76563 0,0.5625 q 0,0.9375 -0.0469,1.70312 l 0.0469,0 q 0.29688,-0.78125 0.85938,-2.04687 l 1.875,-3.98438 1.15625,0 0.23437,3.76563 q 0.0469,1.0625 0.0469,1.65625 l 0,0.34375 -0.0156,0.26562 0.0312,0 q 0.1875,-0.54687 0.53125,-1.39062 0.34375,-0.84375 2.04688,-4.64063 l 1.125,0 -3.20313,6.95313 -1.29687,0 z m 8.69418,0 0.9375,-4.39063 q 0.10938,-0.59375 0.10938,-0.85937 0,-0.4375 -0.20313,-0.6875 -0.1875,-0.25 -0.65625,-0.25 -0.54687,0 -1.04687,0.39062 -0.5,0.375 -0.89063,1.07813 -0.375,0.70312 -0.59375,1.70312 l -0.64062,3.01563 -1.0625,0 1.48437,-6.95313 0.89063,0 -0.14063,1.28125 0.0625,0 q 0.54688,-0.75 1.09375,-1.07812 0.54688,-0.32813 1.14063,-0.32813 0.71875,0 1.09375,0.40625 0.39062,0.40625 0.46875,1.15625 l 0.0469,0 q 0.54688,-0.79687 1.15625,-1.17187 0.625,-0.39063 1.25,-0.39063 0.79688,0 1.23438,0.4375 0.45312,0.42188 0.45312,1.25 0,0.42188 -0.14062,1.125 l -0.92188,4.26563 -1.07812,0 0.9375,-4.39063 q 0.14062,-0.65625 0.14062,-0.92187 0,-0.40625 -0.21875,-0.64063 -0.21875,-0.23437 -0.6875,-0.23437 -0.51562,0 -1.03125,0.375 -0.5,0.35937 -0.875,1.04687 -0.375,0.67188 -0.57812,1.59375 l -0.67188,3.17188 -1.0625,0 z m 8.62307,0 -0.79688,-6.95313 1.0625,0 0.40625,3.89063 q 0.15625,1.64062 0.15625,2.29687 l 0.0312,0 q 0.8125,-1.75 1.14063,-2.35937 l 2.0625,-3.82813 1.125,0 -3.75,6.95313 -1.4375,0 z"
|
||||
id="path59"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 443.9685,200.23622 236.91339,0 0,75.02364 -236.91339,0 z"
|
||||
id="path61"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 449.2126,200.23622 226.42523,0 0,40.37795 -226.42523,0 z"
|
||||
id="path63"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 545.764,213.59372 2.90625,0 -4.60938,13.5625 -3.125,0 -4.60937,-13.5625 2.90625,0 2.54687,8.0625 q 0.21875,0.71875 0.4375,1.67187 0.23438,0.95313 0.28125,1.32813 0.10938,-0.85938 0.70313,-3 l 2.5625,-8.0625 z m 4.04663,0.51562 q 0,-1.39062 1.54688,-1.39062 1.53125,0 1.53125,1.39062 0,0.65625 -0.39063,1.03125 -0.375,0.35938 -1.14062,0.35938 -1.54688,0 -1.54688,-1.39063 z m 2.95313,13.04688 -2.82813,0 0,-10.375 2.82813,0 0,10.375 z m 6.14654,0.1875 q -1.82812,0 -2.875,-1.42188 -1.03125,-1.42187 -1.03125,-3.9375 0,-2.54687 1.0625,-3.96875 1.0625,-1.42187 2.92188,-1.42187 1.95312,0 2.98437,1.51562 l 0.0937,0 q -0.21875,-1.15625 -0.21875,-2.0625 l 0,-3.32812 2.84375,0 0,14.4375 -2.17187,0 -0.54688,-1.34375 -0.125,0 q -0.95312,1.53125 -2.9375,1.53125 z m 1,-2.25 q 1.07813,0 1.57813,-0.625 0.51562,-0.64063 0.5625,-2.15625 l 0,-0.3125 q 0,-1.65625 -0.51563,-2.375 -0.51562,-0.73438 -1.67187,-0.73438 -0.95313,0 -1.48438,0.8125 -0.51562,0.79688 -0.51562,2.32813 0,1.53125 0.53125,2.29687 0.53125,0.76563 1.51562,0.76563 z m 11.82153,-6.48438 q -0.90625,0 -1.42187,0.57813 -0.5,0.5625 -0.57813,1.60937 l 3.96875,0 q -0.0156,-1.04687 -0.54687,-1.60937 -0.51563,-0.57813 -1.42188,-0.57813 z m 0.39063,8.73438 q -2.5,0 -3.90625,-1.375 -1.40625,-1.39063 -1.40625,-3.92188 0,-2.60937 1.29687,-4.03125 1.29688,-1.42187 3.60938,-1.42187 2.1875,0 3.40625,1.25 1.23437,1.25 1.23437,3.45312 l 0,1.375 -6.6875,0 q 0.0469,1.20313 0.71875,1.89063 0.67188,0.67187 1.875,0.67187 0.9375,0 1.76563,-0.1875 0.84375,-0.20312 1.75,-0.625 l 0,2.1875 q -0.75,0.375 -1.59375,0.54688 -0.84375,0.1875 -2.0625,0.1875 z m 8.58502,-5.39063 q 0,1.53125 0.5,2.32813 0.51563,0.78125 1.65625,0.78125 1.125,0 1.625,-0.78125 0.5,-0.78125 0.5,-2.32813 0,-1.54687 -0.5,-2.3125 -0.5,-0.76562 -1.64062,-0.76562 -1.14063,0 -1.64063,0.76562 -0.5,0.76563 -0.5,2.3125 z m 7.17188,0 q 0,2.53125 -1.34375,3.96875 -1.32813,1.42188 -3.70313,1.42188 -1.5,0 -2.64062,-0.65625 -1.14063,-0.65625 -1.75,-1.875 -0.60938,-1.23438 -0.60938,-2.85938 0,-2.54687 1.3125,-3.95312 1.32813,-1.40625 3.73438,-1.40625 1.5,0 2.64062,0.65625 1.14063,0.64062 1.75,1.85937 0.60938,1.20313 0.60938,2.84375 z"
|
||||
id="path65"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 449.2126,240.61417 226.42523,0 0,34.64569 -226.42523,0 z"
|
||||
id="path67"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 492.4982,262.41418 -0.20313,-3.82813 q -0.0312,-0.59375 -0.0312,-1.07812 l 0,-1 -0.0625,0 -0.3125,0.75 -0.53125,1.20312 -1.84375,3.95313 -1.28125,0 -0.26562,-6.95314 1.03125,0 0.10937,3.76564 0,0.5625 q 0,0.9375 -0.0469,1.70312 l 0.0469,0 q 0.29688,-0.78125 0.85938,-2.04687 l 1.875,-3.98439 1.15625,0 0.23437,3.76564 q 0.0469,1.0625 0.0469,1.65625 l 0,0.34375 -0.0156,0.26562 0.0312,0 q 0.1875,-0.54687 0.53125,-1.39062 0.34375,-0.84375 2.04688,-4.64064 l 1.125,0 -3.20313,6.95314 -1.29687,0 z m 7.39731,0.125 q -1.17188,0 -1.84375,-0.6875 -0.65625,-0.6875 -0.65625,-1.92188 0,-1.1875 0.46875,-2.28125 0.46875,-1.09375 1.25,-1.70314 0.78125,-0.60937 1.71875,-0.60937 0.98437,0 1.46875,0.42187 0.48437,0.42189 0.48437,1.17189 0,1.14063 -1.0625,1.79688 -1.04687,0.64062 -3,0.64062 l -0.21875,0 -0.0156,0.51563 q 0,0.82812 0.39062,1.29687 0.39063,0.46875 1.20313,0.46875 0.40625,0 0.82812,-0.10937 0.42188,-0.125 1.04688,-0.42188 l 0,0.92188 q -0.59375,0.28125 -1.0625,0.39062 -0.45313,0.10938 -1,0.10938 z m 0.875,-6.29688 q -0.64063,0 -1.21875,0.59375 -0.57813,0.59375 -0.89063,1.65625 l 0.0781,0 q 1.45312,0 2.21875,-0.375 0.78125,-0.375 0.78125,-1.09375 0,-0.34375 -0.23438,-0.5625 -0.23437,-0.21875 -0.73437,-0.21875 z m 6.02606,6.29688 q -0.60937,0 -1.07812,-0.3125 -0.46875,-0.32813 -0.70313,-0.89063 l -0.0625,0 -0.4375,1.07813 -0.79687,0 2.09375,-9.87502 1.0625,0 q -0.3125,1.53125 -0.5,2.35938 -0.17188,0.8125 -0.46875,1.89064 l 0.0469,0 q 0.59375,-0.73437 1.17188,-1.09377 0.57812,-0.35937 1.1875,-0.35937 0.89062,0 1.39062,0.64062 0.5,0.62502 0.5,1.71877 0,1.32813 -0.4375,2.45313 -0.42187,1.125 -1.20312,1.76562 -0.78125,0.625 -1.76563,0.625 z m 1.1875,-6.3125 q -0.60937,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.35937,0.90625 -0.35937,1.85937 0,0.70313 0.34375,1.07813 0.35937,0.375 1.01562,0.375 0.64063,0 1.17188,-0.51563 0.54687,-0.51562 0.875,-1.46875 0.32812,-0.95312 0.32812,-2.01562 0,-1.4375 -1.125,-1.4375 z m 7.47357,6.1875 0.9375,-4.39063 q 0.10938,-0.59375 0.10938,-0.85937 0,-0.4375 -0.20313,-0.6875 -0.1875,-0.25 -0.65625,-0.25 -0.54687,0 -1.04687,0.39062 -0.5,0.375 -0.89063,1.07813 -0.375,0.70312 -0.59375,1.70312 l -0.64062,3.01563 -1.0625,0 1.48437,-6.95314 0.89063,0 -0.14063,1.28126 0.0625,0 q 0.54688,-0.75001 1.09375,-1.07814 0.54688,-0.32812 1.14063,-0.32812 0.71875,0 1.09375,0.40625 0.39062,0.40626 0.46875,1.15626 l 0.0469,0 q 0.54688,-0.79687 1.15625,-1.17189 0.625,-0.39062 1.25,-0.39062 0.79688,0 1.23438,0.4375 0.45312,0.42189 0.45312,1.25001 0,0.42188 -0.14062,1.125 l -0.92188,4.26563 -1.07812,0 0.9375,-4.39063 q 0.14062,-0.65625 0.14062,-0.92187 0,-0.40625 -0.21875,-0.64063 -0.21875,-0.23437 -0.6875,-0.23437 -0.51562,0 -1.03125,0.375 -0.5,0.35937 -0.875,1.04687 -0.375,0.67188 -0.57812,1.59375 l -0.67188,3.17188 -1.0625,0 z m 9.04492,-1.51563 0.0469,0.15625 q -0.70313,1.48438 -1.70313,3.03125 l -0.82812,0 q 0.8125,-1.8125 1.29687,-3.1875 l 1.1875,0 z m 9.24219,1.51563 0.9375,-4.39063 q 0.10938,-0.59375 0.10938,-0.85937 0,-0.4375 -0.20313,-0.6875 -0.1875,-0.25 -0.65625,-0.25 -0.54687,0 -1.04687,0.39062 -0.5,0.375 -0.89063,1.07813 -0.375,0.70312 -0.59375,1.70312 l -0.64062,3.01563 -1.0625,0 1.48437,-6.95314 0.89063,0 -0.14063,1.28126 0.0625,0 q 0.54688,-0.75001 1.09375,-1.07814 0.54688,-0.32812 1.14063,-0.32812 0.71875,0 1.09375,0.40625 0.39062,0.40626 0.46875,1.15626 l 0.0469,0 q 0.54688,-0.79687 1.15625,-1.17189 0.625,-0.39062 1.25,-0.39062 0.79688,0 1.23438,0.4375 0.45312,0.42189 0.45312,1.25001 0,0.42188 -0.14062,1.125 l -0.92188,4.26563 -1.07812,0 0.9375,-4.39063 q 0.14062,-0.65625 0.14062,-0.92187 0,-0.40625 -0.21875,-0.64063 -0.21875,-0.23437 -0.6875,-0.23437 -0.51562,0 -1.03125,0.375 -0.5,0.35937 -0.875,1.04687 -0.375,0.67188 -0.57812,1.59375 l -0.67188,3.17188 -1.0625,0 z m 9.29492,-3.54688 3.34375,-3.40626 1.26563,0 -2.96875,2.95314 1.875,4 -1.1875,0 -1.5,-3.32813 -0.95313,0.78125 -0.53125,2.54688 -1.07812,0 2.09375,-9.87502 1.07812,0 q -0.45312,2.125 -0.8125,3.81252 -0.35937,1.6875 -0.65625,2.51563 l 0.0312,0 z m 5.82953,3.54688 -0.79687,-6.95314 1.0625,0 0.40625,3.89064 q 0.15625,1.64062 0.15625,2.29687 l 0.0312,0 q 0.8125,-1.75 1.14062,-2.35937 l 2.0625,-3.82814 1.125,0 -3.75,6.95314 -1.4375,0 z m 6.57831,-1.51563 0.0469,0.15625 q -0.70313,1.48438 -1.70313,3.03125 l -0.82812,0 q 0.8125,-1.8125 1.29687,-3.1875 l 1.1875,0 z m 9.24219,1.51563 0.9375,-4.39063 q 0.10937,-0.59375 0.10937,-0.85937 0,-0.4375 -0.20312,-0.6875 -0.1875,-0.25 -0.65625,-0.25 -0.54688,0 -1.04688,0.39062 -0.5,0.375 -0.89062,1.07813 -0.375,0.70312 -0.59375,1.70312 l -0.64063,3.01563 -1.0625,0 1.48438,-6.95314 0.89062,0 -0.14062,1.28126 0.0625,0 q 0.54687,-0.75001 1.09375,-1.07814 0.54687,-0.32812 1.14062,-0.32812 0.71875,0 1.09375,0.40625 0.39063,0.40626 0.46875,1.15626 l 0.0469,0 q 0.54687,-0.79687 1.15625,-1.17189 0.625,-0.39062 1.25,-0.39062 0.79687,0 1.23437,0.4375 0.45313,0.42189 0.45313,1.25001 0,0.42188 -0.14063,1.125 l -0.92187,4.26563 -1.07813,0 0.9375,-4.39063 q 0.14063,-0.65625 0.14063,-0.92187 0,-0.40Line truncated
|
||||
id="path69"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 51.44882,353.6601 236.91339,0 0,75.02362 -236.91339,0 z"
|
||||
id="path71"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#0171bb;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 56.692913,353.6601 226.425187,0 0,40.37796 -226.425187,0 z"
|
||||
id="path73"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 103.16452,380.5801 -0.98438,-3.23437 -4.95312,0 -0.984375,3.23437 -3.09375,0 4.78125,-13.625 3.515625,0 4.8125,13.625 -3.09375,0 z m -1.67188,-5.64062 q -1.35937,-4.39063 -1.531245,-4.95313 -0.171875,-0.57812 -0.25,-0.92187 -0.3125,1.1875 -1.75,5.875 l 3.531245,0 z m 15.59047,5.64062 -2.82812,0 0,-6.0625 q 0,-1.125 -0.40625,-1.67187 -0.39063,-0.5625 -1.26563,-0.5625 -1.1875,0 -1.71875,0.79687 -0.53125,0.78125 -0.53125,2.625 l 0,4.875 -2.82812,0 0,-10.375 2.15625,0 0.39062,1.32813 0.15625,0 q 0.46875,-0.75 1.29688,-1.125 0.82812,-0.39063 1.89062,-0.39063 1.8125,0 2.75,0.98438 0.9375,0.96875 0.9375,2.8125 l 0,6.76562 z m 2.55826,-13.04687 q 0,-1.39063 1.54688,-1.39063 1.53125,0 1.53125,1.39063 0,0.65625 -0.39063,1.03125 -0.375,0.35937 -1.14062,0.35937 -1.54688,0 -1.54688,-1.39062 z m 2.95313,13.04687 -2.82813,0 0,-10.375 2.82813,0 0,10.375 z m 12.14656,0 -2.82813,0 0,-6.0625 q 0,-1.125 -0.375,-1.67187 -0.375,-0.5625 -1.17187,-0.5625 -1.09375,0 -1.59375,0.79687 -0.48438,0.79688 -0.48438,2.625 l 0,4.875 -2.82812,0 0,-10.375 2.15625,0 0.39062,1.32813 0.15625,0 q 0.42188,-0.71875 1.20313,-1.10938 0.78125,-0.40625 1.8125,-0.40625 2.32812,0 3.15625,1.51563 l 0.25,0 q 0.40625,-0.71875 1.21875,-1.10938 0.8125,-0.40625 1.84375,-0.40625 1.75,0 2.65625,0.90625 0.90625,0.89063 0.90625,2.89063 l 0,6.76562 -2.82813,0 0,-6.0625 q 0,-1.125 -0.39062,-1.67187 -0.375,-0.5625 -1.17188,-0.5625 -1.04687,0 -1.5625,0.75 -0.51562,0.73437 -0.51562,2.34375 l 0,5.20312 z m 15.6317,0 -0.54688,-1.40625 -0.0781,0 q -0.71875,0.89063 -1.48438,1.25 -0.75,0.34375 -1.95312,0.34375 -1.5,0 -2.35938,-0.84375 -0.85937,-0.85937 -0.85937,-2.4375 0,-1.65625 1.15625,-2.4375 1.15625,-0.78125 3.48437,-0.875 l 1.79688,-0.0469 0,-0.45313 q 0,-1.57812 -1.60938,-1.57812 -1.25,0 -2.92187,0.75 l -0.9375,-1.92188 q 1.78125,-0.92187 3.96875,-0.92187 2.09375,0 3.20312,0.90625 1.10938,0.90625 1.10938,2.76562 l 0,6.90625 -1.96875,0 z m -0.84375,-4.8125 -1.09375,0.0469 q -1.23438,0.0312 -1.84375,0.4375 -0.59375,0.40625 -0.59375,1.25 0,1.1875 1.375,1.1875 0.98437,0 1.5625,-0.5625 0.59375,-0.5625 0.59375,-1.5 l 0,-0.85938 z m 9.89344,2.75 q 0.73438,0 1.78125,-0.32812 l 0,2.10937 q -1.0625,0.46875 -2.60937,0.46875 -1.6875,0 -2.46875,-0.85937 -0.76563,-0.85938 -0.76563,-2.57813 l 0,-5 -1.35937,0 0,-1.1875 1.5625,-0.95312 0.8125,-2.1875 1.8125,0 0,2.20312 2.90625,0 0,2.125 -2.90625,0 0,5 q 0,0.60938 0.32812,0.90625 0.34375,0.28125 0.90625,0.28125 z m 8.02022,-6.48437 q -0.90625,0 -1.42187,0.57812 -0.5,0.5625 -0.57813,1.60938 l 3.96875,0 q -0.0156,-1.04688 -0.54687,-1.60938 -0.51563,-0.57812 -1.42188,-0.57812 z m 0.39063,8.73437 q -2.5,0 -3.90625,-1.375 -1.40625,-1.39062 -1.40625,-3.92187 0,-2.60938 1.29687,-4.03125 1.29688,-1.42188 3.60938,-1.42188 2.1875,0 3.40625,1.25 1.23437,1.25 1.23437,3.45313 l 0,1.375 -6.6875,0 q 0.0469,1.20312 0.71875,1.89062 0.67188,0.67188 1.875,0.67188 0.9375,0 1.76563,-0.1875 0.84375,-0.20313 1.75,-0.625 l 0,2.1875 q -0.75,0.375 -1.59375,0.54687 -0.84375,0.1875 -2.0625,0.1875 z m 9.61624,0 q -1.82813,0 -2.875,-1.42187 -1.03125,-1.42188 -1.03125,-3.9375 0,-2.54688 1.0625,-3.96875 1.0625,-1.42188 2.92187,-1.42188 1.95313,0 2.98438,1.51563 l 0.0937,0 q -0.21875,-1.15625 -0.21875,-2.0625 l 0,-3.32813 2.84375,0 0,14.4375 -2.17188,0 -0.54687,-1.34375 -0.125,0 q -0.95313,1.53125 -2.9375,1.53125 z m 1,-2.25 q 1.07812,0 1.57812,-0.625 0.51563,-0.64062 0.5625,-2.15625 l 0,-0.3125 q 0,-1.65625 -0.51562,-2.375 -0.51563,-0.73437 -1.67188,-0.73437 -0.95312,0 -1.48437,0.8125 -0.51563,0.79687 -0.51563,2.32812 0,1.53125 0.53125,2.29688 0.53125,0.76562 1.51563,0.76562 z m 12.58966,2.0625 0,-13.5625 2.875,0 0,13.5625 -2.875,0 z m 15.23874,0 -2.82813,0 0,-6.0625 q 0,-1.125 -0.375,-1.67187 -0.375,-0.5625 -1.17187,-0.5625 -1.09375,0 -1.59375,0.79687 -0.48438,0.79688 -0.48438,2.625 l 0,4.875 -2.82812,0 0,-10.375 2.15625,0 0.39062,1.32813 0.15625,0 q 0.42188,-0.71875 1.20313,-1.10938 0.78125,-0.40625 1.8125,-0.40625 2.32812,0 3.15625,1.51563 l 0.25,0 q 0.40625,-0.71875 1.21875,-1.10938 0.8125,-0.40625 1.84375,-0.40625 1.75,0 2.65625,0.90625 0.90625,0.89063 0.90625,2.89063 l 0,6.76562 -2.82813,0 0,-6.0625 q 0,-1.125 -0.39062,-1.67187 -0.375,-0.5625 -1.17188,-0.5625 -1.04687,0 -1.5625,0.75 -0.51562,0.73437 -0.51562,2.34375 l 0,5.20312 z m 15.6317,0 -0.54688,-1.40625 -0.0781,0 q -0.71875,0.89063 -1.48438,1.25 -0.75,0.34375 -1.95312,0.34375 -1.5,0 -2.35938,-0.84375 -0.85937,-0.85937 -0.85937,-2.4375 0,-1.65625 1.15625,-2.4375 1.15625,-0.78125 3.48437,-0.875 l 1.79688,-0.0469 0,-0.45313 q 0,-1.57812 -1.60938,-1.57812 -1.25,0 -2.92187,0.75 l -0.9375,-1.92188 q 1.78125,-0.92187 3.96875,-0.92187 2.09375,0 3.20312,0.90625 1.10938,0.90625 1.10938,2.76562 l 0,6.90625 -1.96875,0 z m -0.84375,-4.8125 -1.09375,0.0469 q -1.23438,0.0312 -1.84375,0.4375 -0.59375,0.40625 -0.59375,1.25 0,1.1875 1.375,1.1875 0.98437,0 1.5625,-0.5625 0.59375,-0.5625 0.59375,-1.5 l 0,-0.85938 z m 14.5497,-5.5625 0,1.4375 -1.625,0.42188 q 0.4375,0.6875 0.4375,1.5625 0,1.67187 -1.17188,2.60937Line truncated
|
||||
id="path75"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 56.692913,394.03806 226.425187,0 0,34.64566 -226.425187,0 z"
|
||||
id="path77"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 169.77353,408.88492 -0.15625,0.67188 -1.34375,0.15625 q 0.26562,0.39062 0.26562,1 0,1.21875 -0.75,1.9375 -0.73437,0.71875 -1.96875,0.71875 -0.35937,0 -0.53125,-0.0469 -0.89062,0.32813 -0.89062,0.82813 0,0.26562 0.20312,0.35937 0.21875,0.0781 0.625,0.125 l 0.73438,0.0781 q 1.15625,0.14062 1.67187,0.5625 0.51563,0.42187 0.51563,1.23437 0,1.17188 -0.9375,1.8125 -0.92188,0.64063 -2.59375,0.64063 -1.23438,0 -1.9375,-0.46875 -0.70313,-0.46875 -0.70313,-1.3125 0,-0.67188 0.46875,-1.17188 0.45313,-0.48437 1.46875,-0.8125 -0.48437,-0.26562 -0.48437,-0.78125 0,-0.4375 0.3125,-0.75 0.32812,-0.3125 0.90625,-0.57812 -0.40625,-0.20313 -0.65625,-0.59375 -0.25,-0.40625 -0.25,-0.9375 0,-1.23438 0.75,-2.01563 0.76562,-0.78125 1.95312,-0.78125 0.48438,0 0.96875,0.125 l 2.35938,0 z m -6.76563,8.1875 q 0,0.5 0.40625,0.78125 0.42188,0.28125 1.23438,0.28125 1.15625,0 1.79687,-0.40625 0.65625,-0.40625 0.65625,-1.14062 0,-0.39063 -0.34375,-0.625 -0.34375,-0.21875 -1.15625,-0.3125 l -1.01562,-0.0937 q -0.76563,0.15625 -1.17188,0.54687 -0.40625,0.40625 -0.40625,0.96875 z m 1.76563,-5.54687 q 0,0.53125 0.28125,0.8125 0.29687,0.28125 0.79687,0.28125 0.5,0 0.875,-0.26563 0.375,-0.26562 0.57813,-0.71875 0.20312,-0.46875 0.20312,-1.01562 0,-0.53125 -0.28125,-0.79688 -0.28125,-0.28125 -0.79687,-0.28125 -0.5,0 -0.875,0.26563 -0.35938,0.25 -0.57813,0.71875 -0.20312,0.45312 -0.20312,1 z m 6.1302,4.3125 -1.0625,0 1.48438,-6.95313 1.0625,0 -1.48438,6.95313 z m 0.71875,-8.73438 q 0,-0.35937 0.20313,-0.57812 0.20312,-0.23438 0.53125,-0.23438 0.5625,0 0.5625,0.57813 0,0.34375 -0.21875,0.59375 -0.21875,0.23437 -0.48438,0.23437 -0.26562,0 -0.4375,-0.15625 -0.15625,-0.15625 -0.15625,-0.4375 z m 0.5716,11.85938 q -0.4375,0 -0.79688,-0.14063 l 0,-0.89062 q 0.40625,0.14062 0.70313,0.14062 0.48437,0 0.75,-0.39062 0.26562,-0.39063 0.42187,-1.125 l 1.4375,-6.875 -1.21875,0 0.0781,-0.42188 1.3125,-0.42187 0.14062,-0.625 q 0.29688,-1.28125 0.8125,-1.79688 0.51563,-0.53125 1.53125,-0.53125 0.25,0 0.60938,0.0781 0.375,0.0781 0.57812,0.15625 l -0.26562,0.82812 q -0.48438,-0.1875 -0.875,-0.1875 -0.54688,0 -0.84375,0.3125 -0.29688,0.29688 -0.48438,1.125 l -0.15625,0.6875 1.51563,0 -0.15625,0.79688 -1.51563,0 -1.46875,6.96875 q -0.25,1.20312 -0.76562,1.75 -0.51563,0.5625 -1.34375,0.5625 z"
|
||||
id="path79"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 52.293964,489.9042 236.913376,0 0,87.3071 -236.913376,0 z"
|
||||
id="path81"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#0171bb;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 57.53806,489.9042 226.4252,0 0,40.37796 -226.4252,0 z"
|
||||
id="path83"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 143.79076,516.8242 0,-13.56253 2.875,0 0,13.56253 -2.875,0 z m 15.23874,0 -2.82813,0 0,-6.06253 q 0,-1.125 -0.375,-1.67188 -0.375,-0.5625 -1.17187,-0.5625 -1.09375,0 -1.59375,0.79688 -0.48438,0.79687 -0.48438,2.625 l 0,4.87503 -2.82812,0 0,-10.37503 2.15625,0 0.39062,1.32812 0.15625,0 q 0.42188,-0.71875 1.20313,-1.10937 0.78125,-0.40625 1.8125,-0.40625 2.32812,0 3.15625,1.51562 l 0.25,0 q 0.40625,-0.71875 1.21875,-1.10937 0.8125,-0.40625 1.84375,-0.40625 1.75,0 2.65625,0.90625 0.90625,0.89062 0.90625,2.89062 l 0,6.76566 -2.82813,0 0,-6.06253 q 0,-1.125 -0.39062,-1.67188 -0.375,-0.5625 -1.17188,-0.5625 -1.04687,0 -1.5625,0.75 -0.51562,0.73438 -0.51562,2.34375 l 0,5.20316 z m 15.6317,0 -0.54688,-1.40625 -0.0781,0 q -0.71875,0.89063 -1.48438,1.25 -0.75,0.34375 -1.95312,0.34375 -1.5,0 -2.35938,-0.84375 -0.85937,-0.85937 -0.85937,-2.4375 0,-1.65625 1.15625,-2.43753 1.15625,-0.78125 3.48437,-0.875 l 1.79688,-0.0469 0,-0.45312 q 0,-1.57813 -1.60938,-1.57813 -1.25,0 -2.92187,0.75 l -0.9375,-1.92187 q 1.78125,-0.92188 3.96875,-0.92188 2.09375,0 3.20312,0.90625 1.10938,0.90625 1.10938,2.76563 l 0,6.90628 -1.96875,0 z m -0.84375,-4.8125 -1.09375,0.0469 q -1.23438,0.0312 -1.84375,0.4375 -0.59375,0.40625 -0.59375,1.25 0,1.1875 1.375,1.1875 0.98437,0 1.5625,-0.5625 0.59375,-0.5625 0.59375,-1.5 l 0,-0.85938 z m 14.54968,-5.56253 0,1.4375 -1.625,0.42187 q 0.4375,0.6875 0.4375,1.5625 0,1.67188 -1.17187,2.60941 -1.15624,0.92188 -3.21874,0.92188 l -0.51562,-0.0312 -0.40625,-0.0469 q -0.4375,0.34375 -0.4375,0.75 0,0.60938 1.54687,0.60938 l 1.76563,0 q 1.70311,0 2.59373,0.73437 0.90625,0.73438 0.90625,2.15625 0,1.8125 -1.51562,2.8125 -1.51561,1 -4.35936,1 -2.17188,0 -3.3125,-0.76562 -1.14063,-0.75 -1.14063,-2.10938 0,-0.9375 0.57813,-1.57812 0.57812,-0.625 1.71875,-0.89063 -0.4375,-0.1875 -0.76563,-0.60937 -0.32812,-0.42188 -0.32812,-0.89063 0,-0.59375 0.34375,-0.98437 0.34375,-0.40625 1,-0.78125 -0.8125,-0.34375 -1.29688,-1.12504 -0.48437,-0.78125 -0.48437,-1.84375 0,-1.70312 1.10937,-2.625 1.10938,-0.92187 3.15625,-0.92187 0.4375,0 1.03125,0.0781 0.59375,0.0781 0.76563,0.10938 l 3.62498,0 z m -8.01561,11.84378 q 0,0.57813 0.5625,0.90625 0.5625,0.34375 1.57813,0.34375 1.51562,0 2.375,-0.42187 0.87498,-0.40625 0.87498,-1.14063 0,-0.57812 -0.51561,-0.8125 -0.51562,-0.21875 -1.57812,-0.21875 l -1.46875,0 q -0.78125,0 -1.3125,0.35938 -0.51563,0.375 -0.51563,0.98437 z m 1.03125,-8.45316 q 0,0.85938 0.39063,1.34375 0.39062,0.48438 1.17187,0.48438 0.79688,0 1.17188,-0.48438 0.375,-0.48437 0.375,-1.34375 0,-1.85937 -1.54688,-1.85937 -1.5625,0 -1.5625,1.85937 z m 12.78969,-1.5625 q -0.90625,0 -1.42188,0.57813 -0.5,0.5625 -0.57812,1.60937 l 3.96875,0 q -0.0156,-1.04687 -0.54688,-1.60937 -0.51562,-0.57813 -1.42187,-0.57813 z m 0.39062,8.73441 q -2.5,0 -3.90625,-1.375 -1.40625,-1.39062 -1.40625,-3.92191 0,-2.60937 1.29688,-4.03125 1.29687,-1.42187 3.60937,-1.42187 2.1875,0 3.40625,1.25 1.23438,1.25 1.23438,3.45312 l 0,1.37504 -6.6875,0 q 0.0469,1.20312 0.71875,1.89062 0.67187,0.67188 1.875,0.67188 0.9375,0 1.76562,-0.1875 0.84375,-0.20313 1.75,-0.625 l 0,2.1875 q -0.75,0.375 -1.59375,0.54687 -0.84375,0.1875 -2.0625,0.1875 z"
|
||||
id="path85"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 57.53806,530.28217 226.4252,0 0,46.92914 -226.4252,0 z"
|
||||
id="path87"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 78.94802,552.20715 q -0.609375,0 -1.078125,-0.3125 -0.46875,-0.32813 -0.703125,-0.89063 l -0.0625,0 -0.4375,1.07813 -0.796875,0 2.09375,-9.875 1.0625,0 q -0.3125,1.53125 -0.5,2.35937 -0.171875,0.8125 -0.46875,1.89063 l 0.04687,0 q 0.59375,-0.73438 1.171875,-1.09375 0.578125,-0.35938 1.1875,-0.35938 0.890625,0 1.390625,0.64063 0.5,0.625 0.5,1.71875 0,1.32812 -0.4375,2.45312 -0.421875,1.125 -1.203125,1.76563 -0.78125,0.625 -1.765625,0.625 z m 1.1875,-6.3125 q -0.609375,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.359375,0.90625 -0.359375,1.85937 0,0.70313 0.34375,1.07813 0.359375,0.375 1.015625,0.375 0.640625,0 1.171875,-0.51563 0.546875,-0.51562 0.875,-1.46875 0.328125,-0.95312 0.328125,-2.01562 0,-1.4375 -1.125,-1.4375 z m 7.473556,6.1875 0.9375,-4.39063 q 0.109375,-0.59375 0.109375,-0.85937 0,-0.4375 -0.203125,-0.6875 -0.1875,-0.25 -0.65625,-0.25 -0.546875,0 -1.046875,0.39062 -0.5,0.375 -0.890625,1.07813 -0.375,0.70312 -0.59375,1.70312 l -0.640625,3.01563 -1.0625,0 1.484375,-6.95313 0.890625,0 -0.140625,1.28125 0.0625,0 q 0.546875,-0.75 1.09375,-1.07812 0.546875,-0.32813 1.140625,-0.32813 0.71875,0 1.09375,0.40625 0.390625,0.40625 0.46875,1.15625 l 0.04687,0 q 0.546875,-0.79687 1.15625,-1.17187 0.625,-0.39063 1.25,-0.39063 0.796875,0 1.234375,0.4375 0.453125,0.42188 0.453125,1.25 0,0.42188 -0.140625,1.125 l -0.921875,4.26563 -1.078125,0 0.9375,-4.39063 q 0.140625,-0.65625 0.140625,-0.92187 0,-0.40625 -0.21875,-0.64063 -0.21875,-0.23437 -0.6875,-0.23437 -0.515625,0 -1.03125,0.375 -0.5,0.35937 -0.875,1.04687 -0.375,0.67188 -0.578125,1.59375 l -0.671875,3.17188 -1.0625,0 z m 10.654313,0.125 q -0.609375,0 -1.078125,-0.3125 -0.453125,-0.32813 -0.71875,-0.89063 l -0.0625,0 -0.01563,0.23438 q -0.01563,0.17187 -0.07813,0.45312 -0.04687,0.28125 -0.71875,3.51563 l -1.046875,0 2.125,-10.07813 0.890625,0 -0.171875,1.32813 0.04687,0 q 1.140625,-1.45313 2.359375,-1.45313 0.874996,0 1.374996,0.625 0.5,0.625 0.5,1.73438 0,1.34375 -0.4375,2.46875 -0.4375,1.125 -1.21875,1.75 -0.765621,0.625 -1.749996,0.625 z m 1.1875,-6.3125 q -0.609375,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.359375,0.90625 -0.359375,1.85937 0,0.70313 0.34375,1.07813 0.359375,0.375 1.015625,0.375 0.640625,0 1.171875,-0.51563 0.546875,-0.51562 0.874996,-1.46875 0.32813,-0.95312 0.32813,-2.01562 0,-1.4375 -1.125001,-1.4375 z m 4.895431,4.67187 0.0469,0.15625 q -0.70313,1.48438 -1.70313,3.03125 l -0.82812,0 q 0.8125,-1.8125 1.29687,-3.1875 l 1.1875,0 z m 7.94531,1.64063 q -1.17187,0 -1.84375,-0.6875 -0.65625,-0.6875 -0.65625,-1.92188 0,-1.1875 0.46875,-2.28125 0.46875,-1.09375 1.25,-1.70312 0.78125,-0.60938 1.71875,-0.60938 0.98438,0 1.46875,0.42188 0.48438,0.42187 0.48438,1.17187 0,1.14063 -1.0625,1.79688 -1.04688,0.64062 -3,0.64062 l -0.21875,0 -0.0156,0.51563 q 0,0.82812 0.39063,1.29687 0.39062,0.46875 1.20312,0.46875 0.40625,0 0.82813,-0.10937 0.42187,-0.125 1.04687,-0.42188 l 0,0.92188 q -0.59375,0.28125 -1.0625,0.39062 -0.45312,0.10938 -1,0.10938 z m 0.875,-6.29688 q -0.64062,0 -1.21875,0.59375 -0.57812,0.59375 -0.89062,1.65625 l 0.0781,0 q 1.45313,0 2.21875,-0.375 0.78125,-0.375 0.78125,-1.09375 0,-0.34375 -0.23437,-0.5625 -0.23438,-0.21875 -0.73438,-0.21875 z m 5.5417,3.42188 -2.20312,2.75 -1.23438,0 3.01563,-3.59375 -1.51563,-3.35938 1.07813,0 1.10937,2.60938 2.09375,-2.60938 1.21875,0 -2.875,3.42188 1.59375,3.53125 -1.0625,0 -1.21875,-2.75 z m 8.18372,-4.32813 q 0.4375,0 0.75,0.0781 l -0.21875,0.95312 q -0.34375,-0.0781 -0.67187,-0.0781 -0.57813,0 -1.09375,0.39062 -0.5,0.375 -0.875,1.04688 -0.375,0.67187 -0.54688,1.5 l -0.6875,3.1875 -1.0625,0 1.48438,-6.95313 0.89062,0 -0.14062,1.28125 0.0625,0 q 0.45312,-0.59375 0.75,-0.85937 0.29687,-0.26563 0.625,-0.40625 0.32812,-0.14063 0.73437,-0.14063 z m 2.3404,5.5625 0.0469,0.15625 q -0.70313,1.48438 -1.70314,3.03125 l -0.82812,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 6.25781,1.51563 -1.0625,0 1.48438,-6.95313 1.0625,0 -1.48438,6.95313 z m 0.71875,-8.73438 q 0,-0.35937 0.20313,-0.57812 0.20312,-0.23438 0.53125,-0.23438 0.5625,0 0.5625,0.57813 0,0.34375 -0.21875,0.59375 -0.21875,0.23437 -0.48438,0.23437 -0.26562,0 -0.4375,-0.15625 -0.15625,-0.15625 -0.15625,-0.4375 z m 4.4466,8.85938 q -1.23438,0 -1.92188,-0.67188 -0.67187,-0.6875 -0.67187,-1.92187 0,-1.26563 0.46875,-2.34375 0.46875,-1.07813 1.29687,-1.67188 0.82813,-0.59375 1.85938,-0.59375 0.875,0 1.70312,0.3125 l -0.29687,0.90625 q -0.76563,-0.32812 -1.39063,-0.32812 -0.70312,0 -1.29687,0.48437 -0.59375,0.48438 -0.92188,1.35938 -0.32812,0.85937 -0.32812,1.875 0,0.8125 0.42187,1.26562 0.42188,0.45313 1.15625,0.45313 0.46875,0 0.875,-0.125 0.40625,-0.14063 0.79688,-0.3125 l 0,0.92187 q -0.79688,0.39063 -1.75,0.39063 z m 6.85963,-7.17188 q 1.20313,0 1.90625,0.71875 0.70313,0.70313 0.70313,1.95313 0,1.20312 -0.46875,2.26562 -0.45313,1.0625 -1.23438,1.64063 -0.78125,0.57812 -1.76562,0.57812 -1.21875,0 -1.90625,-0.71875 -0.6875,-0.71875 -0.6875,-1.96875 0,-1.20312 0.45312,-2.26562 0.46875,-1.0625 1.25,-1.625 0.79688,-0.57813 1.75,-0.Line truncated
|
||||
id="path89"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 123.11223,566.1134 q 0,0.98437 -0.70313,1.54687 -0.70312,0.54688 -1.98437,0.54688 -1.0625,0 -1.9375,-0.4375 l 0,-1 q 0.45312,0.26562 0.96875,0.42187 0.51562,0.14063 0.95312,0.14063 0.79688,0 1.20313,-0.3125 0.40625,-0.32813 0.40625,-0.82813 0,-0.35937 -0.23438,-0.60937 -0.21875,-0.25 -0.95312,-0.67188 -0.82813,-0.46875 -1.17188,-0.90625 -0.34375,-0.45312 -0.34375,-1.0625 0,-0.875 0.64063,-1.40625 0.65625,-0.53125 1.70312,-0.53125 1.07813,0 2.09375,0.46875 l -0.34375,0.85938 -0.35937,-0.15625 q -0.64063,-0.26563 -1.39063,-0.26563 -0.59375,0 -0.9375,0.28125 -0.32812,0.26563 -0.32812,0.70313 0,0.35937 0.21875,0.60937 0.23437,0.25 0.9375,0.65625 0.67187,0.375 0.96875,0.65625 0.29687,0.26563 0.4375,0.57813 0.15625,0.3125 0.15625,0.71875 z m 2.45741,1.96875 -0.79687,-6.95313 1.0625,0 0.40625,3.89063 q 0.15625,1.64062 0.15625,2.29687 l 0.0312,0 q 0.8125,-1.75 1.14062,-2.35937 l 2.0625,-3.82813 1.125,0 -3.75,6.95313 -1.4375,0 z m 11.71895,-6.95313 -0.15625,0.67188 -1.34375,0.15625 q 0.26563,0.39062 0.26563,1 0,1.21875 -0.75,1.9375 -0.73438,0.71875 -1.96875,0.71875 -0.35938,0 -0.53125,-0.0469 -0.89063,0.32813 -0.89063,0.82813 0,0.26562 0.20313,0.35937 0.21875,0.0781 0.625,0.125 l 0.73437,0.0781 q 1.15625,0.14062 1.67188,0.5625 0.51562,0.42187 0.51562,1.23437 0,1.17188 -0.9375,1.8125 -0.92187,0.64063 -2.59375,0.64063 -1.23437,0 -1.9375,-0.46875 -0.70312,-0.46875 -0.70312,-1.3125 0,-0.67188 0.46875,-1.17188 0.45312,-0.48437 1.46875,-0.8125 -0.48438,-0.26562 -0.48438,-0.78125 0,-0.4375 0.3125,-0.75 0.32813,-0.3125 0.90625,-0.57812 -0.40625,-0.20313 -0.65625,-0.59375 -0.25,-0.40625 -0.25,-0.9375 0,-1.23438 0.75,-2.01563 0.76563,-0.78125 1.95313,-0.78125 0.48437,0 0.96875,0.125 l 2.35937,0 z m -6.76562,8.1875 q 0,0.5 0.40625,0.78125 0.42187,0.28125 1.23437,0.28125 1.15625,0 1.79688,-0.40625 0.65625,-0.40625 0.65625,-1.14062 0,-0.39063 -0.34375,-0.625 -0.34375,-0.21875 -1.15625,-0.3125 l -1.01563,-0.0937 q -0.76562,0.15625 -1.17187,0.54687 -0.40625,0.40625 -0.40625,0.96875 z m 1.76562,-5.54687 q 0,0.53125 0.28125,0.8125 0.29688,0.28125 0.79688,0.28125 0.5,0 0.875,-0.26563 0.375,-0.26562 0.57812,-0.71875 0.20313,-0.46875 0.20313,-1.01562 0,-0.53125 -0.28125,-0.79688 -0.28125,-0.28125 -0.79688,-0.28125 -0.5,0 -0.875,0.26563 -0.35937,0.25 -0.57812,0.71875 -0.20313,0.45312 -0.20313,1 z m 6.53645,2.79687 0.0469,0.15625 q -0.70313,1.48438 -1.70313,3.03125 l -0.82812,0 q 0.8125,-1.8125 1.29687,-3.1875 l 1.1875,0 z m 7.32032,0.76563 q 0.35937,0 0.92187,-0.15625 l 0,0.8125 q -0.21875,0.0937 -0.53125,0.15625 -0.3125,0.0625 -0.51562,0.0625 -0.78125,0 -1.20313,-0.375 -0.42187,-0.375 -0.42187,-1.125 0,-0.42188 0.10937,-0.95313 l 0.79688,-3.82812 -1.07813,0 0.0781,-0.45313 1.17187,-0.5 0.79688,-1.45312 0.625,0 -0.34375,1.60937 1.73437,0 -0.17187,0.79688 -1.71875,0 -0.82813,3.84375 q -0.10937,0.54687 -0.10937,0.82812 0,0.35938 0.17187,0.54688 0.1875,0.1875 0.51563,0.1875 z m 8.8056,-6.20313 -0.15625,0.67188 -1.34375,0.15625 q 0.26562,0.39062 0.26562,1 0,1.21875 -0.75,1.9375 -0.73437,0.71875 -1.96875,0.71875 -0.35937,0 -0.53125,-0.0469 -0.89062,0.32813 -0.89062,0.82813 0,0.26562 0.20312,0.35937 0.21875,0.0781 0.625,0.125 l 0.73438,0.0781 q 1.15625,0.14062 1.67187,0.5625 0.51563,0.42187 0.51563,1.23437 0,1.17188 -0.9375,1.8125 -0.92188,0.64063 -2.59375,0.64063 -1.23438,0 -1.9375,-0.46875 -0.70313,-0.46875 -0.70313,-1.3125 0,-0.67188 0.46875,-1.17188 0.45313,-0.48437 1.46875,-0.8125 -0.48437,-0.26562 -0.48437,-0.78125 0,-0.4375 0.3125,-0.75 0.32812,-0.3125 0.90625,-0.57812 -0.40625,-0.20313 -0.65625,-0.59375 -0.25,-0.40625 -0.25,-0.9375 0,-1.23438 0.75,-2.01563 0.76562,-0.78125 1.95312,-0.78125 0.48438,0 0.96875,0.125 l 2.35938,0 z m -6.76563,8.1875 q 0,0.5 0.40625,0.78125 0.42188,0.28125 1.23438,0.28125 1.15625,0 1.79687,-0.40625 0.65625,-0.40625 0.65625,-1.14062 0,-0.39063 -0.34375,-0.625 -0.34375,-0.21875 -1.15625,-0.3125 l -1.01562,-0.0937 q -0.76563,0.15625 -1.17188,0.54687 -0.40625,0.40625 -0.40625,0.96875 z m 1.76563,-5.54687 q 0,0.53125 0.28125,0.8125 0.29687,0.28125 0.79687,0.28125 0.5,0 0.875,-0.26563 0.375,-0.26562 0.57813,-0.71875 0.20312,-0.46875 0.20312,-1.01562 0,-0.53125 -0.28125,-0.79688 -0.28125,-0.28125 -0.79687,-0.28125 -0.5,0 -0.875,0.26563 -0.35938,0.25 -0.57813,0.71875 -0.20312,0.45312 -0.20312,1 z m 8.7552,-2.76563 q 0.57813,0 1.03125,0.3125 0.45313,0.3125 0.71875,0.90625 l 0.0625,0 0.42188,-1.09375 0.8125,0 -1.48438,6.95313 -0.84375,0 0.17188,-1.32813 -0.0469,0 q -1.14062,1.45313 -2.40625,1.45313 -0.875,0 -1.375,-0.625 -0.5,-0.625 -0.5,-1.71875 0,-1.32813 0.45313,-2.45313 0.45312,-1.125 1.23437,-1.76562 0.79688,-0.64063 1.75,-0.64063 z m -1.21875,6.32813 q 0.625,0 1.23438,-0.59375 0.60937,-0.59375 0.98437,-1.53125 0.39063,-0.9375 0.39063,-1.89063 0,-0.65625 -0.35938,-1.03125 -0.35937,-0.39062 -0.9375,-0.39062 -0.65625,0 -1.23437,0.54687 -0.5625,0.54688 -0.89063,1.48438 -0.3125,0.92187 -0.3125,1.95312 0,0.73438 0.29688,1.09375 0.29687,0.35938 0.82812,0.35938 z m 6.52962,-0.76563 0.0469,0.15625 q -0.7031Line truncated
|
||||
id="path91"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 443.9685,495.9042 236.91339,0 0,75.02359 -236.91339,0 z"
|
||||
id="path93"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 449.2126,495.9042 226.42523,0 0,40.37796 -226.42523,0 z"
|
||||
id="path95"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 535.4653,522.8242 0,-13.56253 2.875,0 0,13.56253 -2.875,0 z m 15.23877,0 -2.82813,0 0,-6.0625 q 0,-1.125 -0.375,-1.67187 -0.375,-0.5625 -1.17187,-0.5625 -1.09375,0 -1.59375,0.79687 -0.48438,0.79688 -0.48438,2.625 l 0,4.875 -2.82812,0 0,-10.375 2.15625,0 0.39062,1.32813 0.15625,0 q 0.42188,-0.71875 1.20313,-1.10938 0.78125,-0.40625 1.8125,-0.40625 2.32812,0 3.15625,1.51563 l 0.25,0 q 0.40625,-0.71875 1.21875,-1.10938 0.8125,-0.40625 1.84375,-0.40625 1.75,0 2.65625,0.90625 0.90625,0.89063 0.90625,2.89063 l 0,6.76562 -2.82813,0 0,-6.0625 q 0,-1.125 -0.39062,-1.67187 -0.375,-0.5625 -1.17188,-0.5625 -1.04687,0 -1.5625,0.75 -0.51562,0.73437 -0.51562,2.34375 l 0,5.20312 z m 15.63171,0 -0.54687,-1.40625 -0.0781,0 q -0.71875,0.89063 -1.48437,1.25 -0.75,0.34375 -1.95313,0.34375 -1.5,0 -2.35937,-0.84375 -0.85938,-0.85937 -0.85938,-2.4375 0,-1.65625 1.15625,-2.4375 1.15625,-0.78125 3.48438,-0.875 l 1.79687,-0.0469 0,-0.45313 q 0,-1.57812 -1.60937,-1.57812 -1.25,0 -2.92188,0.75 l -0.9375,-1.92188 q 1.78125,-0.92187 3.96875,-0.92187 2.09375,0 3.20313,0.90625 1.10937,0.90625 1.10937,2.76562 l 0,6.90625 -1.96875,0 z m -0.84375,-4.8125 -1.09375,0.0469 q -1.23437,0.0312 -1.84375,0.4375 -0.59375,0.40625 -0.59375,1.25 0,1.1875 1.375,1.1875 0.98438,0 1.5625,-0.5625 0.59375,-0.5625 0.59375,-1.5 l 0,-0.85938 z m 14.54969,-5.5625 0,1.4375 -1.625,0.42188 q 0.4375,0.6875 0.4375,1.5625 0,1.67187 -1.17188,2.60937 -1.15625,0.92188 -3.21875,0.92188 l -0.51562,-0.0312 -0.40625,-0.0469 q -0.4375,0.34375 -0.4375,0.75 0,0.60938 1.54687,0.60938 l 1.76563,0 q 1.70312,0 2.59375,0.73437 0.90625,0.73438 0.90625,2.15625 0,1.8125 -1.51563,2.8125 -1.51562,1 -4.35937,1 -2.17188,0 -3.3125,-0.76562 -1.14063,-0.75 -1.14063,-2.10938 0,-0.9375 0.57813,-1.57812 0.57812,-0.625 1.71875,-0.89063 -0.4375,-0.1875 -0.76563,-0.60937 -0.32812,-0.42188 -0.32812,-0.89063 0,-0.59375 0.34375,-0.98437 0.34375,-0.40625 1,-0.78125 -0.8125,-0.34375 -1.29688,-1.125 -0.48437,-0.78125 -0.48437,-1.84375 0,-1.70313 1.10937,-2.625 1.10938,-0.92188 3.15625,-0.92188 0.4375,0 1.03125,0.0781 0.59375,0.0781 0.76563,0.10937 l 3.625,0 z m -8.01563,11.84375 q 0,0.57813 0.5625,0.90625 0.5625,0.34375 1.57813,0.34375 1.51562,0 2.375,-0.42187 0.875,-0.40625 0.875,-1.14063 0,-0.57812 -0.51563,-0.8125 -0.51562,-0.21875 -1.57812,-0.21875 l -1.46875,0 q -0.78125,0 -1.3125,0.35938 -0.51563,0.375 -0.51563,0.98437 z m 1.03125,-8.45312 q 0,0.85937 0.39063,1.34375 0.39062,0.48437 1.17187,0.48437 0.79688,0 1.17188,-0.48437 0.375,-0.48438 0.375,-1.34375 0,-1.85938 -1.54688,-1.85938 -1.5625,0 -1.5625,1.85938 z m 12.78967,-1.5625 q -0.90625,0 -1.42187,0.57812 -0.5,0.5625 -0.57813,1.60938 l 3.96875,0 q -0.0156,-1.04688 -0.54687,-1.60938 -0.51563,-0.57812 -1.42188,-0.57812 z m 0.39063,8.73437 q -2.5,0 -3.90625,-1.375 -1.40625,-1.39062 -1.40625,-3.92187 0,-2.60938 1.29687,-4.03125 1.29688,-1.42188 3.60938,-1.42188 2.1875,0 3.40625,1.25 1.23437,1.25 1.23437,3.45313 l 0,1.375 -6.6875,0 q 0.0469,1.20312 0.71875,1.89062 0.67188,0.67188 1.875,0.67188 0.9375,0 1.76563,-0.1875 0.84375,-0.20313 1.75,-0.625 l 0,2.1875 q -0.75,0.375 -1.59375,0.54687 -0.84375,0.1875 -2.0625,0.1875 z"
|
||||
id="path97"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 449.2126,536.28217 226.42523,0 0,34.64563 -226.42523,0 z"
|
||||
id="path99"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 511.5036,558.08215 -1.0625,0 1.48437,-6.95313 1.0625,0 -1.48437,6.95313 z m 0.71875,-8.73438 q 0,-0.35937 0.20312,-0.57812 0.20313,-0.23438 0.53125,-0.23438 0.5625,0 0.5625,0.57813 0,0.34375 -0.21875,0.59375 -0.21875,0.23437 -0.48437,0.23437 -0.26563,0 -0.4375,-0.15625 -0.15625,-0.15625 -0.15625,-0.4375 z m 4.44659,8.85938 q -1.23437,0 -1.92187,-0.67188 -0.67188,-0.6875 -0.67188,-1.92187 0,-1.26563 0.46875,-2.34375 0.46875,-1.07813 1.29688,-1.67188 0.82812,-0.59375 1.85937,-0.59375 0.875,0 1.70313,0.3125 l -0.29688,0.90625 q -0.76562,-0.32812 -1.39062,-0.32812 -0.70313,0 -1.29688,0.48437 -0.59375,0.48438 -0.92187,1.35938 -0.32813,0.85937 -0.32813,1.875 0,0.8125 0.42188,1.26562 0.42187,0.45313 1.15625,0.45313 0.46875,0 0.875,-0.125 0.40625,-0.14063 0.79687,-0.3125 l 0,0.92187 q -0.79687,0.39063 -1.75,0.39063 z m 6.85962,-7.17188 q 1.20313,0 1.90625,0.71875 0.70313,0.70313 0.70313,1.95313 0,1.20312 -0.46875,2.26562 -0.45313,1.0625 -1.23438,1.64063 -0.78125,0.57812 -1.76562,0.57812 -1.21875,0 -1.90625,-0.71875 -0.6875,-0.71875 -0.6875,-1.96875 0,-1.20312 0.45312,-2.26562 0.46875,-1.0625 1.25,-1.625 0.79688,-0.57813 1.75,-0.57813 z m 1.5,2.53125 q 0,-0.73437 -0.40625,-1.1875 -0.39062,-0.45312 -1.0625,-0.45312 -0.6875,0 -1.25,0.46875 -0.54687,0.46875 -0.84375,1.3125 -0.29687,0.82812 -0.29687,1.85937 0,0.82813 0.39062,1.28125 0.40625,0.45313 1.17188,0.45313 0.65625,0 1.17187,-0.45313 0.53125,-0.46875 0.82813,-1.32812 0.29687,-0.85938 0.29687,-1.95313 z m 3.74317,3 0.0469,0.15625 q -0.70312,1.48438 -1.70312,3.03125 l -0.82813,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 3.96093,4.64063 q -0.4375,0 -0.78125,-0.14063 l 0,-0.89062 q 0.39063,0.14062 0.76563,0.14062 0.78125,0 1.0625,-1.29687 l 1.67187,-7.89063 1.04688,0 -1.6875,7.98438 q -0.21875,1.07812 -0.71875,1.57812 -0.5,0.51563 -1.35938,0.51563 z m 3.01563,-11.85938 q 0,-0.35937 0.20312,-0.57812 0.20313,-0.23438 0.53125,-0.23438 0.54688,0 0.54688,0.57813 0,0.34375 -0.21875,0.59375 -0.20313,0.23437 -0.48438,0.23437 -0.25,0 -0.42187,-0.15625 -0.15625,-0.15625 -0.15625,-0.4375 z m 4.68097,8.85938 q -0.60938,0 -1.07813,-0.3125 -0.45312,-0.32813 -0.71875,-0.89063 l -0.0625,0 -0.0156,0.23438 q -0.0156,0.17187 -0.0781,0.45312 -0.0469,0.28125 -0.71875,3.51563 l -1.04687,0 2.125,-10.07813 0.89062,0 -0.17187,1.32813 0.0469,0 q 1.14063,-1.45313 2.35938,-1.45313 0.875,0 1.375,0.625 0.5,0.625 0.5,1.73438 0,1.34375 -0.4375,2.46875 -0.4375,1.125 -1.21875,1.75 -0.76563,0.625 -1.75,0.625 z m 1.1875,-6.3125 q -0.60938,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.35938,0.90625 -0.35938,1.85937 0,0.70313 0.34375,1.07813 0.35938,0.375 1.01563,0.375 0.64062,0 1.17187,-0.51563 0.54688,-0.51562 0.875,-1.46875 0.32813,-0.95312 0.32813,-2.01562 0,-1.4375 -1.125,-1.4375 z m 10.03607,-0.76563 -0.15625,0.67188 -1.34375,0.15625 q 0.26563,0.39062 0.26563,1 0,1.21875 -0.75,1.9375 -0.73438,0.71875 -1.96875,0.71875 -0.35938,0 -0.53125,-0.0469 -0.89063,0.32813 -0.89063,0.82813 0,0.26562 0.20313,0.35937 0.21875,0.0781 0.625,0.125 l 0.73437,0.0781 q 1.15625,0.14062 1.67188,0.5625 0.51562,0.42187 0.51562,1.23437 0,1.17188 -0.9375,1.8125 -0.92187,0.64063 -2.59375,0.64063 -1.23437,0 -1.9375,-0.46875 -0.70312,-0.46875 -0.70312,-1.3125 0,-0.67188 0.46875,-1.17188 0.45312,-0.48437 1.46875,-0.8125 -0.48438,-0.26562 -0.48438,-0.78125 0,-0.4375 0.3125,-0.75 0.32813,-0.3125 0.90625,-0.57812 -0.40625,-0.20313 -0.65625,-0.59375 -0.25,-0.40625 -0.25,-0.9375 0,-1.23438 0.75,-2.01563 0.76563,-0.78125 1.95313,-0.78125 0.48437,0 0.96875,0.125 l 2.35937,0 z m -6.76562,8.1875 q 0,0.5 0.40625,0.78125 0.42187,0.28125 1.23437,0.28125 1.15625,0 1.79688,-0.40625 0.65625,-0.40625 0.65625,-1.14062 0,-0.39063 -0.34375,-0.625 -0.34375,-0.21875 -1.15625,-0.3125 l -1.01563,-0.0937 q -0.76562,0.15625 -1.17187,0.54687 -0.40625,0.40625 -0.40625,0.96875 z m 1.76562,-5.54687 q 0,0.53125 0.28125,0.8125 0.29688,0.28125 0.79688,0.28125 0.5,0 0.875,-0.26563 0.375,-0.26562 0.57812,-0.71875 0.20313,-0.46875 0.20313,-1.01562 0,-0.53125 -0.28125,-0.79688 -0.28125,-0.28125 -0.79688,-0.28125 -0.5,0 -0.875,0.26563 -0.35937,0.25 -0.57812,0.71875 -0.20313,0.45312 -0.20313,1 z m 6.53644,2.79687 0.0469,0.15625 q -0.70312,1.48438 -1.70312,3.03125 l -0.82813,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 8.27344,1.64063 q -0.60938,0 -1.07813,-0.3125 -0.45312,-0.32813 -0.71875,-0.89063 l -0.0625,0 -0.0156,0.23438 q -0.0156,0.17187 -0.0781,0.45312 -0.0469,0.28125 -0.71875,3.51563 l -1.04687,0 2.125,-10.07813 0.89062,0 -0.17187,1.32813 0.0469,0 q 1.14063,-1.45313 2.35938,-1.45313 0.875,0 1.375,0.625 0.5,0.625 0.5,1.73438 0,1.34375 -0.4375,2.46875 -0.4375,1.125 -1.21875,1.75 -0.76563,0.625 -1.75,0.625 z m 1.1875,-6.3125 q -0.60938,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.35938,0.90625 -0.35938,1.85937 0,0.70313 0.34375,1.07813 0.35938,0.375 1.01563,0.375 0.64062,0 1.17187,-0.51563 0.54688,-0.51562 0.875,-1.46875 0.32813,-0.95312 0.32813,-2.01562 0,-1.4375 -1.125,-1.4375 z m 7.67669,6.1875 0.9375,-4.39063 q 0.125,-0.65625 0.125,-0Line truncated
|
||||
id="path101"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 447.09186,656.3924 236.91339,0 0,75.02362 -236.91339,0 z"
|
||||
id="path103"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 452.33597,656.3924 226.4252,0 0,40.37793 -226.4252,0 z"
|
||||
id="path105"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 530.0437,676.4061 q 0,3.34375 -1.90625,5.125 -1.90625,1.78125 -5.5,1.78125 l -3.84375,0 0,-13.5625 4.26562,0 q 3.3125,0 5.14063,1.75 1.84375,1.75 1.84375,4.90625 z m -2.98438,0.0625 q 0,-4.35937 -3.85937,-4.35937 l -1.53125,0 0,8.82812 1.23437,0 q 4.15625,0 4.15625,-4.46875 z m 7.57563,1.64063 q 0,1.53125 0.5,2.32812 0.51562,0.78125 1.65625,0.78125 1.125,0 1.625,-0.78125 0.5,-0.78125 0.5,-2.32812 0,-1.54688 -0.5,-2.3125 -0.5,-0.76563 -1.64063,-0.76563 -1.14062,0 -1.64062,0.76563 -0.5,0.76562 -0.5,2.3125 z m 7.17187,0 q 0,2.53125 -1.34375,3.96875 -1.32812,1.42187 -3.70312,1.42187 -1.5,0 -2.64063,-0.65625 -1.14062,-0.65625 -1.75,-1.875 -0.60937,-1.23437 -0.60937,-2.85937 0,-2.54688 1.3125,-3.95313 1.32812,-1.40625 3.73437,-1.40625 1.5,0 2.64063,0.65625 1.14062,0.64063 1.75,1.85938 0.60937,1.20312 0.60937,2.84375 z m 6.34772,5.39062 q -4.84375,0 -4.84375,-5.3125 0,-2.65625 1.3125,-4.04687 1.3125,-1.39063 3.78125,-1.39063 1.79687,0 3.21875,0.70313 l -0.82813,2.1875 q -0.67187,-0.26563 -1.25,-0.4375 -0.57812,-0.17188 -1.14062,-0.17188 -2.21875,0 -2.21875,3.125 0,3.04688 2.21875,3.04688 0.8125,0 1.5,-0.21875 0.70312,-0.21875 1.39062,-0.67188 l 0,2.42188 q -0.67187,0.42187 -1.375,0.59375 -0.70312,0.17187 -1.76562,0.17187 z m 12.71728,-0.1875 -0.375,-1.32812 -0.15625,0 q -0.45312,0.71875 -1.29687,1.125 -0.82813,0.39062 -1.89063,0.39062 -1.82812,0 -2.76562,-0.96875 -0.92188,-0.98437 -0.92188,-2.82812 l 0,-6.76563 2.84375,0 0,6.0625 q 0,1.125 0.39063,1.6875 0.40625,0.5625 1.26562,0.5625 1.1875,0 1.71875,-0.79687 0.53125,-0.79688 0.53125,-2.64063 l 0,-4.875 2.82813,0 0,10.375 -2.17188,0 z m 14.19892,0 -2.82813,0 0,-6.0625 q 0,-1.125 -0.375,-1.67187 -0.375,-0.5625 -1.17187,-0.5625 -1.09375,0 -1.59375,0.79687 -0.48438,0.79688 -0.48438,2.625 l 0,4.875 -2.82812,0 0,-10.375 2.15625,0 0.39062,1.32813 0.15625,0 q 0.42188,-0.71875 1.20313,-1.10938 0.78125,-0.40625 1.8125,-0.40625 2.32812,0 3.15625,1.51563 l 0.25,0 q 0.40625,-0.71875 1.21875,-1.10938 0.8125,-0.40625 1.84375,-0.40625 1.75,0 2.65625,0.90625 0.90625,0.89063 0.90625,2.89063 l 0,6.76562 -2.82813,0 0,-6.0625 q 0,-1.125 -0.39062,-1.67187 -0.375,-0.5625 -1.17188,-0.5625 -1.04687,0 -1.5625,0.75 -0.51562,0.73437 -0.51562,2.34375 l 0,5.20312 z m 13.33484,-8.54687 q -0.90625,0 -1.42188,0.57812 -0.5,0.5625 -0.57812,1.60938 l 3.96875,0 q -0.0156,-1.04688 -0.54688,-1.60938 -0.51562,-0.57812 -1.42187,-0.57812 z m 0.39062,8.73437 q -2.5,0 -3.90625,-1.375 -1.40625,-1.39062 -1.40625,-3.92187 0,-2.60938 1.29688,-4.03125 1.29687,-1.42188 3.60937,-1.42188 2.1875,0 3.40625,1.25 1.23438,1.25 1.23438,3.45313 l 0,1.375 -6.6875,0 q 0.0469,1.20312 0.71875,1.89062 0.67187,0.67188 1.875,0.67188 0.9375,0 1.76562,-0.1875 0.84375,-0.20313 1.75,-0.625 l 0,2.1875 q -0.75,0.375 -1.59375,0.54687 -0.84375,0.1875 -2.0625,0.1875 z m 15.91309,-0.1875 -2.82813,0 0,-6.0625 q 0,-1.125 -0.40625,-1.67187 -0.39062,-0.5625 -1.26562,-0.5625 -1.1875,0 -1.71875,0.79687 -0.53125,0.78125 -0.53125,2.625 l 0,4.875 -2.82813,0 0,-10.375 2.15625,0 0.39063,1.32813 0.15625,0 q 0.46875,-0.75 1.29687,-1.125 0.82813,-0.39063 1.89063,-0.39063 1.8125,0 2.75,0.98438 0.9375,0.96875 0.9375,2.8125 l 0,6.76562 z m 7.05829,-2.0625 q 0.73437,0 1.78125,-0.32812 l 0,2.10937 q -1.0625,0.46875 -2.60938,0.46875 -1.6875,0 -2.46875,-0.85937 -0.76562,-0.85938 -0.76562,-2.57813 l 0,-5 -1.35938,0 0,-1.1875 1.5625,-0.95312 0.8125,-2.1875 1.8125,0 0,2.20312 2.90625,0 0,2.125 -2.90625,0 0,5 q 0,0.60938 0.32813,0.90625 0.34375,0.28125 0.90625,0.28125 z"
|
||||
id="path107"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 452.33597,696.7703 226.4252,0 0,34.64569 -226.4252,0 z"
|
||||
id="path109"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#004b82;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 559.2236,718.6953 q -0.60937,0 -1.07812,-0.3125 -0.45313,-0.32813 -0.71875,-0.89063 l -0.0625,0 -0.0156,0.23438 q -0.0156,0.17187 -0.0781,0.45312 -0.0469,0.28125 -0.71875,3.51563 l -1.04688,0 2.125,-10.07813 0.89063,0 -0.17188,1.32813 0.0469,0 q 1.14062,-1.45313 2.35937,-1.45313 0.875,0 1.375,0.625 0.5,0.625 0.5,1.73438 0,1.34375 -0.4375,2.46875 -0.4375,1.125 -1.21875,1.75 -0.76562,0.625 -1.75,0.625 z m 1.1875,-6.3125 q -0.60937,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.35937,0.90625 -0.35937,1.85937 0,0.70313 0.34375,1.07813 0.35937,0.375 1.01562,0.375 0.64063,0 1.17188,-0.51563 0.54687,-0.51562 0.875,-1.46875 0.32812,-0.95312 0.32812,-2.01562 0,-1.4375 -1.125,-1.4375 z m 7.1142,-0.89063 q 1.21875,0 1.78125,1.21875 l 0.0625,0 q 0.10937,-0.98437 0.28125,-1.75 l 0.5,-2.26562 1.04687,0 -2.09375,9.875 -0.875,0 0.14063,-1.32813 -0.0625,0 q -0.64063,0.79688 -1.20313,1.125 -0.54687,0.32813 -1.14062,0.32813 -0.89063,0 -1.39063,-0.625 -0.48437,-0.625 -0.48437,-1.71875 0,-1.35938 0.45312,-2.48438 0.45313,-1.14062 1.23438,-1.75 0.78125,-0.625 1.75,-0.625 z m -1.21875,6.32813 q 0.60937,0 1.23437,-0.59375 0.64063,-0.59375 1,-1.51563 0.375,-0.9375 0.375,-1.89062 0,-0.70313 -0.34375,-1.0625 -0.32812,-0.375 -0.98437,-0.375 -0.64063,0 -1.20313,0.53125 -0.54687,0.51562 -0.875,1.46875 -0.32812,0.9375 -0.32812,1.98437 0,1.45313 1.125,1.45313 z m 4.19232,3.875 q -0.4375,0 -0.79688,-0.14063 l 0,-0.89062 q 0.40625,0.14062 0.70313,0.14062 0.48437,0 0.75,-0.39062 0.26562,-0.39063 0.42187,-1.125 l 1.4375,-6.875 -1.21875,0 0.0781,-0.42188 1.3125,-0.42187 0.14062,-0.625 q 0.29688,-1.28125 0.8125,-1.79688 0.51563,-0.53125 1.53125,-0.53125 0.25,0 0.60938,0.0781 0.375,0.0781 0.57812,0.15625 l -0.26562,0.82812 q -0.48438,-0.1875 -0.875,-0.1875 -0.54688,0 -0.84375,0.3125 -0.29688,0.29688 -0.48438,1.125 l -0.15625,0.6875 1.51563,0 -0.15625,0.79688 -1.51563,0 -1.46875,6.96875 q -0.25,1.20312 -0.76562,1.75 -0.51563,0.5625 -1.34375,0.5625 z"
|
||||
id="path111"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 47.89501,650.2507 236.91339,0 0,87.30707 -236.91339,0 z"
|
||||
id="path113"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#0171bb;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 53.139107,650.2507 226.425203,0 0,40.37793 -226.425203,0 z"
|
||||
id="path115"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 130.84686,670.2644 q 0,3.34375 -1.90625,5.125 -1.90625,1.78125 -5.5,1.78125 l -3.84375,0 0,-13.5625 4.26562,0 q 3.3125,0 5.14063,1.75 1.84375,1.75 1.84375,4.90625 z m -2.98438,0.0625 q 0,-4.35937 -3.85937,-4.35937 l -1.53125,0 0,8.82812 1.23437,0 q 4.15625,0 4.15625,-4.46875 z m 7.57563,1.64063 q 0,1.53125 0.5,2.32812 0.51562,0.78125 1.65625,0.78125 1.125,0 1.625,-0.78125 0.5,-0.78125 0.5,-2.32812 0,-1.54688 -0.5,-2.3125 -0.5,-0.76563 -1.64063,-0.76563 -1.14062,0 -1.64062,0.76563 -0.5,0.76562 -0.5,2.3125 z m 7.17187,0 q 0,2.53125 -1.34375,3.96875 -1.32812,1.42187 -3.70312,1.42187 -1.5,0 -2.64063,-0.65625 -1.14062,-0.65625 -1.75,-1.875 -0.60937,-1.23437 -0.60937,-2.85937 0,-2.54688 1.3125,-3.95313 1.32812,-1.40625 3.73437,-1.40625 1.5,0 2.64063,0.65625 1.14062,0.64063 1.75,1.85938 0.60937,1.20312 0.60937,2.84375 z m 6.34772,5.39062 q -4.84375,0 -4.84375,-5.3125 0,-2.65625 1.3125,-4.04687 1.3125,-1.39063 3.78125,-1.39063 1.79687,0 3.21875,0.70313 l -0.82813,2.1875 q -0.67187,-0.26563 -1.25,-0.4375 -0.57812,-0.17188 -1.14062,-0.17188 -2.21875,0 -2.21875,3.125 0,3.04688 2.21875,3.04688 0.8125,0 1.5,-0.21875 0.70312,-0.21875 1.39062,-0.67188 l 0,2.42188 q -0.67187,0.42187 -1.375,0.59375 -0.70312,0.17187 -1.76562,0.17187 z m 12.7173,-0.1875 -0.375,-1.32812 -0.15625,0 q -0.45313,0.71875 -1.29688,1.125 -0.82812,0.39062 -1.89062,0.39062 -1.82813,0 -2.76563,-0.96875 -0.92187,-0.98437 -0.92187,-2.82812 l 0,-6.76563 2.84375,0 0,6.0625 q 0,1.125 0.39062,1.6875 0.40625,0.5625 1.26563,0.5625 1.1875,0 1.71875,-0.79687 0.53125,-0.79688 0.53125,-2.64063 l 0,-4.875 2.82812,0 0,10.375 -2.17187,0 z m 14.19888,0 -2.82812,0 0,-6.0625 q 0,-1.125 -0.375,-1.67187 -0.375,-0.5625 -1.17188,-0.5625 -1.09375,0 -1.59375,0.79687 -0.48437,0.79688 -0.48437,2.625 l 0,4.875 -2.82813,0 0,-10.375 2.15625,0 0.39063,1.32813 0.15625,0 q 0.42187,-0.71875 1.20312,-1.10938 0.78125,-0.40625 1.8125,-0.40625 2.32813,0 3.15625,1.51563 l 0.25,0 q 0.40625,-0.71875 1.21875,-1.10938 0.8125,-0.40625 1.84375,-0.40625 1.75,0 2.65625,0.90625 0.90625,0.89063 0.90625,2.89063 l 0,6.76562 -2.82812,0 0,-6.0625 q 0,-1.125 -0.39063,-1.67187 -0.375,-0.5625 -1.17187,-0.5625 -1.04688,0 -1.5625,0.75 -0.51563,0.73437 -0.51563,2.34375 l 0,5.20312 z m 13.33484,-8.54687 q -0.90625,0 -1.42187,0.57812 -0.5,0.5625 -0.57813,1.60938 l 3.96875,0 q -0.0156,-1.04688 -0.54687,-1.60938 -0.51563,-0.57812 -1.42188,-0.57812 z m 0.39063,8.73437 q -2.5,0 -3.90625,-1.375 -1.40625,-1.39062 -1.40625,-3.92187 0,-2.60938 1.29687,-4.03125 1.29688,-1.42188 3.60938,-1.42188 2.1875,0 3.40625,1.25 1.23437,1.25 1.23437,3.45313 l 0,1.375 -6.6875,0 q 0.0469,1.20312 0.71875,1.89062 0.67188,0.67188 1.875,0.67188 0.9375,0 1.76563,-0.1875 0.84375,-0.20313 1.75,-0.625 l 0,2.1875 q -0.75,0.375 -1.59375,0.54687 -0.84375,0.1875 -2.0625,0.1875 z m 15.91311,-0.1875 -2.82812,0 0,-6.0625 q 0,-1.125 -0.40625,-1.67187 -0.39063,-0.5625 -1.26563,-0.5625 -1.1875,0 -1.71875,0.79687 -0.53125,0.78125 -0.53125,2.625 l 0,4.875 -2.82812,0 0,-10.375 2.15625,0 0.39062,1.32813 0.15625,0 q 0.46875,-0.75 1.29688,-1.125 0.82812,-0.39063 1.89062,-0.39063 1.8125,0 2.75,0.98438 0.9375,0.96875 0.9375,2.8125 l 0,6.76562 z m 7.05826,-2.0625 q 0.73438,0 1.78125,-0.32812 l 0,2.10937 q -1.0625,0.46875 -2.60937,0.46875 -1.6875,0 -2.46875,-0.85937 -0.76563,-0.85938 -0.76563,-2.57813 l 0,-5 -1.35937,0 0,-1.1875 1.5625,-0.95312 0.8125,-2.1875 1.8125,0 0,2.20312 2.90625,0 0,2.125 -2.90625,0 0,5 q 0,0.60938 0.32812,0.90625 0.34375,0.28125 0.90625,0.28125 z"
|
||||
id="path117"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 53.139107,690.6286 226.425203,0 0,46.92914 -226.425203,0 z"
|
||||
id="path119"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 72.60971,712.5536 q -0.609375,0 -1.078125,-0.3125 -0.453125,-0.32813 -0.71875,-0.89063 l -0.0625,0 -0.01563,0.23438 q -0.01563,0.17187 -0.07813,0.45312 -0.04687,0.28125 -0.71875,3.51563 l -1.046875,0 2.125,-10.07813 0.890625,0 -0.171875,1.32813 0.04687,0 q 1.140625,-1.45313 2.359375,-1.45313 0.875,0 1.375,0.625 0.5,0.625 0.5,1.73438 0,1.34375 -0.4375,2.46875 -0.4375,1.125 -1.21875,1.75 -0.765625,0.625 -1.75,0.625 z m 1.1875,-6.3125 q -0.609375,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.359375,0.90625 -0.359375,1.85937 0,0.70313 0.34375,1.07813 0.359375,0.375 1.015625,0.375 0.640625,0 1.171875,-0.51563 0.546875,-0.51562 0.875,-1.46875 0.328125,-0.95312 0.328125,-2.01562 0,-1.4375 -1.125,-1.4375 z m 7.114182,-0.89063 q 1.21875,0 1.78125,1.21875 l 0.0625,0 q 0.109375,-0.98437 0.28125,-1.75 l 0.5,-2.26562 1.046875,0 -2.09375,9.875 -0.875,0 0.140625,-1.32813 -0.0625,0 q -0.640625,0.79688 -1.203125,1.125 -0.546875,0.32813 -1.140625,0.32813 -0.890625,0 -1.390625,-0.625 -0.484375,-0.625 -0.484375,-1.71875 0,-1.35938 0.453125,-2.48438 0.453125,-1.14062 1.234375,-1.75 0.78125,-0.625 1.75,-0.625 z m -1.21875,6.32813 q 0.609375,0 1.234375,-0.59375 0.640625,-0.59375 1,-1.51563 0.375,-0.9375 0.375,-1.89062 0,-0.70313 -0.34375,-1.0625 -0.328125,-0.375 -0.984375,-0.375 -0.640625,0 -1.203125,0.53125 -0.546875,0.51562 -0.875,1.46875 -0.328125,0.9375 -0.328125,1.98437 0,1.45313 1.125,1.45313 z m 4.192306,3.875 q -0.4375,0 -0.796875,-0.14063 l 0,-0.89062 q 0.40625,0.14062 0.703125,0.14062 0.484375,0 0.75,-0.39062 0.265625,-0.39063 0.421875,-1.125 l 1.4375,-6.875 -1.21875,0 0.07813,-0.42188 1.3125,-0.42187 0.140625,-0.625 q 0.296875,-1.28125 0.8125,-1.79688 0.515625,-0.53125 1.53125,-0.53125 0.25,0 0.609375,0.0781 0.375,0.0781 0.578125,0.15625 l -0.265625,0.82812 q -0.484375,-0.1875 -0.875,-0.1875 -0.546875,0 -0.84375,0.3125 -0.296875,0.29688 -0.484375,1.125 l -0.15625,0.6875 1.515625,0 -0.15625,0.79688 -1.515625,0 -1.46875,6.96875 q -0.25,1.20312 -0.765625,1.75 -0.515625,0.5625 -1.34375,0.5625 z m 6.671555,-4.64063 0.04687,0.15625 q -0.703125,1.48438 -1.703125,3.03125 l -0.828125,0 q 0.8125,-1.8125 1.296875,-3.1875 l 1.1875,0 z m 8.882812,-5.5625 q 1.218755,0 1.781255,1.21875 l 0.0625,0 q 0.10937,-0.98437 0.28125,-1.75 l 0.5,-2.26562 1.04687,0 -2.09375,9.875 -0.875,0 0.14063,-1.32813 -0.0625,0 q -0.64063,0.79688 -1.20313,1.125 -0.546875,0.32813 -1.140625,0.32813 -0.890625,0 -1.390625,-0.625 -0.484375,-0.625 -0.484375,-1.71875 0,-1.35938 0.453125,-2.48438 0.453125,-1.14062 1.234375,-1.75 0.78125,-0.625 1.75,-0.625 z m -1.21875,6.32813 q 0.609375,0 1.234375,-0.59375 0.64063,-0.59375 1,-1.51563 0.375,-0.9375 0.375,-1.89062 0,-0.70313 -0.34375,-1.0625 -0.32812,-0.375 -0.984375,-0.375 -0.640625,0 -1.203125,0.53125 -0.546875,0.51562 -0.875,1.46875 -0.328125,0.9375 -0.328125,1.98437 0,1.45313 1.125,1.45313 z m 8.926685,-6.29688 q 1.20312,0 1.90625,0.71875 0.70312,0.70313 0.70312,1.95313 0,1.20312 -0.46875,2.26562 -0.45312,1.0625 -1.23437,1.64063 -0.78125,0.57812 -1.76563,0.57812 -1.21875,0 -1.90625,-0.71875 -0.6875,-0.71875 -0.6875,-1.96875 0,-1.20312 0.45313,-2.26562 0.46875,-1.0625 1.25,-1.625 0.79687,-0.57813 1.75,-0.57813 z m 1.5,2.53125 q 0,-0.73437 -0.40625,-1.1875 -0.39063,-0.45312 -1.0625,-0.45312 -0.6875,0 -1.25,0.46875 -0.54688,0.46875 -0.84375,1.3125 -0.29688,0.82812 -0.29688,1.85937 0,0.82813 0.39063,1.28125 0.40625,0.45313 1.17187,0.45313 0.65625,0 1.17188,-0.45313 0.53125,-0.46875 0.82812,-1.32812 0.29688,-0.85938 0.29688,-1.95313 z m 5.11818,4.64063 q -1.23438,0 -1.92188,-0.67188 -0.67187,-0.6875 -0.67187,-1.92187 0,-1.26563 0.46875,-2.34375 0.46875,-1.07813 1.29687,-1.67188 0.82813,-0.59375 1.85938,-0.59375 0.875,0 1.70312,0.3125 l -0.29687,0.90625 q -0.76563,-0.32812 -1.39063,-0.32812 -0.70312,0 -1.29687,0.48437 -0.59375,0.48438 -0.92188,1.35938 -0.32812,0.85937 -0.32812,1.875 0,0.8125 0.42187,1.26562 0.42188,0.45313 1.15625,0.45313 0.46875,0 0.875,-0.125 0.40625,-0.14063 0.79688,-0.3125 l 0,0.92187 q -0.79688,0.39063 -1.75,0.39063 z m 4.62526,-1.64063 0.0469,0.15625 q -0.70312,1.48438 -1.70312,3.03125 l -0.82813,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 8.88281,-5.5625 q 1.21875,0 1.78125,1.21875 l 0.0625,0 q 0.10937,-0.98437 0.28125,-1.75 l 0.5,-2.26562 1.04687,0 -2.09375,9.875 -0.875,0 0.14063,-1.32813 -0.0625,0 q -0.64063,0.79688 -1.20313,1.125 -0.54687,0.32813 -1.14062,0.32813 -0.89063,0 -1.39063,-0.625 -0.48437,-0.625 -0.48437,-1.71875 0,-1.35938 0.45312,-2.48438 0.45313,-1.14062 1.23438,-1.75 0.78125,-0.625 1.75,-0.625 z m -1.21875,6.32813 q 0.60937,0 1.23437,-0.59375 0.64063,-0.59375 1,-1.51563 0.375,-0.9375 0.375,-1.89062 0,-0.70313 -0.34375,-1.0625 -0.32812,-0.375 -0.98437,-0.375 -0.64063,0 -1.20313,0.53125 -0.54687,0.51562 -0.875,1.46875 -0.32812,0.9375 -0.32812,1.98437 0,1.45313 1.125,1.45313 z m 8.92668,-6.29688 q 1.20312,0 1.90625,0.71875 0.70312,0.70313 0.70312,1.95313 0,1.20312 -0.46875,2.26562 -0.45312,1.0625 -1.23437,1.64063 -0.78125,0.57812 -1.76563,0.57812 -1.21875,0 -1.9062Line truncated
|
||||
id="path121"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 131.45392,728.5536 q -0.60938,0 -1.07813,-0.3125 -0.45312,-0.32813 -0.71875,-0.89063 l -0.0625,0 -0.0156,0.23438 q -0.0156,0.17187 -0.0781,0.45312 -0.0469,0.28125 -0.71875,3.51563 l -1.04688,0 2.12501,-10.07813 0.89062,0 -0.17187,1.32813 0.0469,0 q 1.14063,-1.45313 2.35938,-1.45313 0.875,0 1.375,0.625 0.5,0.625 0.5,1.73438 0,1.34375 -0.4375,2.46875 -0.4375,1.125 -1.21875,1.75 -0.76563,0.625 -1.75,0.625 z m 1.1875,-6.3125 q -0.60938,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.35938,0.90625 -0.35938,1.85937 0,0.70313 0.34375,1.07813 0.35938,0.375 1.01563,0.375 0.64062,0 1.17187,-0.51563 0.54688,-0.51562 0.875,-1.46875 0.32813,-0.95312 0.32813,-2.01562 0,-1.4375 -1.125,-1.4375 z m 6.50481,6.3125 q -0.60938,0 -1.07813,-0.3125 -0.45312,-0.32813 -0.71875,-0.89063 l -0.0625,0 -0.0156,0.23438 q -0.0156,0.17187 -0.0781,0.45312 -0.0469,0.28125 -0.71875,3.51563 l -1.04687,0 2.125,-10.07813 0.89062,0 -0.17187,1.32813 0.0469,0 q 1.14063,-1.45313 2.35938,-1.45313 0.875,0 1.375,0.625 0.5,0.625 0.5,1.73438 0,1.34375 -0.4375,2.46875 -0.4375,1.125 -1.21875,1.75 -0.76563,0.625 -1.75,0.625 z m 1.1875,-6.3125 q -0.60938,0 -1.25,0.60937 -0.625,0.59375 -1,1.51563 -0.35938,0.90625 -0.35938,1.85937 0,0.70313 0.34375,1.07813 0.35938,0.375 1.01563,0.375 0.64062,0 1.17187,-0.51563 0.54688,-0.51562 0.875,-1.46875 0.32813,-0.95312 0.32813,-2.01562 0,-1.4375 -1.125,-1.4375 z m 5.55168,5.4375 q 0.35937,0 0.92187,-0.15625 l 0,0.8125 q -0.21875,0.0937 -0.53125,0.15625 -0.3125,0.0625 -0.51562,0.0625 -0.78125,0 -1.20313,-0.375 -0.42187,-0.375 -0.42187,-1.125 0,-0.42188 0.10937,-0.95313 l 0.79688,-3.82812 -1.07813,0 0.0781,-0.45313 1.17187,-0.5 0.79688,-1.45312 0.625,0 -0.34375,1.60937 1.73437,0 -0.17187,0.79688 -1.71875,0 -0.82813,3.84375 q -0.10937,0.54687 -0.10937,0.82812 0,0.35938 0.17187,0.54688 0.1875,0.1875 0.51563,0.1875 z m 4.78998,-2 -2.20313,2.75 -1.23437,0 3.01562,-3.59375 -1.51562,-3.35938 1.07812,0 1.10938,2.60938 2.09375,-2.60938 1.21875,0 -2.875,3.42188 1.59375,3.53125 -1.0625,0 -1.21875,-2.75 z m 5.24621,1.23437 0.0469,0.15625 q -0.70313,1.48438 -1.70313,3.03125 l -0.82812,0 q 0.8125,-1.8125 1.29687,-3.1875 l 1.1875,0 z m 7.78906,-1.23437 -2.20312,2.75 -1.23438,0 3.01563,-3.59375 -1.51563,-3.35938 1.07813,0 1.10937,2.60938 2.09375,-2.60938 1.21875,0 -2.875,3.42188 1.59375,3.53125 -1.0625,0 -1.21875,-2.75 z m 4.82435,2.75 -1.0625,0 2.10937,-9.875 1.0625,0 -2.10937,9.875 z m 6.63409,-1.96875 q 0,0.98437 -0.70313,1.54687 -0.70312,0.54688 -1.98437,0.54688 -1.0625,0 -1.9375,-0.4375 l 0,-1 q 0.45312,0.26562 0.96875,0.42187 0.51562,0.14063 0.95312,0.14063 0.79688,0 1.20313,-0.3125 0.40625,-0.32813 0.40625,-0.82813 0,-0.35937 -0.23438,-0.60937 -0.21875,-0.25 -0.95312,-0.67188 -0.82813,-0.46875 -1.17188,-0.90625 -0.34375,-0.45312 -0.34375,-1.0625 0,-0.875 0.64063,-1.40625 0.65625,-0.53125 1.70312,-0.53125 1.07813,0 2.09375,0.46875 l -0.34375,0.85938 -0.35937,-0.15625 q -0.64063,-0.26563 -1.39063,-0.26563 -0.59375,0 -0.9375,0.28125 -0.32812,0.26563 -0.32812,0.70313 0,0.35937 0.21875,0.60937 0.23437,0.25 0.9375,0.65625 0.67187,0.375 0.96875,0.65625 0.29687,0.26563 0.4375,0.57813 0.15625,0.3125 0.15625,0.71875 z m 2.87929,0.45312 0.0469,0.15625 q -0.70312,1.48438 -1.70312,3.03125 l -0.82813,0 q 0.8125,-1.8125 1.29688,-3.1875 l 1.1875,0 z m 7.78906,-1.23437 -2.20313,2.75 -1.23437,0 3.01562,-3.59375 -1.51562,-3.35938 1.07812,0 1.10938,2.60938 2.09375,-2.60938 1.21875,0 -2.875,3.42188 1.59375,3.53125 -1.0625,0 -1.21875,-2.75 z m 4.82434,2.75 -1.0625,0 2.10938,-9.875 1.0625,0 -2.10938,9.875 z m 6.63409,-1.96875 q 0,0.98437 -0.70312,1.54687 -0.70313,0.54688 -1.98438,0.54688 -1.0625,0 -1.9375,-0.4375 l 0,-1 q 0.45313,0.26562 0.96875,0.42187 0.51563,0.14063 0.95313,0.14063 0.79687,0 1.20312,-0.3125 0.40625,-0.32813 0.40625,-0.82813 0,-0.35937 -0.23437,-0.60937 -0.21875,-0.25 -0.95313,-0.67188 -0.82812,-0.46875 -1.17187,-0.90625 -0.34375,-0.45312 -0.34375,-1.0625 0,-0.875 0.64062,-1.40625 0.65625,-0.53125 1.70313,-0.53125 1.07812,0 2.09375,0.46875 l -0.34375,0.85938 -0.35938,-0.15625 q -0.64062,-0.26563 -1.39062,-0.26563 -0.59375,0 -0.9375,0.28125 -0.32813,0.26563 -0.32813,0.70313 0,0.35937 0.21875,0.60937 0.23438,0.25 0.9375,0.65625 0.67188,0.375 0.96875,0.65625 0.29688,0.26563 0.4375,0.57813 0.15625,0.3125 0.15625,0.71875 z m 4.00429,-0.78125 -2.20312,2.75 -1.23438,0 3.01563,-3.59375 -1.51563,-3.35938 1.07813,0 1.10937,2.60938 2.09375,-2.60938 1.21875,0 -2.875,3.42188 1.59375,3.53125 -1.0625,0 -1.21875,-2.75 z"
|
||||
id="path123"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 288.3622,77.57874 155.62204,0"
|
||||
id="path125"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 288.3622,77.57874 131.62204,0"
|
||||
id="path127"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 419.98425,84.18567 18.1524,-6.606926 -18.1524,-6.606934 z"
|
||||
id="path129"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
<path
|
||||
d="M 289.20734,241.10104 443.97901,391.17978"
|
||||
id="path131"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 289.20734,241.10104 137.54187,133.3714"
|
||||
id="path133"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 422.1499,379.2156 17.63107,7.89343 -8.4324,-17.37976 z"
|
||||
id="path135"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
<path
|
||||
d="m 289.20734,241.10104 154.77167,-3.33858"
|
||||
id="path137"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 289.20734,241.10104 130.77725,-2.82098"
|
||||
id="path139"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 420.12708,244.88544 18.00568,-6.99686 -18.29065,-6.21392 z"
|
||||
id="path141"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
<path
|
||||
d="M 289.20734,241.10104 443.97901,77.57348"
|
||||
id="path143"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="M 289.20734,241.10104 427.48151,95.0043"
|
||||
id="path145"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 432.28003,99.54587 7.67935,-17.725357 -17.27637,8.642212 z"
|
||||
id="path147"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
<path
|
||||
d="M 288.3622,391.1719 443.98424,237.75459"
|
||||
id="path149"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="M 288.3622,391.1719 426.89302,254.60365"
|
||||
id="path151"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 431.5314,259.3087 8.28857,-17.44881 -17.56527,8.03876 z"
|
||||
id="path153"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
<path
|
||||
d="m 289.20734,533.55774 154.77167,-0.12598"
|
||||
id="path155"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 289.20734,533.55774 130.77167,-0.10645"
|
||||
id="path157"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 419.98438,540.0582 18.14703,-6.6217 -18.15777,-6.59217 z"
|
||||
id="path159"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
<path
|
||||
d="m 284.8084,693.9042 162.2992,0"
|
||||
id="path161"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 284.8084,693.9042 138.2992,0"
|
||||
id="path163"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 423.1076,700.5111 18.1524,-6.60693 -18.1524,-6.60694 z"
|
||||
id="path165"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
<path
|
||||
d="M 289.20734,533.55774 447.09711,693.90418"
|
||||
id="path167"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="M 289.20734,533.55774 430.25809,676.80316"
|
||||
id="path169"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 425.55032,681.4387 17.44394,8.29883 -8.02847,-17.57001 z"
|
||||
id="path171"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
<path
|
||||
d="M 284.8084,693.9042 443.958,533.4003"
|
||||
id="path173"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="M 284.8084,693.9042 427.0595,550.44259"
|
||||
id="path175"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 431.75107,555.09454 8.0896,-17.54193 -17.47272,8.23798 z"
|
||||
id="path177"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
<path
|
||||
d="m 288.3622,391.1719 155.62204,0"
|
||||
id="path179"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#000000;fill-opacity:0;fill-rule:nonzero" />
|
||||
<path
|
||||
d="m 288.3622,391.1719 131.62204,0"
|
||||
id="path181"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round" />
|
||||
<path
|
||||
d="m 419.98425,397.77884 18.1524,-6.60693 -18.1524,-6.60694 z"
|
||||
id="path183"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffe599;fill-rule:evenodd;stroke:#ffe599;stroke-width:4;stroke-linecap:butt" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 184 KiB |
|
After Width: | Height: | Size: 551 B |
|
After Width: | Height: | Size: 376 KiB |
|
After Width: | Height: | Size: 376 KiB |
@@ -0,0 +1,66 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<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"
|
||||
width="48"
|
||||
height="48"
|
||||
viewBox="0 0 48.000001 48.000001"
|
||||
id="svg2"
|
||||
version="1.1"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="CancelIcon.svg"
|
||||
inkscape:export-filename="C:\Users\aallard\Documents\GitHub\FileConverter\Resources\CancelIcon.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90">
|
||||
<defs
|
||||
id="defs4" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="8"
|
||||
inkscape:cx="29.858285"
|
||||
inkscape:cy="23.115955"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
inkscape:window-width="1853"
|
||||
inkscape:window-height="1058"
|
||||
inkscape:window-x="59"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1" />
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<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>
|
||||
<g
|
||||
inkscape:label="Calque 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-1004.3622)">
|
||||
<path
|
||||
style="opacity:1;fill:#d32f2f;fill-opacity:0.94117647;stroke:none"
|
||||
d="M 24 0 A 24 24 0 0 0 0 24 A 24 24 0 0 0 24 48 A 24 24 0 0 0 48 24 A 24 24 0 0 0 24 0 z M 24 4 A 20 20 0 0 1 44 24 A 20 20 0 0 1 40.560547 35.203125 L 10.087891 9.6328125 A 20 20 0 0 1 24 4 z M 7.4394531 12.796875 L 37.912109 38.367188 A 20 20 0 0 1 24 44 A 20 20 0 0 1 4 24 A 20 20 0 0 1 7.4394531 12.796875 z "
|
||||
transform="translate(0,1004.3622)"
|
||||
id="path3338" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
@@ -0,0 +1,88 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<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"
|
||||
width="48"
|
||||
height="48"
|
||||
viewBox="0 0 48.000001 48.000001"
|
||||
id="svg2"
|
||||
version="1.1"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="FailIcon.svg"
|
||||
inkscape:export-filename="C:\Users\Adrien\Documents\GitHub\FileConverter\Resources\FailIcon.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90">
|
||||
<defs
|
||||
id="defs4" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="8"
|
||||
inkscape:cx="29.858285"
|
||||
inkscape:cy="28.115955"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
inkscape:window-width="1289"
|
||||
inkscape:window-height="745"
|
||||
inkscape:window-x="69"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1" />
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<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></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Calque 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-1004.3622)">
|
||||
<flowRoot
|
||||
xml:space="preserve"
|
||||
id="flowRoot4348"
|
||||
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f44336;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
||||
transform="translate(0,1004.3622)"><flowRegion
|
||||
id="flowRegion4350"><rect
|
||||
id="rect4352"
|
||||
width="24"
|
||||
height="44.75"
|
||||
x="12"
|
||||
y="2.625"
|
||||
style="fill:#f44336;fill-opacity:1;" /></flowRegion><flowPara
|
||||
id="flowPara4354">!</flowPara></flowRoot> <flowRoot
|
||||
xml:space="preserve"
|
||||
id="flowRoot4356"
|
||||
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#d32f2f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
||||
transform="matrix(1.6923977,0,0,1.6923977,15.004532,977.45445)"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90"><flowRegion
|
||||
id="flowRegion4358"><rect
|
||||
id="rect4360"
|
||||
width="49.5"
|
||||
height="47.5"
|
||||
x="0.875"
|
||||
y="0.875"
|
||||
style="fill:#d32f2f;fill-opacity:1;" /></flowRegion><flowPara
|
||||
id="flowPara4362"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'MS UI Gothic';-inkscape-font-specification:'MS UI Gothic';fill:#d32f2f;fill-opacity:1;">!</flowPara></flowRoot> </g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.3 KiB |
@@ -0,0 +1,52 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 18.1.1, 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="Layer_1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
viewBox="0 0 24 24"
|
||||
enable-background="new 0 0 24 24"
|
||||
xml:space="preserve"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="SettingsIcon.svg"
|
||||
inkscape:export-filename="C:\Users\Adrien\Documents\GitHub\FileConverter\Resources\Icons\SettingsIcon.png"
|
||||
inkscape:export-xdpi="240"
|
||||
inkscape:export-ydpi="240"><metadata
|
||||
id="metadata9"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs7" /><sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1289"
|
||||
inkscape:window-height="745"
|
||||
id="namedview5"
|
||||
showgrid="false"
|
||||
inkscape:zoom="9.8333333"
|
||||
inkscape:cx="12"
|
||||
inkscape:cy="12"
|
||||
inkscape:window-x="69"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="Layer_1" /><path
|
||||
fill="#4588A9"
|
||||
d="M20,13.4v-2.9l-1.8-0.3c-0.1-0.4-0.3-0.8-0.6-1.4l1.1-1.5l-2.1-2.1l-1.5,1.1c-0.5-0.3-1-0.5-1.4-0.6 l-0.2-1.8h-2.9l-0.3,1.8C9.8,5.8,9.4,6,8.9,6.3L7.4,5.2L5.3,7.3l1,1.5C6,9.3,5.9,9.7,5.7,10.2L4,10.4v2.9l1.8,0.3 c0.1,0.5,0.3,0.9,0.6,1.4l-1,1.5l2.1,2.1l1.5-1c0.4,0.2,0.9,0.4,1.4,0.6l0.3,1.8h3l0.3-1.8c0.5-0.1,0.9-0.3,1.4-0.6l1.5,1.1l2.1-2.1 l-1.1-1.5c0.3-0.5,0.5-1,0.6-1.4L20,13.4z M12,14.9c-1.7,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3S13.7,14.9,12,14.9z"
|
||||
id="path3"
|
||||
style="fill:#0171bb;fill-opacity:1"
|
||||
inkscape:export-xdpi="360"
|
||||
inkscape:export-ydpi="360" /></svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
@@ -0,0 +1,67 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<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"
|
||||
width="48"
|
||||
height="48"
|
||||
viewBox="0 0 48.000001 48.000001"
|
||||
id="svg2"
|
||||
version="1.1"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="SuccessIcon.svg"
|
||||
inkscape:export-filename="C:\Users\Adrien\Documents\GitHub\FileConverter\Resources\SuccessIcon.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90">
|
||||
<defs
|
||||
id="defs4" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="8"
|
||||
inkscape:cx="29.858285"
|
||||
inkscape:cy="28.115955"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
inkscape:window-width="1289"
|
||||
inkscape:window-height="745"
|
||||
inkscape:window-x="69"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1" />
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<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>
|
||||
<g
|
||||
inkscape:label="Calque 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-1004.3622)">
|
||||
<path
|
||||
style="fill:none;fill-rule:evenodd;stroke:#4caf50;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 2.125,1031.1122 13.625,19 29.875,-43.5"
|
||||
id="path3342"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="ccc" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 1.4 KiB |