Merge pull request #190 from theJayTea/macOS-v4_4

macOS v4.1

Author: theJayTea

macOS/Latest_Version_for_Update_Check.txt

@@ -1 +1 @@
-4.0
+4.1

macOS/README.md

@@ -6,22 +6,9 @@ Core functionality works well, and it is still an ongoing work in progress.
 
 ---
 
-## Working Features
-- All of the tools, including the new response windows and the manual chat option.
-- Input Window even when no text is selected
-- Gemini, OpenAI and Local LLM Support.
-- The Gradient Theme (Dark Mode and Light Mode are supported).
-- Initial Setup, Settings, and About pages.
-
----
-
-## Not Yet Available
-- All of the original port's features are now available; however, more optimizations and improvements are coming soon.
-
----
-
 ## System Requirements
-Due to the accessibility features the app uses (e.g., automatically selecting the window containing the text and pasting the updated version), **the minimum macOS version required is 14.0**.
+Due to the accessibility features the app uses (e.g., automatically selecting the window containing the text and pasting the updated version), **the minimum macOS version required is 14.0**. You also have to allow this accessibility access in System Settings. 
+> System Settings → Privacy & Security → Accessibility → Press the plus (+) button → Add *writing-tools* and enable access.
 
 ---
 
@@ -72,14 +59,10 @@ This guide will help you properly set up the Writing Tools macOS project in Xcod
 
 ## Credits
 
