diff --git a/Application/FileConverter/Application.xaml.cs b/Application/FileConverter/Application.xaml.cs index d3e404b..35ffbcf 100644 --- a/Application/FileConverter/Application.xaml.cs +++ b/Application/FileConverter/Application.xaml.cs @@ -36,9 +36,9 @@ namespace FileConverter { private static readonly Version Version = new Version() { - Major = 1, - Minor = 2, - Patch = 3, + Major = 2, + Minor = 0, + Patch = 0, }; private bool needToRunConversionThread; diff --git a/Application/FileConverter/Properties/AssemblyInfo.cs b/Application/FileConverter/Properties/AssemblyInfo.cs index 0363215..d51fe70 100644 --- a/Application/FileConverter/Properties/AssemblyInfo.cs +++ b/Application/FileConverter/Properties/AssemblyInfo.cs @@ -1,6 +1,4 @@ using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; @@ -51,5 +49,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/Application/FileConverter/Resources/FileConverterUsage.gif b/Application/FileConverter/Resources/FileConverterUsage.gif index de4af49..626923a 100644 Binary files a/Application/FileConverter/Resources/FileConverterUsage.gif and b/Application/FileConverter/Resources/FileConverterUsage.gif differ diff --git a/Application/FileConverter/Views/HelpWindow.xaml b/Application/FileConverter/Views/HelpWindow.xaml index 368ceaa..1e17913 100644 --- a/Application/FileConverter/Views/HelpWindow.xaml +++ b/Application/FileConverter/Views/HelpWindow.xaml @@ -8,7 +8,7 @@ xmlns:gif="http://wpfanimatedgif.codeplex.com" 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" + Width="1000" Height="880" DataContext="{Binding Help, Source={StaticResource Locator}}"> diff --git a/Application/FileConverter/Views/MainWindow.xaml b/Application/FileConverter/Views/MainWindow.xaml index eac5e76..a841966 100644 --- a/Application/FileConverter/Views/MainWindow.xaml +++ b/Application/FileConverter/Views/MainWindow.xaml @@ -57,7 +57,7 @@ - + diff --git a/Application/FileConverterExtension/Properties/AssemblyInfo.cs b/Application/FileConverterExtension/Properties/AssemblyInfo.cs index 48a3d13..40ef7c7 100644 --- a/Application/FileConverterExtension/Properties/AssemblyInfo.cs +++ b/Application/FileConverterExtension/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/CHANGELOG.md b/CHANGELOG.md index d261ebb..fa9a031 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## Next version +## Version 2.0 - New: Possibility to create custom command line preset for types converted with FFMPEG (video and audio) (github issue #19 #18 #41 #61 #73 #128 #140 #153 #177 #182 #225 #255 #310 #314 #316 #325). - New: Possibility to create preset folders in File Converter context menu. @@ -39,7 +39,7 @@ - Fixes: Issue where File Converter version upgrade download was not working due to an issue with https encryption. - Fixes: Issue where output video was not working correclty on some video players like Quick time (github issue #34) (thanks to Diego López Bugna). - Fixes: Issue where icons and images were blurry on high dpi device. -- Fixes: Issue where file 'Error' in there name were generating false negative result (github issue #247). +- Fixes: Issue where file with 'Error' in there name were generating false negative result (github issue #247). - 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. @@ -50,6 +50,8 @@ - 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 - Fixes: Issue where the scale was not working for image conversions depending on the application current language. diff --git a/Installer/Product.wxs b/Installer/Product.wxs index c497309..42b50ae 100644 --- a/Installer/Product.wxs +++ b/Installer/Product.wxs @@ -25,8 +25,8 @@ - - + + diff --git a/README.md b/README.md index 28fa7c6..a582994 100644 --- a/README.md +++ b/README.md @@ -68,14 +68,14 @@ Thanks to **CrisBalGreece** for the Greek localization. File converter uses the following middlewares: -**ffmpeg** as file conversion software. +**ffmpeg** (v6.1.1) as file conversion software. Thanks to ffmpeg devs for this awesome open source file conversion tool. [Web site link](https://ffmpeg.org) -**ImageMagick** as image edition and conversion software. +**ImageMagick** (v13.5) as image edition and conversion software. Thanks to image magick devs for this awesome open source image edition software suite. [Web site link](http://imagemagick.net) And thanks to dlemstra for the C# wrapper of this software. [Github link](https://github.com/ImageMagick/ImageMagick) -**Ghostscript** as pdf edition software. +**Ghostscript** (10.02.1) as pdf edition software. Thanks to ghostscript devs. [Download link](https://www.ghostscript.com/download/gsdnld.html) **SharpShell** to easily create windows context menu extensions. diff --git a/Resources/FileConverterUsage-small.gif b/Resources/FileConverterUsage-small.gif deleted file mode 100644 index 50e45f0..0000000 Binary files a/Resources/FileConverterUsage-small.gif and /dev/null differ diff --git a/Resources/FileConverterUsage.gif b/Resources/FileConverterUsage.gif index de4af49..626923a 100644 Binary files a/Resources/FileConverterUsage.gif and b/Resources/FileConverterUsage.gif differ