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 |
No files matched your search
@@ -194,4 +194,7 @@ FakesAssemblies/
|
||||
*.opt
|
||||
|
||||
# Ignore the installer signing commands file
|
||||
Installer/Installer.sign
|
||||
Installer/Installer.sign
|
||||
|
||||
# Ignore the installer languages file because it is automatically generated
|
||||
Installer/Languages.wxs
|
||||
@@ -31,8 +31,8 @@ namespace FileConverter
|
||||
private static readonly Version Version = new Version()
|
||||
{
|
||||
Major = 1,
|
||||
Minor = 1,
|
||||
Patch = 0,
|
||||
Minor = 2,
|
||||
Patch = 1,
|
||||
};
|
||||
|
||||
private readonly List<ConversionJob> conversionJobs = new List<ConversionJob>();
|
||||
@@ -341,8 +341,7 @@ namespace FileConverter
|
||||
{
|
||||
string inputFilePath = filePaths[index];
|
||||
ConversionJob conversionJob = ConversionJobFactory.Create(conversionPreset, inputFilePath);
|
||||
conversionJob.PrepareConversion(inputFilePath);
|
||||
|
||||
|
||||
this.conversionJobs.Add(conversionJob);
|
||||
}
|
||||
}
|
||||
@@ -358,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.
|
||||
@@ -396,7 +401,7 @@ namespace FileConverter
|
||||
Thread thread = jobThreads[threadIndex];
|
||||
if (thread == null || !thread.IsAlive)
|
||||
{
|
||||
jobThread = Helpers.InstantiateThread("ConversionThread", this.ExecuteConversionJob);
|
||||
jobThread = Helpers.InstantiateThread(conversionJob.GetType().Name, this.ExecuteConversionJob);
|
||||
jobThreads[threadIndex] = jobThread;
|
||||
break;
|
||||
}
|
||||
@@ -405,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;
|
||||
|
||||
@@ -19,24 +19,32 @@ namespace FileConverter.ConversionJobs
|
||||
private CancelConversionJobCommand cancelCommand;
|
||||
|
||||
private string initialInputPath = string.Empty;
|
||||
private string[] outputFilePaths;
|
||||
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;
|
||||
@@ -67,22 +75,22 @@ namespace FileConverter.ConversionJobs
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.outputFilePaths == null)
|
||||
if (this.OutputFilePaths == null || this.OutputFilePaths.Length == 0)
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
if (this.CurrentOuputFilePathIndex < 0)
|
||||
{
|
||||
return this.outputFilePaths[0];
|
||||
return this.OutputFilePaths[0];
|
||||
}
|
||||
|
||||
if (this.CurrentOuputFilePathIndex >= this.outputFilePaths.Length)
|
||||
if (this.CurrentOuputFilePathIndex >= this.OutputFilePaths.Length)
|
||||
{
|
||||
return this.outputFilePaths[this.outputFilePaths.Length - 1];
|
||||
return this.OutputFilePaths[this.OutputFilePaths.Length - 1];
|
||||
}
|
||||
|
||||
return this.outputFilePaths[this.CurrentOuputFilePathIndex];
|
||||
return this.OutputFilePaths[this.CurrentOuputFilePathIndex];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -200,24 +208,27 @@ namespace FileConverter.ConversionJobs
|
||||
}
|
||||
}
|
||||
|
||||
protected string[] OutputFilePaths
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public virtual bool CanStartConversion(ConversionFlags conversionFlags)
|
||||
{
|
||||
return (conversionFlags & ConversionFlags.CdDriveExtraction) == 0;
|
||||
}
|
||||
|
||||
public void PrepareConversion(string inputFilePath, string outputFilePath = null)
|
||||
public void PrepareConversion(params string[] outputFilePaths)
|
||||
{
|
||||
if (string.IsNullOrEmpty(inputFilePath))
|
||||
{
|
||||
throw new ArgumentNullException(nameof(inputFilePath));
|
||||
}
|
||||
|
||||
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 = Helpers.GetExtensionCategory(extension);
|
||||
if (!Helpers.IsOutputTypeCompatibleWithCategory(this.ConversionPreset.OutputType, extensionCategory))
|
||||
@@ -226,15 +237,22 @@ namespace FileConverter.ConversionJobs
|
||||
return;
|
||||
}
|
||||
|
||||
this.initialInputPath = inputFilePath;
|
||||
this.InputFilePath = inputFilePath;
|
||||
|
||||
int outputFilesCount = this.GetOuputFilesCount();
|
||||
this.outputFilePaths = new string[outputFilesCount];
|
||||
|
||||
for (int index = 0; index < outputFilesCount; index++)
|
||||
this.OutputFilePaths = outputFilePaths;
|
||||
if (this.OutputFilePaths.Length == 0)
|
||||
{
|
||||
string path = outputFilePath ?? this.ConversionPreset.GenerateOutputFilePath(inputFilePath, index + 1, outputFilesCount);
|
||||
int outputFilesCount = this.GetOuputFilesCount();
|
||||
this.OutputFilePaths = new string[outputFilesCount];
|
||||
}
|
||||
|
||||
for (int index = 0; index < this.OutputFilePaths.Length; index++)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.OutputFilePaths[index]))
|
||||
{
|
||||
// Don't generate a path if it has already been set.
|
||||
continue;
|
||||
}
|
||||
|
||||
string path = this.ConversionPreset.GenerateOutputFilePath(this.initialInputPath, index + 1, this.OutputFilePaths.Length);
|
||||
|
||||
if (!PathHelpers.IsPathValid(path))
|
||||
{
|
||||
@@ -252,7 +270,7 @@ namespace FileConverter.ConversionJobs
|
||||
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);
|
||||
System.IO.File.Move(this.initialInputPath, this.InputFilePath);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -266,7 +284,7 @@ namespace FileConverter.ConversionJobs
|
||||
// Make the output path valid.
|
||||
try
|
||||
{
|
||||
path = PathHelpers.GenerateUniquePath(path, this.outputFilePaths);
|
||||
path = PathHelpers.GenerateUniquePath(path, this.OutputFilePaths);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
@@ -275,7 +293,7 @@ namespace FileConverter.ConversionJobs
|
||||
return;
|
||||
}
|
||||
|
||||
this.outputFilePaths[index] = path;
|
||||
this.OutputFilePaths[index] = path;
|
||||
}
|
||||
|
||||
this.CurrentOuputFilePathIndex = 0;
|
||||
@@ -295,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 = Properties.Resources.ConversionStateInQueue;
|
||||
if (this.State != ConversionState.Failed)
|
||||
{
|
||||
this.UserState = Properties.Resources.ConversionStateInQueue;
|
||||
}
|
||||
}
|
||||
|
||||
public void StartConvertion()
|
||||
@@ -336,11 +357,11 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
if (this.State == ConversionJob.ConversionState.Done && !this.AllOuputFilesExists())
|
||||
{
|
||||
Debug.LogError("Can't find the output file(s).");
|
||||
Debug.LogError(Properties.Resources.ErrorCantFindOutputFiles);
|
||||
}
|
||||
else if (this.State == ConversionJob.ConversionState.Failed && this.AtLeastOneOuputFilesExists())
|
||||
{
|
||||
Debug.Log("The conversion job failed but there is an output file that does exists.");
|
||||
Debug.Log(Properties.Resources.ErrorConversionFailedWithOutput);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -372,9 +393,9 @@ namespace FileConverter.ConversionJobs
|
||||
{
|
||||
Debug.Log("Conversion Failed.");
|
||||
|
||||
for (int index = 0; index < this.outputFilePaths.Length; index++)
|
||||
for (int index = 0; index < this.OutputFilePaths.Length; index++)
|
||||
{
|
||||
string outputFilePath = this.outputFilePaths[index];
|
||||
string outputFilePath = this.OutputFilePaths[index];
|
||||
try
|
||||
{
|
||||
if (System.IO.File.Exists(outputFilePath))
|
||||
@@ -453,9 +474,9 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
private bool AllOuputFilesExists()
|
||||
{
|
||||
for (int index = 0; index < this.outputFilePaths.Length; index++)
|
||||
for (int index = 0; index < this.OutputFilePaths.Length; index++)
|
||||
{
|
||||
string outputFilePath = this.outputFilePaths[index];
|
||||
string outputFilePath = this.OutputFilePaths[index];
|
||||
if (!System.IO.File.Exists(outputFilePath))
|
||||
{
|
||||
return false;
|
||||
@@ -467,9 +488,9 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
private bool AtLeastOneOuputFilesExists()
|
||||
{
|
||||
for (int index = 0; index < this.outputFilePaths.Length; index++)
|
||||
for (int index = 0; index < this.OutputFilePaths.Length; index++)
|
||||
{
|
||||
string outputFilePath = this.outputFilePaths[index];
|
||||
string outputFilePath = this.OutputFilePaths[index];
|
||||
if (System.IO.File.Exists(outputFilePath))
|
||||
{
|
||||
return true;
|
||||
|
||||
@@ -10,31 +10,46 @@ namespace FileConverter.ConversionJobs
|
||||
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 (conversionPreset.OutputType == OutputType.Gif)
|
||||
{
|
||||
return new ConversionJob_Gif(conversionPreset);
|
||||
return new ConversionJob_Gif(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
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);
|
||||
return new ConversionJob_ImageMagick(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
if (conversionPreset.OutputType == OutputType.Pdf)
|
||||
{
|
||||
return new ConversionJob_ImageMagick(conversionPreset);
|
||||
}
|
||||
|
||||
return new ConversionJob_FFMPEG(conversionPreset);
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
@@ -35,7 +37,14 @@ namespace FileConverter.ConversionJobs
|
||||
return InputPostConversionAction.None;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public override void Cancel()
|
||||
{
|
||||
base.Cancel();
|
||||
|
||||
this.compressionConversionJob.Cancel();
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
@@ -103,7 +112,7 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
// Sub conversion job (for compression).
|
||||
this.compressionConversionJob = ConversionJobFactory.Create(this.ConversionPreset, this.intermediateFilePath);
|
||||
this.compressionConversionJob.PrepareConversion(this.intermediateFilePath, this.OutputFilePath);
|
||||
this.compressionConversionJob.PrepareConversion(this.OutputFilePath);
|
||||
this.compressionThread = Helpers.InstantiateThread("CDACompressionThread", this.CompressAsync);
|
||||
}
|
||||
|
||||
@@ -193,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;
|
||||
|
||||
@@ -197,7 +197,7 @@ namespace FileConverter.ConversionJobs
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert video quality index to lib theora video quality level.
|
||||
/// 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>
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace FileConverter.ConversionJobs
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
|
||||
public ConversionJob_FFMPEG(ConversionPreset conversionPreset) : base(conversionPreset)
|
||||
public ConversionJob_FFMPEG(ConversionPreset conversionPreset, string inputFilePath) : base(conversionPreset, inputFilePath)
|
||||
{
|
||||
this.IsCancelable = true;
|
||||
}
|
||||
@@ -73,6 +73,9 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
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:
|
||||
@@ -81,7 +84,7 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
// https://trac.ffmpeg.org/wiki/Encode/AAC
|
||||
int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
|
||||
string encoderArgs = $"-c:a aac -q:a {this.AACBitrateToQualityIndex(audioEncodingBitrate)} {channelArgs}";
|
||||
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);
|
||||
|
||||
@@ -106,7 +109,7 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
// Compute final arguments.
|
||||
string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
|
||||
string encoderArgs = string.Format("-c:v mpeg4 -vtag xvid -qscale:v {0} {1} {2}", this.MPEG4QualityToQualityIndex(videoEncodingQuality), audioArgs, videoFilteringArgs);
|
||||
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));
|
||||
@@ -119,7 +122,7 @@ namespace FileConverter.ConversionJobs
|
||||
string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
|
||||
|
||||
// http://taer-naguur.blogspot.fr/2013/11/flac-audio-encoding-with-ffmpeg.html
|
||||
string encoderArgs = $"-compression_level 12 {channelArgs}";
|
||||
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));
|
||||
@@ -198,11 +201,11 @@ namespace FileConverter.ConversionJobs
|
||||
switch (encodingMode)
|
||||
{
|
||||
case EncodingMode.Mp3VBR:
|
||||
encoderArgs = $"-codec:a libmp3lame -q:a {this.MP3VBRBitrateToQualityIndex(encodingQuality)} {channelArgs}";
|
||||
encoderArgs = $"-codec:a libmp3lame -q:a {this.MP3VBRBitrateToQualityIndex(encodingQuality)} {channelArgs} {metadataArgs}";
|
||||
break;
|
||||
|
||||
case EncodingMode.Mp3CBR:
|
||||
encoderArgs = $"-codec:a libmp3lame -b:a {encodingQuality}k {channelArgs}";
|
||||
encoderArgs = $"-codec:a libmp3lame -b:a {encodingQuality}k {channelArgs} {metadataArgs}";
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -231,7 +234,7 @@ namespace FileConverter.ConversionJobs
|
||||
string audioArgs = "-an";
|
||||
if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
|
||||
{
|
||||
audioArgs = string.Format("-c:a aac -qscale:a {0}", this.AACBitrateToQualityIndex(audioEncodingBitrate));
|
||||
audioArgs = $"-c:a aac -qscale:a {this.AACBitrateToQualityIndex(audioEncodingBitrate)} {metadataArgs}";
|
||||
}
|
||||
|
||||
string encoderArgs = string.Format(
|
||||
@@ -253,7 +256,7 @@ namespace FileConverter.ConversionJobs
|
||||
string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
|
||||
|
||||
int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
|
||||
string encoderArgs = $"-vn -codec:a libvorbis -qscale:a {this.OGGVBRBitrateToQualityIndex(encodingQuality)} {channelArgs}";
|
||||
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));
|
||||
@@ -273,14 +276,10 @@ namespace FileConverter.ConversionJobs
|
||||
string audioArgs = "-an";
|
||||
if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
|
||||
{
|
||||
audioArgs = string.Format("-codec:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(audioEncodingBitrate));
|
||||
audioArgs = $"-codec:a libvorbis -qscale:a {this.OGGVBRBitrateToQualityIndex(audioEncodingBitrate)}";
|
||||
}
|
||||
|
||||
string encoderArgs = string.Format(
|
||||
"-codec:v libtheora -qscale:v {0} {1} {2}",
|
||||
this.OGVTheoraQualityToQualityIndex(videoEncodingQuality),
|
||||
audioArgs,
|
||||
videoFilteringArgs);
|
||||
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);
|
||||
|
||||
@@ -313,7 +312,7 @@ namespace FileConverter.ConversionJobs
|
||||
string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
|
||||
|
||||
EncodingMode encodingMode = this.ConversionPreset.GetSettingsValue<EncodingMode>(ConversionPreset.ConversionSettingKeys.AudioEncodingMode);
|
||||
string encoderArgs = $"-acodec {this.WAVEncodingToCodecArgument(encodingMode)} {channelArgs}";
|
||||
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));
|
||||
@@ -331,11 +330,11 @@ namespace FileConverter.ConversionJobs
|
||||
if (videoEncodingQuality == 63)
|
||||
{
|
||||
// Replace maximum quality settings by lossless compression.
|
||||
encodingArgs = "-lossless 1";
|
||||
encodingArgs = $"-lossless 1 {metadataArgs}";
|
||||
}
|
||||
else
|
||||
{
|
||||
encodingArgs = string.Format("-crf {0} -b:v 0", this.WebmQualityToCRF(videoEncodingQuality));
|
||||
encodingArgs = $"-crf {this.WebmQualityToCRF(videoEncodingQuality)} -b:v 0 {metadataArgs}";
|
||||
}
|
||||
|
||||
string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
|
||||
|
||||
@@ -12,8 +12,17 @@ namespace FileConverter.ConversionJobs
|
||||
private ConversionJob pngConversionJob = null;
|
||||
private ConversionJob gifConversionJob = null;
|
||||
|
||||
public ConversionJob_Gif(ConversionPreset conversionPreset) : base(conversionPreset)
|
||||
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()
|
||||
@@ -41,7 +50,7 @@ namespace FileConverter.ConversionJobs
|
||||
// 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.InputFilePath, this.intermediateFilePath);
|
||||
this.pngConversionJob.PrepareConversion(this.intermediateFilePath);
|
||||
|
||||
inputFilePath = this.intermediateFilePath;
|
||||
}
|
||||
@@ -51,8 +60,8 @@ namespace FileConverter.ConversionJobs
|
||||
}
|
||||
|
||||
// Convert png file into ico.
|
||||
this.gifConversionJob = new ConversionJob_FFMPEG(this.ConversionPreset);
|
||||
this.gifConversionJob.PrepareConversion(inputFilePath, this.OutputFilePath);
|
||||
this.gifConversionJob = new ConversionJob_FFMPEG(this.ConversionPreset, inputFilePath);
|
||||
this.gifConversionJob.PrepareConversion(this.OutputFilePath);
|
||||
}
|
||||
|
||||
protected override void Convert()
|
||||
|
||||
@@ -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,15 +9,19 @@ 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()
|
||||
@@ -81,19 +85,19 @@ namespace FileConverter.ConversionJobs
|
||||
{
|
||||
MagickReadSettings settings = new MagickReadSettings();
|
||||
|
||||
float dpi = 200f;
|
||||
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);
|
||||
Debug.Log("Apply scale factor: {0}%.", scaleFactor * 100);
|
||||
|
||||
dpi *= scaleFactor;
|
||||
}
|
||||
|
||||
Debug.Log("Density: {0}dpi.", dpi);
|
||||
settings.Density = new Density(dpi, dpi);
|
||||
settings.Density = new Density(dpi);
|
||||
|
||||
this.UserState = Properties.Resources.ConversionStateReadPdf;
|
||||
this.UserState = Properties.Resources.ConversionStateReadDocument;
|
||||
|
||||
using (MagickImageCollection images = new MagickImageCollection())
|
||||
{
|
||||
@@ -124,9 +128,9 @@ namespace FileConverter.ConversionJobs
|
||||
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
|
||||
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
|
||||
{
|
||||
Debug.Log("Apply scale factor: {0}%.", scaleFactor*100);
|
||||
Debug.Log("Apply scale factor: {0}%.", scaleFactor * 100);
|
||||
|
||||
image.Scale(new Percentage(scaleFactor*100f));
|
||||
image.Scale(new Percentage(scaleFactor * 100f));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -148,7 +152,7 @@ namespace FileConverter.ConversionJobs
|
||||
{
|
||||
int referenceSize = System.Math.Min(image.Width, image.Height);
|
||||
int size = 2;
|
||||
while (size*2 <= referenceSize)
|
||||
while (size * 2 <= referenceSize)
|
||||
{
|
||||
size *= 2;
|
||||
}
|
||||
@@ -185,6 +189,12 @@ namespace FileConverter.ConversionJobs
|
||||
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:
|
||||
@@ -199,8 +209,14 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
private void Image_Progress(object sender, ProgressEventArgs eventArgs)
|
||||
{
|
||||
if (this.CancelIsRequested)
|
||||
{
|
||||
eventArgs.Cancel = true;
|
||||
return;
|
||||
}
|
||||
|
||||
float alreadyCompletedPages = this.CurrentOuputFilePathIndex / (float)this.pageCount;
|
||||
this.Progress = alreadyCompletedPages + (float)eventArgs.Progress.ToDouble() / (100f * 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -30,7 +30,7 @@ namespace FileConverter
|
||||
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;
|
||||
@@ -41,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;
|
||||
@@ -51,6 +51,11 @@ namespace FileConverter
|
||||
inputTypeList.AddRange(source.inputTypes);
|
||||
}
|
||||
|
||||
if (additionalInputTypes != null)
|
||||
{
|
||||
inputTypeList.AddRange(additionalInputTypes);
|
||||
}
|
||||
|
||||
this.InputTypes = inputTypeList;
|
||||
|
||||
this.outputFileNameTemplate = source.OutputFileNameTemplate;
|
||||
@@ -503,6 +508,14 @@ namespace FileConverter
|
||||
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0");
|
||||
break;
|
||||
|
||||
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.Ico:
|
||||
break;
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -54,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);
|
||||
|
||||
@@ -66,7 +66,6 @@
|
||||
<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.2.900\lib\net40-client\Magick.NET-Q16-AnyCPU.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
@@ -74,23 +73,28 @@
|
||||
<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>
|
||||
@@ -120,12 +124,16 @@
|
||||
</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" />
|
||||
@@ -141,11 +149,13 @@
|
||||
<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" />
|
||||
@@ -257,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">
|
||||
@@ -301,6 +312,12 @@
|
||||
<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\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
|
||||
|
||||
@@ -10,17 +10,20 @@ namespace FileConverter
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
|
||||
using FileConverter.ConversionJobs;
|
||||
using Microsoft.Win32;
|
||||
|
||||
public static class Helpers
|
||||
{
|
||||
public static IEnumerable<CultureInfo> GetSupportedCultures()
|
||||
{
|
||||
//Get all culture
|
||||
// Get all cultures.
|
||||
CultureInfo[] cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
|
||||
|
||||
//Find the location where application installed.
|
||||
// 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 all culture for which satellite folder found with culture code.
|
||||
return cultures.Where(cultureInfo => Directory.Exists(Path.Combine(exeLocation, "Languages", cultureInfo.Name)));
|
||||
}
|
||||
|
||||
@@ -67,12 +70,22 @@ namespace FileConverter
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -106,13 +119,14 @@ namespace FileConverter
|
||||
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;
|
||||
return category == InputCategoryNames.Image || category == InputCategoryNames.Document;
|
||||
|
||||
default:
|
||||
return false;
|
||||
@@ -152,7 +166,82 @@ namespace FileConverter
|
||||
|
||||
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";
|
||||
|
||||
@@ -21,5 +21,6 @@ namespace FileConverter
|
||||
Png,
|
||||
Wav,
|
||||
Webm,
|
||||
Webp,
|
||||
}
|
||||
}
|
||||
@@ -3,8 +3,8 @@
|
||||
namespace FileConverter
|
||||
{
|
||||
using System;
|
||||
using System.Text;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
using FileConverter.Diagnostics;
|
||||
|
||||
@@ -268,20 +268,29 @@ namespace FileConverter.Properties {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Read input image.
|
||||
/// Looks up a localized string similar to Prepare conversion.
|
||||
/// </summary>
|
||||
public static string ConversionStateReadIntputImage {
|
||||
public static string ConversionStatePrepareConversion {
|
||||
get {
|
||||
return ResourceManager.GetString("ConversionStateReadIntputImage", resourceCulture);
|
||||
return ResourceManager.GetString("ConversionStatePrepareConversion", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Read document.
|
||||
/// </summary>
|
||||
public static string ConversionStateReadPdf {
|
||||
public static string ConversionStateReadDocument {
|
||||
get {
|
||||
return ResourceManager.GetString("ConversionStateReadPdf", resourceCulture);
|
||||
return ResourceManager.GetString("ConversionStateReadDocument", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Read input image.
|
||||
/// </summary>
|
||||
public static string ConversionStateReadIntputImage {
|
||||
get {
|
||||
return ResourceManager.GetString("ConversionStateReadIntputImage", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -412,7 +421,16 @@ namespace FileConverter.Properties {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Audio CD track extraction failed.
|
||||
/// Looks up a localized string similar to Can't find the output file(s)..
|
||||
/// </summary>
|
||||
public static string ErrorCantFindOutputFiles {
|
||||
get {
|
||||
return ResourceManager.GetString("ErrorCantFindOutputFiles", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Audio CD track extraction failed..
|
||||
/// </summary>
|
||||
public static string ErrorCDAExtractionFailed {
|
||||
get {
|
||||
@@ -429,6 +447,15 @@ namespace FileConverter.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to The conversion job failed but there is an output file that does exists..
|
||||
/// </summary>
|
||||
public static string ErrorConversionFailedWithOutput {
|
||||
get {
|
||||
return ResourceManager.GetString("ErrorConversionFailedWithOutput", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Fail to launch ffmpeg..
|
||||
/// </summary>
|
||||
@@ -510,6 +537,51 @@ namespace FileConverter.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Microsoft Excel must be installed in order to convert Excel documents..
|
||||
/// </summary>
|
||||
public static string ErrorMicrosoftExcelIsNotAvailable {
|
||||
get {
|
||||
return ResourceManager.GetString("ErrorMicrosoftExcelIsNotAvailable", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Microsoft Office must be installed in order to convert Office documents..
|
||||
/// </summary>
|
||||
public static string ErrorMicrosoftOfficeIsNotAvailable {
|
||||
get {
|
||||
return ResourceManager.GetString("ErrorMicrosoftOfficeIsNotAvailable", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Microsoft PowerPoint must be installed in order to convert PowerPoint documents..
|
||||
/// </summary>
|
||||
public static string ErrorMicrosoftPowerPointIsNotAvailable {
|
||||
get {
|
||||
return ResourceManager.GetString("ErrorMicrosoftPowerPointIsNotAvailable", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Microsoft Word must be installed in order to convert Word documents..
|
||||
/// </summary>
|
||||
public static string ErrorMicrosoftWordIsNotAvailable {
|
||||
get {
|
||||
return ResourceManager.GetString("ErrorMicrosoftWordIsNotAvailable", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Fail to open document with Microsoft Office (check if your licence/installation is valid)..
|
||||
/// </summary>
|
||||
public static string ErrorUnableToUseMicrosoftOffice {
|
||||
get {
|
||||
return ResourceManager.GetString("ErrorUnableToUseMicrosoftOffice", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Unsupported output format '{0}'..
|
||||
/// </summary>
|
||||
@@ -1003,6 +1075,15 @@ namespace FileConverter.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Misc.
|
||||
/// </summary>
|
||||
public static string StringMiscName {
|
||||
get {
|
||||
return ResourceManager.GetString("StringMiscName", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Video.
|
||||
/// </summary>
|
||||
@@ -1201,6 +1282,15 @@ namespace FileConverter.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Open File Converter website.
|
||||
/// </summary>
|
||||
public static string WebsiteButtonDescription {
|
||||
get {
|
||||
return ResourceManager.GetString("WebsiteButtonDescription", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to None.
|
||||
/// </summary>
|
||||
|
||||
@@ -308,7 +308,7 @@ use maj for uppercase version</value>
|
||||
<value>See change log ...</value>
|
||||
</data>
|
||||
<data name="Settings" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
<value>File Converter Settings</value>
|
||||
</data>
|
||||
<data name="SettingsButtonTitle" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
@@ -400,7 +400,7 @@ use maj for uppercase version</value>
|
||||
<data name="ConversionStateReadIntputImage" xml:space="preserve">
|
||||
<value>Read input image</value>
|
||||
</data>
|
||||
<data name="ConversionStateReadPdf" xml:space="preserve">
|
||||
<data name="ConversionStateReadDocument" xml:space="preserve">
|
||||
<value>Read document</value>
|
||||
</data>
|
||||
<data name="StringAnimatedImageName" xml:space="preserve">
|
||||
@@ -514,4 +514,34 @@ use maj for uppercase version</value>
|
||||
<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>
|
||||
@@ -319,7 +319,7 @@ utilisez maj pour une version en majuscules</value>
|
||||
<value>Voir les changements ...</value>
|
||||
</data>
|
||||
<data name="Settings" xml:space="preserve">
|
||||
<value>Configuration</value>
|
||||
<value>Configuration de File Converter</value>
|
||||
</data>
|
||||
<data name="SettingsButtonTitle" xml:space="preserve">
|
||||
<value>Configuration</value>
|
||||
@@ -414,7 +414,7 @@ utilisez maj pour une version en majuscules</value>
|
||||
<data name="ConversionStateReadIntputImage" xml:space="preserve">
|
||||
<value>Lecture de l'image d'origine</value>
|
||||
</data>
|
||||
<data name="ConversionStateReadPdf" xml:space="preserve">
|
||||
<data name="ConversionStateReadDocument" xml:space="preserve">
|
||||
<value>Lecture du document</value>
|
||||
</data>
|
||||
<data name="StringAnimatedImageName" xml:space="preserve">
|
||||
@@ -494,7 +494,7 @@ utilisez maj pour une version en majuscules</value>
|
||||
<comment>Invalid output path generated by output file path template.</comment>
|
||||
</data>
|
||||
<data name="ErrorUnsupportedOutputFormat" xml:space="preserve">
|
||||
<value>Format de fichier de destion non supporté '{0}'.</value>
|
||||
<value>Format de fichier de destination non supporté '{0}'.</value>
|
||||
</data>
|
||||
<data name="ChannelCountTitle" xml:space="preserve">
|
||||
<value>Nombre de canaux :</value>
|
||||
@@ -532,4 +532,34 @@ utilisez maj pour une version en majuscules</value>
|
||||
<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>
|
||||
@@ -403,7 +403,7 @@ use maj for uppercase version</value>
|
||||
<data name="ConversionStateReadIntputImage" xml:space="preserve">
|
||||
<value>Read input image</value>
|
||||
</data>
|
||||
<data name="ConversionStateReadPdf" xml:space="preserve">
|
||||
<data name="ConversionStateReadDocument" xml:space="preserve">
|
||||
<value>Read document</value>
|
||||
</data>
|
||||
<data name="StringAnimatedImageName" xml:space="preserve">
|
||||
@@ -446,7 +446,7 @@ use maj for uppercase version</value>
|
||||
<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>
|
||||
<value>Audio CD track extraction failed.</value>
|
||||
</data>
|
||||
<data name="ErrorCDDriveNotReady" xml:space="preserve">
|
||||
<value>CD drive is not ready.</value>
|
||||
@@ -514,4 +514,34 @@ use maj for uppercase version</value>
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 976 B After Width: | Height: | Size: 625 B |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
@@ -1,12 +1,9 @@
|
||||
// <copyright file="Settings.Settings.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
using System.Globalization;
|
||||
using System.Windows;
|
||||
using System.Windows.Markup;
|
||||
|
||||
namespace FileConverter
|
||||
{
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
|
||||
@@ -135,7 +135,7 @@ namespace FileConverter
|
||||
{
|
||||
Settings.MigrateSettingsToCurrentVersion(userSettings);
|
||||
|
||||
Diagnostics.Debug.Log("File converter settings has been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
|
||||
Diagnostics.Debug.Log("File converter settings have been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
|
||||
userSettings.SerializationVersion = Version;
|
||||
}
|
||||
|
||||
@@ -483,7 +483,7 @@ namespace FileConverter
|
||||
|
||||
private Settings Merge(Settings settings)
|
||||
{
|
||||
if (settings == null)
|
||||
if (settings == null || settings.conversionPresets == null)
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
<?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="3">
|
||||
<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>
|
||||
<MaximumNumberOfSimultaneousConversions>2</MaximumNumberOfSimultaneousConversions>
|
||||
<ConversionPreset Name="To Mkv" OutputType="Mkv" IsDefaultSettings="true">
|
||||
<InputTypes>3gp</InputTypes>
|
||||
<InputTypes>avi</InputTypes>
|
||||
@@ -208,6 +209,7 @@
|
||||
<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" />
|
||||
@@ -239,6 +241,7 @@
|
||||
<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" />
|
||||
@@ -266,8 +269,10 @@
|
||||
<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">
|
||||
@@ -276,6 +281,7 @@
|
||||
<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">
|
||||
@@ -302,6 +308,7 @@
|
||||
<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">
|
||||
@@ -329,6 +336,7 @@
|
||||
<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">
|
||||
@@ -355,6 +363,7 @@
|
||||
<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">
|
||||
@@ -382,12 +391,14 @@
|
||||
<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">
|
||||
@@ -395,17 +406,20 @@
|
||||
<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">
|
||||
@@ -413,6 +427,7 @@
|
||||
<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">
|
||||
@@ -427,6 +442,7 @@
|
||||
<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" />
|
||||
@@ -436,7 +452,16 @@
|
||||
</ConversionPreset>
|
||||
<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" />
|
||||
@@ -444,6 +469,27 @@
|
||||
<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>
|
||||
<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="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>
|
||||
@@ -456,6 +502,7 @@
|
||||
<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" />
|
||||
@@ -474,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" />
|
||||
@@ -492,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" />
|
||||
@@ -511,6 +560,7 @@
|
||||
<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" />
|
||||
@@ -531,6 +581,7 @@
|
||||
<InputTypes>tga</InputTypes>
|
||||
<InputTypes>tiff</InputTypes>
|
||||
<InputTypes>xcf</InputTypes>
|
||||
<InputTypes>webp</InputTypes>
|
||||
<InputPostConversionAction>None</InputPostConversionAction>
|
||||
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
|
||||
</ConversionPreset>
|
||||
@@ -545,6 +596,16 @@
|
||||
<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>
|
||||
|
||||
@@ -128,7 +128,7 @@ namespace FileConverter.Upgrade
|
||||
Helpers.currentlyDownloadedVersionDescription = upgradeVersionDescription;
|
||||
|
||||
Helpers.webClient.DownloadProgressChanged += Helpers.WebClient_DownloadProgressChanged;
|
||||
Helpers.webClient.DownloadFileCompleted += Helpers.WebClient_DownloadFileCompleted; ;
|
||||
Helpers.webClient.DownloadFileCompleted += Helpers.WebClient_DownloadFileCompleted;
|
||||
Task downloadTask = Helpers.webClient.DownloadFileTaskAsync(uri, installerPath);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
// <copyright file="UpgradeVersionDescription.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.CompilerServices;
|
||||
using FileConverter.Annotations;
|
||||
|
||||
namespace FileConverter
|
||||
{
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
using FileConverter.Annotations;
|
||||
|
||||
public class UpgradeVersionDescription : INotifyPropertyChanged
|
||||
{
|
||||
private int installerDownloadProgress;
|
||||
private bool installerDownloadInProgress;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
[XmlElement("Latest")]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// <copyright file="BoolInverterConverter.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
// <copyright file="CultureInfoToStringConverter.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.ValueConverters.Generic
|
||||
{
|
||||
@@ -27,7 +27,7 @@ namespace FileConverter.ValueConverters.Generic
|
||||
return nativeName.ToUpper(cultureInfo);
|
||||
}
|
||||
|
||||
return nativeName.Substring(0, 1).ToUpper(cultureInfo) + nativeName.Substring(1, nativeName.Length - 1); ;
|
||||
return nativeName.Substring(0, 1).ToUpper(cultureInfo) + nativeName.Substring(1, nativeName.Length - 1);
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// <copyright file="BoolInverterConverter.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
// <copyright file="ObjectToLocalizedString.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.ValueConverters.Generic
|
||||
{
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
// <copyright file="BitrateToString.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
// <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.Windows.Data;
|
||||
using System.Linq;
|
||||
using System.Windows.Data;
|
||||
|
||||
using FileConverter.Windows;
|
||||
|
||||
public class OutputTypeEnumToViewModel : IValueConverter
|
||||
|
||||
@@ -91,6 +91,12 @@ namespace FileConverter.Windows
|
||||
set;
|
||||
}
|
||||
|
||||
public DataTemplate WebpSettingsDataTemplate
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public override DataTemplate SelectTemplate(object item, DependencyObject container)
|
||||
{
|
||||
if (item == null)
|
||||
@@ -140,6 +146,9 @@ namespace FileConverter.Windows
|
||||
|
||||
case OutputType.Webm:
|
||||
return this.WebmSettingsDataTemplate;
|
||||
|
||||
case OutputType.Webp:
|
||||
return this.WebpSettingsDataTemplate;
|
||||
}
|
||||
|
||||
return this.DefaultDataTemplate;
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -147,7 +147,7 @@ namespace FileConverter
|
||||
else if (this.upgradeWindow == null)
|
||||
{
|
||||
this.upgradeWindow = new UpgradeWindow();
|
||||
this.upgradeWindow.Closed += UpgradeWindow_Closed;
|
||||
this.upgradeWindow.Closed += this.UpgradeWindow_Closed;
|
||||
}
|
||||
|
||||
Application application = Application.Current as Application;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// <copyright file="OutputFileType.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
// <copyright file="OutputTypeViewModel.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
namespace FileConverter.Windows
|
||||
{
|
||||
|
||||
@@ -710,7 +710,8 @@
|
||||
OgvSettingsDataTemplate="{StaticResource OgvSettingsDataTemplate}"
|
||||
PngSettingsDataTemplate="{StaticResource PngSettingsDataTemplate}"
|
||||
WavSettingsDataTemplate="{StaticResource WavSettingsDataTemplate}"
|
||||
WebmSettingsDataTemplate="{StaticResource WebmSettingsDataTemplate}" />
|
||||
WebmSettingsDataTemplate="{StaticResource WebmSettingsDataTemplate}"
|
||||
WebpSettingsDataTemplate="{StaticResource JpgSettingsDataTemplate}" />
|
||||
</Window.Resources>
|
||||
<Window.Title>
|
||||
<Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
|
||||
@@ -735,9 +736,9 @@
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Image HorizontalAlignment="Left" Height="48" Width="48" VerticalAlignment="Top" Source="..\Resources\ApplicationIcon.png" />
|
||||
<Image HorizontalAlignment="Left" Height="48" Width="48" VerticalAlignment="Top" Source="..\Resources\Settings-Icon.png" />
|
||||
<Label Grid.Column="1" Content="{x:Static project:Resources.Settings}" FontSize="20" Margin="4" VerticalAlignment="Center" />
|
||||
<Label Grid.Column="2" HorizontalAlignment="Right" FontStyle="Italic" FontSize="14" VerticalAlignment="Center">
|
||||
<Label Grid.Column="2" HorizontalAlignment="Right" FontStyle="Italic" FontSize="14" VerticalAlignment="Center" Foreground="#FF999999">
|
||||
<Label.Content>
|
||||
<Binding Path="(local:Application.ApplicationVersion)" Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" />
|
||||
</Label.Content>
|
||||
@@ -826,7 +827,7 @@
|
||||
</CheckBox>
|
||||
</HierarchicalDataTemplate>
|
||||
<DataTemplate DataType="{x:Type local:InputExtension}">
|
||||
<CheckBox Content="{Binding Name}" Height="20" VerticalAlignment="Top" Margin="2" Checked="OnInputTypeChecked" Unchecked="OnInputTypeUnchecked">
|
||||
<CheckBox Content="{Binding Name}" Foreground="{Binding ForegroundBrush}" ToolTip="{Binding ToolTip}" Height="20" VerticalAlignment="Top" Margin="2" Checked="OnInputTypeChecked" Unchecked="OnInputTypeUnchecked">
|
||||
<CheckBox.IsChecked>
|
||||
<MultiBinding Converter="{StaticResource CollectionContainsElementToBool}" Mode="OneWay">
|
||||
<Binding ElementName="window" Path="SelectedPreset.InputTypes" Mode="OneWay"/>
|
||||
@@ -976,7 +977,7 @@
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="35"/>
|
||||
<RowDefinition Height="45"/>
|
||||
<RowDefinition Height="30"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
@@ -986,11 +987,32 @@
|
||||
<Binding Path="(local:Application.ApplicationVersion)" Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" />
|
||||
</Label.Content>
|
||||
</Label>
|
||||
<TextBlock Margin="5" FontSize="16" HorizontalAlignment="Right" VerticalAlignment="Bottom" >
|
||||
<Hyperlink Foreground="#1E6BB8" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://www.file-converter.org?from=about">www.file-converter.org</Hyperlink>
|
||||
</DockPanel>
|
||||
|
||||
<DockPanel Grid.Row="1" Grid.Column="0" Margin="0,0,5,0">
|
||||
<FlowDocumentScrollViewer Grid.Row="0" Grid.Column="0" Margin="5,10,5,10" HorizontalAlignment="Stretch" VerticalAlignment="Top" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
|
||||
Document="{Binding AboutSectionContent, Converter={StaticResource TextToFlowDocumentConverter}, ElementName=window}" DockPanel.Dock="Top"/>
|
||||
|
||||
<TextBlock Grid.Row="1" Margin="5" DockPanel.Dock="Top" FontSize="14" HorizontalAlignment="Center" Visibility="{Binding DisplaySeeChangeLogLink, ElementName=window, Mode=OneWay, Converter={StaticResource BoolToVisibility}}">
|
||||
<Hyperlink Foreground="#1E6BB8" Command="{Binding GetChangeLogContentCommand, ElementName=window, Mode=OneWay}"><x:Static Member="project:Resources.SeeChangeLog" /></Hyperlink>
|
||||
</TextBlock>
|
||||
</DockPanel>
|
||||
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,5,0,0">
|
||||
|
||||
<Image Grid.Row="1" Grid.Column="1" Margin="20,20,20,20" VerticalAlignment="Top" Source="/FileConverter;component/Resources/ApplicationIcon.ico"></Image>
|
||||
|
||||
<StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center" Margin="5">
|
||||
<Label Content="{x:Static project:Resources.DonateDescription}" VerticalAlignment="Center" FontStyle="Italic"/>
|
||||
<Button Style="{StaticResource DonateButton}" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://pledgie.com/campaigns/31615?from=about">
|
||||
<Button.Content>
|
||||
<DockPanel>
|
||||
<Image Source="/FileConverter;component/Resources/Pledge-icon.png"></Image>
|
||||
<Label Content="{x:Static project:Resources.DonateButtonTitle}" Margin="5,0,5,0" Foreground="WhiteSmoke" FontWeight="Bold" FontSize="14"/>
|
||||
</DockPanel>
|
||||
</Button.Content>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,0">
|
||||
<Button ToolTip="{x:Static project:Resources.GitHubButtonDescription}" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://github.com/Tichau/FileConverter/?from=about">
|
||||
<Button.Content>
|
||||
<Image Source="/FileConverter;component/Resources/GitHub-Icon.png"></Image>
|
||||
@@ -1006,27 +1028,9 @@
|
||||
<Image Source="/FileConverter;component/Resources/GitHub-Documentation-Icon.png"></Image>
|
||||
</Button.Content>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
<DockPanel Grid.Row="1" Grid.Column="0" Margin="0,0,5,0">
|
||||
<FlowDocumentScrollViewer Grid.Row="0" Grid.Column="0" Margin="5,10,5,10" HorizontalAlignment="Stretch" VerticalAlignment="Top" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
|
||||
Document="{Binding AboutSectionContent, Converter={StaticResource TextToFlowDocumentConverter}, ElementName=window}" DockPanel.Dock="Top"/>
|
||||
|
||||
<TextBlock Grid.Row="1" Margin="5" DockPanel.Dock="Top" FontSize="14" HorizontalAlignment="Center" Visibility="{Binding DisplaySeeChangeLogLink, ElementName=window, Mode=OneWay, Converter={StaticResource BoolToVisibility}}">
|
||||
<Hyperlink Foreground="#1E6BB8" Command="{Binding GetChangeLogContentCommand, ElementName=window, Mode=OneWay}"><x:Static Member="project:Resources.SeeChangeLog" /></Hyperlink>
|
||||
</TextBlock>
|
||||
</DockPanel>
|
||||
|
||||
<Image Grid.Row="1" Grid.Column="1" Margin="0,5,0,5" Source="/FileConverter;component/Resources/ApplicationIcon.ico"></Image>
|
||||
|
||||
<StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<Label Content="{x:Static project:Resources.DonateDescription}" VerticalAlignment="Center"/>
|
||||
<Button Style="{StaticResource DonateButton}" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://pledgie.com/campaigns/31615?from=about">
|
||||
<Button ToolTip="{x:Static project:Resources.WebsiteButtonDescription}" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="www.file-converter.org?from=about">
|
||||
<Button.Content>
|
||||
<DockPanel>
|
||||
<Image Source="/FileConverter;component/Resources/Pledge-icon.png"></Image>
|
||||
<Label Content="{x:Static project:Resources.DonateButtonTitle}" Margin="5,0,5,0" Foreground="WhiteSmoke" FontWeight="Bold" FontSize="14"/>
|
||||
</DockPanel>
|
||||
<Image Source="/FileConverter;component/Resources/WebSite-Icon.png"></Image>
|
||||
</Button.Content>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
@@ -13,10 +13,10 @@ namespace FileConverter
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Input;
|
||||
|
||||
using FileConverter.Windows;
|
||||
using FileConverter.Annotations;
|
||||
using FileConverter.Commands;
|
||||
using FileConverter.ConversionJobs;
|
||||
using FileConverter.Windows;
|
||||
using Microsoft.Win32;
|
||||
|
||||
/// <summary>
|
||||
@@ -57,6 +57,26 @@ namespace FileConverter
|
||||
|
||||
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
|
||||
@@ -148,26 +168,7 @@ namespace FileConverter
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
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.Ico),
|
||||
new OutputTypeViewModel(OutputType.Gif),
|
||||
new OutputTypeViewModel(OutputType.Pdf),
|
||||
};
|
||||
|
||||
|
||||
public InputPostConversionAction[] InputPostConversionActions => new[]
|
||||
{
|
||||
InputPostConversionAction.None,
|
||||
|
||||
@@ -2,12 +2,11 @@
|
||||
|
||||
namespace FileConverter.Windows
|
||||
{
|
||||
using System;
|
||||
using System.Windows.Input;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Input;
|
||||
|
||||
using FileConverter.Annotations;
|
||||
using FileConverter.Commands;
|
||||
|
||||
@@ -1,5 +1,22 @@
|
||||
# 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.
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Fragment>
|
||||
<DirectoryRef Id="INSTALLFOLDER">
|
||||
<Directory Id="dir59665241F3CDDE1A2AC55595EAB82331" Name="Languages" />
|
||||
</DirectoryRef>
|
||||
</Fragment>
|
||||
<Fragment>
|
||||
<ComponentGroup Id="Languages">
|
||||
<Component Id="cmp416BC2ED150FADE2B6C889B2E30BEFF1" Directory="dir69039193B93E3CF7D8D647984CD644EA" Guid="{0CA9BF52-0792-493A-8758-B4A5B8958F71}">
|
||||
<File Id="fil5460820E8FE9AB69A71E15E4E9BEB1E2" KeyPath="yes" Source="$(var.FileConverter.TargetDir)\en\FileConverter.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpF149529191A3B87AAB82B9301A2CAB8B" Directory="dir6DD71661C1CC5A2A0CCF37D75E6494F1" Guid="{8488EC70-06C5-4FD0-A8DA-F68481FEA431}">
|
||||
<File Id="fil47BB5F07444A2330EB2978EA5E7A488E" KeyPath="yes" Source="$(var.FileConverter.TargetDir)\fr\FileConverter.resources.dll" />
|
||||
</Component>
|
||||
</ComponentGroup>
|
||||
</Fragment>
|
||||
<Fragment>
|
||||
<DirectoryRef Id="dir59665241F3CDDE1A2AC55595EAB82331">
|
||||
<Directory Id="dir69039193B93E3CF7D8D647984CD644EA" Name="en" />
|
||||
</DirectoryRef>
|
||||
</Fragment>
|
||||
<Fragment>
|
||||
<DirectoryRef Id="dir59665241F3CDDE1A2AC55595EAB82331">
|
||||
<Directory Id="dir6DD71661C1CC5A2A0CCF37D75E6494F1" Name="fr" />
|
||||
</DirectoryRef>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
<!-- Upgrade documentation: http://wixtoolset.org/documentation/manual/v3/howtos/updates/major_upgrade.html -->
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.1.0" Manufacturer="Adrien Allard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
|
||||
<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 ?>
|
||||
@@ -142,7 +142,7 @@
|
||||
<Component Id="RegistryEntries" Guid="{C3EF3D67-0206-4DBD-B2EA-78FF2E290093}">
|
||||
<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;gif;ico;jpg;jpeg;m4a;m4v;mkv;mov;mp3;mp4;mpeg;oga;ogg;ogv;pdf;png;psd;svg;tga;tiff;vob;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>
|
||||
|
||||
@@ -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 |
@@ -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 |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 84 KiB |
@@ -1,4 +1,4 @@
|
||||
<Version>
|
||||
<Latest Major="1" Minor="0" Patch="0"/>
|
||||
<URL>http://github.com/Tichau/FileConverter/releases/download/v1.0/FileConverter-1.0-x86-setup.msi</URL>
|
||||
<Latest Major="1" Minor="2" Patch="0"/>
|
||||
<URL>http://github.com/Tichau/FileConverter/releases/download/v1.2/FileConverter-1.2-x86-setup.msi</URL>
|
||||
</Version>
|
||||
@@ -1,4 +1,4 @@
|
||||
<Version>
|
||||
<Latest Major="1" Minor="0" Patch="0"/>
|
||||
<URL>http://github.com/Tichau/FileConverter/releases/download/v1.0/FileConverter-1.0-x64-setup.msi</URL>
|
||||
<Latest Major="1" Minor="2" Patch="0"/>
|
||||
<URL>http://github.com/Tichau/FileConverter/releases/download/v1.2/FileConverter-1.2-x64-setup.msi</URL>
|
||||
</Version>
|
||||