From 79a2e867178dd19146414a1296465ab967cadd79 Mon Sep 17 00:00:00 2001 From: michael starke Date: Fri, 20 Nov 2015 17:41:36 +0100 Subject: [PATCH] Using default identfier Signed-off-by: michael starke --- MacPass/MPPluginSettingsController.m | 13 +++---------- MacPass/MacPass-Info.plist | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/MacPass/MPPluginSettingsController.m b/MacPass/MPPluginSettingsController.m index 4231608a..2012710a 100644 --- a/MacPass/MPPluginSettingsController.m +++ b/MacPass/MPPluginSettingsController.m @@ -12,8 +12,6 @@ #import "MPSettingsHelper.h" -NSString *const _kMPPluginTableNameColumn = @"Name"; - @interface MPPluginSettingsController () @property (weak) IBOutlet NSTableView *pluginTableView; @@ -41,8 +39,6 @@ NSString *const _kMPPluginTableNameColumn = @"Name"; } - (void)didLoadView { - self.pluginTableView.tableColumns[0].identifier = _kMPPluginTableNameColumn; - self.pluginTableView.delegate = self; self.pluginTableView.dataSource = self; @@ -58,11 +54,8 @@ NSString *const _kMPPluginTableNameColumn = @"Name"; } - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { - if(![tableColumn.identifier isEqualToString:_kMPPluginTableNameColumn]) { - return nil; - } MPPlugin *plugin = [self pluginForRow:row]; - NSTableCellView *view = [tableView makeViewWithIdentifier:@"NameCell" owner:nil]; + NSTableCellView *view = [tableView makeViewWithIdentifier:tableColumn.identifier owner:nil]; view.textField.stringValue = plugin.name; return view; } @@ -76,8 +69,8 @@ NSString *const _kMPPluginTableNameColumn = @"Name"; [self.settingsView addSubview:viewController.view]; NSDictionary *dict = @{ @"view" : viewController.view, @"table" : self.pluginTableView.enclosingScrollView }; - [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[view]-|" options:0 metrics:nil views:dict]]; - [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-[view]-|" options:0 metrics:nil views:dict]]; + [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[view]|" options:0 metrics:nil views:dict]]; + [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[view]|" options:0 metrics:nil views:dict]]; } } diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 843a0345..bf88b543 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -62,7 +62,7 @@ CFBundleSignature ???? CFBundleVersion - 2567 + 2568 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSAppTransportSecurity