Skip to content

Fix build on Apple Silicon (arm64), modernize a few deprecated AppKit calls #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andreabrugnoli wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −16
Open

Fix build on Apple Silicon (arm64), modernize a few deprecated AppKit calls #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions Table Tool.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,7 @@
E1CC84D31B4A5F2A00ED8314 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1700;
ORGANIZATIONNAME = "Egger Apps";
TargetAttributes = {
E1CC84DA1B4A5F2A00ED8314 = {
Expand Down Expand Up @@ -392,7 +391,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -431,7 +430,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
Expand All @@ -448,8 +447,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = at.eggerapps.tabletool;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Table Tool/Table Tool-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
};
Expand All @@ -464,7 +461,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = at.eggerapps.tabletool;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Table Tool/Table Tool-Bridging-Header.h";
};
name = Release;
};
Expand Down
14 changes: 7 additions & 7 deletions Table Tool/Document.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,9 @@ -(void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColum
NSArray *rowArray = [_data objectAtIndex:rowIndex];
if(rowArray.count > tableColumn.identifier.integerValue){
if([rowArray[tableColumn.identifier.integerValue] isKindOfClass:[NSDecimalNumber class]]){
textCell.alignment = NSRightTextAlignment;
textCell.alignment = NSTextAlignmentRight;
}else{
textCell.alignment = NSLeftTextAlignment;
textCell.alignment = NSTextAlignmentLeft;
}
}
}
Expand Down Expand Up @@ -326,7 +326,7 @@ -(void)initValidPBoardTypes
{
validPBoardTypes = [NSArray arrayWithObjects:TTRowInternalPboardType,
NSPasteboardTypeTabularText,
NSStringPboardType,
NSPasteboardTypeString,
nil];
}

Expand Down Expand Up @@ -569,7 +569,7 @@ -(void)updateTableColumns {
NSTableColumn *tableColumn = [[NSTableColumn alloc] initWithIdentifier:[NSString stringWithFormat:@"%d",i]];
tableColumn.dataCell = dataCell;
tableColumn.headerCell.stringValue = i < columnNames.count ? columnNames[i] : [self generateColumnName:i];
((NSCell *)tableColumn.headerCell).alignment = NSCenterTextAlignment;
((NSCell *)tableColumn.headerCell).alignment = NSTextAlignmentCenter;
[self.tableView addTableColumn: tableColumn];
}
}
Expand All @@ -579,7 +579,7 @@ -(void)updateTableColumnsNames {
for(int i = 0; i < [self.tableView.tableColumns count]; i++) {
NSTableColumn *tableColumn = self.tableView.tableColumns[i];
tableColumn.headerCell.stringValue = [self generateColumnName:i];
((NSCell *)tableColumn.headerCell).alignment = NSCenterTextAlignment;
((NSCell *)tableColumn.headerCell).alignment = NSTextAlignmentCenter;
}
}
}
Expand Down Expand Up @@ -903,7 +903,7 @@ -(void)restoreColumns:(NSMutableArray *)columnIds atIndexes:(NSIndexSet *)column
if(self.csvConfig.firstRowAsHeader){
col.headerCell.stringValue = [columnNames objectAtIndex:((NSString *)columnIds[i]).integerValue];
}
((NSCell *)col.headerCell).alignment = NSCenterTextAlignment;
((NSCell *)col.headerCell).alignment = NSTextAlignmentCenter;
[self.tableView addTableColumn:col];
[self.tableView moveColumn:[self.tableView numberOfColumns]-1 toColumn:[columnIndexes firstIndex]+i];
}
Expand Down Expand Up @@ -1134,7 +1134,7 @@ -(IBAction)exportFile:(id)sender {
[accessoryViewController selectFormatByConfig];
savePanel.allowedFileTypes = [NSArray arrayWithObject:@"csv"];
[savePanel beginSheetModalForWindow:window completionHandler:^(NSInteger result){
if (result == NSFileHandlingPanelOKButton)
if (result == NSModalResponseOK)
{
NSError *error = nil;
NSData *data = [self dataWithCSVConfig:accessoryViewController.config error:&error];
Expand Down
4 changes: 2 additions & 2 deletions Table Tool/TTFormatViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ - (IBAction)updateConfiguration:(id)sender {
}
_config.escapeCharacter = [[self.escapeControl labelForSegment:[self.escapeControl selectedSegment]] substringToIndex:1];

_config.firstRowAsHeader = (self.useFirstRowAsHeaderCheckbox.state == NSOnState);
_config.firstRowAsHeader = (self.useFirstRowAsHeaderCheckbox.state == NSControlStateValueOn);

[self.delegate configurationChangedForFormatViewController:self];
}
Expand Down Expand Up @@ -85,7 +85,7 @@ -(void)selectFormatByConfig{
[_escapeControl selectSegmentWithTag:2];
}

self.useFirstRowAsHeaderCheckbox.state = self.config.firstRowAsHeader ? NSOnState : NSOffState;
self.useFirstRowAsHeaderCheckbox.state = self.config.firstRowAsHeader ? NSControlStateValueOn : NSControlStateValueOff;
}

@end