sveinbjornt · sveinbjornt · Nov 27, 2025 · May 22, 2025 · May 24, 2025 · May 24, 2025
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -1,3 +1,5 @@
+# GitHub Actions CI build
+
 name: build
 
 on:
@@ -18,7 +20,8 @@ jobs:
         uses: actions/checkout@v4
       - run: gem install xcpretty
       - name: Build app
-        run: make build_unsigned | xcpretty -c && exit ${PIPESTATUS[0]}
+        run: |
+          make build_unsigned | xcpretty -c && exit ${PIPESTATUS[0]}
       # Tests require GUI environment, disabled in CI
       #- name: Run tests
       #  run: make clt_tests
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,5 @@ dsa_priv.pem
 Tests/platypus
 Tests/*.app
 Tests/args.txt
+Platypus-*
+.claude
diff --git a/Application/ArgsController.h b/Application/ArgsController.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,8 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
+
 #import "NSResponderNotifyingTableView.h"
 
 @interface ArgsController : NSWindowController <NSTableViewDataSource, NSTableViewDelegate, NSTableViewFirstResponderDelegate, NSMenuItemValidation>

diff --git a/Application/ArgsController.m b/Application/ArgsController.m
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -141,7 +141,7 @@ - (void)constructCommandString {
     NSMutableAttributedString *cmdString = [[NSMutableAttributedString alloc] initWithString:[interpreterTextField stringValue] attributes:defaultAttrs];
 
     // Interpreter args
-    for (int i = 0; i < [interpreterArgs count]; i++)
+    for (NSInteger i = 0; i < [interpreterArgs count]; i++)
     {
         NSString *a = [NSString stringWithFormat:@" %@", interpreterArgs[i]];
         NSMutableDictionary *attrs = [defaultAttrs mutableCopy];
@@ -175,7 +175,7 @@ - (void)constructCommandString {
     [cmdString appendAttributedString:scriptString];
 
     // Script args
-    for (int i = 0; i < [scriptArgs count]; i++)
+    for (NSInteger i = 0; i < [scriptArgs count]; i++)
     {
         NSString *a = [NSString stringWithFormat:@"%@ ", scriptArgs[i]];
         NSMutableDictionary *attrs = [defaultAttrs mutableCopy];
@@ -196,7 +196,7 @@ - (void)constructCommandString {
     }
 
     // File args
-    if ([isDroppableCheckbox state] == NSOnState) {
+    if ([isDroppableCheckbox state] == NSControlStateValueOn) {
         NSAttributedString *attrStr = [[NSAttributedString alloc] initWithString:@" [files ...]" attributes:defaultAttrs];
         [cmdString appendAttributedString:attrStr];
     }

diff --git a/Application/BundledFilesController.h b/Application/BundledFilesController.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+ Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without modification,
@@ -31,7 +31,7 @@
 // This is a controller class around the Bundled Files list in the Platypus
 // window.  It is the data source and delegate of the tableview with the files.
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface BundledFilesController : NSObject <NSTableViewDataSource, NSTableViewDelegate, NSMenuDelegate, NSMenuItemValidation>
 

diff --git a/Application/BundledFilesController.m b/Application/BundledFilesController.m
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -133,15 +133,15 @@ - (void)updateButtonStatus {
 }
 
 - (void)updateFileSizeField {
-    //if there are no items
+    // If there are no items
     if ([files count] == 0) {
         _totalSizeOfFiles = 0;
         [bundleSizeTextField setStringValue:@""];
         [[NSNotificationCenter defaultCenter] postNotificationName:PLATYPUS_APP_SIZE_CHANGED_NOTIFICATION object:nil];
         return;
     }
 
-    //otherwise, loop through all files, calculate size in a separate queue
+    // Otherwise, loop through all files, calculate size in a separate queue
     [bundleSizeTextField setStringValue:@"Calculating size..."];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^(void){
@@ -300,8 +300,8 @@ - (void)copyFilenamesToPasteboard:(BOOL)basenameOnly {
         }
     }
 
-    [[NSPasteboard generalPasteboard] declareTypes:@[NSStringPboardType] owner:self];
-    [[NSPasteboard generalPasteboard] setString:copyStr forType:NSStringPboardType];
+    [[NSPasteboard generalPasteboard] declareTypes:@[NSPasteboardTypeString] owner:self];
+    [[NSPasteboard generalPasteboard] setString:copyStr forType:NSPasteboardTypeString];
 }
 
 - (IBAction)addFilesToList:(id)sender {
@@ -373,7 +373,7 @@ - (IBAction)removeSelectedFiles:(id)sender {
         }
     }
     if ([tableView numberOfRows]) {
-        NSUInteger rowToSelect = [selectedItems firstIndex] - 1;
+        NSInteger rowToSelect = [selectedItems firstIndex] - 1;
         [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:rowToSelect] byExtendingSelection:NO];
     }
 

diff --git a/Application/DropSettingsController.h b/Application/DropSettingsController.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,8 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
+
 #import "NSResponderNotifyingTableView.h"
 
 @class SuffixTypeListController, UniformTypeListController;

diff --git a/Application/DropSettingsController.m b/Application/DropSettingsController.m
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,

diff --git a/Application/EditorController.h b/Application/EditorController.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface EditorController : NSWindowController
 

diff --git a/Application/EditorController.m b/Application/EditorController.m
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,

diff --git a/Application/IconController.h b/Application/IconController.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,8 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
+
 #import "STDragImageView.h"
 
 @interface IconController : NSObject <STDragImageViewDragDelegate, NSMenuItemValidation>

diff --git a/Application/IconController.m b/Application/IconController.m
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -84,13 +84,13 @@ - (void)awakeFromNib {
 
 - (IBAction)copyIconPath:(id)sender {
 
-    [[NSPasteboard generalPasteboard] declareTypes:@[NSStringPboardType] owner:self];
-    [[NSPasteboard generalPasteboard] setString:[self icnsFilePath] forType:NSStringPboardType];
+    [[NSPasteboard generalPasteboard] declareTypes:@[NSPasteboardTypeString] owner:self];
+    [[NSPasteboard generalPasteboard] setString:[self icnsFilePath] forType:NSPasteboardTypeString];
 }
 
 - (IBAction)copyIcon:(id)sender {
-    [[NSPasteboard generalPasteboard] declareTypes:@[NSTIFFPboardType] owner:self];
-    [[NSPasteboard generalPasteboard] setData:[[iconImageView image] TIFFRepresentation] forType:NSTIFFPboardType];
+    [[NSPasteboard generalPasteboard] declareTypes:@[NSPasteboardTypeTIFF] owner:self];
+    [[NSPasteboard generalPasteboard] setData:[[iconImageView image] TIFFRepresentation] forType:NSPasteboardTypeTIFF];
 }
 
 - (IBAction)pasteIcon:(id)sender {

diff --git a/Application/InterpreterTextField.h b/Application/InterpreterTextField.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,

diff --git a/Application/InterpreterTextField.m b/Application/InterpreterTextField.m
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,

diff --git a/Application/PlatypusWindowController.h b/Application/PlatypusWindowController.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -28,14 +28,14 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @class PlatypusAppSpec;
-@interface PlatypusWindowController : NSWindowController <  NSApplicationDelegate,
-                                                            NSMenuDelegate,
-                                                            NSMenuItemValidation,
-                                                            NSWindowDelegate,
-                                                            NSOpenSavePanelDelegate >
+@interface PlatypusWindowController : NSWindowController <NSApplicationDelegate,
+                                                          NSMenuDelegate,
+                                                          NSMenuItemValidation,
+                                                          NSWindowDelegate,
+                                                          NSOpenSavePanelDelegate>
 
 - (BOOL)verifyFieldContents;
 - (PlatypusAppSpec *)appSpecFromControls;

diff --git a/Application/PlatypusWindowController.m b/Application/PlatypusWindowController.m
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -28,8 +28,8 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import "PlatypusWindowController.h"
 #import "Common.h"
+#import "PlatypusWindowController.h"
 #import "PlatypusAppSpec.h"
 #import "PlatypusScriptUtils.h"
 #import "IconController.h"
@@ -44,7 +44,7 @@
 #import "DropSettingsController.h"
 #import "SyntaxCheckerController.h"
 #import "BundledFilesController.h"
-#import "PrefsController.h"
+#import "SettingsController.h"
 #import "NSWorkspace+Additions.h"
 #import "Alerts.h"
 #import "NSColor+HexTools.h"
@@ -94,7 +94,7 @@ @interface PlatypusWindowController()
     IBOutlet ProfilesController *profilesController;
     IBOutlet TextSettingsController *textSettingsController;
     IBOutlet StatusItemSettingsController *statusItemSettingsController;
-    IBOutlet PrefsController *prefsController;
+    IBOutlet SettingsController *settingsController;
     IBOutlet BundledFilesController *bundledFilesController;
 
     VDKQueue *fileWatcherQueue;
@@ -114,7 +114,7 @@ - (instancetype)init {
 
 + (void)initialize {
     // Register the dictionary of defaults
-    [DEFAULTS registerDefaults:[PrefsController defaultsDictionary]];
+    [DEFAULTS registerDefaults:[SettingsController defaultsDictionary]];
 }
 
 - (void)awakeFromNib {
@@ -170,7 +170,7 @@ - (void)awakeFromNib {
     [self updateInterfaceTypeMenu:NSMakeSize(16, 16)];
 
     // Main window accepts dragged text and dragged files
-    [[self window] registerForDraggedTypes:@[NSFilenamesPboardType, NSStringPboardType]];
+    [[self window] registerForDraggedTypes:@[NSFilenamesPboardType, NSPasteboardTypeString]];
 
     // If we haven't already loaded a profile via openfile delegate method
     // we set all fields to their defaults. Any profile must contain a name
@@ -202,7 +202,7 @@ - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filenam
 }
 
 - (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)app {
-    return NO;
+    return YES;
 }
 
 #pragma mark - NSWindowDelegate
@@ -878,6 +878,8 @@ - (NSString *)estimatedAppSizeString {
     }
     estimatedAppSize += nibSize;
 
+    estimatedAppSize -= 50 * 1024; // Just because it's more accurate!
+
     // Bundled files altogether
     estimatedAppSize += [bundledFilesController totalSizeOfFiles];
 
@@ -954,9 +956,9 @@ - (BOOL)performDragOperation:(id <NSDraggingInfo> )sender {
         return YES;
     }
     // String
-    else if ([[pboard types] containsObject:NSStringPboardType]) {
+    else if ([[pboard types] containsObject:NSPasteboardTypeString]) {
         // Create a new script file with the dropped string, load it
-        NSString *draggedString = [pboard stringForType:NSStringPboardType];
+        NSString *draggedString = [pboard stringForType:NSPasteboardTypeString];
         NSString *newScriptPath = [self createNewScript:draggedString];
         if (newScriptPath) {
             [self loadScript:newScriptPath];
@@ -971,7 +973,7 @@ - (NSDragOperation)draggingEntered:(id <NSDraggingInfo> )sender {
 
     if ([[[sender draggingPasteboard] types] containsObject:NSFilenamesPboardType]) {
         return NSDragOperationLink;
-    } else if ([[[sender draggingPasteboard] types] containsObject:NSStringPboardType]) {
+    } else if ([[[sender draggingPasteboard] types] containsObject:NSPasteboardTypeString]) {
         return NSDragOperationCopy;
     }
 
@@ -980,7 +982,7 @@ - (NSDragOperation)draggingEntered:(id <NSDraggingInfo> )sender {
 
 // If we just created a file with a dragged string, we open it in default editor
 - (void)concludeDragOperation:(id <NSDraggingInfo> )sender {
-    if ([[[sender draggingPasteboard] types] containsObject:NSStringPboardType]) {
+    if ([[[sender draggingPasteboard] types] containsObject:NSPasteboardTypeString]) {
         [self editScript:self];
     }
 }

diff --git a/Application/ProfilesController.h b/Application/ProfilesController.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
+    Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface ProfilesController : NSObject <NSMenuItemValidation>