mirror of
https://github.com/Tichau/FileConverter.git
synced 2026-11-20 17:42:20 +01:00
Merge pull request #354 from Tichau/feature/upgrade-dependencies
Upgrade project and dependencies
This commit is contained in:
53 files changed
+1234
-653
No files matched your search
+1
-3
@@ -26,6 +26,7 @@ bld/
|
||||
# MSTest test Results
|
||||
[Tt]est[Rr]esult*/
|
||||
[Bb]uild[Ll]og.*
|
||||
TestData/*
|
||||
|
||||
# NUNIT
|
||||
*.VisualState.xml
|
||||
@@ -195,6 +196,3 @@ FakesAssemblies/
|
||||
|
||||
# Ignore the installer signing commands file
|
||||
Installer/Installer.sign
|
||||
|
||||
# Ignore the installer languages file because it is automatically generated
|
||||
Installer/Languages.wxs
|
||||
@@ -1,14 +1,26 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
|
||||
</startup>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<probing privatePath="Languages" />
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
@@ -17,9 +17,6 @@
|
||||
|
||||
<!--Global View Model Locator-->
|
||||
<viewModels:ViewModelLocator x:Key="Locator" />
|
||||
<services:NavigationService x:Key="Navigation" />
|
||||
<services:ConversionService x:Key="Conversions" />
|
||||
<services:SettingsService x:Key="Settings" />
|
||||
<services:UpgradeService x:Key="Upgrade" />
|
||||
|
||||
<!-- Markdown style -->
|
||||
|
||||
@@ -22,12 +22,13 @@ namespace FileConverter
|
||||
using System.Threading;
|
||||
using System.Windows;
|
||||
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
|
||||
using FileConverter.ConversionJobs;
|
||||
using FileConverter.Services;
|
||||
using FileConverter.ViewModels;
|
||||
using FileConverter.Views;
|
||||
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Debug = FileConverter.Diagnostics.Debug;
|
||||
|
||||
public partial class Application : System.Windows.Application
|
||||
@@ -77,7 +78,7 @@ namespace FileConverter
|
||||
this.Initialize();
|
||||
|
||||
// Navigate to the wanted view.
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
|
||||
if (this.showHelp)
|
||||
{
|
||||
@@ -89,7 +90,7 @@ namespace FileConverter
|
||||
{
|
||||
navigationService.Show(Pages.Main);
|
||||
|
||||
IConversionService conversionService = SimpleIoc.Default.GetInstance<IConversionService>();
|
||||
IConversionService conversionService = Ioc.Default.GetRequiredService<IConversionService>();
|
||||
conversionService.ConversionJobsTerminated += this.ConversionService_ConversionJobsTerminated;
|
||||
conversionService.ConvertFilesAsync();
|
||||
}
|
||||
@@ -111,7 +112,7 @@ namespace FileConverter
|
||||
|
||||
Debug.Log("Exit application.");
|
||||
|
||||
IUpgradeService upgradeService = SimpleIoc.Default.GetInstance<IUpgradeService>();
|
||||
IUpgradeService upgradeService = Ioc.Default.GetRequiredService<IUpgradeService>();
|
||||
|
||||
if (!this.isSessionEnding && upgradeService.UpgradeVersionDescription != null && upgradeService.UpgradeVersionDescription.NeedToUpgrade)
|
||||
{
|
||||
@@ -161,37 +162,36 @@ namespace FileConverter
|
||||
|
||||
private void RegisterServices()
|
||||
{
|
||||
if (this.TryFindResource("Settings") == null)
|
||||
{
|
||||
Debug.LogError("Can't retrieve conversion service.");
|
||||
this.Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
|
||||
}
|
||||
var services = new ServiceCollection();
|
||||
|
||||
if (this.TryFindResource("Locator") == null)
|
||||
if (this.TryFindResource("Locator") is ViewModelLocator viewModelLocator)
|
||||
{
|
||||
viewModelLocator.RegisterViewModels(services);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("Can't retrieve view model locator.");
|
||||
this.Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
|
||||
}
|
||||
|
||||
if (this.TryFindResource("Conversions") == null)
|
||||
if (this.TryFindResource("Upgrade") is UpgradeService upgradeService)
|
||||
{
|
||||
Debug.LogError("Can't retrieve conversion service.");
|
||||
services.AddSingleton<IUpgradeService>(upgradeService);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("Can't retrieve Upgrade service.");
|
||||
this.Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
|
||||
}
|
||||
|
||||
if (this.TryFindResource("Navigation") == null)
|
||||
{
|
||||
Debug.LogError("Can't retrieve navigation service.");
|
||||
this.Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
|
||||
}
|
||||
services
|
||||
.AddSingleton<INavigationService, NavigationService>()
|
||||
.AddSingleton<IConversionService, ConversionService>()
|
||||
.AddSingleton<ISettingsService, SettingsService>();
|
||||
|
||||
if (this.TryFindResource("Upgrade") == null)
|
||||
{
|
||||
Debug.LogError("Can't retrieve navigation service.");
|
||||
this.Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown()));
|
||||
}
|
||||
Ioc.Default.ConfigureServices(services.BuildServiceProvider());
|
||||
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
|
||||
navigationService.RegisterPage<HelpWindow>(Pages.Help, false, true);
|
||||
navigationService.RegisterPage<MainWindow>(Pages.Main, false, true);
|
||||
@@ -228,7 +228,7 @@ namespace FileConverter
|
||||
return;
|
||||
}
|
||||
|
||||
ISettingsService settingsService = SimpleIoc.Default.GetInstance<ISettingsService>();
|
||||
ISettingsService settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||
|
||||
// Parse arguments.
|
||||
bool quitAfterStartup = false;
|
||||
@@ -364,7 +364,7 @@ namespace FileConverter
|
||||
// Check for upgrade.
|
||||
if (settingsService.Settings.CheckUpgradeAtStartup)
|
||||
{
|
||||
IUpgradeService upgradeService = SimpleIoc.Default.GetInstance<IUpgradeService>();
|
||||
IUpgradeService upgradeService = Ioc.Default.GetRequiredService<IUpgradeService>();
|
||||
upgradeService.NewVersionAvailable += this.UpgradeService_NewVersionAvailable;
|
||||
upgradeService.CheckForUpgrade();
|
||||
}
|
||||
@@ -383,7 +383,7 @@ namespace FileConverter
|
||||
|
||||
if (conversionPreset != null)
|
||||
{
|
||||
IConversionService conversionService = SimpleIoc.Default.GetInstance<IConversionService>();
|
||||
IConversionService conversionService = Ioc.Default.GetRequiredService<IConversionService>();
|
||||
|
||||
// Create conversion jobs.
|
||||
Debug.Log("Create jobs for conversion preset: '{0}'", conversionPreset.FullName);
|
||||
@@ -409,18 +409,18 @@ namespace FileConverter
|
||||
|
||||
private void UpgradeService_NewVersionAvailable(object sender, UpgradeVersionDescription e)
|
||||
{
|
||||
SimpleIoc.Default.GetInstance<INavigationService>().Show(Pages.Upgrade);
|
||||
Ioc.Default.GetRequiredService<INavigationService>().Show(Pages.Upgrade);
|
||||
|
||||
IUpgradeService upgradeService = SimpleIoc.Default.GetInstance<IUpgradeService>();
|
||||
IUpgradeService upgradeService = Ioc.Default.GetRequiredService<IUpgradeService>();
|
||||
upgradeService.NewVersionAvailable -= this.UpgradeService_NewVersionAvailable;
|
||||
}
|
||||
|
||||
private void ConversionService_ConversionJobsTerminated(object sender, ConversionJobsTerminatedEventArgs e)
|
||||
{
|
||||
IConversionService conversionService = SimpleIoc.Default.GetInstance<IConversionService>();
|
||||
IConversionService conversionService = Ioc.Default.GetRequiredService<IConversionService>();
|
||||
conversionService.ConversionJobsTerminated -= this.ConversionService_ConversionJobsTerminated;
|
||||
|
||||
ISettingsService settingsService = SimpleIoc.Default.GetInstance<ISettingsService>();
|
||||
ISettingsService settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||
|
||||
if (!settingsService.Settings.ExitApplicationWhenConversionsFinished)
|
||||
{
|
||||
|
||||
@@ -6,11 +6,11 @@ namespace FileConverter.ConversionJobs
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Windows.Input;
|
||||
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
|
||||
using FileConverter.Diagnostics;
|
||||
|
||||
using GalaSoft.MvvmLight.Command;
|
||||
|
||||
public class ConversionJob : INotifyPropertyChanged
|
||||
{
|
||||
private float progress = 0f;
|
||||
@@ -192,7 +192,7 @@ namespace FileConverter.ConversionJobs
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual bool IsCancelable => this.State == ConversionState.InProgress;
|
||||
protected virtual bool IsCancelable() => this.State == ConversionState.InProgress;
|
||||
|
||||
protected string[] OutputFilePaths
|
||||
{
|
||||
@@ -363,7 +363,7 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
public virtual void Cancel()
|
||||
{
|
||||
if (!this.IsCancelable)
|
||||
if (!this.IsCancelable())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
protected override ApplicationName Application => ApplicationName.Excel;
|
||||
|
||||
protected override bool IsCancelable => false;
|
||||
protected override bool IsCancelable() => false;
|
||||
|
||||
protected override int GetOutputFilesCount()
|
||||
{
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace FileConverter.ConversionJobs
|
||||
get;
|
||||
}
|
||||
|
||||
protected override bool IsCancelable => false;
|
||||
protected override bool IsCancelable() => false;
|
||||
|
||||
protected override void Initialize()
|
||||
{
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
protected override ApplicationName Application => ApplicationName.PowerPoint;
|
||||
|
||||
protected override bool IsCancelable => false;
|
||||
protected override bool IsCancelable() => false;
|
||||
|
||||
protected override int GetOutputFilesCount()
|
||||
{
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace FileConverter.ConversionJobs
|
||||
|
||||
protected override ApplicationName Application => ApplicationName.Word;
|
||||
|
||||
protected override bool IsCancelable => false;
|
||||
protected override bool IsCancelable() => false;
|
||||
|
||||
protected override int GetOutputFilesCount()
|
||||
{
|
||||
|
||||
@@ -6,11 +6,11 @@ namespace FileConverter
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
|
||||
using FileConverter.Controls;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
|
||||
[XmlRoot]
|
||||
[XmlType]
|
||||
public class ConversionPreset : ObservableObject, IXmlSerializable
|
||||
@@ -109,7 +109,7 @@ namespace FileConverter
|
||||
set
|
||||
{
|
||||
this.shortName = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ namespace FileConverter
|
||||
{
|
||||
this.outputType = value;
|
||||
this.InitializeDefaultSettings(this.outputType);
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
this.CoerceInputTypes();
|
||||
}
|
||||
}
|
||||
@@ -157,7 +157,7 @@ namespace FileConverter
|
||||
this.inputTypes[index] = this.inputTypes[index].ToLowerInvariant();
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ namespace FileConverter
|
||||
set
|
||||
{
|
||||
this.inputPostConversionAction = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@ namespace FileConverter
|
||||
}
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged(nameof(this.Settings));
|
||||
this.OnPropertyChanged(nameof(this.Settings));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -231,7 +231,7 @@ namespace FileConverter
|
||||
set
|
||||
{
|
||||
this.outputFileNameTemplate = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -268,7 +268,7 @@ namespace FileConverter
|
||||
}
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -308,14 +308,14 @@ namespace FileConverter
|
||||
}
|
||||
|
||||
this.inputTypes.Add(inputType);
|
||||
this.RaisePropertyChanged(nameof(this.InputTypes));
|
||||
this.OnPropertyChanged(nameof(this.InputTypes));
|
||||
}
|
||||
|
||||
public void RemoveInputType(string inputType)
|
||||
{
|
||||
if (this.inputTypes.Remove(inputType))
|
||||
{
|
||||
this.RaisePropertyChanged(nameof(this.InputTypes));
|
||||
this.OnPropertyChanged(nameof(this.InputTypes));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -348,7 +348,7 @@ namespace FileConverter
|
||||
|
||||
this.settings[settingsKey] = value;
|
||||
|
||||
this.RaisePropertyChanged(nameof(this.Settings));
|
||||
this.OnPropertyChanged(nameof(this.Settings));
|
||||
}
|
||||
|
||||
public string GetSettingsValue(string settingsKey)
|
||||
@@ -544,7 +544,7 @@ namespace FileConverter
|
||||
throw new System.Exception("Missing default settings for type " + outputType);
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged(nameof(this.Settings));
|
||||
this.OnPropertyChanged(nameof(this.Settings));
|
||||
}
|
||||
|
||||
private void InitializeSettingsValue(string settingsKey, string value, bool force = false)
|
||||
|
||||
@@ -9,11 +9,13 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>FileConverter</RootNamespace>
|
||||
<AssemblyName>FileConverter</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<TargetFrameworkProfile />
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
@@ -67,24 +69,29 @@
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommunityToolkit.Mvvm, Version=8.2.0.0, Culture=neutral, PublicKeyToken=4aff67a105548ee2, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\CommunityToolkit.Mvvm.8.2.2\lib\netstandard2.0\CommunityToolkit.Mvvm.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
|
||||
<Reference Include="Magick.NET-Q16-AnyCPU, Version=13.5.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.13.5.0\lib\netstandard20\Magick.NET-Q16-AnyCPU.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Magick.NET-Q16-AnyCPU, Version=7.12.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.12.0\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
|
||||
<Reference Include="Magick.NET.Core, Version=13.5.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Magick.NET.Core.13.5.0\lib\netstandard20\Magick.NET.Core.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Markdown.Xaml">
|
||||
<HintPath>..\..\Middleware\Markdown.Xaml.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
@@ -97,6 +104,9 @@
|
||||
<HintPath>..\..\packages\Microsoft.Office.Interop.Word.15.0.4797.1003\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.77\lib\net462\Microsoft.Xaml.Behaviors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Office, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
|
||||
<HintPath>..\..\packages\Office.12.0.0\lib\net40\Office.dll</HintPath>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
@@ -106,16 +116,33 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\Middleware\Ripper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SharpShell, Version=2.7.1.0, Culture=neutral, PublicKeyToken=f14dc899472fe6fb, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\SharpShell.2.7.1\lib\net40-client\SharpShell.dll</HintPath>
|
||||
<Reference Include="SharpShell, Version=2.7.2.0, Culture=neutral, PublicKeyToken=f14dc899472fe6fb, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\SharpShell.2.7.2\lib\net40-client\SharpShell.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
|
||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Core" />
|
||||
@@ -127,9 +154,8 @@
|
||||
<Reference Include="WindowsBase" />
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="WpfAnimatedGif, Version=1.4.14.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\WpfAnimatedGif.1.4.14\lib\net\WpfAnimatedGif.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Reference Include="WpfAnimatedGif, Version=2.0.0.0, Culture=neutral, PublicKeyToken=9e7cd3b544a090dc, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\WpfAnimatedGif.2.0.2\lib\net40\WpfAnimatedGif.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="yeti.mmedia">
|
||||
<HintPath>..\..\Middleware\yeti.mmedia.dll</HintPath>
|
||||
@@ -426,15 +452,24 @@
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
|
||||
copy /Y "$(SolutionDir)Middleware\gs\x86\gsdll32.dll" "$(TargetDir)gsdll32.dll"
|
||||
copy /Y "$(SolutionDir)Middleware\gs\x86\gswin32c.exe" "$(TargetDir)gswin32c.exe"
|
||||
<PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
|
||||
copy /Y "$(SolutionDir)Middleware\gs\gsdll64.dll" "$(TargetDir)gsdll64.dll"
|
||||
copy /Y "$(SolutionDir)Middleware\gs\gswin64c.exe" "$(TargetDir)gswin64c.exe"
|
||||
copy /Y "$(ProjectDir)Settings.default.xml" "$(TargetDir)Settings.default.xml"
|
||||
robocopy $(TargetDir) $(TargetDir)\Languages "$(TargetName).resources.dll" /CREATE /S /XD Languages /IS /IT /NFL /NDL /NJH /NJS /NC /NS /NP
|
||||
if %25errorlevel%25 leq 1 exit 0 else exit %25errorlevel%25
|
||||
robocopy $(TargetDir) $(TargetDir)\Languages "$(TargetName).resources.dll" /MOVE /S /XD Languages /XL /IS /IT /NFL /NDL /NJH /NJS /NC /NS /NP
|
||||
if %25errorlevel%25 leq 1 exit 0 else exit %25errorlevel%25</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\..\packages\Magick.NET-Q16-AnyCPU.13.5.0\build\netstandard20\Magick.NET-Q16-AnyCPU.targets" Condition="Exists('..\..\packages\Magick.NET-Q16-AnyCPU.13.5.0\build\netstandard20\Magick.NET-Q16-AnyCPU.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\packages\Magick.NET-Q16-AnyCPU.13.5.0\build\netstandard20\Magick.NET-Q16-AnyCPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Magick.NET-Q16-AnyCPU.13.5.0\build\netstandard20\Magick.NET-Q16-AnyCPU.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\..\packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets" Condition="Exists('..\..\packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets')" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
|
||||
@@ -15,9 +15,9 @@ namespace FileConverter
|
||||
|
||||
using SharpShell;
|
||||
using SharpShell.ServerRegistration;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
|
||||
using Microsoft.Win32;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
|
||||
public static class Helpers
|
||||
{
|
||||
@@ -243,7 +243,7 @@ namespace FileConverter
|
||||
|
||||
public static Thread InstantiateThread(string name, ThreadStart threadStart)
|
||||
{
|
||||
ISettingsService settingsService = SimpleIoc.Default.GetInstance<ISettingsService>();
|
||||
ISettingsService settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||
CultureInfo currentCulture = settingsService?.Settings?.ApplicationLanguage;
|
||||
|
||||
Thread thread = new Thread(threadStart);
|
||||
@@ -260,7 +260,7 @@ namespace FileConverter
|
||||
|
||||
public static Thread InstantiateThread(string name, ParameterizedThreadStart parameterizedThreadStart)
|
||||
{
|
||||
ISettingsService settingsService = SimpleIoc.Default.GetInstance<ISettingsService>();
|
||||
ISettingsService settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||
CultureInfo currentCulture = settingsService?.Settings?.ApplicationLanguage;
|
||||
|
||||
Thread thread = new Thread(parameterizedThreadStart);
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ namespace FileConverter.Properties {
|
||||
// class via a tool like ResGen or Visual Studio.
|
||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
// with the /str option, or rebuild your VS project.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
public class Resources {
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ namespace FileConverter.Properties {
|
||||
|
||||
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")]
|
||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||
|
||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||
|
||||
@@ -7,23 +7,26 @@ namespace FileConverter.Services
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Threading;
|
||||
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
|
||||
using FileConverter.ConversionJobs;
|
||||
using FileConverter.Diagnostics;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
|
||||
public class ConversionService : ObservableObject, IConversionService
|
||||
{
|
||||
private readonly List<ConversionJob> conversionJobs = new List<ConversionJob>();
|
||||
|
||||
private readonly int numberOfConversionThread = 1;
|
||||
|
||||
public ConversionService()
|
||||
public ConversionService(ISettingsService settingsService)
|
||||
{
|
||||
this.ConversionJobs = this.conversionJobs.AsReadOnly();
|
||||
if (settingsService == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(settingsService));
|
||||
}
|
||||
|
||||
ISettingsService settingsService = SimpleIoc.Default.GetInstance<ISettingsService>();
|
||||
this.ConversionJobs = this.conversionJobs.AsReadOnly();
|
||||
|
||||
this.numberOfConversionThread = settingsService.Settings.MaximumNumberOfSimultaneousConversions;
|
||||
Diagnostics.Debug.Log("Maximum number of conversion threads: {0}", this.numberOfConversionThread);
|
||||
@@ -33,8 +36,6 @@ namespace FileConverter.Services
|
||||
this.numberOfConversionThread = System.Math.Max(1, Environment.ProcessorCount / 2);
|
||||
Diagnostics.Debug.Log("The number of processors on this computer is {0}. Set the default number of conversion threads to {0}", settingsService.Settings.MaximumNumberOfSimultaneousConversions);
|
||||
}
|
||||
|
||||
SimpleIoc.Default.Register<IConversionService>(() => this);
|
||||
}
|
||||
|
||||
public event System.EventHandler<ConversionJobsTerminatedEventArgs> ConversionJobsTerminated;
|
||||
@@ -48,7 +49,7 @@ namespace FileConverter.Services
|
||||
public void RegisterConversionJob(ConversionJob conversionJob)
|
||||
{
|
||||
this.conversionJobs.Add(conversionJob);
|
||||
this.RaisePropertyChanged(nameof(this.ConversionJobs));
|
||||
this.OnPropertyChanged(nameof(this.ConversionJobs));
|
||||
}
|
||||
|
||||
public void ConvertFilesAsync()
|
||||
|
||||
@@ -6,10 +6,10 @@ namespace FileConverter.Services
|
||||
using System.Collections.Generic;
|
||||
using System.Windows;
|
||||
|
||||
using FileConverter.Annotations;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
using FileConverter.Annotations;
|
||||
|
||||
using Application = FileConverter.Application;
|
||||
|
||||
@@ -21,8 +21,6 @@ namespace FileConverter.Services
|
||||
public NavigationService()
|
||||
{
|
||||
this.pageInfoByType = new Dictionary<string, PageInfo>();
|
||||
|
||||
SimpleIoc.Default.Register<INavigationService>(() => this);
|
||||
}
|
||||
|
||||
public void Show([NotNull] string pageKey)
|
||||
@@ -104,7 +102,7 @@ namespace FileConverter.Services
|
||||
// If this is the last window.
|
||||
if (this.numberOfPageShowed == 0)
|
||||
{
|
||||
IUpgradeService upgradeService = SimpleIoc.Default.GetInstance<IUpgradeService>();
|
||||
IUpgradeService upgradeService = Ioc.Default.GetRequiredService<IUpgradeService>();
|
||||
bool upgradeInProgress = upgradeService.UpgradeVersionDescription != null &&
|
||||
upgradeService.UpgradeVersionDescription.NeedToUpgrade &&
|
||||
!upgradeService.UpgradeVersionDescription.InstallerDownloadDone;
|
||||
@@ -118,7 +116,7 @@ namespace FileConverter.Services
|
||||
}
|
||||
else
|
||||
{
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
navigationService.Show(Pages.Upgrade);
|
||||
Diagnostics.Debug.Log("There is an upgrade in progress, display the upgrade window.");
|
||||
}
|
||||
|
||||
@@ -9,8 +9,7 @@ namespace FileConverter.Services
|
||||
using System.IO;
|
||||
using System.Windows;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
|
||||
using Debug = FileConverter.Diagnostics.Debug;
|
||||
|
||||
@@ -21,8 +20,6 @@ namespace FileConverter.Services
|
||||
// Load settigns.
|
||||
Debug.Log("Load settings...");
|
||||
this.Settings = this.Load();
|
||||
|
||||
SimpleIoc.Default.Register<ISettingsService>(() => this);
|
||||
}
|
||||
|
||||
public Settings Settings
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
namespace FileConverter.Services
|
||||
{
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Text.RegularExpressions;
|
||||
@@ -11,12 +10,11 @@ namespace FileConverter.Services
|
||||
using System.Xml;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
|
||||
using FileConverter.Annotations;
|
||||
using FileConverter.Diagnostics;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
|
||||
public class UpgradeService : ObservableObject, IUpgradeService
|
||||
{
|
||||
#if DEBUG
|
||||
@@ -33,7 +31,6 @@ namespace FileConverter.Services
|
||||
public UpgradeService()
|
||||
{
|
||||
this.UpgradeVersionDescription = new UpgradeVersionDescription();
|
||||
SimpleIoc.Default.Register<IUpgradeService>(() => this);
|
||||
}
|
||||
|
||||
public event EventHandler<UpgradeVersionDescription> NewVersionAvailable;
|
||||
@@ -44,7 +41,7 @@ namespace FileConverter.Services
|
||||
private set
|
||||
{
|
||||
this.upgradeVersionDescription = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ namespace FileConverter.Services
|
||||
{
|
||||
using System.Xml.Serialization;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
|
||||
public class UpgradeVersionDescription : ObservableObject
|
||||
{
|
||||
@@ -34,7 +34,7 @@ namespace FileConverter.Services
|
||||
set
|
||||
{
|
||||
this.changeLog = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,9 +53,9 @@ namespace FileConverter.Services
|
||||
set
|
||||
{
|
||||
this.installerDownloadInProgress = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.RaisePropertyChanged(nameof(this.InstallerDownloadDone));
|
||||
this.RaisePropertyChanged(nameof(this.InstallerDownloadNotStarted));
|
||||
this.OnPropertyChanged();
|
||||
this.OnPropertyChanged(nameof(this.InstallerDownloadDone));
|
||||
this.OnPropertyChanged(nameof(this.InstallerDownloadNotStarted));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,9 +67,9 @@ namespace FileConverter.Services
|
||||
set
|
||||
{
|
||||
this.installerDownloadProgress = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.RaisePropertyChanged(nameof(this.InstallerDownloadDone));
|
||||
this.RaisePropertyChanged(nameof(this.InstallerDownloadNotStarted));
|
||||
this.OnPropertyChanged();
|
||||
this.OnPropertyChanged(nameof(this.InstallerDownloadDone));
|
||||
this.OnPropertyChanged(nameof(this.InstallerDownloadNotStarted));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,13 +2,12 @@
|
||||
|
||||
namespace FileConverter
|
||||
{
|
||||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
using System.Xml.Serialization;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Globalization;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
|
||||
[XmlRoot]
|
||||
[XmlType]
|
||||
@@ -86,7 +85,7 @@ namespace FileConverter
|
||||
System.Threading.Thread.CurrentThread.CurrentUICulture = this.applicationLanguage;
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,7 +125,7 @@ namespace FileConverter
|
||||
set
|
||||
{
|
||||
this.conversionPresets = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,7 +140,7 @@ namespace FileConverter
|
||||
set
|
||||
{
|
||||
this.exitApplicationWhenConversionsFinished = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -156,7 +155,7 @@ namespace FileConverter
|
||||
set
|
||||
{
|
||||
this.durationBetweenEndOfConversionsAndApplicationExit = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -171,7 +170,7 @@ namespace FileConverter
|
||||
set
|
||||
{
|
||||
this.maximumNumberOfSimultaneousConversions = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -203,7 +202,7 @@ namespace FileConverter
|
||||
set
|
||||
{
|
||||
this.checkUpgradeAtStartup = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ namespace FileConverter.ValueConverters
|
||||
using System.Linq;
|
||||
using System.Windows.Data;
|
||||
|
||||
using CommonServiceLocator;
|
||||
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
|
||||
using FileConverter.ViewModels;
|
||||
|
||||
public class OutputTypeEnumToViewModel : IValueConverter
|
||||
@@ -22,7 +22,7 @@ namespace FileConverter.ValueConverters
|
||||
|
||||
OutputType outputType = (OutputType)value;
|
||||
|
||||
SettingsViewModel settingsViewModel = ServiceLocator.Current.GetInstance<SettingsViewModel>();
|
||||
SettingsViewModel settingsViewModel = Ioc.Default.GetRequiredService<SettingsViewModel>();
|
||||
|
||||
return settingsViewModel.OutputTypes.Cast<OutputTypeViewModel>()
|
||||
.FirstOrDefault(match => match.Type == outputType);
|
||||
|
||||
@@ -5,25 +5,16 @@ namespace FileConverter.ViewModels
|
||||
using System.ComponentModel;
|
||||
using System.Windows.Input;
|
||||
|
||||
using FileConverter.Services;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using GalaSoft.MvvmLight.Command;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
using FileConverter.Services;
|
||||
|
||||
/// <summary>
|
||||
/// This class contains properties that the diagnostics View can data bind to.
|
||||
/// <para>
|
||||
/// Use the <strong>mvvminpc</strong> snippet to add bindable properties to this ViewModel.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// You can also use Blend to data bind with the tool's support.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// See http://www.galasoft.ch/mvvm
|
||||
/// </para>
|
||||
/// </summary>
|
||||
public class DiagnosticsViewModel : ViewModelBase
|
||||
public class DiagnosticsViewModel : ObservableRecipient
|
||||
{
|
||||
private RelayCommand<CancelEventArgs> closeCommand;
|
||||
|
||||
@@ -32,13 +23,6 @@ namespace FileConverter.ViewModels
|
||||
/// </summary>
|
||||
public DiagnosticsViewModel()
|
||||
{
|
||||
if (this.IsInDesignMode)
|
||||
{
|
||||
// Code runs in Blend --> create design time data.
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
public ICommand CloseCommand
|
||||
@@ -56,7 +40,7 @@ namespace FileConverter.ViewModels
|
||||
|
||||
private void Close(CancelEventArgs args)
|
||||
{
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
navigationService.Close(Pages.Diagnostics, args != null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,25 +5,16 @@ namespace FileConverter.ViewModels
|
||||
using System.ComponentModel;
|
||||
using System.Windows.Input;
|
||||
|
||||
using FileConverter.Services;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using GalaSoft.MvvmLight.Command;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
using FileConverter.Services;
|
||||
|
||||
/// <summary>
|
||||
/// This class contains properties that the main View can data bind to.
|
||||
/// <para>
|
||||
/// Use the <strong>mvvminpc</strong> snippet to add bindable properties to this ViewModel.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// You can also use Blend to data bind with the tool's support.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// See http://www.galasoft.ch/mvvm
|
||||
/// </para>
|
||||
/// </summary>
|
||||
public class HelpViewModel : ViewModelBase
|
||||
public class HelpViewModel : ObservableRecipient
|
||||
{
|
||||
private RelayCommand<CancelEventArgs> closeCommand;
|
||||
|
||||
@@ -32,13 +23,6 @@ namespace FileConverter.ViewModels
|
||||
/// </summary>
|
||||
public HelpViewModel()
|
||||
{
|
||||
if (this.IsInDesignMode)
|
||||
{
|
||||
// Code runs in Blend --> create design time data.
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
public ICommand CloseCommand
|
||||
@@ -56,7 +40,7 @@ namespace FileConverter.ViewModels
|
||||
|
||||
private void Close(CancelEventArgs args)
|
||||
{
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
navigationService.Close(Pages.Help, args != null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,10 +4,9 @@ namespace FileConverter.ViewModels
|
||||
{
|
||||
using System.Windows.Media;
|
||||
|
||||
using CommonServiceLocator;
|
||||
using GalaSoft.MvvmLight;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
|
||||
using FileConverter.Annotations;
|
||||
using FileConverter.ConversionJobs;
|
||||
|
||||
public class InputExtension : ObservableObject
|
||||
@@ -56,7 +55,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.name = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,7 +66,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.foregroundBrush = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +77,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.toolTip = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,7 +85,7 @@ namespace FileConverter.ViewModels
|
||||
{
|
||||
get
|
||||
{
|
||||
SettingsViewModel settingsViewModel = ServiceLocator.Current.GetInstance<SettingsViewModel>();
|
||||
SettingsViewModel settingsViewModel = Ioc.Default.GetRequiredService<SettingsViewModel>();
|
||||
PresetNode selectedPreset = settingsViewModel.SelectedPreset;
|
||||
if (selectedPreset == null)
|
||||
{
|
||||
@@ -98,7 +97,7 @@ namespace FileConverter.ViewModels
|
||||
|
||||
set
|
||||
{
|
||||
SettingsViewModel settingsViewModel = ServiceLocator.Current.GetInstance<SettingsViewModel>();
|
||||
SettingsViewModel settingsViewModel = Ioc.Default.GetRequiredService<SettingsViewModel>();
|
||||
PresetNode selectedPreset = settingsViewModel.SelectedPreset;
|
||||
|
||||
if (value)
|
||||
@@ -110,8 +109,13 @@ namespace FileConverter.ViewModels
|
||||
selectedPreset?.Preset.RemoveInputType(this.name.ToLowerInvariant());
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged(nameof(this.IsChecked));
|
||||
this.OnPropertyChanged(nameof(this.IsChecked));
|
||||
}
|
||||
}
|
||||
|
||||
internal void OnCategoryChanged()
|
||||
{
|
||||
this.OnPropertyChanged(nameof(this.IsChecked));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,11 +2,12 @@
|
||||
|
||||
namespace FileConverter.ViewModels
|
||||
{
|
||||
using CommonServiceLocator;
|
||||
using GalaSoft.MvvmLight;
|
||||
using System.ComponentModel;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
|
||||
public class InputExtensionCategory : ObservableObject
|
||||
{
|
||||
private readonly List<InputExtension> inputExtensions = new List<InputExtension>();
|
||||
@@ -24,7 +25,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.name = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,9 +52,9 @@ namespace FileConverter.ViewModels
|
||||
|
||||
inputExtension.PropertyChanged += this.OnExtensionPropertyChange;
|
||||
|
||||
this.RaisePropertyChanged(nameof(this.InputExtensions));
|
||||
this.RaisePropertyChanged(nameof(this.InputExtensionNames));
|
||||
this.RaisePropertyChanged(nameof(this.IsChecked));
|
||||
this.OnPropertyChanged(nameof(this.InputExtensions));
|
||||
this.OnPropertyChanged(nameof(this.InputExtensionNames));
|
||||
this.OnPropertyChanged(nameof(this.IsChecked));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +62,7 @@ namespace FileConverter.ViewModels
|
||||
{
|
||||
get
|
||||
{
|
||||
SettingsViewModel settingsViewModel = ServiceLocator.Current.GetInstance<SettingsViewModel>();
|
||||
SettingsViewModel settingsViewModel = Ioc.Default.GetRequiredService<SettingsViewModel>();
|
||||
PresetNode selectedPreset = settingsViewModel.SelectedPreset;
|
||||
if (selectedPreset == null)
|
||||
{
|
||||
@@ -91,7 +92,7 @@ namespace FileConverter.ViewModels
|
||||
|
||||
set
|
||||
{
|
||||
SettingsViewModel settingsViewModel = ServiceLocator.Current.GetInstance<SettingsViewModel>();
|
||||
SettingsViewModel settingsViewModel = Ioc.Default.GetRequiredService<SettingsViewModel>();
|
||||
PresetNode selectedPreset = settingsViewModel.SelectedPreset;
|
||||
|
||||
foreach (string extension in this.InputExtensionNames)
|
||||
@@ -109,16 +110,16 @@ namespace FileConverter.ViewModels
|
||||
// Raise property change for extensions.
|
||||
foreach (InputExtension inputExtension in this.InputExtensions)
|
||||
{
|
||||
inputExtension.RaisePropertyChanged(nameof(inputExtension.IsChecked));
|
||||
inputExtension.OnCategoryChanged();
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged(nameof(this.IsChecked));
|
||||
this.OnPropertyChanged(nameof(this.IsChecked));
|
||||
}
|
||||
}
|
||||
|
||||
private void OnExtensionPropertyChange(object sender, PropertyChangedEventArgs e)
|
||||
{
|
||||
this.RaisePropertyChanged(nameof(this.IsChecked));
|
||||
this.OnPropertyChanged(nameof(this.IsChecked));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,26 +6,17 @@ namespace FileConverter.ViewModels
|
||||
using System.ComponentModel;
|
||||
using System.Windows.Input;
|
||||
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
|
||||
using FileConverter.ConversionJobs;
|
||||
using FileConverter.Services;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using GalaSoft.MvvmLight.Command;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
|
||||
/// <summary>
|
||||
/// This class contains properties that the main View can data bind to.
|
||||
/// <para>
|
||||
/// Use the <strong>mvvminpc</strong> snippet to add bindable properties to this ViewModel.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// You can also use Blend to data bind with the tool's support.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// See http://www.galasoft.ch/mvvm
|
||||
/// </para>
|
||||
/// </summary>
|
||||
public class MainViewModel : ViewModelBase
|
||||
public class MainViewModel : ObservableRecipient
|
||||
{
|
||||
private string informationMessage;
|
||||
private ObservableCollection<ConversionJob> conversionJobs;
|
||||
@@ -39,21 +30,11 @@ namespace FileConverter.ViewModels
|
||||
/// </summary>
|
||||
public MainViewModel()
|
||||
{
|
||||
if (this.IsInDesignMode)
|
||||
{
|
||||
// Code runs in Blend --> create design time data.
|
||||
this.InformationMessage = "Design time mode.";
|
||||
this.ConversionJobs = new ObservableCollection<ConversionJob>();
|
||||
//this.ConversionJobs.Add(new ConversionJob());
|
||||
}
|
||||
else
|
||||
{
|
||||
IConversionService settingsService = SimpleIoc.Default.GetInstance<IConversionService>();
|
||||
this.ConversionJobs = new ObservableCollection<ConversionJob>(settingsService.ConversionJobs);
|
||||
IConversionService settingsService = Ioc.Default.GetRequiredService<IConversionService>();
|
||||
this.ConversionJobs = new ObservableCollection<ConversionJob>(settingsService.ConversionJobs);
|
||||
|
||||
Application application = Application.Current as Application;
|
||||
application.OnApplicationTerminate += this.Application_OnApplicationTerminate;
|
||||
}
|
||||
Application application = Application.Current as Application;
|
||||
application.OnApplicationTerminate += this.Application_OnApplicationTerminate;
|
||||
}
|
||||
|
||||
public string InformationMessage
|
||||
@@ -62,7 +43,7 @@ namespace FileConverter.ViewModels
|
||||
|
||||
private set
|
||||
{
|
||||
this.Set(ref this.informationMessage, value);
|
||||
this.SetProperty(ref this.informationMessage, value);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +53,7 @@ namespace FileConverter.ViewModels
|
||||
|
||||
private set
|
||||
{
|
||||
this.Set(ref this.conversionJobs, value);
|
||||
this.SetProperty(ref this.conversionJobs, value);
|
||||
|
||||
foreach (var job in this.conversionJobs)
|
||||
{
|
||||
@@ -87,7 +68,7 @@ namespace FileConverter.ViewModels
|
||||
{
|
||||
if (this.showSettingsCommand == null)
|
||||
{
|
||||
this.showSettingsCommand = new RelayCommand(() => SimpleIoc.Default.GetInstance<INavigationService>().Show(Pages.Settings));
|
||||
this.showSettingsCommand = new RelayCommand(() => Ioc.Default.GetRequiredService<INavigationService>().Show(Pages.Settings));
|
||||
}
|
||||
|
||||
return this.showSettingsCommand;
|
||||
@@ -100,7 +81,7 @@ namespace FileConverter.ViewModels
|
||||
{
|
||||
if (this.showDiagnosticsCommand == null)
|
||||
{
|
||||
this.showDiagnosticsCommand = new RelayCommand(() => SimpleIoc.Default.GetInstance<INavigationService>().Show(Pages.Diagnostics));
|
||||
this.showDiagnosticsCommand = new RelayCommand(() => Ioc.Default.GetRequiredService<INavigationService>().Show(Pages.Diagnostics));
|
||||
}
|
||||
|
||||
return this.showDiagnosticsCommand;
|
||||
@@ -122,7 +103,7 @@ namespace FileConverter.ViewModels
|
||||
|
||||
private void Close(CancelEventArgs args)
|
||||
{
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
navigationService.Close(Pages.Main, args != null);
|
||||
}
|
||||
|
||||
@@ -133,7 +114,7 @@ namespace FileConverter.ViewModels
|
||||
return;
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged(nameof(this.ConversionJobs));
|
||||
this.OnPropertyChanged(nameof(this.ConversionJobs));
|
||||
}
|
||||
|
||||
private void Application_OnApplicationTerminate(object sender, ApplicationTerminateArgs eventArgs)
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
// <copyright file="PresetNode.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
|
||||
|
||||
using System.Collections.ObjectModel;
|
||||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
using GalaSoft.MvvmLight;
|
||||
|
||||
namespace FileConverter.ViewModels
|
||||
{
|
||||
using System.Collections.ObjectModel;
|
||||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
|
||||
public abstract class AbstractTreeNode : ObservableObject, IDataErrorInfo
|
||||
{
|
||||
private PresetFolderNode parent;
|
||||
@@ -28,7 +29,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.parent = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,8 +136,8 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.Preset.ShortName = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.RaisePropertyChanged(nameof(this.HasError));
|
||||
this.OnPropertyChanged();
|
||||
this.OnPropertyChanged(nameof(this.HasError));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,7 +148,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.Preset.OutputFileNameTemplate = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,8 +256,8 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.name = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.RaisePropertyChanged(nameof(this.HasError));
|
||||
this.OnPropertyChanged();
|
||||
this.OnPropertyChanged(nameof(this.HasError));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -267,7 +268,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.children = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,34 +9,23 @@ namespace FileConverter.ViewModels
|
||||
using System.Diagnostics;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Windows;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Input;
|
||||
|
||||
using Microsoft.Win32;
|
||||
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
|
||||
using FileConverter.Annotations;
|
||||
using FileConverter.Services;
|
||||
using FileConverter.Views;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using GalaSoft.MvvmLight.Command;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
using GalaSoft.MvvmLight.Messaging;
|
||||
|
||||
using Microsoft.Win32;
|
||||
|
||||
/// <summary>
|
||||
/// This class contains properties that the main View can data bind to.
|
||||
/// <para>
|
||||
/// Use the <strong>mvvminpc</strong> snippet to add bindable properties to this ViewModel.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// You can also use Blend to data bind with the tool's support.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// See http://www.galasoft.ch/mvvm
|
||||
/// </para>
|
||||
/// This class contains properties that the settings View can data bind to.
|
||||
/// </summary>
|
||||
public class SettingsViewModel : ViewModelBase, IDataErrorInfo
|
||||
public class SettingsViewModel : ObservableRecipient, IDataErrorInfo
|
||||
{
|
||||
private InputExtensionCategory[] inputCategories;
|
||||
private PresetFolderNode presetsRootFolder;
|
||||
@@ -59,6 +48,9 @@ namespace FileConverter.ViewModels
|
||||
private ListCollectionView outputTypes;
|
||||
private CultureInfo[] supportedCultures;
|
||||
|
||||
public event Action OnPresetCreated;
|
||||
public event Action OnFolderCreated;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the SettingsViewModel class.
|
||||
/// </summary>
|
||||
@@ -75,42 +67,33 @@ namespace FileConverter.ViewModels
|
||||
this.saveCommand = new RelayCommand(this.SaveSettings, this.CanSaveSettings);
|
||||
this.closeCommand = new RelayCommand<CancelEventArgs>(this.CloseSettings);
|
||||
|
||||
if (this.IsInDesignMode)
|
||||
{
|
||||
// Code runs in Blend --> create design time data.
|
||||
this.Settings = new Settings();
|
||||
this.Settings.ConversionPresets.Add(new ConversionPreset("Test", OutputType.Mp3));
|
||||
}
|
||||
else
|
||||
{
|
||||
ISettingsService settingsService = SimpleIoc.Default.GetInstance<ISettingsService>();
|
||||
this.Settings = settingsService.Settings;
|
||||
ISettingsService settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||
this.Settings = settingsService.Settings;
|
||||
|
||||
List<OutputTypeViewModel> outputTypeViewModels = new List<OutputTypeViewModel>();
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Ogg));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Mp3));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Aac));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Flac));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Wav));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Mkv));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Mp4));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Ogv));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Webm));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Avi));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Png));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Jpg));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Webp));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Ico));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Gif));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Pdf));
|
||||
this.outputTypes = new ListCollectionView(outputTypeViewModels);
|
||||
this.outputTypes.GroupDescriptions.Add(new PropertyGroupDescription("Category"));
|
||||
List<OutputTypeViewModel> outputTypeViewModels = new List<OutputTypeViewModel>();
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Ogg));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Mp3));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Aac));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Flac));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Wav));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Mkv));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Mp4));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Ogv));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Webm));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Avi));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Png));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Jpg));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Webp));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Ico));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Gif));
|
||||
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Pdf));
|
||||
this.outputTypes = new ListCollectionView(outputTypeViewModels);
|
||||
this.outputTypes.GroupDescriptions.Add(new PropertyGroupDescription("Category"));
|
||||
|
||||
this.SupportedCultures = Helpers.GetSupportedCultures().ToArray();
|
||||
this.SupportedCultures = Helpers.GetSupportedCultures().ToArray();
|
||||
|
||||
this.InitializeCompatibleInputExtensions();
|
||||
this.InitializePresetFolders();
|
||||
}
|
||||
this.InitializeCompatibleInputExtensions();
|
||||
this.InitializePresetFolders();
|
||||
}
|
||||
|
||||
public IEnumerable<InputExtensionCategory> InputCategories
|
||||
@@ -147,7 +130,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.presetsRootFolder = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,7 +164,7 @@ namespace FileConverter.ViewModels
|
||||
this.SelectedFolder = null;
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -193,11 +176,11 @@ namespace FileConverter.ViewModels
|
||||
{
|
||||
this.selectedFolder = value;
|
||||
|
||||
this.RaisePropertyChanged();
|
||||
this.RaisePropertyChanged(nameof(this.SelectedItem));
|
||||
this.removePresetCommand?.RaiseCanExecuteChanged();
|
||||
this.exportPresetCommand?.RaiseCanExecuteChanged();
|
||||
this.duplicatePresetCommand?.RaiseCanExecuteChanged();
|
||||
this.OnPropertyChanged();
|
||||
this.OnPropertyChanged(nameof(this.SelectedItem));
|
||||
this.removePresetCommand?.NotifyCanExecuteChanged();
|
||||
this.exportPresetCommand?.NotifyCanExecuteChanged();
|
||||
this.duplicatePresetCommand?.NotifyCanExecuteChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -219,12 +202,12 @@ namespace FileConverter.ViewModels
|
||||
this.selectedPreset.Preset.PropertyChanged += this.SelectedPresetPropertyChanged;
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged();
|
||||
this.RaisePropertyChanged(nameof(this.SelectedItem));
|
||||
this.RaisePropertyChanged(nameof(this.InputCategories));
|
||||
this.removePresetCommand?.RaiseCanExecuteChanged();
|
||||
this.exportPresetCommand?.RaiseCanExecuteChanged();
|
||||
this.duplicatePresetCommand?.RaiseCanExecuteChanged();
|
||||
this.OnPropertyChanged();
|
||||
this.OnPropertyChanged(nameof(this.SelectedItem));
|
||||
this.OnPropertyChanged(nameof(this.InputCategories));
|
||||
this.removePresetCommand?.NotifyCanExecuteChanged();
|
||||
this.exportPresetCommand?.NotifyCanExecuteChanged();
|
||||
this.duplicatePresetCommand?.NotifyCanExecuteChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -235,7 +218,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.settings = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -245,7 +228,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.supportedCultures = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,7 +238,7 @@ namespace FileConverter.ViewModels
|
||||
set
|
||||
{
|
||||
this.outputTypes = value;
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -270,7 +253,7 @@ namespace FileConverter.ViewModels
|
||||
{
|
||||
this.displaySeeChangeLogLink = value;
|
||||
|
||||
this.RaisePropertyChanged();
|
||||
this.OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -375,20 +358,20 @@ namespace FileConverter.ViewModels
|
||||
{
|
||||
if (eventArgs.PropertyName == "OutputType")
|
||||
{
|
||||
this.RaisePropertyChanged(nameof(this.InputCategories));
|
||||
this.OnPropertyChanged(nameof(this.InputCategories));
|
||||
}
|
||||
|
||||
this.saveCommand.RaiseCanExecuteChanged();
|
||||
this.saveCommand.NotifyCanExecuteChanged();
|
||||
}
|
||||
|
||||
private void NodePropertyChanged(object sender, PropertyChangedEventArgs eventArgs)
|
||||
{
|
||||
this.saveCommand.RaiseCanExecuteChanged();
|
||||
this.saveCommand.NotifyCanExecuteChanged();
|
||||
}
|
||||
|
||||
private void DownloadChangeLogAction()
|
||||
{
|
||||
IUpgradeService upgradeService = SimpleIoc.Default.GetInstance<IUpgradeService>();
|
||||
IUpgradeService upgradeService = Ioc.Default.GetRequiredService<IUpgradeService>();
|
||||
upgradeService.DownloadChangeLog();
|
||||
this.DisplaySeeChangeLogLink = false;
|
||||
}
|
||||
@@ -411,7 +394,7 @@ namespace FileConverter.ViewModels
|
||||
}
|
||||
|
||||
this.inputCategories = categories.ToArray();
|
||||
this.RaisePropertyChanged(nameof(this.InputCategories));
|
||||
this.OnPropertyChanged(nameof(this.InputCategories));
|
||||
}
|
||||
|
||||
private void InitializePresetFolders()
|
||||
@@ -434,7 +417,7 @@ namespace FileConverter.ViewModels
|
||||
this.CreatePresetNode(preset, parent);
|
||||
}
|
||||
|
||||
this.RaisePropertyChanged(nameof(this.PresetsRootFolder));
|
||||
this.OnPropertyChanged(nameof(this.PresetsRootFolder));
|
||||
}
|
||||
|
||||
private void ComputePresetsParentFoldersNamesAndFillSettings(AbstractTreeNode node, List<string> folderNamesCache)
|
||||
@@ -465,10 +448,10 @@ namespace FileConverter.ViewModels
|
||||
|
||||
private void CloseSettings(CancelEventArgs args)
|
||||
{
|
||||
ISettingsService settingsService = SimpleIoc.Default.GetInstance<ISettingsService>();
|
||||
ISettingsService settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||
settingsService.RevertSettings();
|
||||
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
navigationService.Close(Pages.Settings, args != null);
|
||||
}
|
||||
|
||||
@@ -484,10 +467,10 @@ namespace FileConverter.ViewModels
|
||||
this.ComputePresetsParentFoldersNamesAndFillSettings(this.presetsRootFolder, new List<string>());
|
||||
|
||||
// Save changes.
|
||||
ISettingsService settingsService = SimpleIoc.Default.GetInstance<ISettingsService>();
|
||||
ISettingsService settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||
settingsService.SaveSettings();
|
||||
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
navigationService.Close(Pages.Settings, false);
|
||||
}
|
||||
|
||||
@@ -530,9 +513,9 @@ namespace FileConverter.ViewModels
|
||||
|
||||
this.SelectedItem = newFolder;
|
||||
|
||||
this.saveCommand.RaiseCanExecuteChanged();
|
||||
this.saveCommand.NotifyCanExecuteChanged();
|
||||
|
||||
Messenger.Default.Send<string>("FolderName", "DoFocus");
|
||||
this.OnFolderCreated();
|
||||
}
|
||||
|
||||
private bool CanDuplicateSelectedPreset()
|
||||
@@ -590,10 +573,10 @@ namespace FileConverter.ViewModels
|
||||
|
||||
this.SelectedItem = node;
|
||||
|
||||
Messenger.Default.Send<string>("PresetName", "DoFocus");
|
||||
this.OnPresetCreated.Invoke();
|
||||
|
||||
this.removePresetCommand.RaiseCanExecuteChanged();
|
||||
this.saveCommand.RaiseCanExecuteChanged();
|
||||
this.removePresetCommand.NotifyCanExecuteChanged();
|
||||
this.saveCommand.NotifyCanExecuteChanged();
|
||||
}
|
||||
|
||||
private void ImportPreset()
|
||||
@@ -699,8 +682,8 @@ namespace FileConverter.ViewModels
|
||||
|
||||
this.SelectedItem = null;
|
||||
|
||||
this.removePresetCommand.RaiseCanExecuteChanged();
|
||||
this.saveCommand.RaiseCanExecuteChanged();
|
||||
this.removePresetCommand.NotifyCanExecuteChanged();
|
||||
this.saveCommand.NotifyCanExecuteChanged();
|
||||
}
|
||||
|
||||
private bool CanRemoveSelectedPreset()
|
||||
@@ -708,9 +691,9 @@ namespace FileConverter.ViewModels
|
||||
return this.SelectedItem != null;
|
||||
}
|
||||
|
||||
public override void Cleanup()
|
||||
protected override void OnDeactivated()
|
||||
{
|
||||
base.Cleanup();
|
||||
base.OnDeactivated();
|
||||
|
||||
this.UnbindNode(this.presetsRootFolder);
|
||||
}
|
||||
|
||||
@@ -5,25 +5,16 @@ namespace FileConverter.ViewModels
|
||||
using System.ComponentModel;
|
||||
using System.Windows.Input;
|
||||
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
|
||||
using FileConverter.Services;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using GalaSoft.MvvmLight.Command;
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
|
||||
/// <summary>
|
||||
/// This class contains properties that the main View can data bind to.
|
||||
/// <para>
|
||||
/// Use the <strong>mvvminpc</strong> snippet to add bindable properties to this ViewModel.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// You can also use Blend to data bind with the tool's support.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// See http://www.galasoft.ch/mvvm
|
||||
/// </para>
|
||||
/// This class contains properties that the upgrade View can data bind to.
|
||||
/// </summary>
|
||||
public class UpgradeViewModel : ViewModelBase
|
||||
public class UpgradeViewModel : ObservableRecipient
|
||||
{
|
||||
private readonly IUpgradeService upgradeService;
|
||||
|
||||
@@ -36,7 +27,7 @@ namespace FileConverter.ViewModels
|
||||
/// </summary>
|
||||
public UpgradeViewModel()
|
||||
{
|
||||
this.upgradeService = SimpleIoc.Default.GetInstance<IUpgradeService>();
|
||||
this.upgradeService = Ioc.Default.GetRequiredService<IUpgradeService>();
|
||||
this.upgradeService.DownloadChangeLog();
|
||||
}
|
||||
|
||||
@@ -83,19 +74,19 @@ namespace FileConverter.ViewModels
|
||||
{
|
||||
this.upgradeService.StartUpgrade();
|
||||
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
navigationService.Close(Pages.Upgrade, false);
|
||||
}
|
||||
|
||||
private void ExecuteLaunchInstallerCommand()
|
||||
{
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
navigationService.Close(Pages.Upgrade, false);
|
||||
}
|
||||
|
||||
private void Close(CancelEventArgs args)
|
||||
{
|
||||
INavigationService navigationService = SimpleIoc.Default.GetInstance<INavigationService>();
|
||||
INavigationService navigationService = Ioc.Default.GetRequiredService<INavigationService>();
|
||||
navigationService.Close(Pages.Upgrade, args != null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,21 +9,12 @@
|
||||
|
||||
In the View:
|
||||
DataContext="{Binding Source={StaticResource Locator}, Path=ViewModelName}"
|
||||
|
||||
You can also use Blend to do all this with the tool's support.
|
||||
See http://www.galasoft.ch/mvvm
|
||||
*/
|
||||
|
||||
namespace FileConverter.ViewModels
|
||||
{
|
||||
using System;
|
||||
|
||||
using CommonServiceLocator;
|
||||
|
||||
using FileConverter.Views;
|
||||
|
||||
using GalaSoft.MvvmLight.Ioc;
|
||||
using GalaSoft.MvvmLight.Views;
|
||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
/// <summary>
|
||||
/// This class contains static references to all the view models in the
|
||||
@@ -36,34 +27,26 @@ namespace FileConverter.ViewModels
|
||||
/// </summary>
|
||||
public ViewModelLocator()
|
||||
{
|
||||
ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
|
||||
|
||||
////if (ViewModelBase.IsInDesignModeStatic)
|
||||
////{
|
||||
//// // Create design time view services and models
|
||||
//// SimpleIoc.Default.Register<IDataService, DesignDataService>();
|
||||
////}
|
||||
////else
|
||||
////{
|
||||
//// // Create run time view services and models
|
||||
//// SimpleIoc.Default.Register<IDataService, DataService>();
|
||||
////}
|
||||
|
||||
SimpleIoc.Default.Register<HelpViewModel>();
|
||||
SimpleIoc.Default.Register<MainViewModel>();
|
||||
SimpleIoc.Default.Register<UpgradeViewModel>();
|
||||
SimpleIoc.Default.Register<SettingsViewModel>();
|
||||
SimpleIoc.Default.Register<DiagnosticsViewModel>();
|
||||
}
|
||||
|
||||
public HelpViewModel Help => ServiceLocator.Current.GetInstance<HelpViewModel>();
|
||||
public HelpViewModel Help => Ioc.Default.GetRequiredService<HelpViewModel>();
|
||||
|
||||
public MainViewModel Main => ServiceLocator.Current.GetInstance<MainViewModel>();
|
||||
public MainViewModel Main => Ioc.Default.GetRequiredService<MainViewModel>();
|
||||
|
||||
public UpgradeViewModel Upgrade => ServiceLocator.Current.GetInstance<UpgradeViewModel>();
|
||||
public UpgradeViewModel Upgrade => Ioc.Default.GetRequiredService<UpgradeViewModel>();
|
||||
|
||||
public SettingsViewModel Settings => ServiceLocator.Current.GetInstance<SettingsViewModel>();
|
||||
public SettingsViewModel Settings => Ioc.Default.GetRequiredService<SettingsViewModel>();
|
||||
|
||||
public DiagnosticsViewModel Diagnostics => ServiceLocator.Current.GetInstance<DiagnosticsViewModel>();
|
||||
public DiagnosticsViewModel Diagnostics => Ioc.Default.GetRequiredService<DiagnosticsViewModel>();
|
||||
|
||||
internal void RegisterViewModels(ServiceCollection services)
|
||||
{
|
||||
services
|
||||
.AddSingleton<HelpViewModel>()
|
||||
.AddSingleton<MainViewModel>()
|
||||
.AddSingleton<UpgradeViewModel>()
|
||||
.AddSingleton<SettingsViewModel>()
|
||||
.AddSingleton<DiagnosticsViewModel>();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
using System.Collections.Specialized;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Interactivity;
|
||||
using Microsoft.Xaml.Behaviors;
|
||||
|
||||
namespace FileConverter.Views
|
||||
{
|
||||
|
||||
@@ -6,16 +6,15 @@
|
||||
xmlns:diagnostics="clr-namespace:FileConverter.Diagnostics"
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
xmlns:local="clr-namespace:FileConverter"
|
||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||
xmlns:command="http://www.galasoft.ch/mvvmlight"
|
||||
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
|
||||
mc:Ignorable="d"
|
||||
Height="600" Width="800" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
|
||||
DataContext="{Binding Diagnostics, Source={StaticResource Locator}}">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Closing">
|
||||
<command:EventToCommand Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
<behaviors:Interaction.Triggers>
|
||||
<behaviors:EventTrigger EventName="Closing">
|
||||
<behaviors:InvokeCommandAction Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</behaviors:EventTrigger>
|
||||
</behaviors:Interaction.Triggers>
|
||||
<Window.Title>
|
||||
<Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
|
||||
</Window.Title>
|
||||
|
||||
@@ -6,16 +6,15 @@
|
||||
xmlns:fileConverter="clr-namespace:FileConverter"
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
xmlns:gif="http://wpfanimatedgif.codeplex.com"
|
||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||
xmlns:command="http://www.galasoft.ch/mvvmlight"
|
||||
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
|
||||
mc:Ignorable="d" Icon="/FileConverter;component/Resources/ApplicationIcon.ico" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="NoResize"
|
||||
Width="640" Height="545"
|
||||
DataContext="{Binding Help, Source={StaticResource Locator}}">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Closing">
|
||||
<command:EventToCommand Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
<behaviors:Interaction.Triggers>
|
||||
<behaviors:EventTrigger EventName="Closing">
|
||||
<behaviors:InvokeCommandAction Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</behaviors:EventTrigger>
|
||||
</behaviors:Interaction.Triggers>
|
||||
<Window.Resources>
|
||||
</Window.Resources>
|
||||
<Window.Title>
|
||||
|
||||
@@ -6,16 +6,15 @@
|
||||
xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
xmlns:controls="clr-namespace:FileConverter.Controls"
|
||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||
xmlns:command="http://www.galasoft.ch/mvvmlight"
|
||||
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
|
||||
mc:Ignorable="d" x:Class="FileConverter.Views.MainWindow"
|
||||
Height="500" Width="950" MinHeight="480" MinWidth="640" WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
|
||||
DataContext="{Binding Main, Source={StaticResource Locator}}">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Closing">
|
||||
<command:EventToCommand Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
<behaviors:Interaction.Triggers>
|
||||
<behaviors:EventTrigger EventName="Closing">
|
||||
<behaviors:InvokeCommandAction Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</behaviors:EventTrigger>
|
||||
</behaviors:Interaction.Triggers>
|
||||
<Window.Resources>
|
||||
<valueConverters:ConversionJobsToProgressState x:Key="ConversionJobsToProgressState" />
|
||||
<valueConverters:ConversionJobsToProgressValue x:Key="ConversionJobsToProgressValue" />
|
||||
|
||||
@@ -6,8 +6,7 @@
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
xmlns:views="clr-namespace:FileConverter.Views"
|
||||
xmlns:viewModels="clr-namespace:FileConverter.ViewModels"
|
||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||
xmlns:command="http://www.galasoft.ch/mvvmlight"
|
||||
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
|
||||
xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
|
||||
xmlns:controls="clr-namespace:FileConverter.Controls"
|
||||
x:Class="FileConverter.Views.SettingsWindow"
|
||||
@@ -17,11 +16,11 @@
|
||||
mc:Ignorable="d"
|
||||
DataContext="{Binding Settings, Source={StaticResource Locator}}"
|
||||
d:DataContext="{d:DesignData /SampleData/SettingsSampleData.xaml}">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Closing">
|
||||
<command:EventToCommand Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
<behaviors:Interaction.Triggers>
|
||||
<behaviors:EventTrigger EventName="Closing">
|
||||
<behaviors:InvokeCommandAction Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</behaviors:EventTrigger>
|
||||
</behaviors:Interaction.Triggers>
|
||||
<Window.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
@@ -292,12 +291,12 @@
|
||||
<EventSetter Event="MouseMove" Handler="TreeView_MouseMove"/>
|
||||
</Style>
|
||||
</TreeView.ItemContainerStyle>
|
||||
<i:Interaction.Behaviors>
|
||||
<behaviors:Interaction.Behaviors>
|
||||
<views:TreeViewSelectionBehavior
|
||||
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
|
||||
HierarchyPredicate="{Binding PresetsHierarchyPredicate}"
|
||||
ExpandSelected="False"/>
|
||||
</i:Interaction.Behaviors>
|
||||
</behaviors:Interaction.Behaviors>
|
||||
<TreeView.ContextMenu>
|
||||
<ContextMenu>
|
||||
<MenuItem Header="{x:Static project:Resources.CreateANewFolder}" Command="{Binding CreateFolderCommand}">
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
|
||||
namespace FileConverter.Views
|
||||
{
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.ComponentModel;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Input;
|
||||
@@ -12,8 +11,6 @@ namespace FileConverter.Views
|
||||
using FileConverter.Diagnostics;
|
||||
using FileConverter.ViewModels;
|
||||
|
||||
using GalaSoft.MvvmLight.Messaging;
|
||||
|
||||
/// <summary>
|
||||
/// Interaction logic for Settings.
|
||||
/// </summary>
|
||||
@@ -35,14 +32,30 @@ namespace FileConverter.Views
|
||||
{
|
||||
this.InitializeComponent();
|
||||
|
||||
Messenger.Default.Register<string>(this, "DoFocus", this.DoFocus);
|
||||
SettingsViewModel settingsViewModel = this.DataContext as SettingsViewModel;
|
||||
settingsViewModel.OnPresetCreated += this.SettingsWindow_OnPresetCreated;
|
||||
settingsViewModel.OnFolderCreated += this.SettingsWindow_OnFolderCreated;
|
||||
|
||||
(this.DataContext as SettingsViewModel).PropertyChanged += this.SettingsWindow_PropertyChanged;
|
||||
settingsViewModel.PropertyChanged += this.SettingsWindow_PropertyChanged;
|
||||
|
||||
this.PresetTreeView.MouseDown += this.TreeView_MouseDown;
|
||||
this.PresetTreeView.MouseUp += this.TreeView_MouseUp;
|
||||
}
|
||||
|
||||
private void SettingsWindow_OnPresetCreated()
|
||||
{
|
||||
this.focusMessage = "PresetName";
|
||||
this.selectedPresetNameTextBox?.Focus();
|
||||
this.selectedPresetNameTextBox?.SelectAll();
|
||||
}
|
||||
|
||||
private void SettingsWindow_OnFolderCreated()
|
||||
{
|
||||
this.focusMessage = "FolderName";
|
||||
this.selectedFolderNameTextBox?.Focus();
|
||||
this.selectedFolderNameTextBox?.SelectAll();
|
||||
}
|
||||
|
||||
private void SettingsWindow_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs args)
|
||||
{
|
||||
if (args.PropertyName == "SelectedItem")
|
||||
@@ -52,23 +65,6 @@ namespace FileConverter.Views
|
||||
}
|
||||
}
|
||||
|
||||
public void DoFocus(string message)
|
||||
{
|
||||
this.focusMessage = message;
|
||||
switch (message)
|
||||
{
|
||||
case "PresetName":
|
||||
this.selectedPresetNameTextBox?.Focus();
|
||||
this.selectedPresetNameTextBox?.SelectAll();
|
||||
break;
|
||||
|
||||
case "FolderName":
|
||||
this.selectedFolderNameTextBox?.Focus();
|
||||
this.selectedFolderNameTextBox?.SelectAll();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void TreeView_MouseDown(object sender, MouseButtonEventArgs args)
|
||||
{
|
||||
FrameworkElement element = args.OriginalSource as FrameworkElement;
|
||||
@@ -345,7 +341,7 @@ namespace FileConverter.Views
|
||||
this.selectedPresetNameTextBox = (TextBox)sender;
|
||||
if (this.focusMessage == "PresetName")
|
||||
{
|
||||
this.DoFocus(this.focusMessage);
|
||||
this.selectedPresetNameTextBox.Focus();
|
||||
this.focusMessage = null;
|
||||
}
|
||||
}
|
||||
@@ -355,7 +351,7 @@ namespace FileConverter.Views
|
||||
this.selectedFolderNameTextBox = (TextBox)sender;
|
||||
if (this.focusMessage == "FolderName")
|
||||
{
|
||||
this.DoFocus(this.focusMessage);
|
||||
this.selectedFolderNameTextBox.Focus();
|
||||
this.focusMessage = null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,19 +4,18 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:project="clr-namespace:FileConverter.Properties"
|
||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||
xmlns:command="http://www.galasoft.ch/mvvmlight"
|
||||
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
|
||||
mc:Ignorable="d"
|
||||
Title="{x:Static project:Resources.UpgradeWindowTitle}"
|
||||
WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
|
||||
MinHeight="300" MinWidth="450"
|
||||
Height="450" Width="450" WindowStyle="ToolWindow"
|
||||
DataContext="{Binding Upgrade, Source={StaticResource Locator}}">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Closing">
|
||||
<command:EventToCommand Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
<behaviors:Interaction.Triggers>
|
||||
<behaviors:EventTrigger EventName="Closing">
|
||||
<behaviors:InvokeCommandAction Command="{Binding CloseCommand}" PassEventArgsToCommand="True" />
|
||||
</behaviors:EventTrigger>
|
||||
</behaviors:Interaction.Triggers>
|
||||
<Window.Resources>
|
||||
</Window.Resources>
|
||||
<Grid>
|
||||
|
||||
@@ -2,12 +2,6 @@
|
||||
|
||||
namespace FileConverter
|
||||
{
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Xml;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
public class XmlHelpers
|
||||
{
|
||||
public static void LoadFromFile<T>(string root, string path, out T deserializedObject)
|
||||
|
||||
@@ -1,13 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net45" />
|
||||
<package id="Magick.NET-Q16-AnyCPU" version="7.12.0" targetFramework="net461" />
|
||||
<package id="CommunityToolkit.Mvvm" version="8.2.2" targetFramework="net48" />
|
||||
<package id="Magick.NET.Core" version="13.5.0" targetFramework="net48" />
|
||||
<package id="Magick.NET-Q16-AnyCPU" version="13.5.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Extensions.DependencyInjection" version="8.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net45" />
|
||||
<package id="Microsoft.Office.Interop.PowerPoint" version="12.0.4518.1014" targetFramework="net45" />
|
||||
<package id="Microsoft.Office.Interop.Word" version="15.0.4797.1003" targetFramework="net45" />
|
||||
<package id="MvvmLight" version="5.4.1.1" targetFramework="net45" />
|
||||
<package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net45" />
|
||||
<package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.77" targetFramework="net48" />
|
||||
<package id="Office" version="12.0.0" targetFramework="net45" />
|
||||
<package id="SharpShell" version="2.7.1" targetFramework="net461" />
|
||||
<package id="WpfAnimatedGif" version="1.4.14" targetFramework="net45" />
|
||||
<package id="SharpShell" version="2.7.2" targetFramework="net462" />
|
||||
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
|
||||
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net48" />
|
||||
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
|
||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
|
||||
<package id="WpfAnimatedGif" version="2.0.2" targetFramework="net462" />
|
||||
</packages>
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>FileConverterExtension</RootNamespace>
|
||||
<AssemblyName>FileConverterExtension</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
@@ -50,8 +50,8 @@
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="SharpShell, Version=2.7.1.0, Culture=neutral, PublicKeyToken=f14dc899472fe6fb, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\SharpShell.2.7.1\lib\net40-client\SharpShell.dll</HintPath>
|
||||
<Reference Include="SharpShell, Version=2.7.2.0, Culture=neutral, PublicKeyToken=f14dc899472fe6fb, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\SharpShell.2.7.2\lib\net40-client\SharpShell.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace FileConverterExtension.Properties {
|
||||
// class via a tool like ResGen or Visual Studio.
|
||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
// with the /str option, or rebuild your VS project.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class Resources {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="SharpShell" version="2.7.1" targetFramework="net461" />
|
||||
<package id="SharpShell" version="2.7.2" targetFramework="net462" />
|
||||
</packages>
|
||||
+37
-21
@@ -1,17 +1,11 @@
|
||||
# Change Log
|
||||
|
||||
## Next version
|
||||
|
||||
- Added: Possibility to create custom command line preset for types converted with FFMPEG (video and audio).
|
||||
- Added: Possibility to create preset folders in File Converter context menu.
|
||||
- Added: Ability to drag and drop to move conversion presets.
|
||||
- Added: Possibility to export and import conversion presets to share it with other users.
|
||||
- Added: Brazilian Portuguese translation (thanks to Marhc).
|
||||
- Added: Spanish translation (thanks to Chachak).
|
||||
- Added: Italian translation (thanks to Davide).
|
||||
- Added: German translation (thanks to nikotschierske).
|
||||
- Added: Simplified Chinese translation (thanks to Snoopy1866).
|
||||
- Added: Turkish translation (thanks to MayaC0re).
|
||||
- Added: Hindi translation (thanks to vishveshjain).
|
||||
- Added: More presets for scale and rotation in File Converter default configuration.
|
||||
- Added: Support new raw image input formats: arw, dng, nef, raf and cr2.
|
||||
- Added: Display conversion progress on the Windows taskbar item.
|
||||
@@ -22,6 +16,13 @@
|
||||
- Added: Highlight in red elements that contains errors in the preset list.
|
||||
- Added: "Say thanks" button if you can't donate and want to keep my motivation up :).
|
||||
- Added: Messages logged from main thread are now displayed in the console standard output.
|
||||
- Added: Brazilian Portuguese translation (thanks to Marhc).
|
||||
- Added: Spanish translation (thanks to Chachak).
|
||||
- Added: Italian translation (thanks to Davide).
|
||||
- Added: German translation (thanks to nikotschierske).
|
||||
- Added: Simplified Chinese translation (thanks to Snoopy1866).
|
||||
- Added: Turkish translation (thanks to MayaC0re).
|
||||
- Added: Hindi translation (thanks to vishveshjain).
|
||||
- Change: Rework extension so it uses the settings file on disk instead of registry settings (github issue #22 #32).
|
||||
- Change: Some UX improvements.
|
||||
- Change: Replace Pledgie donation button by Paypal donation button since Pledgie does not exist anymore.
|
||||
@@ -30,21 +31,25 @@
|
||||
- Fixed: Issue where File Converter version upgrade download was not working due to an issue with https encryption.
|
||||
- Fixed: Issue where output video was not working correclty on some video players like Quick time (github issue #34) (thanks to Diego López Bugna).
|
||||
- Fixed: Issue where icons and images were blurry on high dpi device.
|
||||
- Tech: Complete rework of the project architecture to be able to improve it in a long term perspective. The project is now using the MVVM Light framework and is following more closely this design pattern.
|
||||
- Tech: Update ffmpeg to v4.0.0 and ImageMagick to v7.12.0.
|
||||
- Tech: Update SharpShell to v2.7.1.
|
||||
- Tech: Update project to Visual Studio 2017 and installer Wix 3.11.
|
||||
- Tech: Update project to .NET framework 4.6.2.
|
||||
- Tech: Complete rework of the project architecture to be able to improve it in a long term perspective. The project is now using the MVVM Community Toolkit and is following more closely this design pattern.
|
||||
- Tech: Update ffmpeg to v6.1.1 and ImageMagick to v13.5.
|
||||
- Tech: Update SharpShell to v2.7.2.
|
||||
- Tech: Change ghostscript version from 9.21 to 10.02.1.
|
||||
- Tech: Update project to Visual Studio 2022 and installer Wix 4.
|
||||
- Tech: Update project to .NET framework 4.8.
|
||||
- Tech: Check for .NET framework version in installer and prompt the user if the required version is not installed.
|
||||
- Tech: Remove sharpshell tools from installer dependencies. The shell extension is now registered by File Converter application (github issue #39 #46).
|
||||
- Tech: Remove Windows Vista support and 32bit platform support. Use File Converter 1.2.3 if you need these.
|
||||
|
||||
## Version 1.2.3
|
||||
|
||||
- Fixed: Issue where the scale was not working for image conversions depending on the application current language.
|
||||
- Tech: Include office library dependencies in package config (now you don't need to install office to build the project).
|
||||
- Tech: Upgrade Ghostscript to version 9.21.
|
||||
- Tech: Update ImageMagick to version 7.0.5.
|
||||
|
||||
## Version 1.2.2
|
||||
|
||||
- Added: Portuguese translation (thanks to Khidreal).
|
||||
- Fixed: Issue where scale was corrupted when switching application language (github issue #5).
|
||||
- Fixed: Issue where file metadata were not copied when converting to aac format (github issue #15).
|
||||
@@ -52,12 +57,14 @@
|
||||
- Tech: Improve security using https instead of http for upgrade system and links (thanks to TheAresjej).
|
||||
|
||||
## 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).
|
||||
@@ -69,6 +76,7 @@
|
||||
- Tech: Improve diagnostics.
|
||||
|
||||
## Version 1.1
|
||||
|
||||
- New: Localization system. File Converter can now be translated in multiple languages. The default language is the same than your OS language (if available).
|
||||
- New: Add the possibility to choose the application language in the application settings.
|
||||
- New: Add french localization.
|
||||
@@ -84,9 +92,10 @@
|
||||
- Fixed: Issue where it was impossible to rotate an image for the output types: jpg and png.
|
||||
|
||||
## Version 1.0
|
||||
- New: File Converter is now certified by Microsoft Authenticode.
|
||||
|
||||
- New: File Converter is now certified by Microsoft Authenticode.
|
||||
- New: Add an about section that contains information on the software development (change log, documentation link, report issue link).
|
||||
- New: Split conversion preset settings and application settings to improve ergonomy.
|
||||
- New: Split conversion preset settings and application settings to improve ergonomic design.
|
||||
- New: Add help shortcuts in the conversion preset edition interface that links directly to the corresponding documentation page.
|
||||
- New: Add shortcuts in start menu.
|
||||
- New: Create a donation campaign on Pledgie and linked it in the about section.
|
||||
@@ -94,6 +103,7 @@
|
||||
- Fixed: Issue where it was impossible to convert files from a network path.
|
||||
|
||||
## Version 0.7
|
||||
|
||||
- New: Possibility to encode videos using VP9 video codec and Ogg vorbis audio codec in a webm container.
|
||||
- New: Possibility to convert videos and images to gif.
|
||||
- New: Possibility to convert gif files to videos.
|
||||
@@ -106,11 +116,12 @@
|
||||
- Fixed: Issue where "Clamp to power of 2 size" option didn't work well with images that already have a power of 2 size.
|
||||
- Fixed: Issue where conversion progress was not updated correctly (for converters based on ffmpeg).
|
||||
- Fixed: Issue where converting a video into the ogg format did not extract audio in an ogg file correctly.
|
||||
- Fixed: Issue where simultaneous read on the same CD drive was performed when files from differents conversions come from the same drive (other than cda extraction preset).
|
||||
- Fixed: Issue where simultaneous read on the same CD drive was performed when files from different conversions came from the same drive (other than cda extraction preset).
|
||||
- Fixed: Issue where the path generator was unable to create a valid path if the input file was at the root of a drive.
|
||||
- Tech: Annotate the conversion presets to know if there are default preset or user preset in order to improve the upgrade process.
|
||||
|
||||
## Version 0.6
|
||||
|
||||
- New: Possibility to encode videos using H.264 video codec and AAC audio codec in a mp4 container (more portable than mkv).
|
||||
- New: Support new image input file formats: psd, tga, svg and exr.
|
||||
- New: Support new video input file format: m4v.
|
||||
@@ -118,17 +129,18 @@
|
||||
- New: Remove restriction on image size to convert to ico file format (it is now possible to convert all images to ico).
|
||||
- New: Add "Clamp to power of 2 size" option in image conversion.
|
||||
- New: Support input images encoded in 16 bits or 32 bits per color channel.
|
||||
- Fixed: Issue where the installer detects the utilisation of the extension dll in explorer, ask the user to restart it and fail to do it.
|
||||
- Fixed: Issue where the installer detects the uses of the extension dll in explorer, ask the user to restart it and fail to do it.
|
||||
- Fixed: Issue where it is impossible to delete a conversion preset defined in default settings.
|
||||
- Fixed: Issue where the Windows context menu does not contain user preset after an application upgrade.
|
||||
- Fixed: Issue where some registry keys remain after file converter uninstallation.
|
||||
- Fixed: Issue where some registry keys remain after file converter uninstall.
|
||||
- Fixed: Issue where aac bitrate was not saved.
|
||||
- Fixed: Issue where settings serialization version was not updated.
|
||||
- Change: Allow the user to scale images until 1600% size (useful to scale pixel art images).
|
||||
|
||||
## Version 0.5
|
||||
|
||||
- New: Software update system. The application now checks if a new version of File Converter is available.
|
||||
- New: Possibility to scale images and videos.
|
||||
- New: Possibility to scale images and videos.
|
||||
- New: Possibility to encode videos (avi output file format) using Xvid video codec and Mp3 audio codec.
|
||||
- New: Support new video input file formats: 3gp, webm and wmv.
|
||||
- New: Add a help window to explain how file converter works when you launch it without using the context menu.
|
||||
@@ -136,6 +148,7 @@
|
||||
- Tech: Update ffmpeg version (aac encoding is not anymore experimental).
|
||||
|
||||
## Version 0.4
|
||||
|
||||
- New: Possibility to encode videos (mkv output file format) using H.264 video codec and AAC audio codec.
|
||||
- New: Possibility to extract Audio CD content.
|
||||
- New: Possibility to encode audio in aac format.
|
||||
@@ -147,13 +160,14 @@
|
||||
- New: Copy the currently selected preset when clicking on the add preset button.
|
||||
- New: Add "My Documents", "My Music", "My Videos" and "My Pictures" folder to output file name generator.
|
||||
- New: Possibility to choose if the application quit after succeeded conversions.
|
||||
- Fixed: Reordering presets does not update the registry.
|
||||
- Fixed: Merge default settings with user settings to prevent errors when upgrading the application.
|
||||
- Fixed: Reordering presets does not update the registry.
|
||||
- Fixed: Merge default settings with user settings to prevent errors when upgrading the application.
|
||||
- Tech: Handle incorrect user settings case.
|
||||
- Tech: Improve diagnostics system (compatibility with logs from multiple threads, dump files in AppData folder and error messages).
|
||||
- Tech: Update ffmpeg version.
|
||||
|
||||
## Version 0.3
|
||||
|
||||
- New: Possibility to extract audio from videos.
|
||||
- New: Support new input file formats: aiff, m4a, avi, mp4.
|
||||
- New: Quality settings for Mp3 (Encoding mode vbr/cbr and bitrate).
|
||||
@@ -168,6 +182,7 @@
|
||||
- Tech: Add error codes on error messages.
|
||||
|
||||
## Version 0.2
|
||||
|
||||
- New: Support new input file format: ape.
|
||||
- New: Add notion of conversion preset (in order to customize the conversion possibilities).
|
||||
- New: Add settings window to edit conversion presets.
|
||||
@@ -176,6 +191,7 @@
|
||||
- New: Add diagnostic window to read the application logs.
|
||||
|
||||
## Version 0.1
|
||||
- New: Add decode support for file formats Mp3, Ogg, Wav, Flac, Wma
|
||||
|
||||
- New: Add decode support for file formats Mp3, Ogg, Wav, Flac, Wma
|
||||
- New: Add encode support for file formats Mp3, Ogg, Wav, Flac
|
||||
- New: UI to visualize the conversion progress
|
||||
+3
-17
@@ -1,46 +1,32 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27703.2000
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.7.34003.232
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileConverterExtension", "Application\FileConverterExtension\FileConverterExtension.csproj", "{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileConverter", "Application\FileConverter\FileConverter.csproj", "{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}"
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F14673DF-DF38-44B4-AB1D-99A59182C24C}"
|
||||
Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Installer", "Installer\Installer.wixproj", "{F14673DF-DF38-44B4-AB1D-99A59182C24C}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x64.Build.0 = Debug|x64
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x64.ActiveCfg = Release|x64
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x64.Build.0 = Release|x64
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.Build.0 = Debug|x64
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.Build.0 = Debug|x86
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.ActiveCfg = Release|x64
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.Build.0 = Release|x64
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.ActiveCfg = Release|x86
|
||||
{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.Build.0 = Release|x86
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x64.Build.0 = Debug|x64
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x86.Build.0 = Debug|x86
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x64.ActiveCfg = Release|x64
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x64.Build.0 = Release|x64
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x86.ActiveCfg = Release|x86
|
||||
{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
+17
-49
@@ -1,47 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project>
|
||||
<Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.3" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProductVersion>3.9</ProductVersion>
|
||||
<ProjectGuid>f14673df-df38-44b4-ab1d-99a59182c24c</ProjectGuid>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>FileConverter-setup</OutputName>
|
||||
<OutputType>Package</OutputType>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
|
||||
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Languages.wxs" />
|
||||
<Compile Include="Product.wxs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<WixExtension Include="WixNetFxExtension">
|
||||
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
|
||||
<Name>WixNetFxExtension</Name>
|
||||
</WixExtension>
|
||||
<WixExtension Include="WixUIExtension">
|
||||
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
|
||||
<Name>WixUIExtension</Name>
|
||||
</WixExtension>
|
||||
<PackageReference Include="WixToolset.Heat" Version="4.0.3" />
|
||||
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.3" />
|
||||
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Application\FileConverterExtension\FileConverterExtension.csproj">
|
||||
@@ -61,18 +32,15 @@
|
||||
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" />
|
||||
<Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.3" />
|
||||
<ItemGroup>
|
||||
<HarvestDirectory Include="..\Application\FileConverter\$(OutputPath)Languages">
|
||||
<ComponentGroupName>Languages</ComponentGroupName>
|
||||
<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
|
||||
<PreprocessorVariable>var.FileConverter.TargetDir</PreprocessorVariable>
|
||||
<SuppressRegistry>true</SuppressRegistry>
|
||||
</HarvestDirectory>
|
||||
</ItemGroup>
|
||||
<!-- congigure the project to sign the installer. Comment this line to produce an unsigned installer. -->
|
||||
<Import Project=".\Installer.sign" />
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>"C:\Program Files (x86)\WiX Toolset v3.11\bin\heat.exe" dir "$(SolutionDir)Application\FileConverter\$(OutDir)Languages" -gg -template fragment -cg "Languages" -dr "INSTALLFOLDER" -var "var.FileConverter.TargetDir" -out "$(ProjectDir)Languages.wxs"</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Wix.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
<Import Project=".\Installer.sign" Condition=" '$(Configuration)' == 'Release' " />
|
||||
</Project>
|
||||
+85
-92
@@ -1,26 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?if $(var.Platform) = x64 ?>
|
||||
<?define ProductName = "File Converter (64 bit)" ?>
|
||||
<?define Win64 = "yes" ?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
|
||||
<?else ?>
|
||||
<?define ProductName = "File Converter (32 bit)" ?>
|
||||
<?define Win64 = "no" ?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
|
||||
<?endif ?>
|
||||
|
||||
<!-- Upgrade documentation: http://wixtoolset.org/documentation/manual/v3/howtos/updates/major_upgrade.html -->
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
|
||||
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.2.3" Manufacturer="Adrien Allard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
|
||||
<?if $(var.Platform) = x64 ?>
|
||||
<Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" />
|
||||
<?else ?>
|
||||
<Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
|
||||
<?endif ?>
|
||||
|
||||
<Icon Id="icon.ico" SourceFile="..\Resources\Icons\ApplicationIcon.ico"/>
|
||||
<!-- Upgrade documentation: http://wixtoolset.org/documentation/manual/v3/howtos/updates/major_upgrade.html -->
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
|
||||
<Package Name="File Converter" Language="1033" Version="2.0" Manufacturer="Adrien Allard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b" InstallerVersion="200">
|
||||
<Icon Id="icon.ico" SourceFile="..\Resources\Icons\ApplicationIcon.ico" />
|
||||
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
|
||||
<SetProperty Id="ARPINSTALLLOCATION" Value="[ApplicationFolder]" After="CostFinalize" />
|
||||
|
||||
@@ -33,29 +14,27 @@
|
||||
<ComponentGroupRef Id="Languages" />
|
||||
</Feature>
|
||||
|
||||
<CustomAction Id="InstallShell" FileKey="FileConverter.exe" ExeCommand='--register-shell-extension "[INSTALLFOLDER]FileConverterExtension.dll"' Execute="deferred" Impersonate="no" />
|
||||
<CustomAction Id="UninstallShell" FileKey="FileConverter.exe" ExeCommand='--unregister-shell-extension "[INSTALLFOLDER]FileConverterExtension.dll"' Execute="deferred" Impersonate="no" />
|
||||
<CustomAction Id="PostInstallInit" FileKey="FileConverter.exe" ExeCommand="--post-install-init" Execute="immediate"/>
|
||||
<CustomAction Id="InstallShell" ExeCommand="--register-shell-extension "[INSTALLFOLDER]FileConverterExtension.dll"" Execute="deferred" Impersonate="no" FileRef="FileConverter.exe" />
|
||||
<CustomAction Id="UninstallShell" ExeCommand="--unregister-shell-extension "[INSTALLFOLDER]FileConverterExtension.dll"" Execute="deferred" Impersonate="no" FileRef="FileConverter.exe" />
|
||||
<CustomAction Id="PostInstallInit" ExeCommand="--post-install-init" Execute="immediate" FileRef="FileConverter.exe" />
|
||||
|
||||
<UI>
|
||||
<ProgressText Action="InstallFiles" Template="File: [1], Directory: [9], Size: [6]">Copying new files</ProgressText>
|
||||
<ProgressText Action="InstallShell">Register shell extension to Windows Explorer</ProgressText>
|
||||
<ProgressText Action="UninstallShell">Unregister shell extension from Windows Explorer</ProgressText>
|
||||
<ProgressText Action="PostInstallInit">Initialize conversion presets</ProgressText>
|
||||
<ProgressText Action="InstallFiles" Template="File: [1], Directory: [9], Size: [6]" Message="Copying new files" />
|
||||
<ProgressText Action="InstallShell" Message="Register shell extension to Windows Explorer" />
|
||||
<ProgressText Action="UninstallShell" Message="Unregister shell extension from Windows Explorer" />
|
||||
<ProgressText Action="PostInstallInit" Message="Initialize conversion presets" />
|
||||
</UI>
|
||||
|
||||
<PropertyRef Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED"/>
|
||||
<Condition Message="This application requires .NET Framework 4.6.2. Please install the .NET Framework then run this installer again.">
|
||||
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED]]>
|
||||
</Condition>
|
||||
<PropertyRef Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" />
|
||||
<Launch Condition="Installed OR WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Message="This application requires .NET Framework 4.6.2. Please install the .NET Framework then run this installer again." />
|
||||
|
||||
<InstallExecuteSequence>
|
||||
<Custom Action="UninstallShell" Before="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
|
||||
<Custom Action="InstallShell" After="InstallFiles">NOT Installed</Custom>
|
||||
<Custom Action="PostInstallInit" After="InstallFinalize">NOT Installed</Custom>
|
||||
<Custom Action="UninstallShell" Before="RemoveFiles" Condition="(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")" />
|
||||
<Custom Action="InstallShell" After="InstallFiles" Condition="NOT Installed" />
|
||||
<Custom Action="PostInstallInit" After="InstallFinalize" Condition="NOT Installed" />
|
||||
</InstallExecuteSequence>
|
||||
|
||||
<UIRef Id="WixUI_InstallDir" />
|
||||
<ui:WixUI Id="WixUI_InstallDir" />
|
||||
<Property Id="MSIUSEREALADMINDETECTION" Value="1" />
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
|
||||
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" /> <!-- This avoid an issue where the installer detect the utilization of the extension dll in explorer and then, ask to the user to restart these applications. The restart fails. -->
|
||||
@@ -67,107 +46,121 @@
|
||||
<WixVariable Id="WixUIInfoIco" Value="..\Resources\Installer\WarningIcon.ico" />
|
||||
<!--<WixVariable Id="WixUINewIco" Value="Icon16x16.ico" />
|
||||
<WixVariable Id="WixUIUpIco" Value="Icon16x16.ico" />-->
|
||||
</Product>
|
||||
</Package>
|
||||
|
||||
<Fragment>
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="$(var.PlatformProgramFilesFolder)">
|
||||
<Directory Id="INSTALLFOLDER" Name="File Converter" />
|
||||
</Directory>
|
||||
<Directory Id="ProgramMenuFolder">
|
||||
<Directory Id="ApplicationStartMenuShortcut" Name="File Converter"/>
|
||||
</Directory>
|
||||
</Directory>
|
||||
<StandardDirectory Id="ProgramFiles64Folder">
|
||||
<Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)" />
|
||||
</StandardDirectory>
|
||||
<StandardDirectory Id="ProgramMenuFolder">
|
||||
<Directory Id="ApplicationStartMenuShortcut" Name="File Converter" />
|
||||
</StandardDirectory>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
|
||||
<!-- Application -->
|
||||
<Component Guid="{EFA8CCE9-E501-4C80-AE33-710D11CC2525}" Win64="$(var.Win64)">
|
||||
<Component Guid="{EFA8CCE9-E501-4C80-AE33-710D11CC2525}">
|
||||
<File Id="FileConverter.exe" Source="$(var.FileConverter.TargetPath)" KeyPath="yes" Checksum="yes">
|
||||
<Shortcut Id="ApplicationStartMenuShortcut" Directory="ApplicationStartMenuShortcut" Advertise="yes" WorkingDirectory="INSTALLDIR"
|
||||
Name="File Converter" Description="Convert and compress everything in 2 clicks!" Icon="Icon.exe">
|
||||
<Shortcut Id="ApplicationStartMenuShortcut" Directory="ApplicationStartMenuShortcut" Advertise="yes" WorkingDirectory="INSTALLFOLDER" Name="File Converter" Description="Convert and compress everything in 2 clicks!" Icon="Icon.exe">
|
||||
<Icon Id="Icon.exe" SourceFile="$(var.FileConverter.TargetPath)" />
|
||||
</Shortcut>
|
||||
<Shortcut Id="ApplicationSettingsStartMenuShortcut" Directory="ApplicationStartMenuShortcut" Advertise="yes" WorkingDirectory="INSTALLDIR"
|
||||
Name="File Converter Settings" Description="Configure the conversion and compression presets" Arguments="--settings" Icon="SettingsIcon.exe">
|
||||
<Shortcut Id="ApplicationSettingsStartMenuShortcut" Directory="ApplicationStartMenuShortcut" Advertise="yes" WorkingDirectory="INSTALLFOLDER" Name="File Converter Settings" Description="Configure the conversion and compression presets" Arguments="--settings" Icon="SettingsIcon.exe">
|
||||
<Icon Id="SettingsIcon.exe" SourceFile="$(var.FileConverter.TargetPath)" />
|
||||
</Shortcut>
|
||||
</File>
|
||||
<RemoveFolder Id='RemoveStartMenuDir' Directory='ApplicationStartMenuShortcut' On='uninstall' />
|
||||
<RemoveFolder Id="RemoveStartMenuDir" Directory="ApplicationStartMenuShortcut" On="uninstall" />
|
||||
</Component>
|
||||
<Component Guid="{3E003FD3-46CA-4F4F-811E-663332828229}" Win64="$(var.Win64)">
|
||||
<Component Guid="{3E003FD3-46CA-4F4F-811E-663332828229}">
|
||||
<File Id="FileConverter.exe.config" Source="$(var.FileConverter.TargetDir)FileConverter.exe.config" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
|
||||
<!-- Extension -->
|
||||
<Component Guid="{35B28709-C56C-4F18-9A41-4B238402EE48}" Win64="$(var.Win64)">
|
||||
<Component Guid="{35B28709-C56C-4F18-9A41-4B238402EE48}">
|
||||
<File Id="FileConverterExtension.dll" Source="$(var.FileConverterExtension.TargetDir)FileConverterExtension.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{566A73FB-427D-43C4-9ABC-92F2528F6D0A}" Win64="$(var.Win64)">
|
||||
<File Id="SharpShell.dll" Source="$(var.FileConverterExtension.TargetDir)SharpShell.dll" KeyPath="yes" Checksum="yes"/>
|
||||
<Component Guid="{566A73FB-427D-43C4-9ABC-92F2528F6D0A}">
|
||||
<File Id="SharpShell.dll" Source="$(var.FileConverterExtension.TargetDir)SharpShell.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
|
||||
<!-- Third parties -->
|
||||
<Component Guid="{FF99FD36-9C73-472D-AA18-9384DB7708A6}" Win64="$(var.Win64)">
|
||||
<File Id="CommonServiceLocator.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)CommonServiceLocator.dll" Checksum="yes"/>
|
||||
<Component Guid="{bae11ca4-0842-46f0-b0e5-95ecc1c994fc}">
|
||||
<File Id="CommunityToolkit.Mvvm.dll" Source="$(var.FileConverter.TargetDir)CommunityToolkit.Mvvm.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{2D5509A2-A752-4E4D-A706-E90F041D0B7D}" Win64="$(var.Win64)">
|
||||
<File Id="GalaSoft.MvvmLight.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)GalaSoft.MvvmLight.dll" Checksum="yes"/>
|
||||
<Component Guid="{ae4d8912-9d99-4e70-8746-e0216539fbe3}">
|
||||
<File Id="Microsoft.Bcl.AsyncInterfaces.dll" Source="$(var.FileConverter.TargetDir)Microsoft.Bcl.AsyncInterfaces.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{D4F2C1DD-800D-407D-B863-1FE6C3069D3C}" Win64="$(var.Win64)">
|
||||
<File Id="GalaSoft.MvvmLight.Extras.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)GalaSoft.MvvmLight.Extras.dll" Checksum="yes"/>
|
||||
<Component Guid="{7561fa78-554b-4d31-8e69-49ee5de33371}">
|
||||
<File Id="Microsoft.Extensions.DependencyInjection.Abstractions.dll" Source="$(var.FileConverter.TargetDir)Microsoft.Extensions.DependencyInjection.Abstractions.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{48D1EE43-F7D7-4611-B3AC-B2652ED68261}" Win64="$(var.Win64)">
|
||||
<File Id="GalaSoft.MvvmLight.Platform.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)GalaSoft.MvvmLight.Platform.dll" Checksum="yes"/>
|
||||
<Component Guid="{301c2287-ca21-4013-82b0-5895d89216ea}">
|
||||
<File Id="Microsoft.Extensions.DependencyInjection.dll" Source="$(var.FileConverter.TargetDir)Microsoft.Extensions.DependencyInjection.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{08FB2B2B-7686-4698-B864-0AD39CF3128D}" Win64="$(var.Win64)">
|
||||
<File Id="System.Windows.Interactivity.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)System.Windows.Interactivity.dll" Checksum="yes"/>
|
||||
<Component Guid="{101923f7-d0f9-47f5-9c59-13ec5ca81b37}">
|
||||
<File Id="Microsoft.Xaml.Behaviors.dll" Source="$(var.FileConverter.TargetDir)Microsoft.Xaml.Behaviors.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{e5a7ebe5-30ba-4ee9-be63-f1b39101dff6}">
|
||||
<File Id="System.Buffers.dll" Source="$(var.FileConverter.TargetDir)System.Buffers.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{d9a8094d-b500-47e1-9947-8e40ce74b2c6}">
|
||||
<File Id="System.ComponentModel.Annotations.dll" Source="$(var.FileConverter.TargetDir)System.ComponentModel.Annotations.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{652a91b4-1e9e-477d-b5ad-657320d2541e}">
|
||||
<File Id="System.Memory.dll" Source="$(var.FileConverter.TargetDir)System.Memory.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{9cfa6823-cef6-4c5a-8f20-997ebf1527fb}">
|
||||
<File Id="System.Numerics.Vectors.dll" Source="$(var.FileConverter.TargetDir)System.Numerics.Vectors.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{6fc047b2-4b3c-416c-bed1-a721373df2d6}">
|
||||
<File Id="System.Runtime.CompilerServices.Unsafe.dll" Source="$(var.FileConverter.TargetDir)System.Runtime.CompilerServices.Unsafe.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{cc317711-c6d6-42a4-8bc2-48b0f6adf6ef}">
|
||||
<File Id="System.Threading.Tasks.Extensions.dll" Source="$(var.FileConverter.TargetDir)System.Threading.Tasks.Extensions.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
|
||||
<Component Guid="{BEEAAC73-C479-4080-83B1-2B1448C7378C}" Win64="$(var.Win64)">
|
||||
<File Source="$(var.FileConverter.TargetDir)ffmpeg.exe" KeyPath="yes" Checksum="yes" />
|
||||
<Component Guid="{BEEAAC73-C479-4080-83B1-2B1448C7378C}">
|
||||
<File Id="ffmpeg.exe" Source="$(var.FileConverter.TargetDir)ffmpeg.exe" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{3B94F60C-29BF-4E51-AF85-C10DF19B0B2E}" Win64="$(var.Win64)">
|
||||
<File Id="Magick.NET.dll" Source="$(var.FileConverter.TargetDir)Magick.NET-Q16-AnyCPU.dll" KeyPath="yes" Checksum="yes"/>
|
||||
<Component Guid="{3B94F60C-29BF-4E51-AF85-C10DF19B0B2E}">
|
||||
<File Id="Magick.NET.dll" Source="$(var.FileConverter.TargetDir)Magick.NET-Q16-AnyCPU.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{6925974E-AFE0-4833-B797-36AE33DF9D4D}" Win64="$(var.Win64)">
|
||||
<File Id="gsdll32.dll" Source="$(var.FileConverter.TargetDir)gsdll32.dll" KeyPath="yes" Checksum="yes"/>
|
||||
<Component Guid="{6925974E-AFE0-4833-B797-36AE33DF9D4D}">
|
||||
<File Id="gsdll64.dll" Source="$(var.FileConverter.TargetDir)gsdll64.dll" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{DC549AF7-6004-423E-BFE3-3508F4AC4682}" Win64="$(var.Win64)">
|
||||
<File Id="gswin32c.exe" Source="$(var.FileConverter.TargetDir)gswin32c.exe" KeyPath="yes" Checksum="yes"/>
|
||||
<Component Guid="{DC549AF7-6004-423E-BFE3-3508F4AC4682}">
|
||||
<File Id="gswin64c.exe" Source="$(var.FileConverter.TargetDir)gswin64c.exe" KeyPath="yes" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{12B808AB-C4E3-4B0D-B34B-0124C75B2279}" Win64="$(var.Win64)">
|
||||
<File Id="Markdown.Xaml.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)Markdown.Xaml.dll" Checksum="yes"/>
|
||||
<Component Guid="{12B808AB-C4E3-4B0D-B34B-0124C75B2279}">
|
||||
<File Id="Markdown.Xaml.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)Markdown.Xaml.dll" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{516EDFA8-26F3-49A5-A007-02D927874999}" Win64="$(var.Win64)">
|
||||
<File Id="Ripper.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)Ripper.dll" Checksum="yes"/>
|
||||
<Component Guid="{516EDFA8-26F3-49A5-A007-02D927874999}">
|
||||
<File Id="Ripper.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)Ripper.dll" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{92FE38C7-EE75-4F85-BA97-C221E132853F}" Win64="$(var.Win64)">
|
||||
<File Id="yeti.mmedia.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)yeti.mmedia.dll" Checksum="yes"/>
|
||||
<Component Guid="{92FE38C7-EE75-4F85-BA97-C221E132853F}">
|
||||
<File Id="yeti.mmedia.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)yeti.mmedia.dll" Checksum="yes" />
|
||||
</Component>
|
||||
<Component Guid="{6268D6C0-42D8-4487-AC4B-33C9874C9E2F}" Win64="$(var.Win64)">
|
||||
<File Id="WpfAnimatedGif.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)WpfAnimatedGif.dll" Checksum="yes"/>
|
||||
<Component Guid="{6268D6C0-42D8-4487-AC4B-33C9874C9E2F}">
|
||||
<File Id="WpfAnimatedGif.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)WpfAnimatedGif.dll" Checksum="yes" />
|
||||
</Component>
|
||||
|
||||
<!-- Configuration and documentation -->
|
||||
<Component Guid="{AD58807A-2AE2-48BE-AB55-9BDE9BBE37F3}" Win64="$(var.Win64)">
|
||||
<File Source="$(var.FileConverter.ProjectDir)\Settings.default.xml" KeyPath="yes" />
|
||||
<Component Guid="{AD58807A-2AE2-48BE-AB55-9BDE9BBE37F3}">
|
||||
<File Id="Settings.default.xml" Source="$(var.FileConverter.ProjectDir)\Settings.default.xml" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Guid="{FF6ADF7B-20A1-4222-8949-DD39D315CBEC}" Win64="$(var.Win64)">
|
||||
<File Source="..\README.md" KeyPath="yes" />
|
||||
<Component Guid="{FF6ADF7B-20A1-4222-8949-DD39D315CBEC}">
|
||||
<File Id="README.md" Source="..\README.md" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Guid="{FF0ACDA8-DCAB-44C9-8004-CBD58EF418F6}" Win64="$(var.Win64)">
|
||||
<File Source="..\CHANGELOG.md" KeyPath="yes" />
|
||||
<Component Guid="{FF0ACDA8-DCAB-44C9-8004-CBD58EF418F6}">
|
||||
<File Id="CHANGELOG.md" Source="..\CHANGELOG.md" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Guid="{F082B788-F2C8-4D86-A43E-AB09CBE04D6A}" Win64="$(var.Win64)">
|
||||
<File Source="..\LICENSE.md" KeyPath="yes" />
|
||||
<Component Guid="{F082B788-F2C8-4D86-A43E-AB09CBE04D6A}">
|
||||
<File Id="LICENSE.md" Source="..\LICENSE.md" KeyPath="yes" />
|
||||
</Component>
|
||||
|
||||
<!-- Registry entries -->
|
||||
<Component Id="RegistryEntries" Guid="{1862E9DC-1B37-4AFD-85BF-2E9CFFAFA9F8}">
|
||||
<RegistryKey Root="HKCU" Key="Software\FileConverter" ForceDeleteOnUninstall="yes">
|
||||
<RegistryValue Name="Path" Type="string" Value="[INSTALLFOLDER]FileConverter.exe"/>
|
||||
<RegistryValue Name="Path" Type="string" Value="[INSTALLFOLDER]FileConverter.exe" />
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
</ComponentGroup>
|
||||
|
||||
@@ -0,0 +1,674 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<http://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,6 +1,7 @@
|
||||
# File Converter
|
||||
|
||||
## Description
|
||||
|
||||
**File Converter** is a very simple tool which allows you to convert and compress one or several file(s) using the context menu of windows explorer.
|
||||
|
||||
You can download it here: [www.file-converter.org](https://file-converter.org/?from=readme.md).
|
||||
@@ -13,7 +14,7 @@ File Converter is a personal open source project started in 2014. I have put hun
|
||||
|
||||
You can help me by [contributing to the project](https://github.com/Tichau/FileConverter/wiki#contribute), by [making a donation](https://www.paypal.com/donate/?cmd=_donations&business=3BDWQTYTTA3D8&item_name=File+Converter+Donations¤cy_code=EUR&Z3JncnB0=) or just by [saying thanks](https://saythanks.io/to/Tichau) :).
|
||||
|
||||
## Troubleshooting
|
||||
## Troubleshooting
|
||||
|
||||
If you encounter any problem with File Converter, you can:
|
||||
|
||||
@@ -29,16 +30,19 @@ When you report an issue, please join the following informations:
|
||||
|
||||
You will find the xml files and diagnostics folder in `c:\Users\[UserName]\AppData\Local\FileConverter\`.
|
||||
|
||||
## Setup development environement
|
||||
## Setup development environment
|
||||
|
||||
### Requirements
|
||||
|
||||
For File Converter and its explorer extension:
|
||||
- Visual Studio 2017
|
||||
|
||||
* Visual Studio 2022
|
||||
|
||||
For the installer:
|
||||
- [Wix toolset build tool v3.11 and visual studio extension](http://wixtoolset.org/)
|
||||
- [Windows SDK Signing Tools for Desktop Apps](https://developer.microsoft.com/fr-fr/windows/downloads/windows-10-sdk)
|
||||
|
||||
* [Wix 4](http://wixtoolset.org/)
|
||||
* [Community Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=FireGiant.FireGiantHeatWaveDev17)
|
||||
* [Windows SDK Signing Tools for Desktop Apps](https://developer.microsoft.com/fr-fr/windows/downloads/windows-10-sdk)
|
||||
|
||||
## Thanks
|
||||
|
||||
|
||||
Reference in new issue
Block a user