diff --git a/.gitignore b/.gitignore index d656489..879242a 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Application/FileConverter/App.config b/Application/FileConverter/App.config index b19c16d..4165a81 100644 --- a/Application/FileConverter/App.config +++ b/Application/FileConverter/App.config @@ -1,14 +1,26 @@  - + - - + + + + + + + + + + + + + + diff --git a/Application/FileConverter/Application.xaml b/Application/FileConverter/Application.xaml index d0b126d..9d54817 100644 --- a/Application/FileConverter/Application.xaml +++ b/Application/FileConverter/Application.xaml @@ -17,9 +17,6 @@ - - - diff --git a/Application/FileConverter/Application.xaml.cs b/Application/FileConverter/Application.xaml.cs index ce92013..eb42f30 100644 --- a/Application/FileConverter/Application.xaml.cs +++ b/Application/FileConverter/Application.xaml.cs @@ -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 navigationService = Ioc.Default.GetRequiredService(); if (this.showHelp) { @@ -89,7 +90,7 @@ namespace FileConverter { navigationService.Show(Pages.Main); - IConversionService conversionService = SimpleIoc.Default.GetInstance(); + IConversionService conversionService = Ioc.Default.GetRequiredService(); conversionService.ConversionJobsTerminated += this.ConversionService_ConversionJobsTerminated; conversionService.ConvertFilesAsync(); } @@ -111,7 +112,7 @@ namespace FileConverter Debug.Log("Exit application."); - IUpgradeService upgradeService = SimpleIoc.Default.GetInstance(); + IUpgradeService upgradeService = Ioc.Default.GetRequiredService(); 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(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() + .AddSingleton() + .AddSingleton(); - 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 navigationService = Ioc.Default.GetRequiredService(); navigationService.RegisterPage(Pages.Help, false, true); navigationService.RegisterPage(Pages.Main, false, true); @@ -228,7 +228,7 @@ namespace FileConverter return; } - ISettingsService settingsService = SimpleIoc.Default.GetInstance(); + ISettingsService settingsService = Ioc.Default.GetRequiredService(); // Parse arguments. bool quitAfterStartup = false; @@ -364,7 +364,7 @@ namespace FileConverter // Check for upgrade. if (settingsService.Settings.CheckUpgradeAtStartup) { - IUpgradeService upgradeService = SimpleIoc.Default.GetInstance(); + IUpgradeService upgradeService = Ioc.Default.GetRequiredService(); upgradeService.NewVersionAvailable += this.UpgradeService_NewVersionAvailable; upgradeService.CheckForUpgrade(); } @@ -383,7 +383,7 @@ namespace FileConverter if (conversionPreset != null) { - IConversionService conversionService = SimpleIoc.Default.GetInstance(); + IConversionService conversionService = Ioc.Default.GetRequiredService(); // 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().Show(Pages.Upgrade); + Ioc.Default.GetRequiredService().Show(Pages.Upgrade); - IUpgradeService upgradeService = SimpleIoc.Default.GetInstance(); + IUpgradeService upgradeService = Ioc.Default.GetRequiredService(); upgradeService.NewVersionAvailable -= this.UpgradeService_NewVersionAvailable; } private void ConversionService_ConversionJobsTerminated(object sender, ConversionJobsTerminatedEventArgs e) { - IConversionService conversionService = SimpleIoc.Default.GetInstance(); + IConversionService conversionService = Ioc.Default.GetRequiredService(); conversionService.ConversionJobsTerminated -= this.ConversionService_ConversionJobsTerminated; - ISettingsService settingsService = SimpleIoc.Default.GetInstance(); + ISettingsService settingsService = Ioc.Default.GetRequiredService(); if (!settingsService.Settings.ExitApplicationWhenConversionsFinished) { diff --git a/Application/FileConverter/ConversionJobs/ConversionJob.cs b/Application/FileConverter/ConversionJobs/ConversionJob.cs index 9c51027..1f633ec 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob.cs @@ -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; } diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs index f900a85..f03886c 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs @@ -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() { diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs index 567dd63..c9ca3e2 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs @@ -26,7 +26,7 @@ namespace FileConverter.ConversionJobs get; } - protected override bool IsCancelable => false; + protected override bool IsCancelable() => false; protected override void Initialize() { diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs b/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs index dc88f0c..3242284 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs @@ -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() { diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs index 36d3e54..ac1c1f3 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs @@ -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() { diff --git a/Application/FileConverter/ConversionPreset/ConversionPreset.cs b/Application/FileConverter/ConversionPreset/ConversionPreset.cs index 693892d..1204ea6 100644 --- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs +++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs @@ -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) diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index c171258..2c98a1c 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -9,11 +9,13 @@ Properties FileConverter FileConverter - v4.6.2 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 + + AnyCPU @@ -67,24 +69,29 @@ true - - ..\..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll + + ..\..\packages\CommunityToolkit.Mvvm.8.2.2\lib\netstandard2.0\CommunityToolkit.Mvvm.dll - - ..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll + + ..\..\packages\Magick.NET-Q16-AnyCPU.13.5.0\lib\netstandard20\Magick.NET-Q16-AnyCPU.dll + True - - ..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll - - - ..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll - - - ..\..\packages\Magick.NET-Q16-AnyCPU.7.12.0\lib\net40\Magick.NET-Q16-AnyCPU.dll + + ..\..\packages\Magick.NET.Core.13.5.0\lib\netstandard20\Magick.NET.Core.dll + True ..\..\Middleware\Markdown.Xaml.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll + + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll + ..\..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll True @@ -97,6 +104,9 @@ ..\..\packages\Microsoft.Office.Interop.Word.15.0.4797.1003\lib\net20\Microsoft.Office.Interop.Word.dll True + + ..\..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.77\lib\net462\Microsoft.Xaml.Behaviors.dll + ..\..\packages\Office.12.0.0\lib\net40\Office.dll True @@ -106,16 +116,33 @@ False ..\..\Middleware\Ripper.dll - - ..\..\packages\SharpShell.2.7.1\lib\net40-client\SharpShell.dll + + ..\..\packages\SharpShell.2.7.2\lib\net40-client\SharpShell.dll - - - - - ..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll + + + + + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + @@ -127,9 +154,8 @@ - - ..\..\packages\WpfAnimatedGif.1.4.14\lib\net\WpfAnimatedGif.dll - True + + ..\..\packages\WpfAnimatedGif.2.0.2\lib\net40\WpfAnimatedGif.dll ..\..\Middleware\yeti.mmedia.dll @@ -426,15 +452,24 @@ - copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe" -copy /Y "$(SolutionDir)Middleware\gs\x86\gsdll32.dll" "$(TargetDir)gsdll32.dll" -copy /Y "$(SolutionDir)Middleware\gs\x86\gswin32c.exe" "$(TargetDir)gswin32c.exe" + copy /Y "$(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 + + + + 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}. + + + + + 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 navigationService = Ioc.Default.GetRequiredService(); navigationService.Close(Pages.Diagnostics, args != null); } } diff --git a/Application/FileConverter/ViewModels/HelpViewModel.cs b/Application/FileConverter/ViewModels/HelpViewModel.cs index 7db5a80..32ab7cb 100644 --- a/Application/FileConverter/ViewModels/HelpViewModel.cs +++ b/Application/FileConverter/ViewModels/HelpViewModel.cs @@ -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; /// /// This class contains properties that the main View can data bind to. - /// - /// Use the mvvminpc snippet to add bindable properties to this ViewModel. - /// - /// - /// You can also use Blend to data bind with the tool's support. - /// - /// - /// See http://www.galasoft.ch/mvvm - /// /// - public class HelpViewModel : ViewModelBase + public class HelpViewModel : ObservableRecipient { private RelayCommand closeCommand; @@ -32,13 +23,6 @@ namespace FileConverter.ViewModels /// 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 navigationService = Ioc.Default.GetRequiredService(); navigationService.Close(Pages.Help, args != null); } } diff --git a/Application/FileConverter/ViewModels/InputExtension.cs b/Application/FileConverter/ViewModels/InputExtension.cs index 4299f1c..43f538e 100644 --- a/Application/FileConverter/ViewModels/InputExtension.cs +++ b/Application/FileConverter/ViewModels/InputExtension.cs @@ -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 = Ioc.Default.GetRequiredService(); PresetNode selectedPreset = settingsViewModel.SelectedPreset; if (selectedPreset == null) { @@ -98,7 +97,7 @@ namespace FileConverter.ViewModels set { - SettingsViewModel settingsViewModel = ServiceLocator.Current.GetInstance(); + SettingsViewModel settingsViewModel = Ioc.Default.GetRequiredService(); 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)); + } } } \ No newline at end of file diff --git a/Application/FileConverter/ViewModels/InputExtensionCategory.cs b/Application/FileConverter/ViewModels/InputExtensionCategory.cs index 8affdbe..3eaefcf 100644 --- a/Application/FileConverter/ViewModels/InputExtensionCategory.cs +++ b/Application/FileConverter/ViewModels/InputExtensionCategory.cs @@ -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 inputExtensions = new List(); @@ -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 = Ioc.Default.GetRequiredService(); PresetNode selectedPreset = settingsViewModel.SelectedPreset; if (selectedPreset == null) { @@ -91,7 +92,7 @@ namespace FileConverter.ViewModels set { - SettingsViewModel settingsViewModel = ServiceLocator.Current.GetInstance(); + SettingsViewModel settingsViewModel = Ioc.Default.GetRequiredService(); 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)); } } } \ No newline at end of file diff --git a/Application/FileConverter/ViewModels/MainViewModel.cs b/Application/FileConverter/ViewModels/MainViewModel.cs index 8c0e50f..e50a632 100644 --- a/Application/FileConverter/ViewModels/MainViewModel.cs +++ b/Application/FileConverter/ViewModels/MainViewModel.cs @@ -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; - /// /// This class contains properties that the main View can data bind to. - /// - /// Use the mvvminpc snippet to add bindable properties to this ViewModel. - /// - /// - /// You can also use Blend to data bind with the tool's support. - /// - /// - /// See http://www.galasoft.ch/mvvm - /// /// - public class MainViewModel : ViewModelBase + public class MainViewModel : ObservableRecipient { private string informationMessage; private ObservableCollection conversionJobs; @@ -39,21 +30,11 @@ namespace FileConverter.ViewModels /// public MainViewModel() { - if (this.IsInDesignMode) - { - // Code runs in Blend --> create design time data. - this.InformationMessage = "Design time mode."; - this.ConversionJobs = new ObservableCollection(); - //this.ConversionJobs.Add(new ConversionJob()); - } - else - { - IConversionService settingsService = SimpleIoc.Default.GetInstance(); - this.ConversionJobs = new ObservableCollection(settingsService.ConversionJobs); + IConversionService settingsService = Ioc.Default.GetRequiredService(); + this.ConversionJobs = new ObservableCollection(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().Show(Pages.Settings)); + this.showSettingsCommand = new RelayCommand(() => Ioc.Default.GetRequiredService().Show(Pages.Settings)); } return this.showSettingsCommand; @@ -100,7 +81,7 @@ namespace FileConverter.ViewModels { if (this.showDiagnosticsCommand == null) { - this.showDiagnosticsCommand = new RelayCommand(() => SimpleIoc.Default.GetInstance().Show(Pages.Diagnostics)); + this.showDiagnosticsCommand = new RelayCommand(() => Ioc.Default.GetRequiredService().Show(Pages.Diagnostics)); } return this.showDiagnosticsCommand; @@ -122,7 +103,7 @@ namespace FileConverter.ViewModels private void Close(CancelEventArgs args) { - INavigationService navigationService = SimpleIoc.Default.GetInstance(); + INavigationService navigationService = Ioc.Default.GetRequiredService(); 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) diff --git a/Application/FileConverter/ViewModels/PresetNode.cs b/Application/FileConverter/ViewModels/PresetNode.cs index 1ee5c55..cf8ebd1 100644 --- a/Application/FileConverter/ViewModels/PresetNode.cs +++ b/Application/FileConverter/ViewModels/PresetNode.cs @@ -1,12 +1,13 @@ // License: http://www.gnu.org/licenses/gpl.html GPL version 3. -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(); } } diff --git a/Application/FileConverter/ViewModels/SettingsViewModel.cs b/Application/FileConverter/ViewModels/SettingsViewModel.cs index 7dbe7d2..6e616a6 100644 --- a/Application/FileConverter/ViewModels/SettingsViewModel.cs +++ b/Application/FileConverter/ViewModels/SettingsViewModel.cs @@ -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; - /// - /// This class contains properties that the main View can data bind to. - /// - /// Use the mvvminpc snippet to add bindable properties to this ViewModel. - /// - /// - /// You can also use Blend to data bind with the tool's support. - /// - /// - /// See http://www.galasoft.ch/mvvm - /// + /// This class contains properties that the settings View can data bind to. /// - 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; + /// /// Initializes a new instance of the SettingsViewModel class. /// @@ -75,42 +67,33 @@ namespace FileConverter.ViewModels this.saveCommand = new RelayCommand(this.SaveSettings, this.CanSaveSettings); this.closeCommand = new RelayCommand(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(); - this.Settings = settingsService.Settings; + ISettingsService settingsService = Ioc.Default.GetRequiredService(); + this.Settings = settingsService.Settings; - List outputTypeViewModels = new List(); - 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 outputTypeViewModels = new List(); + 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 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 upgradeService = Ioc.Default.GetRequiredService(); 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 folderNamesCache) @@ -465,10 +448,10 @@ namespace FileConverter.ViewModels private void CloseSettings(CancelEventArgs args) { - ISettingsService settingsService = SimpleIoc.Default.GetInstance(); + ISettingsService settingsService = Ioc.Default.GetRequiredService(); settingsService.RevertSettings(); - INavigationService navigationService = SimpleIoc.Default.GetInstance(); + INavigationService navigationService = Ioc.Default.GetRequiredService(); navigationService.Close(Pages.Settings, args != null); } @@ -484,10 +467,10 @@ namespace FileConverter.ViewModels this.ComputePresetsParentFoldersNamesAndFillSettings(this.presetsRootFolder, new List()); // Save changes. - ISettingsService settingsService = SimpleIoc.Default.GetInstance(); + ISettingsService settingsService = Ioc.Default.GetRequiredService(); settingsService.SaveSettings(); - INavigationService navigationService = SimpleIoc.Default.GetInstance(); + INavigationService navigationService = Ioc.Default.GetRequiredService(); navigationService.Close(Pages.Settings, false); } @@ -530,9 +513,9 @@ namespace FileConverter.ViewModels this.SelectedItem = newFolder; - this.saveCommand.RaiseCanExecuteChanged(); + this.saveCommand.NotifyCanExecuteChanged(); - Messenger.Default.Send("FolderName", "DoFocus"); + this.OnFolderCreated(); } private bool CanDuplicateSelectedPreset() @@ -590,10 +573,10 @@ namespace FileConverter.ViewModels this.SelectedItem = node; - Messenger.Default.Send("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); } diff --git a/Application/FileConverter/ViewModels/UpgradeViewModel.cs b/Application/FileConverter/ViewModels/UpgradeViewModel.cs index 2250525..2a9c00c 100644 --- a/Application/FileConverter/ViewModels/UpgradeViewModel.cs +++ b/Application/FileConverter/ViewModels/UpgradeViewModel.cs @@ -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; - /// - /// This class contains properties that the main View can data bind to. - /// - /// Use the mvvminpc snippet to add bindable properties to this ViewModel. - /// - /// - /// You can also use Blend to data bind with the tool's support. - /// - /// - /// See http://www.galasoft.ch/mvvm - /// + /// This class contains properties that the upgrade View can data bind to. /// - public class UpgradeViewModel : ViewModelBase + public class UpgradeViewModel : ObservableRecipient { private readonly IUpgradeService upgradeService; @@ -36,7 +27,7 @@ namespace FileConverter.ViewModels /// public UpgradeViewModel() { - this.upgradeService = SimpleIoc.Default.GetInstance(); + this.upgradeService = Ioc.Default.GetRequiredService(); this.upgradeService.DownloadChangeLog(); } @@ -83,19 +74,19 @@ namespace FileConverter.ViewModels { this.upgradeService.StartUpgrade(); - INavigationService navigationService = SimpleIoc.Default.GetInstance(); + INavigationService navigationService = Ioc.Default.GetRequiredService(); navigationService.Close(Pages.Upgrade, false); } private void ExecuteLaunchInstallerCommand() { - INavigationService navigationService = SimpleIoc.Default.GetInstance(); + INavigationService navigationService = Ioc.Default.GetRequiredService(); navigationService.Close(Pages.Upgrade, false); } private void Close(CancelEventArgs args) { - INavigationService navigationService = SimpleIoc.Default.GetInstance(); + INavigationService navigationService = Ioc.Default.GetRequiredService(); navigationService.Close(Pages.Upgrade, args != null); } } diff --git a/Application/FileConverter/ViewModels/ViewModelLocator.cs b/Application/FileConverter/ViewModels/ViewModelLocator.cs index e816418..24e2430 100644 --- a/Application/FileConverter/ViewModels/ViewModelLocator.cs +++ b/Application/FileConverter/ViewModels/ViewModelLocator.cs @@ -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; /// /// This class contains static references to all the view models in the @@ -36,34 +27,26 @@ namespace FileConverter.ViewModels /// public ViewModelLocator() { - ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default); - - ////if (ViewModelBase.IsInDesignModeStatic) - ////{ - //// // Create design time view services and models - //// SimpleIoc.Default.Register(); - ////} - ////else - ////{ - //// // Create run time view services and models - //// SimpleIoc.Default.Register(); - ////} - - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); } - public HelpViewModel Help => ServiceLocator.Current.GetInstance(); + public HelpViewModel Help => Ioc.Default.GetRequiredService(); - public MainViewModel Main => ServiceLocator.Current.GetInstance(); + public MainViewModel Main => Ioc.Default.GetRequiredService(); - public UpgradeViewModel Upgrade => ServiceLocator.Current.GetInstance(); + public UpgradeViewModel Upgrade => Ioc.Default.GetRequiredService(); - public SettingsViewModel Settings => ServiceLocator.Current.GetInstance(); + public SettingsViewModel Settings => Ioc.Default.GetRequiredService(); - public DiagnosticsViewModel Diagnostics => ServiceLocator.Current.GetInstance(); + public DiagnosticsViewModel Diagnostics => Ioc.Default.GetRequiredService(); + + internal void RegisterViewModels(ServiceCollection services) + { + services + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + } } } \ No newline at end of file diff --git a/Application/FileConverter/Views/BindableSelectedItemBehavior.cs b/Application/FileConverter/Views/BindableSelectedItemBehavior.cs index 8204034..b1ccc2f 100644 --- a/Application/FileConverter/Views/BindableSelectedItemBehavior.cs +++ b/Application/FileConverter/Views/BindableSelectedItemBehavior.cs @@ -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 { diff --git a/Application/FileConverter/Views/DiagnosticsWindow.xaml b/Application/FileConverter/Views/DiagnosticsWindow.xaml index c6aad8b..d0eb5eb 100644 --- a/Application/FileConverter/Views/DiagnosticsWindow.xaml +++ b/Application/FileConverter/Views/DiagnosticsWindow.xaml @@ -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}}"> - - - - - + + + + + diff --git a/Application/FileConverter/Views/HelpWindow.xaml b/Application/FileConverter/Views/HelpWindow.xaml index 033ba66..368ceaa 100644 --- a/Application/FileConverter/Views/HelpWindow.xaml +++ b/Application/FileConverter/Views/HelpWindow.xaml @@ -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}}"> - - - - - + + + + + diff --git a/Application/FileConverter/Views/MainWindow.xaml b/Application/FileConverter/Views/MainWindow.xaml index 3f8e6d7..51704f1 100644 --- a/Application/FileConverter/Views/MainWindow.xaml +++ b/Application/FileConverter/Views/MainWindow.xaml @@ -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}}"> - - - - - + + + + + diff --git a/Application/FileConverter/Views/SettingsWindow.xaml b/Application/FileConverter/Views/SettingsWindow.xaml index 475745d..58941e0 100644 --- a/Application/FileConverter/Views/SettingsWindow.xaml +++ b/Application/FileConverter/Views/SettingsWindow.xaml @@ -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}"> - - - - - + + + + + @@ -292,12 +291,12 @@ - + - + diff --git a/Application/FileConverter/Views/SettingsWindow.xaml.cs b/Application/FileConverter/Views/SettingsWindow.xaml.cs index 4b3725a..1385b26 100644 --- a/Application/FileConverter/Views/SettingsWindow.xaml.cs +++ b/Application/FileConverter/Views/SettingsWindow.xaml.cs @@ -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; - /// /// Interaction logic for Settings. /// @@ -35,14 +32,30 @@ namespace FileConverter.Views { this.InitializeComponent(); - Messenger.Default.Register(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; } } diff --git a/Application/FileConverter/Views/UpgradeWindow.xaml b/Application/FileConverter/Views/UpgradeWindow.xaml index f3ee4b4..8f49145 100644 --- a/Application/FileConverter/Views/UpgradeWindow.xaml +++ b/Application/FileConverter/Views/UpgradeWindow.xaml @@ -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}}"> - - - - - + + + + + diff --git a/Application/FileConverter/XmlHelpers.cs b/Application/FileConverter/XmlHelpers.cs index e06e79f..9233c71 100644 --- a/Application/FileConverter/XmlHelpers.cs +++ b/Application/FileConverter/XmlHelpers.cs @@ -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(string root, string path, out T deserializedObject) diff --git a/Application/FileConverter/packages.config b/Application/FileConverter/packages.config index cdb731c..dd2d9fb 100644 --- a/Application/FileConverter/packages.config +++ b/Application/FileConverter/packages.config @@ -1,13 +1,22 @@  - - + + + + + + - - + - - + + + + + + + + \ No newline at end of file diff --git a/Application/FileConverterExtension/FileConverterExtension.csproj b/Application/FileConverterExtension/FileConverterExtension.csproj index 5787777..0c11c5d 100644 --- a/Application/FileConverterExtension/FileConverterExtension.csproj +++ b/Application/FileConverterExtension/FileConverterExtension.csproj @@ -9,7 +9,7 @@ Properties FileConverterExtension FileConverterExtension - v4.6.2 + v4.8 512 @@ -50,8 +50,8 @@ app.manifest - - ..\..\packages\SharpShell.2.7.1\lib\net40-client\SharpShell.dll + + ..\..\packages\SharpShell.2.7.2\lib\net40-client\SharpShell.dll diff --git a/Application/FileConverterExtension/Properties/Resources.Designer.cs b/Application/FileConverterExtension/Properties/Resources.Designer.cs index ba1e6e8..bdf5b7c 100644 --- a/Application/FileConverterExtension/Properties/Resources.Designer.cs +++ b/Application/FileConverterExtension/Properties/Resources.Designer.cs @@ -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 { diff --git a/Application/FileConverterExtension/packages.config b/Application/FileConverterExtension/packages.config index ad2897b..ab6941b 100644 --- a/Application/FileConverterExtension/packages.config +++ b/Application/FileConverterExtension/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 27789c3..85ba02b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/FileConverter.sln b/FileConverter.sln index b1d3c53..c6f54d9 100644 --- a/FileConverter.sln +++ b/FileConverter.sln @@ -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 diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj index 92c688d..af073de 100644 --- a/Installer/Installer.wixproj +++ b/Installer/Installer.wixproj @@ -1,47 +1,18 @@ - - + + - Debug - x86 3.9 - f14673df-df38-44b4-ab1d-99a59182c24c - 2.0 FileConverter-setup - Package - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - - - bin\$(Platform)\$(Configuration)\ - obj\$(Configuration)\ - Debug - - - bin\$(Platform)\$(Configuration)\ - obj\$(Configuration)\ - - - Debug bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ + + Debug - - - - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - + + + @@ -61,18 +32,15 @@ INSTALLFOLDER - + + + + Languages + INSTALLFOLDER + var.FileConverter.TargetDir + true + + - - - "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" - - + \ No newline at end of file diff --git a/Installer/Product.wxs b/Installer/Product.wxs index 6cfa716..9998c1a 100644 --- a/Installer/Product.wxs +++ b/Installer/Product.wxs @@ -1,26 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -33,29 +14,27 @@ - - - + + + - Copying new files - Register shell extension to Windows Explorer - Unregister shell extension from Windows Explorer - Initialize conversion presets + + + + - - - - + + - (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") - NOT Installed - NOT Installed + + + - + @@ -67,107 +46,121 @@ - + - - - - - - - - + + + + + + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Middleware/ffmpeg/LICENSE b/Middleware/ffmpeg/LICENSE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/Middleware/ffmpeg/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. diff --git a/Middleware/ffmpeg/x64/ffmpeg.exe b/Middleware/ffmpeg/ffmpeg.exe similarity index 67% rename from Middleware/ffmpeg/x64/ffmpeg.exe rename to Middleware/ffmpeg/ffmpeg.exe index 6d95878..5626ea7 100644 Binary files a/Middleware/ffmpeg/x64/ffmpeg.exe and b/Middleware/ffmpeg/ffmpeg.exe differ diff --git a/Middleware/ffmpeg/x86/ffmpeg.exe b/Middleware/ffmpeg/x86/ffmpeg.exe deleted file mode 100644 index e78483d..0000000 Binary files a/Middleware/ffmpeg/x86/ffmpeg.exe and /dev/null differ diff --git a/Middleware/gs/x86/gsdll32.dll b/Middleware/gs/gsdll64.dll similarity index 55% rename from Middleware/gs/x86/gsdll32.dll rename to Middleware/gs/gsdll64.dll index 4618936..9086c09 100644 Binary files a/Middleware/gs/x86/gsdll32.dll and b/Middleware/gs/gsdll64.dll differ diff --git a/Middleware/gs/gswin64c.exe b/Middleware/gs/gswin64c.exe new file mode 100644 index 0000000..819d76d Binary files /dev/null and b/Middleware/gs/gswin64c.exe differ diff --git a/Middleware/gs/x86/gswin32c.exe b/Middleware/gs/x86/gswin32c.exe deleted file mode 100644 index 1939247..0000000 Binary files a/Middleware/gs/x86/gswin32c.exe and /dev/null differ diff --git a/README.md b/README.md index b41961f..1e3c290 100644 --- a/README.md +++ b/README.md @@ -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