Merge pull request #22 from enginkirmaci/develop

5.0.6
enginkirmaci · Jan 11, 2024 · 756289b · 756289b
2 parents 2fae996 + 0cdeeaf
commit 756289b
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 11 deletions.
diff --git a/SnapIt.Packaging/Package.appxmanifest b/SnapIt.Packaging/Package.appxmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" IgnorableNamespaces="uap rescap desktop">
   <!-- xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"-->
-  <Identity Name="30071EnginKrmac.SnapIt" Publisher="CN=5CFA03AE-FF07-4595-B025-C45A2265838F" Version="5.0.5.0" />
+  <Identity Name="30071EnginKrmac.SnapIt" Publisher="CN=5CFA03AE-FF07-4595-B025-C45A2265838F" Version="5.0.6.0" />
   <Properties>
     <DisplayName>SnapIt</DisplayName>
     <PublisherDisplayName>Engin Kırmacı</PublisherDisplayName>

diff --git a/SnapIt.Services/HotkeyService.cs b/SnapIt.Services/HotkeyService.cs
@@ -67,20 +67,32 @@ public async Task InitializeAsync()
 
     public void RegisterStartStopHotkey()
     {
-        hotKeyManager.Register(StartStopHotKey);
+        try
+        {
+            hotKeyManager.Register(StartStopHotKey);
+        }
+        catch
+        {
+        }
 
         hotKeyManager.KeyPressed -= KeyPressed;
         hotKeyManager.KeyPressed += KeyPressed;
     }
 
     public void Dispose()
     {
-        hotKeyManager.Unregister(CycleLayoutsHotKey);
-        hotKeyManager.Unregister(StartStopHotKey);
-        hotKeyManager.Unregister(MoveLeftHotKey);
-        hotKeyManager.Unregister(MoveRightHotKey);
-        hotKeyManager.Unregister(MoveUpHotKey);
-        hotKeyManager.Unregister(MoveDownHotKey);
+        try
+        {
+            hotKeyManager.Unregister(CycleLayoutsHotKey);
+            hotKeyManager.Unregister(StartStopHotKey);
+            hotKeyManager.Unregister(MoveLeftHotKey);
+            hotKeyManager.Unregister(MoveRightHotKey);
+            hotKeyManager.Unregister(MoveUpHotKey);
+            hotKeyManager.Unregister(MoveDownHotKey);
+        }
+        catch
+        {
+        }
 
         hotKeyManager.KeyPressed -= KeyPressed;
 

diff --git a/SnapIt/SnapIt.csproj b/SnapIt/SnapIt.csproj
@@ -7,7 +7,7 @@
     <ApplicationIcon>Assets\app.ico</ApplicationIcon>
     <Product>SnapIt</Product>
     <Description>SnapIt is a window manager for Windows. Organizes your windows to improve your productivity when working with wide and multiple screens.</Description>
-    <Version>5.0.5.0</Version>
+    <Version>5.0.6.0</Version>
     <Copyright>Copyright ©  2019</Copyright>
     <Company>Engin KIRMACI</Company>
     <FileVersion>

diff --git a/SnapIt/ViewModels/Dialogs/ExcludeApplicationDialogViewModel.cs b/SnapIt/ViewModels/Dialogs/ExcludeApplicationDialogViewModel.cs
@@ -1,5 +1,4 @@
 using System.Windows;
-using Prism.Mvvm;
 using SnapIt.Common.Entities;
 using SnapIt.Common.Mvvm;
 using SnapIt.Services.Contracts;
@@ -26,7 +25,7 @@ public ExcludeApplicationDialogViewModel(
 
     public override async Task InitializeAsync(RoutedEventArgs args)
     {
-        selectedExcludedApplication = new();
+        SelectedExcludedApplication ??= new();
 
         MatchRules = [
             MatchRule.Contains,

diff --git a/SnapIt/ViewModels/Pages/WhatsNewPageViewModel.cs b/SnapIt/ViewModels/Pages/WhatsNewPageViewModel.cs
@@ -8,6 +8,25 @@ public class WhatsNewPageViewModel : ViewModelBase
 {
     private readonly List<ChangeLogItem> changeLogs =
     [
+        new ChangeLogItem()
+        {
+            Header = "v5.0.6.0",
+            Lines =
+                [
+                    "Exclude app dialog fixes.",
+                    "Hotkey fix"
+                ]
+        },
+        new ChangeLogItem()
+        {
+            Header = "v5.0.5.0",
+            Lines =
+                [
+                    "Some more performance improvements.",
+                    "Color animations can be disabled on Settings page.",
+                    "Replaced old hook with SharpHook for global mouse hooking."
+                ]
+        },
         new ChangeLogItem()
         {
             Header = "v5.0.0.0",