-The macOS port is being developed by **Aryamirsepasi**.
-
-GitHub: [https://github.com/Aryamirsepasi](https://github.com/Aryamirsepasi)
-
-The amazing picture processing functionality was created by **Joaov41**
-GitHub: [https://github.com/Joaov41](https://github.com/Joaov41)
+The macOS port is being developed by **Aryamirsepasi**. [GitHub](https://github.com/Aryamirsepasi)
 
-Special Thanks to @sindresorhus for developing an amazing and stable keyboard shortcuts package for Swift. 
+The amazing gemini picture processing functionality was created by **Joaov41**. [GitHub](https://github.com/Joaov41)
 
-GitHub: [https://github.com/sindresorhus/KeyboardShortcuts](https://github.com/sindresorhus/KeyboardShortcuts)
+Special Thanks to @sindresorhus for developing a great and stable keyboard shortcuts package for Swift. [GitHub](https://github.com/sindresorhus/KeyboardShortcuts)
 
+Huge shoutout to MLX Swift Team, creating local LLM compatibility on Apple silicon Macs. [GitHub](https://github.com/ml-explore/mlx-swift-examples)

macOS/writing-tools.xcodeproj/project.pbxproj

@@ -133,7 +133,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1610;
-				LastUpgradeCheck = 1620;
+				LastUpgradeCheck = 1630;
 				TargetAttributes = {
 					2ABCBC1D2CDEB606001E4B5E = {
 						CreatedOnToolsVersion = 16.1;
@@ -195,6 +195,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -226,6 +227,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = MK2V998W66;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -260,6 +262,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -291,6 +294,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = MK2V998W66;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -318,14 +322,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "writing-tools/writing_tools.entitlements";
-				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "Developer ID Application";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 13;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"writing-tools/Preview Content\"";
-				DEVELOPMENT_TEAM = MK2V998W66;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = MK2V998W66;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -338,7 +343,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 4.0;
+				MARKETING_VERSION = 4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.aryamirsepasi.writing-tools";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -353,14 +358,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "writing-tools/writing_tools.entitlements";
-				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "Developer ID Application";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 13;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"writing-tools/Preview Content\"";
-				DEVELOPMENT_TEAM = MK2V998W66;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = MK2V998W66;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -373,7 +379,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 4.0;
+				MARKETING_VERSION = 4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.aryamirsepasi.writing-tools";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

macOS/writing-tools.xcodeproj/xcshareddata/xcschemes/swift-writing-tools.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1620"
+   LastUpgradeVersion = "1630"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

macOS/writing-tools/App/AppDelegate.swift

@@ -232,8 +232,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         menu.addItem(NSMenuItem(title: "Settings", action: #selector(showSettings), keyEquivalent: ","))
         menu.addItem(NSMenuItem(title: "About", action: #selector(showAbout), keyEquivalent: "i"))
         // New Pause/Resume item:
-            let hotkeyTitle = AppSettings.shared.hotkeysPaused ? "Resume" : "Pause"
-            menu.addItem(NSMenuItem(title: hotkeyTitle, action: #selector(toggleHotkeys), keyEquivalent: "p"))
+        let hotkeyTitle = AppSettings.shared.hotkeysPaused ? "Resume" : "Pause"
+        menu.addItem(NSMenuItem(title: hotkeyTitle, action: #selector(toggleHotkeys), keyEquivalent: "p"))
         menu.addItem(NSMenuItem(title: "Reset App", action: #selector(resetApp), keyEquivalent: "r"))
         menu.addItem(NSMenuItem.separator())
         menu.addItem(NSMenuItem(title: "Quit", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q"))
@@ -363,111 +363,111 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     }
 
     @MainActor private func showPopup() {
-            appState.activeProvider.cancel()
+        appState.activeProvider.cancel()
+        
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
 
-            DispatchQueue.main.async { [weak self] in
+            if let currentFrontmostApp = NSWorkspace.shared.frontmostApplication {
+                self.appState.previousApplication = currentFrontmostApp
+            }
+            
+            self.closePopupWindow()
+            
+            let generalPasteboard = NSPasteboard.general
+            let oldContents = generalPasteboard.string(forType: .string)
+            
+            // Clear and perform copy command to get current selection
+            generalPasteboard.clearContents()
+            let source = CGEventSource(stateID: .hidSystemState)
+            let keyDown = CGEvent(keyboardEventSource: source, virtualKey: 0x08, keyDown: true)
+            let keyUp = CGEvent(keyboardEventSource: source, virtualKey: 0x08, keyDown: false)
+            keyDown?.flags = .maskCommand
+            keyUp?.flags = .maskCommand
+            keyDown?.post(tap: .cghidEventTap)
+            keyUp?.post(tap: .cghidEventTap)
+            
+            // Wait for the copy operation to complete, then process the pasteboard
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
                 guard let self = self else { return }
 
-                if let currentFrontmostApp = NSWorkspace.shared.frontmostApplication {
-                    self.appState.previousApplication = currentFrontmostApp
-                }
-                
-                self.closePopupWindow()
+                var foundImages: [Data] = []
+                var selectedText = ""
 
-                let generalPasteboard = NSPasteboard.general
-                let oldContents = generalPasteboard.string(forType: .string)
-                
-                // Clear and perform copy command to get current selection
-                generalPasteboard.clearContents()
-                let source = CGEventSource(stateID: .hidSystemState)
-                let keyDown = CGEvent(keyboardEventSource: source, virtualKey: 0x08, keyDown: true)
-                let keyUp = CGEvent(keyboardEventSource: source, virtualKey: 0x08, keyDown: false)
-                keyDown?.flags = .maskCommand
-                keyUp?.flags = .maskCommand
-                keyDown?.post(tap: .cghidEventTap)
-                keyUp?.post(tap: .cghidEventTap)
-                
-                // Wait for the copy operation to complete, then process the pasteboard
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
-                    guard let self = self else { return }
-                    
-                    var foundImages: [Data] = []
-                    var selectedText = ""
-                    
-                    // First check for file URLs (for Finder selections)
-                    let classes = [NSURL.self]
-                    let options: [NSPasteboard.ReadingOptionKey: Any] = [
-                        .urlReadingFileURLsOnly: true,
-                        .urlReadingContentsConformToTypes: [
-                            "public.image",
-                            "public.png",
-                            "public.jpeg",
-                            "public.tiff",
-                            "com.compuserve.gif"
-                        ]
+                // First check for file URLs (for Finder selections)
+                let classes = [NSURL.self]
+                let options: [NSPasteboard.ReadingOptionKey: Any] = [
+                    .urlReadingFileURLsOnly: true,
+                    .urlReadingContentsConformToTypes: [
+                        "public.image",
+                        "public.png",
+                        "public.jpeg",
+                        "public.tiff",
+                        "com.compuserve.gif"
                     ]
-                    
-                    if let urls = generalPasteboard.readObjects(forClasses: classes, options: options) as? [URL] {
-                        for url in urls {
-                            if let imageData = try? Data(contentsOf: url) {
-                                if NSImage(data: imageData) != nil {
-                                    foundImages.append(imageData)
-                                    NSLog("Loaded image data from file: \(url.lastPathComponent)")
-                                }
+                ]
+                
+                if let urls = generalPasteboard.readObjects(forClasses: classes, options: options) as? [URL] {
+                    for url in urls {
+                        if let imageData = try? Data(contentsOf: url) {
+                            if NSImage(data: imageData) != nil {
+                                foundImages.append(imageData)
+                                NSLog("Loaded image data from file: \(url.lastPathComponent)")
                             }
                         }
                     }
+                }
+                
+                // If no file URLs found, check for direct image data
+                if foundImages.isEmpty {
+                    let supportedImageTypes = [
+                        NSPasteboard.PasteboardType("public.png"),
+                        NSPasteboard.PasteboardType("public.jpeg"),
+                        NSPasteboard.PasteboardType("public.tiff"),
+                        NSPasteboard.PasteboardType("com.compuserve.gif"),
+                        NSPasteboard.PasteboardType("public.image")
+                    ]
 
-                    // If no file URLs found, check for direct image data
-                    if foundImages.isEmpty {
-                        let supportedImageTypes = [
-                            NSPasteboard.PasteboardType("public.png"),
-                            NSPasteboard.PasteboardType("public.jpeg"),
-                            NSPasteboard.PasteboardType("public.tiff"),
-                            NSPasteboard.PasteboardType("com.compuserve.gif"),
-                            NSPasteboard.PasteboardType("public.image")
-                        ]
-                        
-                        for type in supportedImageTypes {
-                            if let data = generalPasteboard.data(forType: type) {
-                                foundImages.append(data)
-                                NSLog("Found direct image data of type: \(type)")
-                                break
-                            }
+                    for type in supportedImageTypes {
+                        if let data = generalPasteboard.data(forType: type) {
+                            foundImages.append(data)
+                            NSLog("Found direct image data of type: \(type)")
+                            break
                         }
                     }
-                    
-                    // Get any text content
-                    selectedText = generalPasteboard.string(forType: .string) ?? ""
-                    
-                    // Restore original pasteboard contents
-                    generalPasteboard.clearContents()
-                    if let oldContents = oldContents {
-                        generalPasteboard.setString(oldContents, forType: .string)
-                    }
-                    
-                    // Update app state and show popup
-                    self.appState.selectedImages = foundImages
-                    self.appState.selectedText = selectedText
-                    
-                    let window = PopupWindow(appState: self.appState)
-                    window.delegate = self
-                    self.popupWindow = window
-                    
-                    // Set window size based on content
-                    if !selectedText.isEmpty || !foundImages.isEmpty {
-                        window.setContentSize(NSSize(width: 400, height: 400))
-                    } else {
-                        window.setContentSize(NSSize(width: 400, height: 100))
-                    }
-                    
-                    window.positionNearMouse()
-                    NSApp.activate(ignoringOtherApps: true)
-                    window.makeKeyAndOrderFront(nil)
-                    window.orderFrontRegardless()
                 }
+                
+                // Get any text content
+                selectedText = generalPasteboard.string(forType: .string) ?? ""
+                
+                // Restore original pasteboard contents
+                generalPasteboard.clearContents()
+                if let oldContents = oldContents {
+                    generalPasteboard.setString(oldContents, forType: .string)
+                }
+                
+                // Update app state and show popup
+                self.appState.selectedImages = foundImages
+                self.appState.selectedText = selectedText
+                
+                let window = PopupWindow(appState: self.appState)
+                window.delegate = self
+                self.popupWindow = window
+                
+                // Set window size based on content
+                if !selectedText.isEmpty || !foundImages.isEmpty {
+                    window.setContentSize(NSSize(width: 400, height: 400))
+                } else {
+                    window.setContentSize(NSSize(width: 400, height: 100))
+                }
+                
+                window.positionNearMouse()
+                NSApp.activate(ignoringOtherApps: true)
+                window.makeKeyAndOrderFront(nil)
+                window.orderFrontRegardless()
             }
         }
+    }
 
     // Closes and cleans up the popup window
     private func closePopupWindow() {
@@ -512,7 +512,7 @@ extension AppDelegate {
 
         // Register services provider
         NSApp.servicesProvider = self
-
+        
         // Register the service
         NSUpdateDynamicServices()
     }