Merge branch 'main' into development

ruittenb · Sep 19, 2024 · 29e4060 · 29e4060
2 parents 62a7821 + 7e0643c
commit 29e4060
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Spaceman.xcodeproj/project.pbxproj b/Spaceman.xcodeproj/project.pbxproj
@@ -449,7 +449,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.2;
+				CURRENT_PROJECT_VERSION = 1.6.3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -463,7 +463,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "1.6.2-alpha";
+				MARKETING_VERSION = "1.6.3-alpha";
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -482,7 +482,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.2;
+				CURRENT_PROJECT_VERSION = 1.6.3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -496,7 +496,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "1.6.2-alpha";
+				MARKETING_VERSION = "1.6.3-alpha";
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Spaceman/Utilities/Constants.swift b/Spaceman/Utilities/Constants.swift
@@ -11,7 +11,7 @@ enum Constants {
 
     enum AppInfo {
         static let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
-        static let repo = URL(string: "https://github.com/Jaysce/Spaceman")!
+        static let repo = URL(string: "https://github.com/ruittenb/Spaceman")!
         static let website = URL(string: "https://jaysce.dev/projects/spaceman")!
     }
 

diff --git a/Spaceman/View/PreferencesView.swift b/Spaceman/View/PreferencesView.swift
@@ -179,13 +179,13 @@ struct PreferencesView: View {
                 Text("With modifiers")
                 Spacer()
                 VStack(alignment: .leading) {
-                    Toggle("Shift", isOn: $withShift)
-                    Toggle("Control", isOn: $withControl)
+                    Toggle("Shift ⇧", isOn: $withShift)
+                    Toggle("Control ⌃", isOn: $withControl)
                 }
                 Spacer()
                 VStack(alignment: .leading) {
-                    Toggle("Option", isOn: $withOption)
-                    Toggle("Command", isOn: $withCommand)
+                    Toggle("Option ⌥", isOn: $withOption)
+                    Toggle("Command ⌘", isOn: $withCommand)
                 }
                 Spacer()
             }

diff --git a/Spaceman/View/StatusBar.swift b/Spaceman/View/StatusBar.swift
@@ -151,6 +151,7 @@ class StatusBar: NSObject, NSMenuDelegate {
         item.image = menuIcon
         if space.isCurrentSpace || shortcutKey == "" {
             item.isEnabled = false
+            // item.state = NSControl.StateValue.on // tick mark
             //if OSVersion().exceeds(14, 0) {
             //if #available(macOS 14.0, *)  {
             //    item.badge = NSMenuItemBadge(string: "Current")