XXXX - Fixed Alt + Arrow commands, now it triggers frame deletion again

NickeManarin · Jun 24, 2023 · 4604924 · 4604924
1 parent 0f5e655
commit 4604924
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/ScreenToGif.Model/ScreenToGif.Domain.csproj b/ScreenToGif.Model/ScreenToGif.Domain.csproj
@@ -7,7 +7,7 @@
     <DebugType>embedded</DebugType>
     <UseWPF>True</UseWPF>
     <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
-    <Version>2.38.0</Version>
+    <Version>2.38.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/ScreenToGif.Native/ScreenToGif.Native.csproj b/ScreenToGif.Native/ScreenToGif.Native.csproj
@@ -7,7 +7,7 @@
     <UseWindowsForms>True</UseWindowsForms>
     <DebugType>embedded</DebugType>
     <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
-    <Version>2.38.0</Version>
+    <Version>2.38.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/ScreenToGif.Util/ScreenToGif.Util.csproj b/ScreenToGif.Util/ScreenToGif.Util.csproj
@@ -6,7 +6,7 @@
     <UseWPF>True</UseWPF>
     <DebugType>embedded</DebugType>
     <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
-    <Version>2.38.0</Version>
+    <Version>2.38.1</Version>
     <!--<UseWindowsForms>True</UseWindowsForms>-->
   </PropertyGroup>
 

diff --git a/ScreenToGif.ViewModel/ScreenToGif.ViewModel.csproj b/ScreenToGif.ViewModel/ScreenToGif.ViewModel.csproj
@@ -6,7 +6,7 @@
     <Nullable>disable</Nullable>
     <DebugType>embedded</DebugType>
     <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
-    <Version>2.38.0</Version>
+    <Version>2.38.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScreenToGif/ScreenToGif.csproj b/ScreenToGif/ScreenToGif.csproj
@@ -141,7 +141,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <Company>Nicke Manarin</Company>
     <Authors>Nicke Manarin</Authors>
-    <Version>2.38.0</Version>
+    <Version>2.38.1</Version>
     <Copyright>Copyright© Nicke Manarin 2023</Copyright>
     <PackageProjectUrl>https://www.screentogif.com</PackageProjectUrl>
     <PackageReadmeFile>Readme.md</PackageReadmeFile>

diff --git a/ScreenToGif/Windows/Editor.xaml.cs b/ScreenToGif/Windows/Editor.xaml.cs
@@ -3034,8 +3034,12 @@ private void FrameListView_PreviewKeyDown(object sender, KeyEventArgs e)
 
                 case Key.Right:
                 {
-                    NextFrame_Executed(sender, null);
-                    e.Handled = true;
+                    if ((Keyboard.Modifiers & ModifierKeys.Alt) == 0 || (Keyboard.Modifiers & (ModifierKeys.Alt | ModifierKeys.Control)) == (ModifierKeys.Alt | ModifierKeys.Control))
+                    {
+                        NextFrame_Executed(sender, null);
+                        e.Handled = true;
+                    }
+
                     break;
                 }
 
@@ -3048,8 +3052,12 @@ private void FrameListView_PreviewKeyDown(object sender, KeyEventArgs e)
 
                 case Key.Left:
                 {
-                    PreviousFrame_Executed(sender, null);
-                    e.Handled = true;
+                    if ((Keyboard.Modifiers & ModifierKeys.Alt) == 0 || (Keyboard.Modifiers & (ModifierKeys.Alt | ModifierKeys.Control)) == (ModifierKeys.Alt | ModifierKeys.Control))
+                    {
+                        PreviousFrame_Executed(sender, null);
+                        e.Handled = true;
+                    }
+
                     break;
                 }
 

diff --git a/ScreenToGif/Windows/Options.xaml.cs b/ScreenToGif/Windows/Options.xaml.cs
@@ -1306,8 +1306,12 @@ private async void FfmpegImageCard_Click(object sender, RoutedEventArgs e)
             return;
         }
 
+        var url = Environment.Is64BitProcess ? "https://www.screentogif.com/downloads/FFmpeg-4.4.1-x64.zip" :
+            "https://www.screentogif.com/downloads/FFmpeg-4.3.1-x86.zip";
+
 #if FULL_MULTI_MSIX_STORE
             StatusBand.Warning(LocalizationHelper.Get("S.Options.Extras.DownloadRestriction"));
+            ProcessHelper.StartWithShell(url);            
             return;
 #else
         #region Save as
@@ -1364,9 +1368,6 @@ private async void FfmpegImageCard_Click(object sender, RoutedEventArgs e)
             //Save to a temp folder.
             var temp = Path.Combine(Path.GetTempPath(), Path.GetTempFileName());
 
-            var url = Environment.Is64BitProcess ? "https://www.screentogif.com/downloads/FFmpeg-4.4.1-x64.zip" :
-                    "https://www.screentogif.com/downloads/FFmpeg-4.3.1-x86.zip";
-
             using (var client = new WebClient { Proxy = WebHelper.GetProxy() })
                 await client.DownloadFileTaskAsync(new Uri(url), temp);