Merge branch 'dev'

Author: NickeManarin

Other/Translator/TranslatorWindow.xaml.cs

@@ -26,11 +26,10 @@ namespace Translator;
 
 public partial class TranslatorWindow : Window
 {
-    private static string TempPath => Path.Combine(".", "ScreenToGif", "Resources");
-
     private readonly List<ResourceDictionary> _resourceList = new();
     private IEnumerable<string> _cultures;
     private ObservableCollection<Translation> _translationList = new();
+    private string _tempPath;
     private string _resourceTemplate;
 
     public TranslatorWindow()
@@ -42,8 +41,7 @@ public TranslatorWindow()
 
     private async void Window_Loaded(object sender, RoutedEventArgs e)
     {
-        if (!Directory.Exists(TempPath))
-            Directory.CreateDirectory(TempPath);
+        PrepareTempPath();
 
         OpenButton.IsEnabled = false;
         RefreshButton.IsEnabled = false;
@@ -220,17 +218,18 @@ private async void Load_Executed(object sender, ExecutedRoutedEventArgs e)
             CheckFileExists = true,
             Title = "Open a Resource Dictionary",
             Filter = "Resource Dictionay (*.xaml)|*.xaml;",
-            InitialDirectory = Path.GetFullPath(TempPath)
+            InitialDirectory = Path.GetFullPath(_tempPath)
         };
 
         var result = ofd.ShowDialog();
 
-        if (!result.HasValue || !result.Value) return;
+        if (!result.HasValue || !result.Value)
+            return;
 
         //Will save the file to other folder.
-        var tempFile = Path.Combine(TempPath, "Temp", Path.GetFileName(ofd.FileName));
+        var tempFile = Path.Combine(_tempPath, "Temp", Path.GetFileName(ofd.FileName));
 
-        Directory.CreateDirectory(Path.Combine(TempPath, "Temp"));
+        Directory.CreateDirectory(Path.Combine(_tempPath, "Temp"));
 
         //Replaces the special chars.
         var text = await Task.Factory.StartNew(() => File.ReadAllText(ofd.FileName, Encoding.UTF8).Replace("&#", "&amp;#").Replace("<!--<!--", "<!--").Replace("-->-->", "-->"));
@@ -290,7 +289,8 @@ private async void Export_Executed(object sender, ExecutedRoutedEventArgs e)
 
         var result = sfd.ShowDialog();
 
-        if (!result.HasValue || !result.Value) return;
+        if (!result.HasValue || !result.Value)
+            return;
 
         BaseDataGrid.IsEnabled = false;
         StatusBand.Info("Exporting translation...");
@@ -321,6 +321,14 @@ private void Window_Closing(object sender, CancelEventArgs e)
 
     #region Methods
 
+    private void PrepareTempPath()
+    {
+        _tempPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ScreenToGif", "Resources");
+
+        if (!Directory.Exists(_tempPath))
+            Directory.CreateDirectory(_tempPath);
+    }
+
     private async Task DownloadSingleResourceAsync(string culture)
     {
         try
@@ -425,7 +433,7 @@ private async Task DownloadFileAsync2(Uri uri, string name)
     {
         try
         {
-            var file = Path.Combine(Dispatcher.Invoke<string>(() => TempPath), name);
+            var file = Path.Combine(Dispatcher.Invoke<string>(() => _tempPath), name);
 
             if (File.Exists(file))
                 File.Delete(file);
@@ -464,7 +472,7 @@ private async Task DownloadFileAsync(Uri uri, string name)
     {
         try
         {
-            var file = Path.Combine(Dispatcher.Invoke<string>(() => TempPath), name);
+            var file = Path.Combine(Dispatcher.Invoke<string>(() => _tempPath), name);
 
             if (File.Exists(file))
                 File.Delete(file);
@@ -503,7 +511,7 @@ private async Task LoadFilesAsync()
     {
         try
         {
-            var files = await Task.Factory.StartNew(() => Directory.EnumerateFiles(TempPath, "*.xaml"));
+            var files = await Task.Factory.StartNew(() => Directory.EnumerateFiles(_tempPath, "*.xaml"));
 
             foreach (var file in files)
             {

ScreenToGif.Model/Enums/EncoderTypes.cs

@@ -3,6 +3,7 @@ namespace ScreenToGif.Domain.Enums;
 public enum EncoderTypes
 {
     ScreenToGif, //Gif, Apng
+    KGySoft, // Gif
     System, //Gif, Video
     FFmpeg, //Gif, Webp, Apng, Video
     Gifski //Gif

ScreenToGif.Model/Enums/PanelType.cs

@@ -69,9 +69,9 @@ public enum PanelTypes
     RemoveDuplicates = 13,
 
     /// <summary>
-    /// Mouse Clicks Panel.
+    /// Mouse Events Panel.
     /// </summary>
-    MouseClicks = 14,
+    MouseEvents = 14,
 
     /// <summary>
     /// Smooth Loop Panel.

ScreenToGif.Model/Enums/TaskTypes.cs

@@ -3,7 +3,7 @@ namespace ScreenToGif.Domain.Enums;
 public enum TaskTypes
 {
     NotDeclared = 0,
-    MouseClicks = 1,
+    MouseEvents = 1,
     KeyStrokes = 2,
     Delay = 3,
     Progress = 4,

ScreenToGif.Model/Enums/VideoCodecPresets.cs

@@ -5,6 +5,7 @@ namespace ScreenToGif.Domain.Enums;
 [SuppressMessage("ReSharper", "InconsistentNaming")]
 public enum VideoCodecPresets
 {
+    Auto = -1,
     NotSelected,
     None,
 

ScreenToGif.Model/Enums/VideoCodecs.cs

@@ -40,5 +40,14 @@ public enum VideoCodecs
     Vp8,
 
     [Description("libvpx-vp9")]
-    Vp9
+    Vp9,
+
+    [Description("libaom-av1")]
+    LibAom,
+
+    [Description("libsvtav1")]
+    SvtAv1,
+
+    [Description("librav1e")]
+    Rav1E,
 }

ScreenToGif.Model/Enums/VideoPixelFormats.cs

@@ -24,6 +24,7 @@ public enum VideoPixelFormats
     Gbrp12Le,
     Gray,
     Gray10Le,
+    Gray12Le,
     Gray16Be,
     MonoB,
     Nv12,

ScreenToGif.Model/ScreenToGif.Domain.csproj

@@ -7,7 +7,7 @@
     <DebugType>embedded</DebugType>
     <UseWPF>True</UseWPF>
     <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
-    <Version>2.36.0</Version>
+    <Version>2.37.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

ScreenToGif.Native/ScreenToGif.Native.csproj

@@ -7,7 +7,7 @@
     <UseWindowsForms>True</UseWindowsForms>
     <DebugType>embedded</DebugType>
     <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
-    <Version>2.36.0</Version>
+    <Version>2.37.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

ScreenToGif.Test/ScreenToGif.Test.csproj

@@ -12,13 +12,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>