nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2026-01-30 23:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/refactor_touchbar

Browse Source 
# Conflicts:
#	MacPass/MPDocumentWindowController.m
This commit is contained in:
Michael Starke
2019-07-12 16:50:10 +02:00
parent a5c97469eb e82db2fe9d
commit 9a55559e71
25 changed files with 188 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MacPass/MPDocumentWindowController.m
View File

@@ -708,7 +708,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
customizationLabel:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")];
}
if([identifier isEqualToString:MPTouchBarItemIdentifierLock]) {
return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate]
return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockLockedTemplate]
identifier:MPTouchBarItemIdentifierLock
target:self
selector:@selector(lock:)