Merge pull request #444 from XcodesOrg/matt/SettingsLinkSonoma

fix: settings link on Sonoma not working
XcodesOrg · Nov 22, 2023 · 5b18a90 · 5b18a90
2 parents 1bd5017 + b9dc7bf
commit 5b18a90
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,10 +8,10 @@ on:
 
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v4
     - name: Run tests
       env:
-        DEVELOPER_DIR: /Applications/Xcode_14.2.app
+        DEVELOPER_DIR: /Applications/Xcode_15.0.1.app
       run: xcodebuild test -scheme Xcodes
diff --git a/Xcodes/Frontend/XcodeList/MainToolbar.swift b/Xcodes/Frontend/XcodeList/MainToolbar.swift
@@ -86,16 +86,23 @@ struct MainToolbarModifier: ViewModifier {
             .keyboardShortcut(KeyboardShortcut("i", modifiers: [.command, .option]))
             .help("InfoDescription")
 
-            Button(action: {
-                if #available(macOS 13, *) {
-                    NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
-                } else {
-                    NSApp.sendAction(Selector(("showPreferencesWindow:")), to: nil, from: nil)
-                }   
-            }, label: {
-                Label("Preferences", systemImage: "gearshape")
-            })
-            .help("PreferencesDescription")
+            if #available(macOS 14, *) {
+                SettingsLink(label: {
+                    Label("Preferences", systemImage: "gearshape")
+                })
+                .help("PreferencesDescription")
+            } else {
+                Button(action: {
+                    if #available(macOS 13, *) {
+                        NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
+                    } else {
+                        NSApp.sendAction(Selector(("showPreferencesWindow:")), to: nil, from: nil)
+                    }
+                }, label: {
+                    Label("Preferences", systemImage: "gearshape")
+                })
+                .help("PreferencesDescription")
+            }
 
             TextField("Search", text: $searchText)
                 .textFieldStyle(RoundedBorderTextFieldStyle())