diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 30a1fe08..bf281137 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -183,7 +183,6 @@ 4C7BD07619FE94C900C7AA5C /* MacPassImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4C7BD07519FE94C900C7AA5C /* MacPassImages.xcassets */; }; 4C7F8B681A10B68400CCB83D /* WelcomeWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C7F8B6A1A10B68400CCB83D /* WelcomeWindow.xib */; }; 4C80304A1E2FBAA300133E4C /* MPTestKeyMapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8030491E2FBAA300133E4C /* MPTestKeyMapper.m */; }; - 4C811C8316ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */; }; 4C82046A1FCDC07800EB24A4 /* MPPickfieldViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8204681FCDC07800EB24A4 /* MPPickfieldViewController.m */; }; 4C82046E1FCDC8A100EB24A4 /* MPPickfieldTableModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C82046D1FCDC8A100EB24A4 /* MPPickfieldTableModel.m */; }; 4C83814215BF4677001AE468 /* MPDocumentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPDocumentWindowController.m */; }; @@ -280,7 +279,6 @@ 6021FE8218E160BC00C3BC51 /* PasswordEditWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE8418E160BC00C3BC51 /* PasswordEditWindow.xib */; }; 6021FE8D18E1617300C3BC51 /* PasswordCreatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE8F18E1617300C3BC51 /* PasswordCreatorView.xib */; }; 6021FE9818E1650F00C3BC51 /* DatabaseSettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE9A18E1650F00C3BC51 /* DatabaseSettingsWindow.xib */; }; - 8345D7291F39023E002B7B0F /* MPPathControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8345D7281F39023E002B7B0F /* MPPathControl.m */; }; FA13910C1F9CD9EB0033D256 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = FA13910A1F9CD9EB0033D256 /* Localizable.stringsdict */; }; FA9FD3271FB5E8F4003CEDD6 /* AutotypeCandidateSelectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA9FD3291FB5E8F4003CEDD6 /* AutotypeCandidateSelectionView.xib */; }; FA9FD32C1FB5EDD3003CEDD6 /* AutotypeBuilderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA9FD32E1FB5EDD3003CEDD6 /* AutotypeBuilderView.xib */; }; @@ -643,8 +641,6 @@ 4C7F8B7A1A10B69700CCB83D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/WelcomeWindow.strings; sourceTree = ""; }; 4C7F8B7C1A10B69800CCB83D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/WelcomeWindow.strings; sourceTree = ""; }; 4C8030491E2FBAA300133E4C /* MPTestKeyMapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTestKeyMapper.m; sourceTree = ""; }; - 4C811C8116ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPKeyfilePathControlDelegate.h; sourceTree = ""; }; - 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPKeyfilePathControlDelegate.m; sourceTree = ""; }; 4C8204671FCDC07800EB24A4 /* MPPickfieldViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPickfieldViewController.h; sourceTree = ""; }; 4C8204681FCDC07800EB24A4 /* MPPickfieldViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPPickfieldViewController.m; sourceTree = ""; }; 4C82046C1FCDC8A100EB24A4 /* MPPickfieldTableModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPickfieldTableModel.h; sourceTree = ""; }; @@ -917,8 +913,6 @@ 6A74B07D2076F4B60049BC29 /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/InfoPlist.strings"; sourceTree = ""; }; 6E719715172058BA00E4C5FC /* MPDatabaseVersion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPDatabaseVersion.h; sourceTree = ""; }; 713F9B481C95CEA000605880 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/PluginSettings.strings; sourceTree = ""; }; - 8345D7271F39023E002B7B0F /* MPPathControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPathControl.h; sourceTree = ""; }; - 8345D7281F39023E002B7B0F /* MPPathControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPathControl.m; sourceTree = ""; }; A50AD5CF212884A0007C85EB /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/PluginDataView.strings; sourceTree = ""; }; A50AD5D0212884A0007C85EB /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/PickfieldView.strings; sourceTree = ""; }; BB3E050C1FE9D1CA00F0B46F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/AutotypeCandidateSelectionView.strings; sourceTree = ""; }; @@ -1137,8 +1131,6 @@ 4C77E37915B84A240093A587 /* MPAppDelegate.m */, 4C3BD51316D276F800389F1F /* MPToolbarDelegate.h */, 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */, - 4C811C8116ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.h */, - 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */, 4CE298E91795FC2A00DF7BDB /* MPEntryContextMenuDelegate.h */, 4CE298EA1795FC2A00DF7BDB /* MPEntryContextMenuDelegate.m */, 4CA08D9E17A831B200A6544B /* MPAddEntryContextMenuDelegate.h */, @@ -1589,8 +1581,6 @@ 4C63B8FA17A3154D0091BD72 /* MPContextButton.m */, 4C57AE1217BA422B00CA4F34 /* MPSegmentedContextCell.h */, 4C57AE1317BA422B00CA4F34 /* MPSegmentedContextCell.m */, - 8345D7271F39023E002B7B0F /* MPPathControl.h */, - 8345D7281F39023E002B7B0F /* MPPathControl.m */, ); name = Controls; sourceTree = ""; @@ -1976,7 +1966,6 @@ 4C888C9316EB6F5E003D34A1 /* MPToolbarItem.m in Sources */, 4CA182741F963FF600DD4A4A /* MPTitlebarColorAccessoryViewController.m in Sources */, 4C888C9716EB754B003D34A1 /* MPActionHelper.m in Sources */, - 4C811C8316ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m in Sources */, 4CDA35751EBA0CF2003CD59F /* NSString+MPComposedCharacterAdditions.m in Sources */, 4CE39ABF16ECE34A000FE29D /* MPIconSelectViewController.m in Sources */, 4CE39AC416ECE4F7000FE29D /* MPIconImageView.m in Sources */, @@ -2052,7 +2041,6 @@ 4C1BDF2B1E4392640012A3F0 /* MPPluginDataViewController.m in Sources */, 4C4B7EF817A4B335000234C7 /* MPUniqueCharactersFormatter.m in Sources */, 4C8B36AB17A6ED4B005E1FF1 /* MPOutlineContextMenuDelegate.m in Sources */, - 8345D7291F39023E002B7B0F /* MPPathControl.m in Sources */, 4CD7223B17A7CB0700F5A1E1 /* MPWorkflowSettingsController.m in Sources */, 4CA08DA017A831B200A6544B /* MPAddEntryContextMenuDelegate.m in Sources */, 4C09495C1FD6E510004F2971 /* MPAddCustomFieldContextMenuDelegate.m in Sources */, diff --git a/MacPass/Base.lproj/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib index 0be1b43b..5479fb70 100644 --- a/MacPass/Base.lproj/PasswordInputView.xib +++ b/MacPass/Base.lproj/PasswordInputView.xib @@ -1,8 +1,8 @@ - + - + @@ -45,14 +45,11 @@ DQ - + - - - @@ -155,9 +152,8 @@ Gw - + - diff --git a/MacPass/MPCustomFieldTableViewDelegate.m b/MacPass/MPCustomFieldTableViewDelegate.m index 9d998feb..adecfde9 100644 --- a/MacPass/MPCustomFieldTableViewDelegate.m +++ b/MacPass/MPCustomFieldTableViewDelegate.m @@ -53,21 +53,6 @@ NSInteger MPCustomFieldIndexFromTag(NSInteger tag) { } } -/* -- (CGFloat)tableView:(NSTableView *)tableView heightOfRow:(NSInteger)row { - static NSTextFieldCell *cell; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - cell = [[NSTextFieldCell alloc] init]; - }); - - cell.stringValue = @"Mutli!"; - NSTableColumn *column = tableView.tableColumns.firstObject; - NSRect frame = NSMakeRect(0, 0, column.width, CGFLOAT_MAX); - return [cell cellSizeForBounds:frame].height + 38; -} -*/ - - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { MPCustomFieldTableCellView *view = [tableView makeViewWithIdentifier:@"SelectedCell" owner:tableView]; diff --git a/MacPass/MPKeyfilePathControlDelegate.h b/MacPass/MPKeyfilePathControlDelegate.h deleted file mode 100644 index b5e4668e..00000000 --- a/MacPass/MPKeyfilePathControlDelegate.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// MPKeyfilePathControlDelegate.h -// MacPass -// -// Created by Michael Starke on 10.03.13. -// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -#import -#import "MPPathControl.h" - -@interface MPKeyfilePathControlDelegate : NSObject - -@end diff --git a/MacPass/MPKeyfilePathControlDelegate.m b/MacPass/MPKeyfilePathControlDelegate.m deleted file mode 100644 index 3c93b495..00000000 --- a/MacPass/MPKeyfilePathControlDelegate.m +++ /dev/null @@ -1,45 +0,0 @@ -// -// MPKeyfilePathControlDelegate.m -// MacPass -// -// Created by Michael Starke on 10.03.13. -// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -#import "MPKeyfilePathControlDelegate.h" -@implementation MPKeyfilePathControlDelegate - -- (NSDragOperation)pathControl:(NSPathControl *)pathControl validateDrop:(id)info { - return NSDragOperationNone; -} - -- (void)pathControlDidBecomeKey:(NSPathControl *)control { -// if(control.URL) { -// return; -// } -// -// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ -// NSOpenPanel *panel = [NSOpenPanel openPanel]; -// panel.allowedFileTypes = control.allowedTypes; -// if([panel runModal] != NSModalResponseOK) { -// return; -// } -// control.URL = panel.URL; -// }); -} - -@end diff --git a/MacPass/MPPasswordInputController.m b/MacPass/MPPasswordInputController.m index 048fb2d7..a97b699c 100644 --- a/MacPass/MPPasswordInputController.m +++ b/MacPass/MPPasswordInputController.m @@ -25,7 +25,6 @@ #import "MPDocumentWindowController.h" #import "MPDocument.h" #import "MPSettingsHelper.h" -#import "MPKeyfilePathControlDelegate.h" #import "HNHUi/HNHUi.h" diff --git a/MacPass/MPPathControl.h b/MacPass/MPPathControl.h deleted file mode 100644 index 5974e020..00000000 --- a/MacPass/MPPathControl.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MPPathControl.h -// MacPass -// -// Created by Christoph Leimbrock on 8/7/17. -// - -#import - -@protocol MPPathControlDelegate -- (void)pathControlDidBecomeKey:(NSPathControl *_Nullable)control; -@end - -@interface MPPathControl : NSPathControl -@property (nullable, weak) id delegate; -@end diff --git a/MacPass/MPPathControl.m b/MacPass/MPPathControl.m deleted file mode 100644 index 2fa952e9..00000000 --- a/MacPass/MPPathControl.m +++ /dev/null @@ -1,25 +0,0 @@ -// -// MPPathControl.m -// MacPass -// -// Created by Christoph Leimbrock on 8/7/17. -// - -#import "MPPathControl.h" -@implementation MPPathControl -@dynamic delegate; - -- (BOOL)canBecomeKeyView { - return YES; -} - -- (BOOL)acceptsFirstResponder { - return YES; -} - -- (BOOL)becomeFirstResponder { - [self.delegate performSelector:@selector(pathControlDidBecomeKey:) withObject:self]; - return YES; -} - -@end