Merge pull request #6 from notahat/modernise-take-two

Modernise for macOS Catalina, take two

Author: notahat

.gitignore

@@ -0,0 +1 @@
+xcuserdata

Controller Classes/EndpointTableDataSource.h

@@ -1,8 +1,8 @@
 #import <Cocoa/Cocoa.h>
-#import <PYMIDI/PYMIDI.h>
+#import "PYMIDI/PYMIDI.h"
 
 
-@interface EndpointTableDataSource : NSObject {
+@interface EndpointTableDataSource : NSObject<NSTableViewDataSource, NSTableViewDelegate, NSTabViewDelegate> {
     Class			endpointClass;
     NSMutableArray*	endpointArray;
     NSUndoManager*  undoManager;
@@ -13,17 +13,17 @@
 
 - (void)setEndpointArray:(NSMutableArray*)newEndpointArray;
 
-- (int)numberOfRowsInTableView:(NSTableView*)tableView;
-- (id)tableView:(NSTableView*)tableView objectValueForTableColumn:(NSTableColumn*)column row:(int)rowIndex;
+- (NSUInteger)numberOfRowsInTableView:(NSTableView*)tableView;
+- (id)tableView:(NSTableView*)tableView objectValueForTableColumn:(NSTableColumn*)column row:(NSUInteger)rowIndex;
 - (BOOL)control:(NSControl*)control isValidObject:(id)value;
 - (void)tableView:(NSTableView*)tableView setObjectValue:(id)value forTableColumn:(NSTableColumn*)column row:(int)rowIndex;
 - (void)deleteSelection:(NSTableView*)tableView;
 
 - (BOOL)tabView:(NSTabView*)tabView shouldSelectTabViewItem:(NSTabViewItem*)tabViewItem;
 
 - (void)tableView:(NSTableView*)tableView newEndpointWithName:(NSString*)name;
-- (void)tableView:(NSTableView*)tableView addEndpoint:(PYMIDIVirtualEndpoint*)endpoint atIndex:(int)index;
-- (void)tableView:(NSTableView*)tableView removeEndpointAtIndex:(int)index;
-- (void)tableView:(NSTableView*)tableView setName:(NSString*)name forEndpointAtIndex:(int)index;
+- (void)tableView:(NSTableView*)tableView addEndpoint:(PYMIDIVirtualEndpoint*)endpoint atIndex:(NSUInteger)index;
+- (void)tableView:(NSTableView*)tableView removeEndpointAtIndex:(NSUInteger)index;
+- (void)tableView:(NSTableView*)tableView setName:(NSString*)name forEndpointAtIndex:(NSUInteger)index;
 
 @end

Controller Classes/EndpointTableDataSource.m

@@ -1,5 +1,5 @@
 #import "EndpointTableDataSource.h"
-#import <PYMIDI/PYMIDI.h>
+#import "PYMIDI/PYMIDI.h"
 
 
 @implementation EndpointTableDataSource
@@ -36,13 +36,13 @@ - (void)setEndpointArray:(NSMutableArray*)newEndpointArray
 }
 
 
-- (int)numberOfRowsInTableView:(NSTableView*)tableView
+- (NSUInteger)numberOfRowsInTableView:(NSTableView*)tableView
 {
     return [endpointArray count];
 }
 
 
-- (id)tableView:(NSTableView*)tableView objectValueForTableColumn:(NSTableColumn*)column row:(int)rowIndex
+- (id)tableView:(NSTableView*)tableView objectValueForTableColumn:(NSTableColumn*)column row:(NSUInteger)rowIndex
 {
     PYMIDIVirtualEndpoint* endpoint = [endpointArray objectAtIndex:rowIndex];
 
@@ -54,11 +54,13 @@ - (id)tableView:(NSTableView*)tableView objectValueForTableColumn:(NSTableColumn
 - (BOOL)control:(NSControl*)control isValidObject:(id)value
 {
     if (PYMIDIIsEndpointNameTaken (value)) {
-        NSRunAlertPanel (
-            [NSString stringWithFormat:@"The name \"%@\" is already taken.", value],
-            @"Please choose a different name.",
-            nil, nil, nil
-        );
+        NSAlert *alert = [[NSAlert alloc] init];
+        [alert addButtonWithTitle:@"OK"];
+        [alert setMessageText: [NSString stringWithFormat:@"The name \"%@\" is already taken.", value]];
+        [alert setInformativeText:@"Please choose a different name."];
+        [alert setAlertStyle:NSAlertStyleWarning];
+        [alert runModal];
+        [alert release];
         return NO;
     }
     else
@@ -72,11 +74,13 @@ - (void)tableView:(NSTableView*)tableView setObjectValue:(id)value forTableColum
 
     if (![value isEqualToString:@""] && ![value isEqualToString:[endpoint name]]) {
         if (PYMIDIIsEndpointNameTaken (value)) {
-            NSRunAlertPanel (
-                [NSString stringWithFormat:@"The name \"%@\" is already taken.", value],
-                @"Please choose a different name.",
-                nil, nil, nil
-            );
+            NSAlert *alert = [[NSAlert alloc] init];
+            [alert addButtonWithTitle:@"OK"];
+            [alert setMessageText: [NSString stringWithFormat:@"The name \"%@\" is already taken.", value]];
+            [alert setInformativeText:@"Please choose a different name."];
+            [alert setAlertStyle:NSAlertStyleWarning];
+            [alert runModal];
+            [alert release];
         }
         else {
             [self tableView:tableView setName:(NSString*)value forEndpointAtIndex:rowIndex];
@@ -90,11 +94,13 @@ - (void)deleteSelection:(NSTableView*)tableView
     PYMIDIVirtualEndpoint* endpoint = [endpointArray objectAtIndex:[tableView selectedRow]];
 
     if ([endpoint isInUse]) {
-        NSRunAlertPanel (
-            @"The selection is in use by one or more patches and cannot be deleted.",
-            @"",
-            nil, nil, nil
-        );
+        NSAlert *alert = [[NSAlert alloc] init];
+        [alert addButtonWithTitle:@"OK"];
+        [alert setMessageText:@"The selection is in use by one or more patches and cannot be deleted."];
+        [alert setInformativeText:@""];
+        [alert setAlertStyle:NSAlertStyleWarning];
+        [alert runModal];
+        [alert release];
     }
     else {
         [self tableView:tableView removeEndpointAtIndex:[tableView selectedRow]];
@@ -135,7 +141,7 @@ - (void)tableView:(NSTableView*)tableView newEndpointWithName:(NSString*)name
 }
 
 
-- (void)tableView:(NSTableView*)tableView addEndpoint:(PYMIDIVirtualEndpoint*)endpoint atIndex:(int)index
+- (void)tableView:(NSTableView*)tableView addEndpoint:(PYMIDIVirtualEndpoint*)endpoint atIndex:(NSUInteger)index
 {
     NSWindow* window = [tableView window];
     if ([window isKeyWindow] && ![window makeFirstResponder:nil]) return;
@@ -152,7 +158,7 @@ - (void)tableView:(NSTableView*)tableView addEndpoint:(PYMIDIVirtualEndpoint*)en
 }
 
 
-- (void)tableView:(NSTableView*)tableView removeEndpointAtIndex:(int)index
+- (void)tableView:(NSTableView*)tableView removeEndpointAtIndex:(NSUInteger)index
 {
     NSWindow* window = [tableView window];
     if ([window isKeyWindow] && ![window makeFirstResponder:nil]) return;
@@ -173,7 +179,7 @@ - (void)tableView:(NSTableView*)tableView removeEndpointAtIndex:(int)index
 }
 
 
-- (void)tableView:(NSTableView*)tableView setName:(NSString*)name forEndpointAtIndex:(int)index
+- (void)tableView:(NSTableView*)tableView setName:(NSString*)name forEndpointAtIndex:(NSUInteger)index
 {
     PYMIDIVirtualEndpoint* endpoint = [endpointArray objectAtIndex:index];
     NSString* oldName = [[endpoint name] retain];

Controller Classes/PatchTableDataSource.h

@@ -4,7 +4,7 @@
 @class PatchbayDocument;
 
 
-@interface PatchTableDataSource : NSObject {
+@interface PatchTableDataSource : NSObject<NSTableViewDataSource> {
     PatchbayDocument*	document;
     NSMutableArray*		patchArray;
 }
@@ -14,8 +14,8 @@
 
 - (void)setPatchArray:(NSMutableArray*)newPatchArray;
 
-- (int)numberOfRowsInTableView:(NSTableView*)tableView;
-- (id)tableView:(NSTableView*)tableView objectValueForTableColumn:(NSTableColumn*)column row:(int)rowIndex;
+- (NSUInteger)numberOfRowsInTableView:(NSTableView*)tableView;
+- (id)tableView:(NSTableView*)tableView objectValueForTableColumn:(NSTableColumn*)column row:(NSUInteger)rowIndex;
 - (void)tableView:(NSTableView*)tableView setObjectValue:(id)value forTableColumn:(NSTableColumn*)column row:(int)rowIndex;
 - (void)deleteSelection:(NSTableView*)tableView;
 

Controller Classes/PatchTableDataSource.m

@@ -36,13 +36,13 @@ - (void)setPatchArray:(NSMutableArray*)newPatchArray
 }
 
 
-- (int)numberOfRowsInTableView:(NSTableView*)tableView
+- (NSUInteger)numberOfRowsInTableView:(NSTableView*)tableView
 {
     return [patchArray count];
 }
 
 
-- (id)tableView:(NSTableView*)tableView objectValueForTableColumn:(NSTableColumn*)column row:(int)rowIndex
+- (id)tableView:(NSTableView*)tableView objectValueForTableColumn:(NSTableColumn*)column row:(NSUInteger)rowIndex
 {
     Patch* patch = [patchArray objectAtIndex:rowIndex];
     id result = nil;

Controller Classes/PatchbayDocument.h

@@ -1,5 +1,5 @@
 #import <AppKit/AppKit.h>
-#import <PYMIDI/PYMIDI.h>
+#import "PYMIDI/PYMIDI.h"
 
 @class WindowWithUndo;
 
@@ -11,7 +11,7 @@
 @class EndpointTableDataSource;
 
 
-@interface PatchbayDocument : NSDocument {
+@interface PatchbayDocument : NSDocument<NSWindowDelegate> {
     IBOutlet NSWindow*			documentWindow;
 
     // Stuff related to the table of patches
@@ -90,9 +90,9 @@
 - (void)selectedPatchChanged:(NSNotification*)notification;
 - (IBAction)addPatchButtonPressed:(id)sender;
 
-- (void)addPatch:(Patch*)patch atIndex:(int)index;
-- (void)addPatchFromArchive:(NSData*)data atIndex:(int)index;
-- (void)removePatchAtIndex:(int)index;
+- (void)addPatch:(Patch*)patch atIndex:(NSUInteger)index;
+- (void)addPatchFromArchive:(NSData*)data atIndex:(NSUInteger)index;
+- (void)removePatchAtIndex:(NSUInteger)index;
 - (void)setIsEnabled:(BOOL)isEnabled forPatch:(Patch*)patch;
 
 - (NSData*)archivePatchForPasteBoard:(Patch*)patch;