Skip to content

Modernize TableTool for recent macOS #3

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

Merged
danaspiegel merged 2 commits into from
Mar 2, 2026
Merged

Modernize TableTool for recent macOS #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
362ad57
Initial plan
Copilot Mar 2, 2026
9931126
Modernize TableTool for recent macOS: replace deprecated APIs and upd…
Copilot Mar 2, 2026
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: 5 additions & 5 deletions Table Tool.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@
E1CC84D31B4A5F2A00ED8314 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0800;
LastSwiftUpdateCheck = 1500;
LastUpgradeCheck = 1500;
ORGANIZATIONNAME = "Egger Apps";
TargetAttributes = {
E1CC84DA1B4A5F2A00ED8314 = {
Expand All @@ -256,7 +256,7 @@
};
buildConfigurationList = E1CC84D61B4A5F2A00ED8314 /* Build configuration list for PBXProject "Table Tool" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -398,7 +398,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 = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -437,7 +437,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 = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
Expand Down
2 changes: 1 addition & 1 deletion Table Tool/Constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#pragma mark Pasteboard Types

extern NSString *TTRowInternalPboardType;
extern NSPasteboardType TTRowInternalPboardType;

#pragma mark Table Column Identifiers

Expand Down
2 changes: 1 addition & 1 deletion Table Tool/Constants.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#pragma mark Initializing Globals for Pasteboard Types

NSString *TTRowInternalPboardType = @"Table Tool Row Internal PasteBoard Type";
NSPasteboardType TTRowInternalPboardType = @"Table Tool Row Internal PasteBoard Type";

#pragma mark Initializing Globals for Table Column Identifiers

Expand Down
18 changes: 9 additions & 9 deletions Table Tool/Document.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,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 @@ -386,7 +386,7 @@ -(void)initValidPBoardTypes
{
validPBoardTypes = [NSArray arrayWithObjects:TTRowInternalPboardType,
NSPasteboardTypeTabularText,
NSStringPboardType,
NSPasteboardTypeString,
nil];
}

Expand Down Expand Up @@ -622,12 +622,12 @@ - (BOOL)moveRowsAtIndexes:(NSIndexSet *)draggedRowIndexes
-(NSTableColumn *)createLineNumberColumn {
NSTableColumn *lineNumberColumn = [[NSTableColumn alloc] initWithIdentifier:TTLineNumberColumnIdentifier];
NSTextFieldCell *lineNumberCell = [[NSTextFieldCell alloc] init];
lineNumberCell.alignment = NSRightTextAlignment;
lineNumberCell.alignment = NSTextAlignmentRight;
lineNumberCell.textColor = [NSColor secondaryLabelColor];
lineNumberCell.editable = NO;
lineNumberColumn.dataCell = lineNumberCell;
lineNumberColumn.headerCell.stringValue = @"#";
((NSCell *)lineNumberColumn.headerCell).alignment = NSCenterTextAlignment;
((NSCell *)lineNumberColumn.headerCell).alignment = NSTextAlignmentCenter;
lineNumberColumn.width = 40;
lineNumberColumn.minWidth = 20;
lineNumberColumn.maxWidth = 60;
Expand All @@ -651,7 +651,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;
tableColumn.sortDescriptorPrototype = [NSSortDescriptor sortDescriptorWithKey:[NSString stringWithFormat:@"%d",i] ascending:YES];
[self.tableView addTableColumn: tableColumn];
}
Expand All @@ -664,7 +664,7 @@ -(void)updateTableColumnsNames {
NSTableColumn *tableColumn = self.tableView.tableColumns[i];
if ([tableColumn.identifier isEqualToString:TTLineNumberColumnIdentifier]) continue;
tableColumn.headerCell.stringValue = [self generateColumnName:dataColumnIndex];
((NSCell *)tableColumn.headerCell).alignment = NSCenterTextAlignment;
((NSCell *)tableColumn.headerCell).alignment = NSTextAlignmentCenter;
dataColumnIndex++;
}
}
Expand Down Expand Up @@ -990,7 +990,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 @@ -1053,7 +1053,7 @@ -(BOOL)validateMenuItem:(NSMenuItem *)menuItem {
}
if (menuItem.action == @selector(toggleLineNumbers:)) {
BOOL showingLineNumbers = [[NSUserDefaults standardUserDefaults] boolForKey:TTShowLineNumbersKey];
menuItem.state = showingLineNumbers ? NSOnState : NSOffState;
menuItem.state = showingLineNumbers ? NSControlStateValueOn : NSControlStateValueOff;
}
return YES;
}
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