Merge pull request #17 from MainasuK/fix/issue-16

Fix shortcut conflict issue
MainasuK · May 31, 2022 · 2a56215 · 2a56215
2 parents 7d122a1 + 7126ce3
commit 2a56215
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 10e6f5005867dbb3964c6d40690aff5abd64540b
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.11.3
diff --git a/Song Rating.xcodeproj/project.pbxproj b/Song Rating.xcodeproj/project.pbxproj
@@ -778,15 +778,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = A8K92XFF77;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Song Rating/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.4.2;
+				MARKETING_VERSION = 1.4.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mainasuk.Song-Rating";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -806,15 +806,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = A8K92XFF77;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Song Rating/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.4.2;
+				MARKETING_VERSION = 1.4.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mainasuk.Song-Rating";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Song Rating/AppDelegate.swift b/Song Rating/AppDelegate.swift
@@ -82,12 +82,12 @@ extension AppDelegate {
             let ratingDownShortcut = MASShortcut(keyCode: kVK_ANSI_Comma, modifierFlags: .option)
             let ratingUpShortcut = MASShortcut(keyCode: kVK_ANSI_Period, modifierFlags: .option)
             let showOrClosePopoverShortcut = MASShortcut(keyCode: kVK_ANSI_Slash, modifierFlags: .option)
-            let songRating5Shortcut = MASShortcut(keyCode: kVK_ANSI_5, modifierFlags: .option)
-            let songRating4Shortcut = MASShortcut(keyCode: kVK_ANSI_4, modifierFlags: .option)
-            let songRating3Shortcut = MASShortcut(keyCode: kVK_ANSI_3, modifierFlags: .option)
-            let songRating2Shortcut = MASShortcut(keyCode: kVK_ANSI_2, modifierFlags: .option)
-            let songRating1Shortcut = MASShortcut(keyCode: kVK_ANSI_1, modifierFlags: .option)
-            let songRating0Shortcut = MASShortcut(keyCode: kVK_ANSI_Grave, modifierFlags: .option)
+            let songRating5Shortcut = MASShortcut(keyCode: kVK_ANSI_5, modifierFlags: .control)
+            let songRating4Shortcut = MASShortcut(keyCode: kVK_ANSI_4, modifierFlags: .control)
+            let songRating3Shortcut = MASShortcut(keyCode: kVK_ANSI_3, modifierFlags: .control)
+            let songRating2Shortcut = MASShortcut(keyCode: kVK_ANSI_2, modifierFlags: .control)
+            let songRating1Shortcut = MASShortcut(keyCode: kVK_ANSI_1, modifierFlags: .control)
+            let songRating0Shortcut = MASShortcut(keyCode: kVK_ANSI_Grave, modifierFlags: .control)
 
             let ratingDownShortcutData = try NSKeyedArchiver.archivedData(withRootObject: ratingDownShortcut as Any, requiringSecureCoding: false)
             let ratingUpShortcutData = try NSKeyedArchiver.archivedData(withRootObject: ratingUpShortcut as Any, requiringSecureCoding: false)