diff --git a/MacPass/Base.lproj/EntryInspectorView.xib b/MacPass/Base.lproj/EntryInspectorView.xib index fb320340..ca70c171 100644 --- a/MacPass/Base.lproj/EntryInspectorView.xib +++ b/MacPass/Base.lproj/EntryInspectorView.xib @@ -40,8 +40,8 @@ - - + + @@ -512,8 +512,8 @@ - - + + @@ -551,8 +551,8 @@ - - + + @@ -560,8 +560,8 @@ - - + + @@ -666,8 +666,8 @@ - - + + @@ -704,7 +704,6 @@ - diff --git a/MacPass/ContextBar.xib b/MacPass/ContextBar.xib index ab6fb9ee..ed6ce7cc 100644 --- a/MacPass/ContextBar.xib +++ b/MacPass/ContextBar.xib @@ -37,8 +37,8 @@ - - + + @@ -46,8 +46,8 @@ - - - - - - - + + @@ -196,8 +196,8 @@ - - + + diff --git a/MacPass/MPContextBarViewController.m b/MacPass/MPContextBarViewController.m index 6238ce7a..73f2cac5 100644 --- a/MacPass/MPContextBarViewController.m +++ b/MacPass/MPContextBarViewController.m @@ -37,7 +37,7 @@ typedef NS_ENUM(NSUInteger, MPContextTab) { @property (weak) IBOutlet NSTextField *historyLabel; @property (weak) IBOutlet NSButton *exitHistoryButton; /* Trash*/ -@property (weak) IBOutlet HNHGradientView *trashBar; +@property (weak) IBOutlet HNHUIGradientView *trashBar; @property (weak) IBOutlet NSButton *emptyTrashButton; @end @@ -141,12 +141,12 @@ typedef NS_ENUM(NSUInteger, MPContextTab) { - (void)_updateFilterButtons { MPDocument *document = [[self windowController] document]; MPEntrySearchFlags currentFlags = document.searchContext.searchFlags; - [self.duplicatePasswordsButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, currentFlags))]; - [self.notesButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchNotes, currentFlags))]; - [self.passwordButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchPasswords, currentFlags))]; - [self.titleButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchTitles, currentFlags))]; - [self.urlButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchUrls, currentFlags))]; - [self.usernameButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchUsernames, currentFlags))]; + [self.duplicatePasswordsButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, currentFlags))]; + [self.notesButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchNotes, currentFlags))]; + [self.passwordButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchPasswords, currentFlags))]; + [self.titleButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchTitles, currentFlags))]; + [self.urlButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUrls, currentFlags))]; + [self.usernameButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUsernames, currentFlags))]; NSInteger selectedTag = MPEntrySearchNone; for(NSMenuItem *item in [[self.specialFilterPopUpButton menu] itemArray]) { MPEntrySearchFlags flag = [item tag]; @@ -159,7 +159,7 @@ typedef NS_ENUM(NSUInteger, MPContextTab) { if(isActive) { selectedTag = flag; } - [item setState:HNHStateForBool(isActive)]; + [item setState:HNHUIStateForBool(isActive)]; } } [self.specialFilterPopUpButton selectItemWithTag:selectedTag]; diff --git a/MacPass/MPDatabaseSettingsWindowController.m b/MacPass/MPDatabaseSettingsWindowController.m index 1a8698e3..ae822c7a 100644 --- a/MacPass/MPDatabaseSettingsWindowController.m +++ b/MacPass/MPDatabaseSettingsWindowController.m @@ -70,7 +70,7 @@ } /* Advanced */ - metaData.useTrash = HNHBoolForState(self.enableTrashCheckButton.state); + metaData.useTrash = HNHUIBoolForState(self.enableTrashCheckButton.state); NSMenuItem *trashMenuItem = self.selectTrashGoupPopUpButton.selectedItem; KPKGroup *trashGroup = trashMenuItem.representedObject; ((MPDocument *)self.document).tree.trash = trashGroup; @@ -80,8 +80,8 @@ ((MPDocument *)self.document).templates = templateGroup; - BOOL enforceMasterKeyChange = HNHBoolForState(self.enforceKeyChangeCheckButton.state); - BOOL recommendMasterKeyChange = HNHBoolForState(self.recommendKeyChangeCheckButton.state); + BOOL enforceMasterKeyChange = HNHUIBoolForState(self.enforceKeyChangeCheckButton.state); + BOOL recommendMasterKeyChange = HNHUIBoolForState(self.recommendKeyChangeCheckButton.state); enforceMasterKeyChange &= (self.enforceKeyChangeIntervalTextField.stringValue.length != 0); recommendMasterKeyChange &= (self.recommendKeyChangeIntervalTextField.stringValue.length != 0); @@ -94,11 +94,11 @@ /* Security */ - metaData.protectNotes = HNHBoolForState(self.protectNotesCheckButton.state); - metaData.protectPassword = HNHBoolForState(self.protectPasswortCheckButton.state); - metaData.protectTitle = HNHBoolForState(self.protectTitleCheckButton.state); - metaData.protectUrl = HNHBoolForState(self.protectURLCheckButton.state); - metaData.protectUserName = HNHBoolForState(self.protectUserNameCheckButton.state); + metaData.protectNotes = HNHUIBoolForState(self.protectNotesCheckButton.state); + metaData.protectPassword = HNHUIBoolForState(self.protectPasswortCheckButton.state); + metaData.protectTitle = HNHUIBoolForState(self.protectTitleCheckButton.state); + metaData.protectUrl = HNHUIBoolForState(self.protectURLCheckButton.state); + metaData.protectUserName = HNHUIBoolForState(self.protectUserNameCheckButton.state); metaData.defaultUserName = self.defaultUsernameTextField.stringValue; @@ -180,18 +180,18 @@ } - (void)_setupProtectionTab:(KPKMetaData *)metaData { - HNHSetStateFromBool(self.protectNotesCheckButton, metaData.protectNotes); - HNHSetStateFromBool(self.protectPasswortCheckButton, metaData.protectPassword); - HNHSetStateFromBool(self.protectTitleCheckButton, metaData.protectTitle); - HNHSetStateFromBool(self.protectURLCheckButton, metaData.protectUrl); - HNHSetStateFromBool(self.protectUserNameCheckButton, metaData.protectUserName); + self.protectNotesCheckButton.state = HNHUIStateForBool(metaData.protectNotes); + self.protectPasswortCheckButton.state = HNHUIStateForBool(metaData.protectPassword); + self.protectTitleCheckButton.state = HNHUIStateForBool(metaData.protectTitle); + self.protectURLCheckButton.state = HNHUIStateForBool(metaData.protectUrl); + self.protectUserNameCheckButton.state = HNHUIStateForBool(metaData.protectUserName); [self.encryptionRoundsTextField setIntegerValue:metaData.rounds]; [self.benchmarkButton setEnabled:YES]; } - (void)_setupAdvancedTab:(KPKTree *)tree { - HNHSetStateFromBool(self.enableTrashCheckButton, tree.metaData.useTrash); + HNHUISetStateFromBool(self.enableTrashCheckButton, tree.metaData.useTrash); self.selectTrashGoupPopUpButton.enabled = tree.metaData.useTrash; [self.enableTrashCheckButton bind:NSValueBinding toObject:self.selectTrashGoupPopUpButton withKeyPath:NSEnabledBinding options:nil]; [self _updateTrashFolders:tree]; @@ -200,8 +200,8 @@ self.defaultUsernameTextField.editable = YES; [self _updateTemplateGroup:tree]; - HNHSetStateFromBool(self.enforceKeyChangeCheckButton, tree.metaData.enforceMasterKeyChange); - HNHSetStateFromBool(self.recommendKeyChangeCheckButton, tree.metaData.recommendMasterKeyChange); + HNHUISetStateFromBool(self.enforceKeyChangeCheckButton, tree.metaData.enforceMasterKeyChange); + HNHUISetStateFromBool(self.recommendKeyChangeCheckButton, tree.metaData.recommendMasterKeyChange); [self.enforceKeyChangeIntervalTextField setEnabled:tree.metaData.enforceMasterKeyChange]; [self.recommendKeyChangeIntervalTextField setEnabled:tree.metaData.recommendMasterKeyChange]; diff --git a/MacPass/MPDocumentController.m b/MacPass/MPDocumentController.m index 8fe91208..1ebb3b6a 100644 --- a/MacPass/MPDocumentController.m +++ b/MacPass/MPDocumentController.m @@ -43,7 +43,7 @@ - (void)toggleAllowAllFiles:(id)sender { NSButton *button = (NSButton *)sender; - BOOL allowAllFiles = HNHBoolForState(button.state); + BOOL allowAllFiles = HNHUIBoolForState(button.state); /* Toggle hidden to force a refresh */ self.openPanel.showsHiddenFiles = !self.openPanel.showsHiddenFiles; self.openPanel.allowedFileTypes = allowAllFiles ? nil : @[MPLegacyDocumentUTI, MPXMLDocumentUTI]; diff --git a/MacPass/MPEntryInspectorViewController.h b/MacPass/MPEntryInspectorViewController.h index 58c374bc..a2711929 100644 --- a/MacPass/MPEntryInspectorViewController.h +++ b/MacPass/MPEntryInspectorViewController.h @@ -10,7 +10,7 @@ #import -@class HNHRoundedSecureTextField; +@class HNHUIRoundedSecureTextField; @class MPDocument; @interface MPEntryInspectorViewController : MPViewController @@ -18,7 +18,7 @@ @property (weak) IBOutlet NSTextField *titleTextField; @property (weak) IBOutlet NSTextField *usernameTextField; @property (weak) IBOutlet NSTextField *URLTextField; -@property (weak) IBOutlet HNHRoundedSecureTextField *passwordTextField; +@property (weak) IBOutlet HNHUIRoundedSecureTextField *passwordTextField; @property (weak) IBOutlet NSTextField *uuidTextField; diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m index 2b4ff346..91b112cc 100644 --- a/MacPass/MPEntryInspectorViewController.m +++ b/MacPass/MPEntryInspectorViewController.m @@ -329,7 +329,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) { - (void)_addScrollViewWithView:(NSView *)view atTab:(MPEntryTab)tab { /* ScrollView setup for the General Tab */ - HNHScrollView *scrollView = [[HNHScrollView alloc] init]; + HNHUIScrollView *scrollView = [[HNHUIScrollView alloc] init]; scrollView.actAsFlipped = NO; scrollView.showBottomShadow = NO; scrollView.hasVerticalScroller = YES; diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m index 63667939..31c3fee4 100644 --- a/MacPass/MPEntryViewController.m +++ b/MacPass/MPEntryViewController.m @@ -75,7 +75,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell"; @property (strong) IBOutlet NSLayoutConstraint *tableToTopConstraint; @property (strong) NSLayoutConstraint *contextBarTopConstraint; -@property (weak) IBOutlet HNHGradientView *bottomBar; +@property (weak) IBOutlet HNHUIGradientView *bottomBar; @property (weak) IBOutlet NSButton *addEntryButton; @property (weak) IBOutlet NSTextField *footerInfoText; diff --git a/MacPass/MPGroupInspectorViewController.h b/MacPass/MPGroupInspectorViewController.h index a1ca2e84..66053caa 100644 --- a/MacPass/MPGroupInspectorViewController.h +++ b/MacPass/MPGroupInspectorViewController.h @@ -8,19 +8,19 @@ #import "MPViewController.h" @class MPDocument; -@class HNHRoundedTextField; +@class HNHUIRoundedTextField; @interface MPGroupInspectorViewController : MPViewController @property (strong) IBOutlet NSView *contentView; -@property (weak) IBOutlet HNHRoundedTextField *titleTextField; +@property (weak) IBOutlet HNHUIRoundedTextField *titleTextField; @property (weak) IBOutlet NSButton *expiresCheckButton; @property (weak) IBOutlet NSButton *expireDateSelectButton; @property (weak) IBOutlet NSPopUpButton *searchPopupButton; @property (weak) IBOutlet NSPopUpButton *autotypePopupButton; -@property (weak) IBOutlet HNHRoundedTextField *autotypeSequenceTextField; +@property (weak) IBOutlet HNHUIRoundedTextField *autotypeSequenceTextField; - (void)setupBindings:(MPDocument *)document; - (void)beginEditing; diff --git a/MacPass/MPGroupInspectorViewController.m b/MacPass/MPGroupInspectorViewController.m index bfbdc2c9..9f8dc1d3 100644 --- a/MacPass/MPGroupInspectorViewController.m +++ b/MacPass/MPGroupInspectorViewController.m @@ -39,7 +39,7 @@ } - (void)awakeFromNib { - HNHScrollView *scrollView = (HNHScrollView *)self.view; + HNHUIScrollView *scrollView = (HNHUIScrollView *)self.view; scrollView.actAsFlipped = NO; scrollView.showBottomShadow = NO; diff --git a/MacPass/MPInspectorViewController.h b/MacPass/MPInspectorViewController.h index 0e447a7c..da203549 100644 --- a/MacPass/MPInspectorViewController.h +++ b/MacPass/MPInspectorViewController.h @@ -8,12 +8,12 @@ #import "MPViewController.h" -@class HNHGradientView; +@class HNHUIGradientView; @class MPPopupImageView; @interface MPInspectorViewController : MPViewController -@property (weak) IBOutlet HNHGradientView *bottomBar; +@property (weak) IBOutlet HNHUIGradientView *bottomBar; @property (weak) IBOutlet NSTextField *createdTextField; @property (weak) IBOutlet NSTextField *modifiedTextField; @property (weak) IBOutlet NSTextField *noSelectionInfo; diff --git a/MacPass/MPOutlineViewController.h b/MacPass/MPOutlineViewController.h index 5c7c8f75..0e51714f 100644 --- a/MacPass/MPOutlineViewController.h +++ b/MacPass/MPOutlineViewController.h @@ -11,13 +11,13 @@ APPKIT_EXTERN NSString *const MPOutlineViewDidChangeGroupSelection; -@class HNHGradientView; +@class HNHUIGradientView; @class MPDocument; @interface MPOutlineViewController : MPViewController -@property (weak) IBOutlet HNHGradientView *bottomBar; +@property (weak) IBOutlet HNHUIGradientView *bottomBar; - (void)clearSelection; - (void)showOutline; diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m index 640983a1..722c5fac 100644 --- a/MacPass/MPOutlineViewController.m +++ b/MacPass/MPOutlineViewController.m @@ -20,7 +20,7 @@ #import "KeePassKit/KeePassKit.h" #import "KPKNode+IconImage.h" -#import "HNHGradientView.h" +#import "HNHUi/HNHUi.h" #define EXPIRED_GROUP_REFRESH_SECONDS 60 diff --git a/MacPass/MPPasswordEditWindowController.h b/MacPass/MPPasswordEditWindowController.h index 6f19b8aa..84764f53 100644 --- a/MacPass/MPPasswordEditWindowController.h +++ b/MacPass/MPPasswordEditWindowController.h @@ -9,7 +9,7 @@ #import #import "MPSheetWindowController.h" @class MPDocument; -@class HNHRoundedSecureTextField; +@class HNHUIRoundedSecureTextField; @protocol MPPasswordEditWindowDelegate @@ -24,8 +24,8 @@ @interface MPPasswordEditWindowController : MPSheetWindowController -@property (weak) IBOutlet HNHRoundedSecureTextField *passwordTextField; -@property (weak) IBOutlet HNHRoundedSecureTextField *passwordRepeatTextField; +@property (weak) IBOutlet HNHUIRoundedSecureTextField *passwordTextField; +@property (weak) IBOutlet HNHUIRoundedSecureTextField *passwordRepeatTextField; @property (weak) IBOutlet NSPathControl *keyfilePathControl; @property (weak) IBOutlet NSButton *togglePasswordButton; @property (weak) IBOutlet NSTextField *errorTextField; diff --git a/MacPass/MPPasswordInputController.m b/MacPass/MPPasswordInputController.m index faebf9df..0527d66f 100644 --- a/MacPass/MPPasswordInputController.m +++ b/MacPass/MPPasswordInputController.m @@ -19,7 +19,7 @@ @interface MPPasswordInputController () -@property (weak) IBOutlet HNHRoundedSecureTextField *passwordTextField; +@property (weak) IBOutlet HNHUIRoundedSecureTextField *passwordTextField; @property (weak) IBOutlet NSPathControl *keyPathControl; @property (strong) MPKeyfilePathControlDelegate *pathControlDelegate; @property (weak) IBOutlet NSImageView *errorImageView;