From e6a73a2e659c5a50941e6ae5ecee0a1c81b44420 Mon Sep 17 00:00:00 2001 From: michael starke Date: Wed, 24 May 2017 18:12:12 +0200 Subject: [PATCH] Dropping 10.9 support --- MacPass.xcodeproj/project.pbxproj | 4 +-- MacPass/MPAppDelegate.m | 6 +++-- MacPass/MPDocumentWindowController.m | 5 ---- MacPass/MPEntryInspectorViewController.m | 2 +- MacPass/MPEntryViewController.m | 3 +-- MacPass/MPGeneralSettingsController.m | 2 +- MacPass/MPIconSelectViewController.m | 3 +-- MacPass/MPInspectorViewController.m | 6 ----- MacPass/MPOutlineViewController.m | 26 ++++++++++---------- MacPass/MPPasswordCreatorViewController.m | 1 - MacPass/MPPasswordInputController.m | 2 +- MacPass/MPPluginDataViewController.m | 6 ++--- MacPass/MPPluginSettingsController.m | 2 +- MacPass/MPReferenceBuilderViewController.m | 3 +-- MacPass/MPSavePanelAccessoryViewController.m | 2 +- MacPass/MPViewController.h | 3 --- MacPass/MPViewController.m | 18 -------------- MacPass/MPWorkflowSettingsController.m | 2 +- 18 files changed, 31 insertions(+), 65 deletions(-) diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 06286a7b..c664c11b 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -2249,7 +2249,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lxml2"; SDKROOT = macosx; @@ -2287,7 +2287,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; OTHER_LDFLAGS = "-lxml2"; SDKROOT = macosx; WARNING_CFLAGS = "-Wpartial-availability"; diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m index 5692f04a..61b35c9b 100644 --- a/MacPass/MPAppDelegate.m +++ b/MacPass/MPAppDelegate.m @@ -196,7 +196,6 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi if(!self.passwordCreatorController) { self.passwordCreatorController = [[MPPasswordCreatorViewController alloc] init]; self.passwordCreatorWindow.contentView = self.passwordCreatorController.view; - [self.passwordCreatorController updateResponderChain]; } [self.passwordCreatorController reset]; [self.passwordCreatorWindow makeKeyAndOrderFront:self.passwordCreatorWindow]; @@ -233,7 +232,10 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi - (void)checkForUpdates:(id)sender { #ifdef DEBUG - NSAlert *alert = [NSAlert alertWithMessageText:@"Updates are disabled!" defaultButton:@"Ok" alternateButton:nil otherButton:nil informativeTextWithFormat:@"Sparkle updates are only available in offical releases of %@!", NSApp.applicationName]; + NSAlert *alert = [[NSAlert alloc] init]; + alert.messageText = @"Updates are disabled!"; + alert.informativeText = [NSString stringWithFormat:@"Sparkle updates are only available in offical releases of %@!", NSApp.applicationName]; + [alert addButtonWithTitle:@"Ok"]; [alert runModal]; #else [[SUUpdater sharedUpdater] checkForUpdates:sender]; diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m index fc98f92c..9cb8c16e 100644 --- a/MacPass/MPDocumentWindowController.m +++ b/MacPass/MPDocumentWindowController.m @@ -164,7 +164,6 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword); views:NSDictionaryOfVariableBindings(newContentView)]]; [contentView layout]; - [viewController updateResponderChain]; [self.window makeFirstResponder:viewController.reconmendedFirstResponder]; } @@ -419,7 +418,6 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword); options:0 metrics:nil views:NSDictionaryOfVariableBindings(inspectorView)]]; - [self.inspectorViewController updateResponderChain]; } [[NSUserDefaults standardUserDefaults] setBool:!inspectorWasVisible forKey:kMPSettingsKeyShowInspector]; } @@ -500,9 +498,6 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword); options:0 metrics:nil views:views]]; - [self.entryViewController updateResponderChain]; - [self.inspectorViewController updateResponderChain]; - [self.outlineViewController updateResponderChain]; [self.outlineViewController showOutline]; /* Restore the State the inspector view was in before the view change */ diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m index 94b908be..3c5bc22e 100644 --- a/MacPass/MPEntryInspectorViewController.m +++ b/MacPass/MPEntryInspectorViewController.m @@ -91,7 +91,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) { return nil; } -- (void)didLoadView { +- (void)viewDidLoad { [self _addScrollViewWithView:self.generalView atTab:MPEntryTabGeneral]; [self _addScrollViewWithView:self.autotypView atTab:MPEntryTabAutotype]; diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m index 618ce8c0..1e8ef996 100644 --- a/MacPass/MPEntryViewController.m +++ b/MacPass/MPEntryViewController.m @@ -110,7 +110,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell"; [[NSNotificationCenter defaultCenter] removeObserver:self]; } -- (void)didLoadView { +- (void)viewDidLoad { self.view.wantsLayer = YES; self.entryTable.delegate = self; @@ -534,7 +534,6 @@ NSString *const _MPTableSecurCellView = @"PasswordCell"; _isDisplayingContextBar = YES; if(!self.contextBarViewController.view.superview) { [self.view addSubview:self.contextBarViewController.view]; - [self.contextBarViewController updateResponderChain]; NSView *contextBar = self.contextBarViewController.view; NSView *scrollView = self.entryTable.enclosingScrollView; NSDictionary *views = NSDictionaryOfVariableBindings(scrollView, contextBar); diff --git a/MacPass/MPGeneralSettingsController.m b/MacPass/MPGeneralSettingsController.m index dc545e90..4ccdd8ec 100644 --- a/MacPass/MPGeneralSettingsController.m +++ b/MacPass/MPGeneralSettingsController.m @@ -30,7 +30,7 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab"; return NSLocalizedString(@"GENERAL_SETTINGS", @"General Settings Label"); } -- (void)didLoadView { +- (void)viewDidLoad { NSUserDefaultsController *defaultsController = [NSUserDefaultsController sharedUserDefaultsController]; [self.clearPasteboardOnQuitCheckButton bind:NSValueBinding toObject:defaultsController withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyClearPasteboardOnQuit] options:nil]; diff --git a/MacPass/MPIconSelectViewController.m b/MacPass/MPIconSelectViewController.m index 6c5f555b..60ff48ab 100644 --- a/MacPass/MPIconSelectViewController.m +++ b/MacPass/MPIconSelectViewController.m @@ -24,8 +24,7 @@ return @"IconSelection"; } -- (void)didLoadView { - //[[self.imageButton cell] setBackgroundStyle:NSBackgroundStyleLowered]; +- (void)viewDidLoad { self.iconCollectionView.backgroundColors = @[[NSColor clearColor]]; self.iconCollectionView.selectable = YES; self.iconCollectionView.allowsMultipleSelection = NO; diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m index b39294ed..2fe79f66 100644 --- a/MacPass/MPInspectorViewController.m +++ b/MacPass/MPInspectorViewController.m @@ -126,12 +126,6 @@ typedef NS_ENUM(NSUInteger, MPContentTab) { [self.entryViewController registerNotificationsForDocument:document]; } -- (void)updateResponderChain { - [super updateResponderChain]; - [self.groupViewController updateResponderChain]; - [self.entryViewController updateResponderChain]; -} - #pragma mark - #pragma mark Properties - (void)setActiveTab:(NSUInteger)activeTab { diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m index 33f8a84e..ccac0783 100644 --- a/MacPass/MPOutlineViewController.m +++ b/MacPass/MPOutlineViewController.m @@ -66,11 +66,11 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell"; - (void)dealloc { [self.outlineView unbind:NSContentBinding]; [self.treeController unbind:NSContentBinding]; - [[NSNotificationCenter defaultCenter] removeObserver:self]; + [NSNotificationCenter.defaultCenter removeObserver:self]; [self.outlineView setDelegate:nil]; } -- (void)didLoadView { +- (void)viewDidLoad { self.outlineView.menu = [self _contextMenu]; self.outlineView.allowsEmptySelection = YES; self.outlineView.floatsGroupRows = NO; @@ -79,18 +79,18 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell"; [self.outlineView setDelegate:self]; [self.outlineView registerForDraggedTypes:@[ KPKGroupUTI, KPKEntryUTI ]]; [self.outlineView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(_didBecomeFirstResponder:) - name:MPDidActivateViewNotification - object:self.outlineView]; + + [NSNotificationCenter.defaultCenter addObserver:self + selector:@selector(_didBecomeFirstResponder:) + name:MPDidActivateViewNotification + object:self.outlineView]; NSView *clipView = self.outlineView.enclosingScrollView.contentView; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(_outlineDidScroll:) - name:NSViewBoundsDidChangeNotification - object:clipView]; + [NSNotificationCenter.defaultCenter addObserver:self + selector:@selector(_outlineDidScroll:) + name:NSViewBoundsDidChangeNotification + object:clipView]; } @@ -108,7 +108,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell"; [self.outlineView bind:NSContentBinding toObject:self.treeController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil]; [self.outlineView bind:NSSelectionIndexPathsBinding toObject:self.treeController withKeyPath:NSStringFromSelector(@selector(selectionIndexPaths)) options:nil]; [self bind:NSStringFromSelector(@selector(databaseNameWrapper)) toObject:document.tree.metaData withKeyPath:NSStringFromSelector(@selector(databaseName)) options:nil]; - [self.outlineView setDataSource:self.datasource]; + self.outlineView.dataSource = self.datasource; _bindingEstablished = YES; } NSTreeNode *node = [_outlineView itemAtRow:0]; @@ -136,7 +136,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell"; } } for(NSTreeNode *child in node.childNodes) { - [self _expandItems:child topRow:topRow]; + [self _expandItems:child topRow:topRow]; } if([nodeItem respondsToSelector:@selector(uuid)]) { MPDocument *document = self.windowController.document; diff --git a/MacPass/MPPasswordCreatorViewController.m b/MacPass/MPPasswordCreatorViewController.m index 1c1f32e7..4d669c4c 100644 --- a/MacPass/MPPasswordCreatorViewController.m +++ b/MacPass/MPPasswordCreatorViewController.m @@ -127,7 +127,6 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) { self.lowerCaseButton.tag = MPPasswordCharactersLowerCase; self.symbolsButton.tag = MPPasswordCharactersSymbols; - [self updateResponderChain]; [self reset]; } diff --git a/MacPass/MPPasswordInputController.m b/MacPass/MPPasswordInputController.m index b5570269..2493a532 100644 --- a/MacPass/MPPasswordInputController.m +++ b/MacPass/MPPasswordInputController.m @@ -51,7 +51,7 @@ [[NSNotificationCenter defaultCenter] removeObserver:self]; } -- (void)didLoadView { +- (void)viewDidLoad { self.keyPathControl.delegate = self.pathControlDelegate; self.errorImageView.image = [NSImage imageNamed:NSImageNameCaution]; [self.passwordTextField bind:NSStringFromSelector(@selector(showPassword)) toObject:self withKeyPath:NSStringFromSelector(@selector(showPassword)) options:nil]; diff --git a/MacPass/MPPluginDataViewController.m b/MacPass/MPPluginDataViewController.m index 6ac728c6..0f244827 100644 --- a/MacPass/MPPluginDataViewController.m +++ b/MacPass/MPPluginDataViewController.m @@ -33,14 +33,14 @@ return self; } -- (void)didLoadView { +- (void)viewDidLoad { [self.pluginDataController bind:NSContentDictionaryBinding toObject:self.representedObject withKeyPath:NSStringFromSelector(@selector(customData)) options:nil]; [self.pluginDataTabelView bind:NSContentBinding toObject:self.pluginDataController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil]; - self.pluginDataTabelView.backgroundColor = [NSColor clearColor]; + self.pluginDataTabelView.backgroundColor = NSColor.clearColor; } - (KPKNode *)representedNode { - if([self.representedObject isKindOfClass:[KPKNode class]]) { + if([self.representedObject isKindOfClass:KPKNode.class]) { return self.representedObject; } return nil; diff --git a/MacPass/MPPluginSettingsController.m b/MacPass/MPPluginSettingsController.m index 5bbd09a4..9b44c410 100644 --- a/MacPass/MPPluginSettingsController.m +++ b/MacPass/MPPluginSettingsController.m @@ -38,7 +38,7 @@ return NSLocalizedString(@"PLUGIN_SETTINGS", ""); } -- (void)didLoadView { +- (void)viewDidLoad { self.pluginTableView.delegate = self; self.pluginTableView.dataSource = self; diff --git a/MacPass/MPReferenceBuilderViewController.m b/MacPass/MPReferenceBuilderViewController.m index 676406e5..28194ea3 100644 --- a/MacPass/MPReferenceBuilderViewController.m +++ b/MacPass/MPReferenceBuilderViewController.m @@ -22,7 +22,7 @@ return @"ReferenceBuilderView"; } -- (void)didLoadView { +- (void)viewDidLoad { [self.searchKeyPopUpButton setMenu:[self _allocateAttributeItemMenu:YES withTitle:NSLocalizedString(@"SEARCH_VALUE", "")]]; [self.valuePopUpButton setMenu:[self _allocateAttributeItemMenu:NO withTitle:NSLocalizedString(@"OUTPUT_VALUE", "")]]; [self.searchStringTextField bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(searchString)) options:nil]; @@ -32,7 +32,6 @@ - (NSMenu *)_allocateAttributeItemMenu:(BOOL)allowCustomAttributes withTitle:(NSString *)title { NSMenu *menu = [[NSMenu alloc] init]; /* first item is button label */ - //[menu addItemWithTitle:title action:NULL keyEquivalent:@""]; [menu addItemWithTitle:NSLocalizedString(@"UUID","") action:NULL keyEquivalent:@""]; [menu addItemWithTitle:NSLocalizedString(@"TITLE","") action:NULL keyEquivalent:@""]; [menu addItemWithTitle:NSLocalizedString(@"USERNAME","") action:NULL keyEquivalent:@""]; diff --git a/MacPass/MPSavePanelAccessoryViewController.m b/MacPass/MPSavePanelAccessoryViewController.m index 2b4ed000..b69bbf38 100644 --- a/MacPass/MPSavePanelAccessoryViewController.m +++ b/MacPass/MPSavePanelAccessoryViewController.m @@ -22,7 +22,7 @@ return @"SavePanelAccessoryView"; } -- (void)didLoadView { +- (void)viewDidLoad { NSArray *types = [self.document writableTypesForSaveOperation:NSSaveOperation]; NSMenu *menu = [[NSMenu alloc] init]; for (NSString *uti in types ) { diff --git a/MacPass/MPViewController.h b/MacPass/MPViewController.h index 0be43eb8..c4186242 100644 --- a/MacPass/MPViewController.h +++ b/MacPass/MPViewController.h @@ -15,7 +15,4 @@ @property (weak, nullable) id observer; @property (nonatomic, readonly, nullable) NSResponder *reconmendedFirstResponder; -- (void)didLoadView; -- (void)updateResponderChain; - @end diff --git a/MacPass/MPViewController.m b/MacPass/MPViewController.m index f41a0701..e8fbf8b0 100644 --- a/MacPass/MPViewController.m +++ b/MacPass/MPViewController.m @@ -11,16 +11,6 @@ @implementation MPViewController -- (void)loadView { - [super loadView]; - [self updateResponderChain]; - [self didLoadView]; -} - -- (void)didLoadView { - // override -} - - (NSWindowController *)windowController { return self.view.window.windowController; } @@ -30,14 +20,6 @@ return nil; // override } -- (void)updateResponderChain { - if(self.view && self.view.nextResponder != self) { - NSResponder *nextResponder = self.view.nextResponder; - self.view.nextResponder = self; - self.nextResponder = nextResponder; - } -} - #pragma mark NSEditorRegistration - (void)objectDidBeginEditing:(id)editor { [self.windowController.document objectDidBeginEditing:editor]; diff --git a/MacPass/MPWorkflowSettingsController.m b/MacPass/MPWorkflowSettingsController.m index 5f016012..ecc2d3c2 100644 --- a/MacPass/MPWorkflowSettingsController.m +++ b/MacPass/MPWorkflowSettingsController.m @@ -20,7 +20,7 @@ return @"WorkflowSettings"; } -- (void)didLoadView { +- (void)viewDidLoad { NSUserDefaultsController *defaultsController = [NSUserDefaultsController sharedUserDefaultsController]; [self.doubleClickURLPopup bind:NSSelectedIndexBinding toObject:defaultsController withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyDoubleClickURLAction] options:nil];