From c7d85d6daa1c49c909843a78d698f4283efc391f Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Mon, 1 Jul 2019 13:27:18 +0200
Subject: [PATCH 01/21] Added log message when no window title can be
 determined

---
 MacPass/MPAutotypeDaemon.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MacPass/MPAutotypeDaemon.m b/MacPass/MPAutotypeDaemon.m
index 8f84b017..1305c477 100644
--- a/MacPass/MPAutotypeDaemon.m
+++ b/MacPass/MPAutotypeDaemon.m
@@ -393,6 +393,10 @@ static MPAutotypeDaemon *_sharedInstance;
       }
     }
   }
+  if(currentWindows.count > 0 && infoDict.count == 0) {
+    // show some information about not being able to determine any windows
+    NSLog(@"Unable to retrieve any window names. If you encounter this issue you might be running 10.15 and MacPass has no permission for screen recording.");
+  }
   return infoDict;
 }
 

From 38e61b96a5225569721a49c93767ef164b40cb57 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Wed, 3 Jul 2019 12:05:43 +0200
Subject: [PATCH 02/21] Added missing palettlabel to toolbar items to show up
 in customizing sheet

---
 MacPass/MPToolbarDelegate.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m
index f03444c7..54858ec7 100644
--- a/MacPass/MPToolbarDelegate.m
+++ b/MacPass/MPToolbarDelegate.m
@@ -111,6 +111,7 @@ NSString *const MPToolbarItemAutotype = @"TOOLBAR_AUTOTYPE";
     item = [[MPToolbarItem alloc] initWithItemIdentifier:itemIdentifier];
     NSString *itemLabel = [self _localizedLabelForToolbarItemIdentifier:itemIdentifier];
     item.label = itemLabel;
+    item.paletteLabel = itemLabel;
     
     if([itemIdentifier isEqualToString:MPToolbarItemAction]) {
       NSPopUpButton *popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(0, 0, 50, 32) pullsDown:YES];

From 176a3b7db49c104894050e0ccc0fe4548f95fff4 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Wed, 3 Jul 2019 12:47:28 +0200
Subject: [PATCH 03/21] use property instead of setter

---
 MacPass/MPToolbarButton.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MacPass/MPToolbarButton.m b/MacPass/MPToolbarButton.m
index 32b53a6b..ae9d5514 100644
--- a/MacPass/MPToolbarButton.m
+++ b/MacPass/MPToolbarButton.m
@@ -30,7 +30,7 @@
   if(self) {
     self.focusRingType = NSFocusRingTypeNone;
     self.bezelStyle = NSTexturedRoundedBezelStyle;
-    [self.cell setImageScaling:NSImageScaleProportionallyDown];
+    ((NSButtonCell *)(self.cell)).imageScaling = NSImageScaleProportionallyDown;
     [self setButtonType:NSMomentaryPushInButton];
     self.imagePosition = NSImageOnly;
   }

From b1cb776e1490abe63499c0c1fc0a2f5e2a52b6e3 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Wed, 3 Jul 2019 17:28:58 +0200
Subject: [PATCH 04/21] Moved accessibilty permission checks into
 MPAutotypeDoctor. Added screen capture permission test.

---
 MacPass.xcodeproj/project.pbxproj             |   6 +
 MacPass/Base.lproj/IntegrationPreferences.xib |  17 ++-
 MacPass/MPAppDelegate.m                       |   4 -
 MacPass/MPAutotypeDaemon.h                    |   4 -
 MacPass/MPAutotypeDaemon.m                    |  63 ++--------
 MacPass/MPAutotypeDoctor.h                    |  31 +++++
 MacPass/MPAutotypeDoctor.m                    | 114 ++++++++++++++++++
 MacPass/MPIntegrationPreferencesController.m  |   7 +-
 MacPass/MPUserNotificationCenterDelegate.m    |   4 +-
 9 files changed, 173 insertions(+), 77 deletions(-)
 create mode 100644 MacPass/MPAutotypeDoctor.h
 create mode 100644 MacPass/MPAutotypeDoctor.m

diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 37da5583..71a05d20 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -35,6 +35,7 @@
 		4C17F109184E6B6C00E85625 /* 30_TerminalTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C17F107184E6B6C00E85625 /* 30_TerminalTemplate.pdf */; };
 		4C1BDF2B1E4392640012A3F0 /* MPPluginDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1BDF291E4392640012A3F0 /* MPPluginDataViewController.m */; };
 		4C1E9885185F71A800943563 /* MPContextBarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1E9884185F71A800943563 /* MPContextBarViewController.m */; };
+		4C1ECAE322CCD30F00F46069 /* MPAutotypeDoctor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1ECAE222CCD30F00F46069 /* MPAutotypeDoctor.m */; };
 		4C1F7FA21E3A12E600D6A40E /* MPModifiedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1F7FA11E3A12E600D6A40E /* MPModifiedKey.m */; };
 		4C1FA07B18231900003A3F8C /* MPDocument+Autotype.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1FA07A18231900003A3F8C /* MPDocument+Autotype.m */; };
 		4C224B4217DFCB2400FF6AEE /* MPNumericalInputFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C224B4117DFCB2400FF6AEE /* MPNumericalInputFormatter.m */; };
@@ -394,6 +395,8 @@
 		4C1D56382271F4BC00C3E594 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/PluginRepositoryBrowserView.strings; sourceTree = "<group>"; };
 		4C1E9883185F71A800943563 /* MPContextBarViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPContextBarViewController.h; sourceTree = "<group>"; };
 		4C1E9884185F71A800943563 /* MPContextBarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPContextBarViewController.m; sourceTree = "<group>"; };
+		4C1ECAE122CCD30F00F46069 /* MPAutotypeDoctor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAutotypeDoctor.h; sourceTree = "<group>"; };
+		4C1ECAE222CCD30F00F46069 /* MPAutotypeDoctor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAutotypeDoctor.m; sourceTree = "<group>"; };
 		4C1F7FA01E3A12E600D6A40E /* MPModifiedKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPModifiedKey.h; sourceTree = "<group>"; };
 		4C1F7FA11E3A12E600D6A40E /* MPModifiedKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPModifiedKey.m; sourceTree = "<group>"; };
 		4C1FA07A18231900003A3F8C /* MPDocument+Autotype.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPDocument+Autotype.m"; sourceTree = "<group>"; };
@@ -1534,6 +1537,8 @@
 				4C3499FF218852160055AF45 /* MPKeyTyper.m */,
 				4C1F7FA01E3A12E600D6A40E /* MPModifiedKey.h */,
 				4C1F7FA11E3A12E600D6A40E /* MPModifiedKey.m */,
+				4C1ECAE122CCD30F00F46069 /* MPAutotypeDoctor.h */,
+				4C1ECAE222CCD30F00F46069 /* MPAutotypeDoctor.m */,
 			);
 			name = Autotype;
 			sourceTree = "<group>";
@@ -1990,6 +1995,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4C1ECAE322CCD30F00F46069 /* MPAutotypeDoctor.m in Sources */,
 				4CD034AC1BFE113B003C002C /* MPPluginHost.m in Sources */,
 				4C77E37315B84A240093A587 /* main.m in Sources */,
 				4C0F04402147A6FA000B8568 /* MPCustomFieldTableView.m in Sources */,
diff --git a/MacPass/Base.lproj/IntegrationPreferences.xib b/MacPass/Base.lproj/IntegrationPreferences.xib
index da6c65ae..e3bfb500 100644
--- a/MacPass/Base.lproj/IntegrationPreferences.xib
+++ b/MacPass/Base.lproj/IntegrationPreferences.xib
@@ -26,29 +26,28 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="1">
-            <rect key="frame" x="0.0" y="0.0" width="400" height="463"/>
+            <rect key="frame" x="0.0" y="0.0" width="400" height="421"/>
             <subviews>
                 <box autoresizesSubviews="NO" verticalHuggingPriority="500" borderType="line" title="Autotype" translatesAutoresizingMaskIntoConstraints="NO" id="P9N-HM-wER">
-                    <rect key="frame" x="17" y="115" width="366" height="328"/>
+                    <rect key="frame" x="17" y="115" width="366" height="286"/>
                     <view key="contentView" id="faU-Ok-HJ3">
-                        <rect key="frame" x="3" y="3" width="360" height="310"/>
+                        <rect key="frame" x="3" y="3" width="360" height="268"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="j52-9L-k7c">
-                                <rect key="frame" x="16" y="17" width="328" height="283"/>
+                                <rect key="frame" x="16" y="17" width="328" height="241"/>
                                 <beginningViews>
                                     <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="328" translatesAutoresizingMaskIntoConstraints="NO" id="hMJ-Mo-xOM">
-                                        <rect key="frame" x="-2" y="227" width="332" height="56"/>
-                                        <textFieldCell key="cell" controlSize="small" id="H37-ku-aTc">
+                                        <rect key="frame" x="-2" y="227" width="150" height="14"/>
+                                        <textFieldCell key="cell" controlSize="small" title="ReportFromAutotypeDoctor" id="H37-ku-aTc">
                                             <font key="font" metaFont="smallSystem"/>
-                                            <string key="title">Autotype is not available, because MacPass is not allowed to control your computer. To enable Autotype, go to the Security and Privacy Preferences and add MacPass to the Accessibilty group. Changes require a restart of MacPass.</string>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
                                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jai-b6-Qv4">
-                                        <rect key="frame" x="-6" y="191" width="160" height="32"/>
-                                        <buttonCell key="cell" type="push" title="Open Preferences…" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="NP0-R3-m6n">
+                                        <rect key="frame" x="-6" y="191" width="177" height="32"/>
+                                        <buttonCell key="cell" type="push" title="Run Autotype Doctor…" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="NP0-R3-m6n">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index b9983d12..b68901da 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -370,10 +370,6 @@ typedef NS_OPTIONS(NSInteger, MPAppStartupState) {
   if(showWelcomeScreen) {
     [self showWelcomeWindow];
   }
-  /* run check for accessibilty after the windowserver should have presented the UI */
-  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-    [MPAutotypeDaemon.defaultDaemon checkForAccessibiltyPermissions];
-  });
 }
 
 @end
diff --git a/MacPass/MPAutotypeDaemon.h b/MacPass/MPAutotypeDaemon.h
index e381b3d5..da0e0007 100644
--- a/MacPass/MPAutotypeDaemon.h
+++ b/MacPass/MPAutotypeDaemon.h
@@ -35,13 +35,9 @@
 @property (weak) IBOutlet NSPopUpButton *matchSelectionButton;
 @property (readonly, strong) DDHotKey *registredHotKey;
 @property (readonly, strong, class) MPAutotypeDaemon *defaultDaemon;
-@property (nonatomic, readonly) BOOL autotypeSupported; // YES if the system allows for Autotype. NO if the user has denied this.
 
 - (instancetype)init NS_UNAVAILABLE;
 
-- (void)checkForAccessibiltyPermissions;
-- (void)openAccessibiltyPreferences;
-
 - (void)performAutotypeForEntry:(KPKEntry *)entry;
 - (void)performAutotypeForEntry:(KPKEntry *)entry overrideSequence:(NSString *)sequence;
 - (void)selectAutotypeCandiate:(MPAutotypeContext *)context;
diff --git a/MacPass/MPAutotypeDaemon.m b/MacPass/MPAutotypeDaemon.m
index 0dd99b0f..3de4a65b 100644
--- a/MacPass/MPAutotypeDaemon.m
+++ b/MacPass/MPAutotypeDaemon.m
@@ -31,6 +31,7 @@
 #import "MPSettingsHelper.h"
 #import "MPAutotypeCandidateSelectionViewController.h"
 #import "MPUserNotificationCenterDelegate.h"
+#import "MPAutotypeDoctor.h"
 
 #import "MPPluginHost.h"
 #import "MPPlugin.h"
@@ -57,12 +58,11 @@ NSString *const kMPProcessIdentifierKey = @"kMPProcessIdentifierKey";
 @property (strong) NSRunningApplication *previousApplication; // The application that was active before we got invoked
 @property (assign) NSTimeInterval userActionRequested;
 @property (strong) id applicationActivationObserver;
+@property BOOL shouldRunAutotypeDoctor;
 @end
 
 @implementation MPAutotypeDaemon
 
-@dynamic autotypeSupported;
-
 #pragma mark -
 #pragma mark Lifecylce
 
@@ -87,6 +87,8 @@ static MPAutotypeDaemon *_sharedInstance;
     _enabled = NO;
     _targetPID = -1;
     _userActionRequested = NSDate.distantPast.timeIntervalSinceReferenceDate;
+    _shouldRunAutotypeDoctor = NO;
+    BOOL test = MPAutotypeDoctor.defaultDoctor.hasScreenRecordingPermissions;
     [self bind:NSStringFromSelector(@selector(enabled))
       toObject:NSUserDefaultsController.sharedUserDefaultsController
    withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyEnableGlobalAutotype]
@@ -117,13 +119,6 @@ static MPAutotypeDaemon *_sharedInstance;
 
 #pragma mark -
 #pragma mark Properties
-- (BOOL)autotypeSupported {
-  if(@available(macOS 10.14, *)) {
-    return AXIsProcessTrusted();
-  }
-  /* macOS 10.13 and lower allows us to send key events regardless of accessibilty trust */
-  return YES;
-}
 
 - (void)setEnabled:(BOOL)enabled {
   if(_enabled != enabled) {
@@ -142,52 +137,6 @@ static MPAutotypeDaemon *_sharedInstance;
   }
 }
 
-- (void)checkForAccessibiltyPermissions {
-  if(!self.enabled) {
-    return;
-  }
-  
-  if(NSApplication.sharedApplication.isRunningTests) {
-    return; // Do not display pop-up when running tests
-  }
-  
-  BOOL hideAlert = NO;
-  if(nil != [NSUserDefaults.standardUserDefaults objectForKey:kMPSettingsKeyAutotypeHideAccessibiltyWarning]) {
-    hideAlert = [NSUserDefaults.standardUserDefaults boolForKey:kMPSettingsKeyAutotypeHideAccessibiltyWarning];
-  }
-  if(hideAlert || self.autotypeSupported) {
-    return;
-  }
-  else {
-    NSAlert *alert = [[NSAlert alloc] init];
-    alert.alertStyle = NSWarningAlertStyle;
-    alert.messageText = NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_MESSAGE_TEXT", @"Alert message displayed when Autotype performs self check and lacks accessibilty permissions");
-    alert.informativeText = NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_INFORMATIVE_TEXT", @"Alert informative text displayed when Autotype performs self check and lacks accessibilty permissions");
-    alert.showsSuppressionButton = YES;
-    [alert addButtonWithTitle:NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OK", @"Button in dialog to leave autotype disabled and continiue!")];
-    [alert addButtonWithTitle:NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OPEN_PREFERENCES", @"Button in dialog to open accessibilty preferences pane!")];
-    NSModalResponse returnCode = [alert runModal];
-    BOOL suppressWarning = (alert.suppressionButton.state == NSOnState);
-    [NSUserDefaults.standardUserDefaults setBool:suppressWarning forKey:kMPSettingsKeyAutotypeHideAccessibiltyWarning];
-    switch(returnCode) {
-      case NSAlertFirstButtonReturn: {
-        /* ok, ignore */
-        break;
-      }
-      case NSAlertSecondButtonReturn:
-        /* open prefs */
-        [self openAccessibiltyPreferences];
-        break;
-      default:
-        break;
-    }
-  }
-}
-
-- (void)openAccessibiltyPreferences {
-  [NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:@"x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility"]];
-}
-
 #pragma mark -
 #pragma mark Autotype Invocation
 - (void)performAutotypeForEntry:(KPKEntry *)entry {
@@ -225,6 +174,10 @@ static MPAutotypeDaemon *_sharedInstance;
 #pragma mark Autotype Execution
 
 - (void)_performAutotypeForEntry:(KPKEntry *)entryOrNil {
+  if(self.shouldRunAutotypeDoctor) {
+    [MPAutotypeDoctor.defaultDoctor showPermissionCheckReport];
+  }
+  
   /*if(!self.autotypeSupported) {
    NSUserNotification *notification = [[NSUserNotification alloc] init];
    notification.title = NSApp.applicationName;
diff --git a/MacPass/MPAutotypeDoctor.h b/MacPass/MPAutotypeDoctor.h
new file mode 100644
index 00000000..e79eab8b
--- /dev/null
+++ b/MacPass/MPAutotypeDoctor.h
@@ -0,0 +1,31 @@
+//
+//  MPAutotypeDoctor.h
+//  MacPass
+//
+//  Created by Michael Starke on 03.07.19.
+//  Copyright © 2019 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_OPTIONS(NSUInteger, MPAutotypeIssue) {
+  MPAutotypeIssueNoAccessibiltyPermission,
+  MPAutotypeIssueNoScreenRecordingPermission  
+};
+
+@interface MPAutotypeDoctor : NSObject
+
+@property (class, readonly, strong) MPAutotypeDoctor *defaultDoctor;
+
+@property (nonatomic, readonly) BOOL hasAccessibiltyPermissions; // 10.14 requires accessibilty access to send key strokes to other applications
+@property (nonatomic, readonly) BOOL hasScreenRecordingPermissions; // 10.15 requires screen recording permissions to get window names from other processes
+@property (nonatomic, readonly, copy) NSString *localizedErrorDescription; // If any issues are present, this property holds alocalized error description
+
+- (BOOL)checkPermissionsWithoutUserFeedback;
+- (void)showPermissionCheckReport;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/MacPass/MPAutotypeDoctor.m b/MacPass/MPAutotypeDoctor.m
new file mode 100644
index 00000000..fd05b8a9
--- /dev/null
+++ b/MacPass/MPAutotypeDoctor.m
@@ -0,0 +1,114 @@
+//
+//  MPAutotypeDoctor.m
+//  MacPass
+//
+//  Created by Michael Starke on 03.07.19.
+//  Copyright © 2019 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPAutotypeDoctor.h"
+#import "MPSettingsHelper.h"
+#import "NSApplication+MPAdditions.h"
+
+@interface MPAutotypeDoctor ()
+
+@end
+
+@implementation MPAutotypeDoctor
+
++ (MPAutotypeDoctor *)defaultDoctor {
+  static MPAutotypeDoctor *instance;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    instance = [[MPAutotypeDoctor alloc] init];
+  });
+  return instance;
+}
+
+- (BOOL)hasScreenRecordingPermissions {
+  /* macos 10.14 and lower do not require screen recording permission to get window titles */
+  if(@available(macos 10.15, *)) {
+    /*
+     To minimize the intrusion just make a 1px image of the upper left corner
+     This way there is no possibilty to access any private data
+     */
+    CGImageRef screenshot = CGWindowListCreateImage(
+                                                    CGRectMake(0, 0, 1, 1),
+                                                    kCGWindowListOptionOnScreenOnly,
+                                                    kCGNullWindowID,
+                                                    kCGWindowImageDefault);
+    if(!screenshot) {
+      return NO;
+    }
+  }
+  return YES;
+}
+
+- (BOOL)hasAccessibiltyPermissions {
+  if(@available(macOS 10.14, *)) {
+    return AXIsProcessTrusted();
+  }
+  /* macOS 10.13 and lower allows us to send key events regardless of accessibilty trust */
+  return YES;
+}
+
+- (NSString *)localizedErrorDescription {
+  return @"TODO";
+}
+
+- (void)showPermissionCheckReport {
+  // TODO
+}
+
+- (BOOL)checkPermissionsWithoutUserFeedback {
+  // TODO
+  return YES;
+}
+
+- (void)checkForAccessibiltyPermissions {
+  if(NSApplication.sharedApplication.isRunningTests) {
+    return; // Do not display pop-up when running tests
+  }
+  
+  BOOL hideAlert = NO;
+  if(nil != [NSUserDefaults.standardUserDefaults objectForKey:kMPSettingsKeyAutotypeHideAccessibiltyWarning]) {
+    hideAlert = [NSUserDefaults.standardUserDefaults boolForKey:kMPSettingsKeyAutotypeHideAccessibiltyWarning];
+  }
+  if(hideAlert || self.hasAccessibiltyPermissions) {
+    return;
+  }
+  else {
+    NSAlert *alert = [[NSAlert alloc] init];
+    alert.alertStyle = NSWarningAlertStyle;
+    alert.messageText = NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_MESSAGE_TEXT", @"Alert message displayed when Autotype performs self check and lacks accessibilty permissions");
+    alert.informativeText = NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_INFORMATIVE_TEXT", @"Alert informative text displayed when Autotype performs self check and lacks accessibilty permissions");
+    alert.showsSuppressionButton = YES;
+    [alert addButtonWithTitle:NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OK", @"Button in dialog to leave autotype disabled and continiue!")];
+    [alert addButtonWithTitle:NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OPEN_PREFERENCES", @"Button in dialog to open accessibilty preferences pane!")];
+    NSModalResponse returnCode = [alert runModal];
+    BOOL suppressWarning = (alert.suppressionButton.state == NSOnState);
+    [NSUserDefaults.standardUserDefaults setBool:suppressWarning forKey:kMPSettingsKeyAutotypeHideAccessibiltyWarning];
+    switch(returnCode) {
+      case NSAlertFirstButtonReturn: {
+        /* ok, ignore */
+        break;
+      }
+      case NSAlertSecondButtonReturn:
+        /* open prefs */
+        [self openAccessibiltyPreferences];
+        break;
+      default:
+        break;
+    }
+  }
+}
+
+- (void)openAccessibiltyPreferences {
+  [NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:@"x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility"]];
+}
+
+- (void)checkForWindowTitlePermissions {
+}
+
+
+@end
diff --git a/MacPass/MPIntegrationPreferencesController.m b/MacPass/MPIntegrationPreferencesController.m
index f416fe16..5765ec4e 100644
--- a/MacPass/MPIntegrationPreferencesController.m
+++ b/MacPass/MPIntegrationPreferencesController.m
@@ -23,7 +23,7 @@
 #import "MPIntegrationPreferencesController.h"
 #import "MPSettingsHelper.h"
 #import "MPIconHelper.h"
-#import "MPAutotypeDaemon.h"
+#import "MPAutotypeDoctor.h"
 
 #import "DDHotKeyCenter.h"
 #import "DDHotKey+MacPassAdditions.h"
@@ -105,7 +105,8 @@
 }
 
 - (void)_updateAccessabilityWarning {
-  BOOL hasAutotypeSupport = MPAutotypeDaemon.defaultDaemon.autotypeSupported;
+  
+  BOOL hasAutotypeSupport = MPAutotypeDoctor.defaultDoctor.hasAccessibiltyPermissions;
   
   if(hasAutotypeSupport) {
     [self.autotypeStackView setVisibilityPriority:NSStackViewVisibilityPriorityNotVisible forView:self.autotypeWarningTextField];
@@ -118,6 +119,6 @@
 }
 
 - (void)openAccessibiltyPreferences:(id)sender {
-  [MPAutotypeDaemon.defaultDaemon openAccessibiltyPreferences];
+  [MPAutotypeDoctor.defaultDoctor showPermissionCheckReport];
 }
 @end
diff --git a/MacPass/MPUserNotificationCenterDelegate.m b/MacPass/MPUserNotificationCenterDelegate.m
index 307276bd..adb4e46d 100644
--- a/MacPass/MPUserNotificationCenterDelegate.m
+++ b/MacPass/MPUserNotificationCenterDelegate.m
@@ -22,7 +22,7 @@
 
 #import "MPUserNotificationCenterDelegate.h"
 #import "MPDocumentController.h"
-#import "MPAutotypeDaemon.h"
+#import "MPAutotypeDoctor.h"
 
 NSString *const MPUserNotificationTypeKey = @"MPUserNotificationTypeKey";
 NSString *const MPUserNotificationTypeAutotypeFeedback = @"MPUserNotificationTypeAutotypeFeedback";
@@ -46,7 +46,7 @@ NSString *const MPUserNotificationTypeShowAccessibiltyPreferences = @"MPUserNoti
     [((MPDocumentController*)NSDocumentController.sharedDocumentController) reopenLastDocument];
   }
   else if([notificationType isEqualToString:MPUserNotificationTypeShowAccessibiltyPreferences]) {
-    [MPAutotypeDaemon.defaultDaemon openAccessibiltyPreferences];
+    [MPAutotypeDoctor.defaultDoctor showPermissionCheckReport];
   }
 }
 

From 32899cb7071fedc43aa22d00e7252d5b8c3b1bf8 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Tue, 9 Jul 2019 15:39:23 +0200
Subject: [PATCH 05/21] Introduced Autotype doctor in preparation for macOS
 10.15.

This change removes the test for autotype on startup and will only check for permissoins when the pereferences are shown or when (gloabal)autotype is performed.
---
 MacPass.xcodeproj/project.pbxproj             |  10 ++
 .../AutotypeDoctorReportViewController.xib    | 138 +++++++++++++++++
 MacPass/Base.lproj/IntegrationPreferences.xib |  17 ++-
 MacPass/Base.lproj/MainMenu.xib               |  12 +-
 MacPass/MPAppDelegate.h                       |   1 +
 MacPass/MPAppDelegate.m                       |   5 +
 MacPass/MPAutotypeDaemon.m                    |  32 ++--
 MacPass/MPAutotypeDoctor.h                    |  18 +--
 MacPass/MPAutotypeDoctor.m                    | 141 ++++++++++--------
 .../MPAutotypeDoctorReportViewController.h    |  28 ++++
 .../MPAutotypeDoctorReportViewController.m    |  67 +++++++++
 MacPass/MPDocument.m                          |   6 +-
 MacPass/MPIntegrationPreferencesController.h  |   2 +-
 MacPass/MPIntegrationPreferencesController.m  |   6 +-
 MacPass/MPSettingsHelper.h                    |   2 +-
 MacPass/MPSettingsHelper.m                    |   7 +-
 MacPass/MPUserNotificationCenterDelegate.h    |   2 +-
 MacPass/MPUserNotificationCenterDelegate.m    |   8 +-
 MacPass/NSError+Messages.h                    |   8 +-
 MacPass/NSError+Messages.m                    |  10 +-
 .../en.lproj/IntegrationPreferences.strings   |   8 +-
 MacPass/en.lproj/Localizable.strings          |  39 +++--
 MacPass/en.lproj/Localizable.strings.updated  | Bin 0 -> 54594 bytes
 23 files changed, 429 insertions(+), 138 deletions(-)
 create mode 100644 MacPass/AutotypeDoctorReportViewController.xib
 create mode 100644 MacPass/MPAutotypeDoctorReportViewController.h
 create mode 100644 MacPass/MPAutotypeDoctorReportViewController.m
 create mode 100644 MacPass/en.lproj/Localizable.strings.updated

diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 71a05d20..78504f2d 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -226,6 +226,8 @@
 		4CAD338F205169D30068587E /* MPPluginRepositoryItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD338E205169D30068587E /* MPPluginRepositoryItem.m */; };
 		4CAD748C15B889B700104512 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748B15B889B700104512 /* Security.framework */; };
 		4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; };
+		4CAD8AA622CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD8AA422CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m */; };
+		4CAD8AA722CF397B0090B2DD /* AutotypeDoctorReportViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD8AA522CF397B0090B2DD /* AutotypeDoctorReportViewController.xib */; };
 		4CB33F861EAF54A000C9341E /* KPKNode+MPIsHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB33F851EAF54A000C9341E /* KPKNode+MPIsHistory.m */; };
 		4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4CB9339716D3A0DD00A13B5D /* Credits.rtf */; };
 		4CBA2ABA17074C07006D8139 /* MPSettingsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */; };
@@ -776,6 +778,9 @@
 		4CAD338E205169D30068587E /* MPPluginRepositoryItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPPluginRepositoryItem.m; sourceTree = "<group>"; };
 		4CAD748B15B889B700104512 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		4CAD748D15B88AC100104512 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		4CAD8AA322CF397B0090B2DD /* MPAutotypeDoctorReportViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAutotypeDoctorReportViewController.h; sourceTree = "<group>"; };
+		4CAD8AA422CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAutotypeDoctorReportViewController.m; sourceTree = "<group>"; };
+		4CAD8AA522CF397B0090B2DD /* AutotypeDoctorReportViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AutotypeDoctorReportViewController.xib; sourceTree = "<group>"; };
 		4CB33F841EAF54A000C9341E /* KPKNode+MPIsHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KPKNode+MPIsHistory.h"; sourceTree = "<group>"; };
 		4CB33F851EAF54A000C9341E /* KPKNode+MPIsHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KPKNode+MPIsHistory.m"; sourceTree = "<group>"; };
 		4CB63A6018986530002DEC4C /* MPFlagsHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPFlagsHelper.h; sourceTree = "<group>"; };
@@ -1615,6 +1620,9 @@
 				4C73B6EE215E64A7009787F7 /* MPWelcomeViewController.h */,
 				4C73B6EF215E64A7009787F7 /* MPWelcomeViewController.m */,
 				4C7F8B6A1A10B68400CCB83D /* WelcomeView.xib */,
+				4CAD8AA322CF397B0090B2DD /* MPAutotypeDoctorReportViewController.h */,
+				4CAD8AA422CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m */,
+				4CAD8AA522CF397B0090B2DD /* AutotypeDoctorReportViewController.xib */,
 			);
 			name = "View Controller";
 			sourceTree = "<group>";
@@ -1847,6 +1855,7 @@
 				4C3826B41AD04D8E007D7D67 /* 39_HistoryTemplate.pdf in Resources */,
 				4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */,
 				4C3826CD1AD04D8E007D7D67 /* 66_MoneyTemplate.pdf in Resources */,
+				4CAD8AA722CF397B0090B2DD /* AutotypeDoctorReportViewController.xib in Resources */,
 				4CA0B2ED15BCADAC00654E32 /* PreferencesWindow.xib in Resources */,
 				4C76155C1764C04C0015A1A6 /* GeneralPreferences.xib in Resources */,
 				4CD884B715BD47080042BBF8 /* DocumentWindow.xib in Resources */,
@@ -2090,6 +2099,7 @@
 				4CEE46DD181C301D006BF1E5 /* MPAutotypeDaemon.m in Sources */,
 				4C50CC041F6C18830095629D /* MPCollectionViewItem.m in Sources */,
 				4CA78C001FD58C92003C8560 /* MPPluginRepository.m in Sources */,
+				4CAD8AA622CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m in Sources */,
 				4C8990F71EE978EB0043B48D /* MPDuplicateEntryOptionsWindowController.m in Sources */,
 				4CA3530B18A53CB800839B0F /* MPKeyMapper.m in Sources */,
 				4CE298EB1795FC2A00DF7BDB /* MPEntryContextMenuDelegate.m in Sources */,
diff --git a/MacPass/AutotypeDoctorReportViewController.xib b/MacPass/AutotypeDoctorReportViewController.xib
new file mode 100644
index 00000000..e9275fa6
--- /dev/null
+++ b/MacPass/AutotypeDoctorReportViewController.xib
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="MPAutotypeDoctorReportViewController">
+            <connections>
+                <outlet property="accessibiltyStatusImageView" destination="Xzw-kJ-WoH" id="jEb-0z-dNB"/>
+                <outlet property="accessibiltyStatusTextField" destination="Pqa-Ff-7cc" id="h5M-ZN-GhR"/>
+                <outlet property="screenRecordingStatusImageView" destination="vvZ-Lj-v22" id="7h0-cF-Mxt"/>
+                <outlet property="screenRecordingStatusTextField" destination="IP0-CP-tlA" id="AfL-XZ-KRk"/>
+                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="400" height="375"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <stackView orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="T2c-ZD-ioV">
+                    <rect key="frame" x="20" y="20" width="360" height="0.0"/>
+                    <beginningViews>
+                        <stackView orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ErP-eL-yKu"/>
+                    </beginningViews>
+                    <visibilityPriorities>
+                        <integer value="1000"/>
+                    </visibilityPriorities>
+                    <customSpacing>
+                        <real value="3.4028234663852886e+38"/>
+                    </customSpacing>
+                </stackView>
+                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Xzw-kJ-WoH">
+                    <rect key="frame" x="20" y="339" width="16" height="16"/>
+                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSStatusAvailable" id="DWu-HI-z3k"/>
+                </imageView>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Pqa-Ff-7cc">
+                    <rect key="frame" x="42" y="338" width="80" height="17"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" title="Accessibility" id="aIL-8W-63g">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hY9-T0-hke">
+                    <rect key="frame" x="42" y="274" width="340" height="56"/>
+                    <textFieldCell key="cell" controlSize="small" selectable="YES" id="6GI-KJ-Xue">
+                        <font key="font" metaFont="smallSystem"/>
+                        <string key="title">MacPass will send key press events to the system when Autotype or Global Autotype is executed. Since macOS 10.14 Mojave this is only possible, if Accessibility permissions are granted to the application.</string>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="x9d-0h-hyJ">
+                    <rect key="frame" x="38" y="226" width="236" height="32"/>
+                    <buttonCell key="cell" type="push" title="Open Accessibilty Preferences…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8m1-vs-pd5">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="openAccessibiltyPreferences:" target="-2" id="aZf-xi-w73"/>
+                    </connections>
+                </button>
+                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="vvZ-Lj-v22">
+                    <rect key="frame" x="20" y="188" width="16" height="16"/>
+                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSStatusAvailable" id="kCX-CB-5vQ"/>
+                </imageView>
+                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6vq-iM-inn">
+                    <rect key="frame" x="42" y="81" width="340" height="98"/>
+                    <textFieldCell key="cell" controlSize="small" selectable="YES" id="7of-1z-Nfk">
+                        <font key="font" metaFont="smallSystem"/>
+                        <string key="title">MacPass will read every window title when Global Autotype is executed to find a match. Since macOS 10.15 Catalina it is not possible to read any window title, if the user has not granted permissions to record the screen. If you are running macOS 10.15 or higher, MacPass will try to capture the left top most pixel on your screen to initate a request to record the screen. This pixel will not be stored and processed in any way.</string>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dek-ho-dPm">
+                    <rect key="frame" x="38" y="33" width="256" height="32"/>
+                    <buttonCell key="cell" type="push" title="Open Screen Sharing Preferences…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="lgB-Ys-L9R">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="openScreenRecordingPreferences:" target="-2" id="rvE-ff-sR2"/>
+                    </connections>
+                </button>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IP0-CP-tlA">
+                    <rect key="frame" x="42" y="187" width="112" height="17"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" title="Screen Recording" id="9gr-mz-2I4">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="BHb-cd-Q0r">
+                    <rect key="frame" x="20" y="210" width="360" height="5"/>
+                </box>
+            </subviews>
+            <constraints>
+                <constraint firstItem="IP0-CP-tlA" firstAttribute="top" secondItem="BHb-cd-Q0r" secondAttribute="bottom" constant="8" symbolic="YES" id="0sS-li-mx4"/>
+                <constraint firstAttribute="trailing" secondItem="hY9-T0-hke" secondAttribute="trailing" constant="20" symbolic="YES" id="1lC-Hg-bzq"/>
+                <constraint firstItem="vvZ-Lj-v22" firstAttribute="leading" secondItem="Xzw-kJ-WoH" secondAttribute="leading" id="2ZC-Uf-Pe3"/>
+                <constraint firstItem="vvZ-Lj-v22" firstAttribute="centerY" secondItem="IP0-CP-tlA" secondAttribute="centerY" id="2t3-9h-RIf"/>
+                <constraint firstItem="Pqa-Ff-7cc" firstAttribute="leading" secondItem="Xzw-kJ-WoH" secondAttribute="trailing" constant="8" symbolic="YES" id="57a-U7-goz"/>
+                <constraint firstItem="6vq-iM-inn" firstAttribute="top" secondItem="IP0-CP-tlA" secondAttribute="bottom" constant="8" symbolic="YES" id="5ag-ah-YEW"/>
+                <constraint firstItem="x9d-0h-hyJ" firstAttribute="top" secondItem="hY9-T0-hke" secondAttribute="bottom" constant="20" symbolic="YES" id="Avt-sj-8GL"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Pqa-Ff-7cc" secondAttribute="trailing" constant="20" symbolic="YES" id="Bmg-tH-M7Q"/>
+                <constraint firstAttribute="trailing" secondItem="6vq-iM-inn" secondAttribute="trailing" constant="20" symbolic="YES" id="Cga-EU-fSf"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="x9d-0h-hyJ" secondAttribute="trailing" constant="20" symbolic="YES" id="D8o-Gu-s2Y"/>
+                <constraint firstItem="T2c-ZD-ioV" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="G27-G3-ORS"/>
+                <constraint firstItem="T2c-ZD-ioV" firstAttribute="top" relation="greaterThanOrEqual" secondItem="dek-ho-dPm" secondAttribute="bottom" constant="20" symbolic="YES" id="GL8-gK-2fL"/>
+                <constraint firstItem="x9d-0h-hyJ" firstAttribute="leading" secondItem="Pqa-Ff-7cc" secondAttribute="leading" id="J4Y-VM-MZt"/>
+                <constraint firstAttribute="trailing" secondItem="T2c-ZD-ioV" secondAttribute="trailing" constant="20" symbolic="YES" id="M4d-KM-mLN"/>
+                <constraint firstItem="dek-ho-dPm" firstAttribute="leading" secondItem="6vq-iM-inn" secondAttribute="leading" id="TaR-vo-kBx"/>
+                <constraint firstItem="BHb-cd-Q0r" firstAttribute="top" secondItem="x9d-0h-hyJ" secondAttribute="bottom" constant="20" symbolic="YES" id="TlD-dn-LEm"/>
+                <constraint firstItem="BHb-cd-Q0r" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="YdV-6E-JaO"/>
+                <constraint firstItem="IP0-CP-tlA" firstAttribute="leading" secondItem="Pqa-Ff-7cc" secondAttribute="leading" id="c76-Ak-WXw"/>
+                <constraint firstItem="Xzw-kJ-WoH" firstAttribute="centerY" secondItem="Pqa-Ff-7cc" secondAttribute="centerY" id="dF3-uj-K2q"/>
+                <constraint firstItem="Pqa-Ff-7cc" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" symbolic="YES" id="eyJ-B0-kI3"/>
+                <constraint firstItem="dek-ho-dPm" firstAttribute="top" secondItem="6vq-iM-inn" secondAttribute="bottom" constant="20" symbolic="YES" id="i0R-gb-coZ"/>
+                <constraint firstItem="hY9-T0-hke" firstAttribute="leading" secondItem="Pqa-Ff-7cc" secondAttribute="leading" id="kLD-8A-d1Y"/>
+                <constraint firstItem="6vq-iM-inn" firstAttribute="leading" secondItem="IP0-CP-tlA" secondAttribute="leading" id="nby-S7-orD"/>
+                <constraint firstItem="Xzw-kJ-WoH" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="oAi-Zl-LCI"/>
+                <constraint firstItem="hY9-T0-hke" firstAttribute="top" secondItem="Pqa-Ff-7cc" secondAttribute="bottom" constant="8" symbolic="YES" id="oK3-FK-r0S"/>
+                <constraint firstAttribute="bottom" secondItem="T2c-ZD-ioV" secondAttribute="bottom" constant="20" symbolic="YES" id="pm7-eL-q1F"/>
+                <constraint firstAttribute="trailing" secondItem="BHb-cd-Q0r" secondAttribute="trailing" constant="20" symbolic="YES" id="ryW-3O-g6b"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="dek-ho-dPm" secondAttribute="trailing" constant="20" symbolic="YES" id="xcq-hp-Ay9"/>
+            </constraints>
+            <point key="canvasLocation" x="-409" y="-124"/>
+        </customView>
+    </objects>
+    <resources>
+        <image name="NSStatusAvailable" width="16" height="16"/>
+    </resources>
+</document>
diff --git a/MacPass/Base.lproj/IntegrationPreferences.xib b/MacPass/Base.lproj/IntegrationPreferences.xib
index e3bfb500..07213981 100644
--- a/MacPass/Base.lproj/IntegrationPreferences.xib
+++ b/MacPass/Base.lproj/IntegrationPreferences.xib
@@ -26,21 +26,22 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="1">
-            <rect key="frame" x="0.0" y="0.0" width="400" height="421"/>
+            <rect key="frame" x="0.0" y="0.0" width="400" height="449"/>
             <subviews>
                 <box autoresizesSubviews="NO" verticalHuggingPriority="500" borderType="line" title="Autotype" translatesAutoresizingMaskIntoConstraints="NO" id="P9N-HM-wER">
-                    <rect key="frame" x="17" y="115" width="366" height="286"/>
+                    <rect key="frame" x="17" y="115" width="366" height="314"/>
                     <view key="contentView" id="faU-Ok-HJ3">
-                        <rect key="frame" x="3" y="3" width="360" height="268"/>
+                        <rect key="frame" x="3" y="3" width="360" height="296"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="j52-9L-k7c">
-                                <rect key="frame" x="16" y="17" width="328" height="241"/>
+                                <rect key="frame" x="16" y="17" width="328" height="269"/>
                                 <beginningViews>
                                     <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="328" translatesAutoresizingMaskIntoConstraints="NO" id="hMJ-Mo-xOM">
-                                        <rect key="frame" x="-2" y="227" width="150" height="14"/>
-                                        <textFieldCell key="cell" controlSize="small" title="ReportFromAutotypeDoctor" id="H37-ku-aTc">
+                                        <rect key="frame" x="-2" y="227" width="332" height="42"/>
+                                        <textFieldCell key="cell" controlSize="small" id="H37-ku-aTc">
                                             <font key="font" metaFont="smallSystem"/>
+                                            <string key="title">Autotype might not work properly. Some issues where found that prevent Autotype or Global Autotype to work. Please run the Autotype Doctor to fix those issues.</string>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -52,7 +53,7 @@
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
                                         <connections>
-                                            <action selector="openAccessibiltyPreferences:" target="-2" id="GTg-6Z-6nd"/>
+                                            <action selector="runAutotypeDoctor:" target="-2" id="u2q-ab-rQY"/>
                                         </connections>
                                     </button>
                                     <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tik-Ar-FJg">
@@ -228,7 +229,7 @@
                 <constraint firstItem="P9N-HM-wER" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="ulV-xL-ldJ"/>
                 <constraint firstItem="VVs-b5-cX9" firstAttribute="leading" secondItem="P9N-HM-wER" secondAttribute="leading" id="z4a-9C-78h"/>
             </constraints>
-            <point key="canvasLocation" x="-357" y="-1007.5"/>
+            <point key="canvasLocation" x="-558" y="-1123"/>
         </customView>
     </objects>
 </document>
diff --git a/MacPass/Base.lproj/MainMenu.xib b/MacPass/Base.lproj/MainMenu.xib
index c608076c..8db4e4ba 100644
--- a/MacPass/Base.lproj/MainMenu.xib
+++ b/MacPass/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -317,12 +317,18 @@ CA
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="1176"/>
-                            <menuItem title="Show Password Generator" keyEquivalent="p" id="1200">
+                            <menuItem title="Password Generator" keyEquivalent="p" id="1200">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                 <connections>
                                     <action selector="showPasswordCreator:" target="494" id="1202"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Autotype Doctor" id="zWx-Re-iuJ">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="showAutotypeDoctor:" target="494" id="fsq-lt-9gZ"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="92">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
diff --git a/MacPass/MPAppDelegate.h b/MacPass/MPAppDelegate.h
index 55f2133d..2e40e15c 100644
--- a/MacPass/MPAppDelegate.h
+++ b/MacPass/MPAppDelegate.h
@@ -42,6 +42,7 @@ APPKIT_EXTERN NSString *const MPDidChangeStoredKeyFilesSettings;
 - (IBAction)showPreferences:(id)sender;
 - (IBAction)showPluginPrefences:(id)sender;
 - (IBAction)showPasswordCreator:(id)sender;
+- (IBAction)showAutotypeDoctor:(id)sender;
 - (IBAction)createNewDatabase:(id)sender;
 - (IBAction)openDatabase:(id)sender;
 - (IBAction)showHelp:(id)sender;
diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index b68901da..a59bcd92 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -42,6 +42,7 @@
 #import "MPWelcomeViewController.h"
 #import "MPPlugin.h"
 #import "MPEntryContextMenuDelegate.h"
+#import "MPAutotypeDoctor.h"
 
 #import "NSApplication+MPAdditions.h"
 
@@ -334,6 +335,10 @@ typedef NS_OPTIONS(NSInteger, MPAppStartupState) {
   [NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:urlString]];
 }
 
+- (void)showAutotypeDoctor:(id)sender {
+  [MPAutotypeDoctor.defaultDoctor runChecksAndPresentResults];
+}
+
 - (void)checkForUpdates:(id)sender {
 #if defined(DEBUG) || defined(NO_SPARKLE)
   NSAlert *alert = [[NSAlert alloc] init];
diff --git a/MacPass/MPAutotypeDaemon.m b/MacPass/MPAutotypeDaemon.m
index 3de4a65b..8f4dc034 100644
--- a/MacPass/MPAutotypeDaemon.m
+++ b/MacPass/MPAutotypeDaemon.m
@@ -58,7 +58,7 @@ NSString *const kMPProcessIdentifierKey = @"kMPProcessIdentifierKey";
 @property (strong) NSRunningApplication *previousApplication; // The application that was active before we got invoked
 @property (assign) NSTimeInterval userActionRequested;
 @property (strong) id applicationActivationObserver;
-@property BOOL shouldRunAutotypeDoctor;
+@property (nonatomic, readonly) BOOL hasNecessaryAutotypePermissions;
 @end
 
 @implementation MPAutotypeDaemon
@@ -87,8 +87,6 @@ static MPAutotypeDaemon *_sharedInstance;
     _enabled = NO;
     _targetPID = -1;
     _userActionRequested = NSDate.distantPast.timeIntervalSinceReferenceDate;
-    _shouldRunAutotypeDoctor = NO;
-    BOOL test = MPAutotypeDoctor.defaultDoctor.hasScreenRecordingPermissions;
     [self bind:NSStringFromSelector(@selector(enabled))
       toObject:NSUserDefaultsController.sharedUserDefaultsController
    withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyEnableGlobalAutotype]
@@ -137,6 +135,10 @@ static MPAutotypeDaemon *_sharedInstance;
   }
 }
 
+- (BOOL)hasNecessaryAutotypePermissions {
+  return MPAutotypeDoctor.defaultDoctor.hasNecessaryAutotypePermissions;
+}
+
 #pragma mark -
 #pragma mark Autotype Invocation
 - (void)performAutotypeForEntry:(KPKEntry *)entry {
@@ -174,20 +176,16 @@ static MPAutotypeDaemon *_sharedInstance;
 #pragma mark Autotype Execution
 
 - (void)_performAutotypeForEntry:(KPKEntry *)entryOrNil {
-  if(self.shouldRunAutotypeDoctor) {
-    [MPAutotypeDoctor.defaultDoctor showPermissionCheckReport];
+  if(!self.hasNecessaryAutotypePermissions) {
+    NSUserNotification *notification = [[NSUserNotification alloc] init];
+    notification.title = NSApp.applicationName;
+    notification.informativeText = NSLocalizedString(@"AUTOTYPE_NOTIFICATION_MACPASS_IS_MISSING_PERMISSIONS", "Notification: Autotype failed, MacPass has not enough permissions to perform autotype");
+    notification.actionButtonTitle = NSLocalizedString(@"SHOW_AUTOTYPE_DOCTOR", "Action button in Notification to show the Autotype Doctor");
+    notification.userInfo = @{ MPUserNotificationTypeKey: MPUserNotificationTypeRunAutotypeDoctor };
+    notification.showsButtons = YES;
+    [NSUserNotificationCenter.defaultUserNotificationCenter deliverNotification:notification];
+    return;
   }
-  
-  /*if(!self.autotypeSupported) {
-   NSUserNotification *notification = [[NSUserNotification alloc] init];
-   notification.title = NSApp.applicationName;
-   notification.informativeText = NSLocalizedString(@"AUTOTYPE_NOTIFICATION_MACPASS_HAS_NO_ACCESSIBILTY_PERMISSIONS", "Notification: Autotype failed, MacPass has no permission to send key strokes");
-   notification.actionButtonTitle = NSLocalizedString(@"OPEN_PREFERENCES", "Action button in Notification to show the Accessibilty preferences");
-   notification.userInfo = @{ MPUserNotificationTypeKey: MPUserNotificationTypeShowAccessibiltyPreferences };
-   notification.showsButtons = YES;
-   [NSUserNotificationCenter.defaultUserNotificationCenter deliverNotification:notification];
-   return;
-   }*/
   NSInteger pid = NSProcessInfo.processInfo.processIdentifier;
   if(self.targetPID == pid) {
     return; // We do not perform Autotype on ourselves
@@ -228,7 +226,7 @@ static MPAutotypeDaemon *_sharedInstance;
   }
   
   MPAutotypeContext *context = [self _autotypeContextForDocuments:documents forWindowTitle:self.targetWindowTitle preferredEntry:entryOrNil];
-  /* TODO: that's popping up if the mulit selection dialog goes up! */
+  /* TODO: that's popping up if the multi selection dialog goes up! */
   if(self.matchSelectionWindow) {
     return; // we present the match selection window, just return
   }
diff --git a/MacPass/MPAutotypeDoctor.h b/MacPass/MPAutotypeDoctor.h
index e79eab8b..ea8f537a 100644
--- a/MacPass/MPAutotypeDoctor.h
+++ b/MacPass/MPAutotypeDoctor.h
@@ -10,21 +10,19 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NS_OPTIONS(NSUInteger, MPAutotypeIssue) {
-  MPAutotypeIssueNoAccessibiltyPermission,
-  MPAutotypeIssueNoScreenRecordingPermission  
-};
-
 @interface MPAutotypeDoctor : NSObject
 
+
 @property (class, readonly, strong) MPAutotypeDoctor *defaultDoctor;
+@property (nonatomic, readonly) BOOL hasNecessaryAutotypePermissions; // MacPass has all the permissions it needs to run autotype on the current system
 
-@property (nonatomic, readonly) BOOL hasAccessibiltyPermissions; // 10.14 requires accessibilty access to send key strokes to other applications
-@property (nonatomic, readonly) BOOL hasScreenRecordingPermissions; // 10.15 requires screen recording permissions to get window names from other processes
-@property (nonatomic, readonly, copy) NSString *localizedErrorDescription; // If any issues are present, this property holds alocalized error description
+- (BOOL)hasScreenRecordingPermissions:(NSError *__autoreleasing*)error;
+- (BOOL)hasAccessibiltyPermissions:(NSError *__autoreleasing*)error;
 
-- (BOOL)checkPermissionsWithoutUserFeedback;
-- (void)showPermissionCheckReport;
+- (void)runChecksAndPresentResults;
+- (void)openScreenRecordingPreferences;
+- (void)openAccessibiltyPreferences;
+- (void)openAutomationPreferences;
 
 @end
 
diff --git a/MacPass/MPAutotypeDoctor.m b/MacPass/MPAutotypeDoctor.m
index fd05b8a9..55412bb4 100644
--- a/MacPass/MPAutotypeDoctor.m
+++ b/MacPass/MPAutotypeDoctor.m
@@ -9,9 +9,35 @@
 #import "MPAutotypeDoctor.h"
 #import "MPSettingsHelper.h"
 #import "NSApplication+MPAdditions.h"
+#import "MPAutotypeDoctorReportViewController.h"
+#import "NSError+Messages.h"
 
-@interface MPAutotypeDoctor ()
 
+@interface MPReportItem : NSObject
+
+@property (copy) NSString *statusDescription;
+@property (copy) NSString *label;
+@property (copy) NSString *actionLabel;
+@property BOOL isOK;
+@property (weak) id target;
+
+@end
+
+@implementation MPReportItem
+
+- (instancetype)init {
+  self = [super init];
+  if(self) {
+    _isOK = NO;
+  }
+  return self;
+}
+
+@end
+
+
+@interface MPAutotypeDoctor () <NSWindowDelegate>
+@property (strong) NSWindow *reportWindow;
 @end
 
 @implementation MPAutotypeDoctor
@@ -25,90 +51,83 @@
   return instance;
 }
 
-- (BOOL)hasScreenRecordingPermissions {
+- (BOOL)hasNecessaryAutotypePermissions {
+  if(![self hasAccessibiltyPermissions:NULL]) {
+    return NO;
+  }
+  if(![self hasScreenRecordingPermissions:NULL]) {
+    return NO;
+  }
+  return YES;
+}
+
+- (BOOL)hasScreenRecordingPermissions:(NSError *__autoreleasing*)error {
+  BOOL canRecordScreen = YES;
   /* macos 10.14 and lower do not require screen recording permission to get window titles */
   if(@available(macos 10.15, *)) {
     /*
      To minimize the intrusion just make a 1px image of the upper left corner
-     This way there is no possibilty to access any private data
+     This way there is no real possibilty to access any private data
      */
     CGImageRef screenshot = CGWindowListCreateImage(
                                                     CGRectMake(0, 0, 1, 1),
                                                     kCGWindowListOptionOnScreenOnly,
                                                     kCGNullWindowID,
                                                     kCGWindowImageDefault);
-    if(!screenshot) {
-      return NO;
+    BOOL canRecordScreen = !screenshot;
+    if(!canRecordScreen && error) {
+      *error = [NSError errorInDomain:MPAutotypeErrorDomain withCode:MPErrorAutotypeIsMissingScreenRecordingPermissions description:NSLocalizedString(@"ERROR_NO_PERMISSION_TO_RECORD_SCREEN", "Error description for missing screen recording permissions")];
     }
   }
-  return YES;
+  return canRecordScreen;
 }
 
-- (BOOL)hasAccessibiltyPermissions {
-  if(@available(macOS 10.14, *)) {
-    return AXIsProcessTrusted();
-  }
+- (BOOL)hasAccessibiltyPermissions:(NSError *__autoreleasing*)error {
+  BOOL isTrusted = YES;
   /* macOS 10.13 and lower allows us to send key events regardless of accessibilty trust */
-  return YES;
-}
-
-- (NSString *)localizedErrorDescription {
-  return @"TODO";
-}
-
-- (void)showPermissionCheckReport {
-  // TODO
-}
-
-- (BOOL)checkPermissionsWithoutUserFeedback {
-  // TODO
-  return YES;
-}
-
-- (void)checkForAccessibiltyPermissions {
-  if(NSApplication.sharedApplication.isRunningTests) {
-    return; // Do not display pop-up when running tests
-  }
-  
-  BOOL hideAlert = NO;
-  if(nil != [NSUserDefaults.standardUserDefaults objectForKey:kMPSettingsKeyAutotypeHideAccessibiltyWarning]) {
-    hideAlert = [NSUserDefaults.standardUserDefaults boolForKey:kMPSettingsKeyAutotypeHideAccessibiltyWarning];
-  }
-  if(hideAlert || self.hasAccessibiltyPermissions) {
-    return;
-  }
-  else {
-    NSAlert *alert = [[NSAlert alloc] init];
-    alert.alertStyle = NSWarningAlertStyle;
-    alert.messageText = NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_MESSAGE_TEXT", @"Alert message displayed when Autotype performs self check and lacks accessibilty permissions");
-    alert.informativeText = NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_INFORMATIVE_TEXT", @"Alert informative text displayed when Autotype performs self check and lacks accessibilty permissions");
-    alert.showsSuppressionButton = YES;
-    [alert addButtonWithTitle:NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OK", @"Button in dialog to leave autotype disabled and continiue!")];
-    [alert addButtonWithTitle:NSLocalizedString(@"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OPEN_PREFERENCES", @"Button in dialog to open accessibilty preferences pane!")];
-    NSModalResponse returnCode = [alert runModal];
-    BOOL suppressWarning = (alert.suppressionButton.state == NSOnState);
-    [NSUserDefaults.standardUserDefaults setBool:suppressWarning forKey:kMPSettingsKeyAutotypeHideAccessibiltyWarning];
-    switch(returnCode) {
-      case NSAlertFirstButtonReturn: {
-        /* ok, ignore */
-        break;
-      }
-      case NSAlertSecondButtonReturn:
-        /* open prefs */
-        [self openAccessibiltyPreferences];
-        break;
-      default:
-        break;
+  if(@available(macOS 10.14, *)) {
+    isTrusted = AXIsProcessTrusted();
+    if(!isTrusted && error) {
+      *error = [NSError errorInDomain:MPAutotypeErrorDomain withCode:MPErrorAutotypeIsMissingAccessibiltyPermissions description:NSLocalizedString(@"ERROR_NO_ACCESSIBILTY_PERMISSIONS", "Error description for missing accessibilty permissions")];
     }
   }
+  return isTrusted;
 }
 
 - (void)openAccessibiltyPreferences {
   [NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:@"x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility"]];
 }
 
-- (void)checkForWindowTitlePermissions {
+- (void)openScreenRecordingPreferences {
+  //TODO fix this in macOS 10.15 to use the correct URL
+  [NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:@"x-apple.systempreferences:com.apple.preference.security"]];
 }
 
+- (void)openAutomationPreferences {
+  [NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:@"x-apple.systempreferences:com.apple.preference.security?Privacy_Automation"]];
+}
+
+- (void)runChecksAndPresentResults {
+  if(!self.reportWindow) {
+    self.reportWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
+                                                    styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable
+                                                      backing:NSBackingStoreBuffered
+                                                        defer:NO];
+    self.reportWindow.releasedWhenClosed = NO;
+    self.reportWindow.title = NSLocalizedString(@"AUTOTYPE_DOCTOR_RESULTS_WINDOW_TITLE", @"Window title for the stand-alone password creator window");
+    self.reportWindow.delegate = self;
+  }
+  MPAutotypeDoctorReportViewController *vc = [[MPAutotypeDoctorReportViewController alloc] init];
+  self.reportWindow.contentViewController = vc;
+
+  [self.reportWindow center];
+  [self.reportWindow makeKeyAndOrderFront:vc];
+}
+
+- (void)windowWillClose:(NSNotification *)notification {
+  if(notification.object == self.reportWindow) {
+    self.reportWindow = nil;
+  }
+}
 
 @end
diff --git a/MacPass/MPAutotypeDoctorReportViewController.h b/MacPass/MPAutotypeDoctorReportViewController.h
new file mode 100644
index 00000000..83d3b9ea
--- /dev/null
+++ b/MacPass/MPAutotypeDoctorReportViewController.h
@@ -0,0 +1,28 @@
+//
+//  MPAutotypeDoctorReportViewController.h
+//  MacPass
+//
+//  Created by Michael Starke on 05.07.19.
+//  Copyright © 2019 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPAutotypeDoctorReportViewController : NSViewController
+
+@property (strong) IBOutlet NSImageView *accessibiltyStatusImageView;
+@property (strong) IBOutlet NSTextField *accessibiltyStatusTextField;
+
+@property (strong) IBOutlet NSImageView *screenRecordingStatusImageView;
+@property (strong) IBOutlet NSTextField *screenRecordingStatusTextField;
+
+- (IBAction)openAccessibiltyPreferences:(id)sender;
+- (IBAction)openScreenRecordingPreferences:(id)sender;
+- (IBAction)openAutomationPreferences:(id)sender;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/MacPass/MPAutotypeDoctorReportViewController.m b/MacPass/MPAutotypeDoctorReportViewController.m
new file mode 100644
index 00000000..52440ec1
--- /dev/null
+++ b/MacPass/MPAutotypeDoctorReportViewController.m
@@ -0,0 +1,67 @@
+//
+//  MPAutotypeDoctorReportViewController.m
+//  MacPass
+//
+//  Created by Michael Starke on 05.07.19.
+//  Copyright © 2019 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPAutotypeDoctorReportViewController.h"
+#import "MPAutotypeDoctor.h"
+
+@implementation MPAutotypeDoctorReportViewController
+
+- (NSNibName)nibName {
+  return @"AutotypeDoctorReportViewController";
+}
+
+- (void)viewDidLoad {
+  [super viewDidLoad];
+  [self _updateView];
+
+}
+
+- (void)openAccessibiltyPreferences:(id)sender {
+  [MPAutotypeDoctor.defaultDoctor openAccessibiltyPreferences];
+}
+
+- (void)openScreenRecordingPreferences:(id)sender {
+  [MPAutotypeDoctor.defaultDoctor openScreenRecordingPreferences];
+}
+
+- (void)openAutomationPreferences:(id)sender {
+  [MPAutotypeDoctor.defaultDoctor openAutomationPreferences];
+}
+
+
+- (void)_updateView {
+  NSError *error;
+  if([MPAutotypeDoctor.defaultDoctor hasAccessibiltyPermissions:&error]) {
+    self.accessibiltyStatusImageView.image = [NSImage imageNamed:NSImageNameStatusAvailable];
+    self.accessibiltyStatusTextField.stringValue = NSLocalizedString(@"AUTOTYPE_STATUS_ACCESSIBILTY_PERMISSIONS_OK", "Status lable when no issue were found in accessibilty");
+  }
+  else {
+    self.accessibiltyStatusImageView.image = [NSImage imageNamed:NSImageNameStatusUnavailable];
+    if(error && error.localizedDescription) {
+      self.accessibiltyStatusTextField.stringValue = error.localizedDescription;
+    }
+    else {
+      self.accessibiltyStatusTextField.stringValue = NSLocalizedString(@"AUTOTYPE_STATUS_NO_ACCESSIBILTY_PERMISSIONS", "Status MacPass has no accessibilty permissions");
+    }
+  }
+  if([MPAutotypeDoctor.defaultDoctor hasScreenRecordingPermissions:&error]) {
+    self.screenRecordingStatusImageView.image = [NSImage imageNamed:NSImageNameStatusAvailable];
+    self.screenRecordingStatusTextField.stringValue = NSLocalizedString(@"AUTOTYPE_STATUS_SCREEN_RECORDING_PERMISSIONS_OK", "Status lable when no issue were found in screen recording permissions");
+  }
+  else {
+    self.screenRecordingStatusImageView.image = [NSImage imageNamed:NSImageNameStatusUnavailable];
+    if(error && error.localizedDescription) {
+      self.screenRecordingStatusTextField.stringValue = error.localizedDescription;
+    }
+    else {
+      self.screenRecordingStatusTextField.stringValue = NSLocalizedString(@"AUTOTYPE_STATUS_NO_SCREEN_RECORDING_PERMISSIONS", "Status MacPass has no screen recording permissions");
+    }
+  } 
+}
+
+@end
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 48fd5310..1feab801 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -168,7 +168,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
                               NSRecoveryAttempterErrorKey : recovery
                               };
   if(outError != NULL) {
-    *outError = [NSError errorWithDomain:MPErrorDomain code:MPErrorNoPasswordOrKeyFile userInfo:userInfo];
+    *outError = [NSError errorWithDomain:MPDefaultErrorDomain code:MPErrorNoPasswordOrKeyFile userInfo:userInfo];
   }
   return NO;
 }
@@ -181,7 +181,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
   if(!self.compositeKey.hasPasswordOrKeyFile) {
     if(outError != NULL) {
       NSDictionary *userInfo = @{ NSLocalizedDescriptionKey: NSLocalizedString(@"WARNING_ON_SAVE_NO_PASSWORD_OR_KEY_SET", "") };
-      *outError = [NSError errorWithDomain:MPErrorDomain code:0 userInfo:userInfo];
+      *outError = [NSError errorWithDomain:MPDefaultErrorDomain code:0 userInfo:userInfo];
     }
     return nil; // Saving without a password/key is not possible
   }
@@ -190,7 +190,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
   if(format == KPKDatabaseFormatUnknown) {
     if(outError != NULL) {
       NSDictionary *userInfo = @{ NSLocalizedDescriptionKey: NSLocalizedString(@"UNKNOWN_FILE_VERSION", "") };
-      *outError = [NSError errorWithDomain:MPErrorDomain code:0 userInfo:userInfo];
+      *outError = [NSError errorWithDomain:MPDefaultErrorDomain code:0 userInfo:userInfo];
     }
     return nil; // We do not know what version to save!
   }
diff --git a/MacPass/MPIntegrationPreferencesController.h b/MacPass/MPIntegrationPreferencesController.h
index 7ebeeecb..2deb2b5a 100644
--- a/MacPass/MPIntegrationPreferencesController.h
+++ b/MacPass/MPIntegrationPreferencesController.h
@@ -44,6 +44,6 @@
 /* Preview */
 @property (strong) IBOutlet NSButton *enableQuicklookCheckBox;
 
-- (IBAction)openAccessibiltyPreferences:(id)sender;
+- (IBAction)runAutotypeDoctor:(id)sender;
 
 @end
diff --git a/MacPass/MPIntegrationPreferencesController.m b/MacPass/MPIntegrationPreferencesController.m
index 5765ec4e..c4ccdfbc 100644
--- a/MacPass/MPIntegrationPreferencesController.m
+++ b/MacPass/MPIntegrationPreferencesController.m
@@ -106,7 +106,7 @@
 
 - (void)_updateAccessabilityWarning {
   
-  BOOL hasAutotypeSupport = MPAutotypeDoctor.defaultDoctor.hasAccessibiltyPermissions;
+  BOOL hasAutotypeSupport = MPAutotypeDoctor.defaultDoctor.hasNecessaryAutotypePermissions;
   
   if(hasAutotypeSupport) {
     [self.autotypeStackView setVisibilityPriority:NSStackViewVisibilityPriorityNotVisible forView:self.autotypeWarningTextField];
@@ -118,7 +118,7 @@
   }
 }
 
-- (void)openAccessibiltyPreferences:(id)sender {
-  [MPAutotypeDoctor.defaultDoctor showPermissionCheckReport];
+- (void)runAutotypeDoctor:(id)sender {
+  [MPAutotypeDoctor.defaultDoctor runChecksAndPresentResults];
 }
 @end
diff --git a/MacPass/MPSettingsHelper.h b/MacPass/MPSettingsHelper.h
index 52d70470..9c24eacf 100644
--- a/MacPass/MPSettingsHelper.h
+++ b/MacPass/MPSettingsHelper.h
@@ -68,7 +68,7 @@ APPKIT_EXTERN NSString *const kMPSettingsKeyAutotypeMatchTitle;               //
 APPKIT_EXTERN NSString *const kMPSettingsKeyAutotypeMatchURL;                 // Autotype lookup includes entry URL
 APPKIT_EXTERN NSString *const kMPSettingsKeyAutotypeMatchHost;                // Autotype lookup includes host part of entry URL
 APPKIT_EXTERN NSString *const kMPSettingsKeyAutotypeMatchTags;                // Autotype lookup includes tags for entries
-APPKIT_EXTERN NSString *const kMPSettingsKeyAutotypeHideAccessibiltyWarning;  // Do not show an alert, when MacPass has no support for Autotype
+APPKIT_EXTERN NSString *const kMPSettingsKeyAutotpyeHideMissingPermissionsWarning;
 
 /* Search */
 APPKIT_EXTERN NSString *const kMPSettingsKeyEntrySearchFilterContext;
diff --git a/MacPass/MPSettingsHelper.m b/MacPass/MPSettingsHelper.m
index eccbb4e2..e50eec04 100644
--- a/MacPass/MPSettingsHelper.m
+++ b/MacPass/MPSettingsHelper.m
@@ -59,7 +59,7 @@ NSString *const kMPSettingsKeyAutotypeMatchTitle                      = @"Autoty
 NSString *const kMPSettingsKeyAutotypeMatchURL                        = @"AutotypeMatchURL";
 NSString *const kMPSettingsKeyAutotypeMatchHost                       = @"AutotypeMatchHost";
 NSString *const kMPSettingsKeyAutotypeMatchTags                       = @"AutotypeMatchTags";
-NSString *const kMPSettingsKeyAutotypeHideAccessibiltyWarning         = @"AutotypeHideAccessibiltyWarning";
+NSString *const kMPSettingsKeyAutotpyeHideMissingPermissionsWarning   = @"AutotpyeHideMissingPermissionsWarning";
 
 NSString *const kMPSettingsKeyEntrySearchFilterContext                = @"EntrySearchFilterContext";
 
@@ -96,7 +96,7 @@ NSString *const kMPDeprecatedSettingsKeyEnableHttpServer                  = @"En
 NSString *const kMPDeprecatedSettingsKeyShowMenuItem                      = @"ShowMenuItem";
 NSString *const kMPDeprecatedSettingsKeyDefaultPasswordRounds             = @"KeyDefaultPasswordRounds";
 NSString *const kMPDepricatedSettingsKeyLoadUnsecurePlugins               = @"MPLoadUnsecurePlugins";
-
+NSString *const kMPDepricatedSettingsKeyAutotypeHideAccessibiltyWarning   = @"AutotypeHideAccessibiltyWarning";
 
 @implementation MPSettingsHelper
 
@@ -181,7 +181,8 @@ NSString *const kMPDepricatedSettingsKeyLoadUnsecurePlugins               = @"MP
                             kMPDeprecatedSettingsKeyHttpPort,
                             kMPDeprecatedSettingsKeyEnableHttpServer,
                             kMPDeprecatedSettingsKeyShowMenuItem,
-                            kMPDepricatedSettingsKeyLoadUnsecurePlugins
+                            kMPDepricatedSettingsKeyLoadUnsecurePlugins,
+                            kMPDepricatedSettingsKeyAutotypeHideAccessibiltyWarning
                             ];
   });
   return deprecatedSettings;
diff --git a/MacPass/MPUserNotificationCenterDelegate.h b/MacPass/MPUserNotificationCenterDelegate.h
index 0eadfd6b..f1c6b649 100644
--- a/MacPass/MPUserNotificationCenterDelegate.h
+++ b/MacPass/MPUserNotificationCenterDelegate.h
@@ -25,7 +25,7 @@
 FOUNDATION_EXTERN NSString *const MPUserNotificationTypeKey;
 FOUNDATION_EXTERN NSString *const MPUserNotificationTypeAutotypeFeedback;
 FOUNDATION_EXTERN NSString *const MPUserNotificationTypeAutotypeOpenDocumentRequest;
-FOUNDATION_EXTERN NSString *const MPUserNotificationTypeShowAccessibiltyPreferences;
+FOUNDATION_EXTERN NSString *const MPUserNotificationTypeRunAutotypeDoctor;
 
 @interface MPUserNotificationCenterDelegate : NSObject <NSUserNotificationCenterDelegate>
 
diff --git a/MacPass/MPUserNotificationCenterDelegate.m b/MacPass/MPUserNotificationCenterDelegate.m
index adb4e46d..be3de356 100644
--- a/MacPass/MPUserNotificationCenterDelegate.m
+++ b/MacPass/MPUserNotificationCenterDelegate.m
@@ -27,7 +27,7 @@
 NSString *const MPUserNotificationTypeKey = @"MPUserNotificationTypeKey";
 NSString *const MPUserNotificationTypeAutotypeFeedback = @"MPUserNotificationTypeAutotypeFeedback";
 NSString *const MPUserNotificationTypeAutotypeOpenDocumentRequest = @"MPUserNotificationTypeAutotypeOpenDocumentRequest";
-NSString *const MPUserNotificationTypeShowAccessibiltyPreferences = @"MPUserNotificationTypeShowAccessibiltyPreferences";
+NSString *const MPUserNotificationTypeRunAutotypeDoctor = @"MPUserNotificationTypeRunAutotypeDoctor";
 
 @implementation MPUserNotificationCenterDelegate
 
@@ -45,8 +45,8 @@ NSString *const MPUserNotificationTypeShowAccessibiltyPreferences = @"MPUserNoti
   if([notificationType isEqualToString:MPUserNotificationTypeAutotypeOpenDocumentRequest]) {
     [((MPDocumentController*)NSDocumentController.sharedDocumentController) reopenLastDocument];
   }
-  else if([notificationType isEqualToString:MPUserNotificationTypeShowAccessibiltyPreferences]) {
-    [MPAutotypeDoctor.defaultDoctor showPermissionCheckReport];
+  else if([notificationType isEqualToString:MPUserNotificationTypeRunAutotypeDoctor]) {
+    [MPAutotypeDoctor.defaultDoctor runChecksAndPresentResults];
   }
 }
 
@@ -55,7 +55,7 @@ NSString *const MPUserNotificationTypeShowAccessibiltyPreferences = @"MPUserNoti
   if([notificationType isEqualToString:MPUserNotificationTypeAutotypeFeedback]) {
     return YES;
   }
-  if([notificationType isEqualToString:MPUserNotificationTypeShowAccessibiltyPreferences]) {
+  if([notificationType isEqualToString:MPUserNotificationTypeRunAutotypeDoctor]) {
     return YES;
   }
   return NO;
diff --git a/MacPass/NSError+Messages.h b/MacPass/NSError+Messages.h
index a7d2cbdf..30e4c028 100644
--- a/MacPass/NSError+Messages.h
+++ b/MacPass/NSError+Messages.h
@@ -22,16 +22,20 @@
 
 #import <Foundation/Foundation.h>
 
-FOUNDATION_EXPORT NSString *const MPErrorDomain;
+FOUNDATION_EXPORT NSString *const MPDefaultErrorDomain;
+FOUNDATION_EXPORT NSString *const MPAutotypeErrorDomain;
 
 typedef NS_ENUM(NSInteger, MPErrorCodes) {
   MPErrorNoPasswordOrKeyFile = 10000,
-  MPErrorInvalidPlugin
+  MPErrorInvalidPlugin,
+  MPErrorAutotypeIsMissingAccessibiltyPermissions,
+  MPErrorAutotypeIsMissingScreenRecordingPermissions
 };
 
 @interface NSError (Messages)
 
 + (NSError *)errorWithCode:(NSInteger)code description:(NSString *)description;
++ (NSError *)errorInDomain:(NSString *)domain withCode:(NSInteger)code description:(NSString *)description;
 
 @property (nonatomic, readonly, copy) NSString *descriptionForErrorCode;
 
diff --git a/MacPass/NSError+Messages.m b/MacPass/NSError+Messages.m
index 22fade7d..bfbed794 100644
--- a/MacPass/NSError+Messages.m
+++ b/MacPass/NSError+Messages.m
@@ -22,7 +22,8 @@
 
 #import "NSError+Messages.h"
 
-NSString *const MPErrorDomain       = @"com.hicknhack.macpass.error";
+NSString *const MPDefaultErrorDomain       = @"com.hicknhack.macpass.error";
+NSString *const MPAutotypeErrorDomain      = @"com.hicknhack.macpass.error.autotype";
 
 @implementation NSError (Messages)
 
@@ -30,7 +31,12 @@ NSString *const MPErrorDomain       = @"com.hicknhack.macpass.error";
   return [NSString stringWithFormat:@"%@ (%ld)", self.localizedDescription, self.code ];
 }
 
++ (NSError *)errorInDomain:(NSString *)domain withCode:(NSInteger)code description:(NSString *)description {
+  return [[NSError alloc] initWithDomain:domain code:code userInfo:@{ NSLocalizedDescriptionKey: description }];
+}
+
 + (NSError *)errorWithCode:(NSInteger)code description:(NSString *)description {
-  return [[NSError alloc] initWithDomain:MPErrorDomain code:code userInfo:@{ NSLocalizedDescriptionKey: description }];
+  return [NSError errorInDomain:MPDefaultErrorDomain withCode:code description:description];
+
 }
 @end
diff --git a/MacPass/en.lproj/IntegrationPreferences.strings b/MacPass/en.lproj/IntegrationPreferences.strings
index cc5838e3..a7ff3899 100644
--- a/MacPass/en.lproj/IntegrationPreferences.strings
+++ b/MacPass/en.lproj/IntegrationPreferences.strings
@@ -10,14 +10,14 @@
 /* Class = "NSButtonCell"; title = "Enable Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
 "ERs-ct-Eyx.title" = "Enable Quicklook Preview";
 
-/* Class = "NSTextFieldCell"; title = "Autotype is not available, because MacPass is not allowed to control your computer. To enable Autotype, go to the Security and Privacy Preferences and add MacPass to the Accessibilty group. Changes require a restart of MacPass."; ObjectID = "H37-ku-aTc"; */
-"H37-ku-aTc.title" = "Autotype is not available, because MacPass is not allowed to control your computer. To enable Autotype, go to the Security and Privacy Preferences and add MacPass to the Accessibilty group. Changes require a restart of MacPass.";
+/* Class = "NSTextFieldCell"; title = "Autotype might not work properly. Some issues where found that prevent Autotype or Global Autotype to work. Please run the Autotype Doctor to fix those issues."; ObjectID = "H37-ku-aTc"; */
+"H37-ku-aTc.title" = "Autotype might not work properly. Some issues where found that prevent Autotype or Global Autotype to work. Please run the Autotype Doctor to fix those issues.";
 
 /* Class = "NSTextFieldCell"; title = "Shortcut is missing Key"; ObjectID = "Lxp-wI-yQy"; */
 "Lxp-wI-yQy.title" = "Shortcut is missing Key";
 
-/* Class = "NSButtonCell"; title = "Open Preferences…"; ObjectID = "NP0-R3-m6n"; */
-"NP0-R3-m6n.title" = "Open Preferences…";
+/* Class = "NSButtonCell"; title = "Run Autotype Doctor…"; ObjectID = "NP0-R3-m6n"; */
+"NP0-R3-m6n.title" = "Run Autotype Doctor…";
 
 /* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
 "P9N-HM-wER.title" = "Autotype";
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 403fa1bf..31d4f721 100644
--- a/MacPass/en.lproj/Localizable.strings
+++ b/MacPass/en.lproj/Localizable.strings
@@ -37,18 +37,6 @@
 /* Action to add an entry via template */
 "ADD_TREMPLATE_ENTRY" = "Create Template Entry";
 
-/* Button in dialog to leave autotype disabled and continiue! */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OK" = "Keep Autotype disabled.";
-
-/* Button in dialog to open accessibilty preferences pane! */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OPEN_PREFERENCES" = "Open Accessibilty Preferences…";
-
-/* Alert informative text displayed when Autotype performs self check and lacks accessibilty permissions */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_INFORMATIVE_TEXT" = "The system prevents MacPass from sending key strokes to other Applications. To enable Autotype please grant MacPass Accessibilty rights in the privacy preferences.";
-
-/* Alert message displayed when Autotype performs self check and lacks accessibilty permissions */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_MESSAGE_TEXT" = "MacPass cannot perform Autotype";
-
 /* Button in dialog to leave plugin ds disabled and continiue! */
 "ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_BUTTON_OK" = "OK";
 
@@ -101,6 +89,9 @@
 /* Menu item for automatic trash creation */
 "AUTOCREATE_TRASH_FOLDER" = "Create Automatically";
 
+/* Window title for the stand-alone password creator window */
+"AUTOTYPE_DOCTOR_RESULTS_WINDOW_TITLE" = "Autotype Doctor";
+
 /* Inherit autotype settings menu item */
 "AUTOTYPE_INHERIT" = "Inherit Autotype Settings";
 
@@ -122,6 +113,18 @@
 /* Notification: Autotype found a single match for %@ (string placeholder). */
 "AUTOTYPE_OVERLAY_SINGLE_MATCH_FOR_%@" = "Found Match for %@!";
 
+/* Status lable when no issue were found in accessibilty */
+"AUTOTYPE_STATUS_ACCESSIBILTY_PERMISSIONS_OK" = "MacPass has permission to control your computer (Accessibilty)";
+
+/* Status MacPass has no accessibilty permissions */
+"AUTOTYPE_STATUS_NO_ACCESSIBILTY_PERMISSIONS" = "MacPass has no permission to control your computer (Accessibilty)";
+
+/* Status MacPass has no screen recording permissions */
+"AUTOTYPE_STATUS_NO_SCREEN_RECORDING_PERMISSIONS" = "MacPass has no permission to record your screen";
+
+/* Status lable when no issue were found in screen recording permissions */
+"AUTOTYPE_STATUS_SCREEN_RECORDING_PERMISSIONS_OK" = "MacPass has permission to record your screen";
+
 /* Notficication: Autotype timed out */
 "AUTOTYPE_TIMED_OUT" = "Autotype timed out.";
 
@@ -325,6 +328,12 @@
 /* Error description given when adding an invalid plugin */
 "ERROR_INVALID_PLUGIN" = "Invalid plugin";
 
+/* Error description for missing accessibilty permissions */
+"ERROR_NO_ACCESSIBILTY_PERMISSIONS" = "MacPass has no permission to control your computer (Accessibilty)";
+
+/* Error description for missing screen recording permissions */
+"ERROR_NO_PERMISSION_TO_RECORD_SCREEN" = "MacPass has no permission to record your screen";
+
 /* Passwords do not match */
 "ERROR_PASSWORD_MISSMATCH" = "Passwords do not match!";
 
@@ -486,9 +495,6 @@
 /* Action button in Notification to open a document */
 "OPEN_DOCUMENT" = "Open Document";
 
-/* Action button in Notification to show the Accessibilty preferences */
-"OPEN_PREFERENCES" = "Open Accessiblity Preferences…";
-
 /* Menu item to open the URL with the default application */
 "OPEN_URL" = "Open URL";
 
@@ -660,6 +666,9 @@
 /* Checkbox in dialog to set the selection as default file change strategy! */
 "SET_AS_DEFAULT_FILE_CHANGE_STRATEGY" = "Use this method as default. You can change this at any time in the preferences.";
 
+/* Action button in Notification to show the Autotype Doctor */
+"SHOW_AUTOTYPE_DOCTOR" = "SHOW_AUTOTYPE_DOCTOR";
+
 /* Menu item to show the history of the selected entry
    Toolbar item to toggle history display */
 "SHOW_HISTORY" = "Show History";
diff --git a/MacPass/en.lproj/Localizable.strings.updated b/MacPass/en.lproj/Localizable.strings.updated
new file mode 100644
index 0000000000000000000000000000000000000000..ed8a8aa9f5420962a8aff2c589d942efec0b5a65
GIT binary patch
literal 54594
zcmd^|U2h#na)!_K{tDWFk?dma&217a5L%>Ut|dw!Da+1{pf7tBTaqKn(K<gqNj?3t
zRMkD*Gjk3P6(fNliJa-_sj9B;s_yyk|N7JB51WI{t<9UwFPqn!clPs}&G+{2v&~;O
zPd0Du?=!pl!hX86t8eY6S9a~CjpgqTc8&iJHb2|{&o)1Pc#hG}?b?&gPc|dt{;>Je
z=69P<H=o&+=bOj&&aXCyn=|`+Yjd$Vwx7=J>c!^1{rg~ZVpqSmpU&*gJsWefIW2$h
z*bE1oKil7Z%=FI&(eDf{XmDiEUK$=h8O*=h@828TZwt0iMZbX)cP}?z*tK(`5p)9|
zDE6jMP}DiFaR&u=QR%r+?wP#->iuMQ^qyySl{uIJ8h>JUS~?vW_TSmNrg+DljK^m-
zheHVzKiK@^Ss&Z%cZ}xa*<(cemahu-;*8OIzOuO=UajruO}#PgyY3n7UK_39MR;rU
zzI%mB9u|&*pGNN-jcecg$lmwD_<HW0kBmo;ja%p5*Bg`H^>dM}OM4gG_O7hii_PDP
zTp@K}{QZ?A9&G+`^AC0<R{48-`i=3{fzjyA=Dq#zT*S!7#@j6qwbwH&Uluw81CotA
zJT(a5TEWHd$Oe$Y<*)4STjMjJ)H7WD-d60Va_znS^v?L)wF(mPqR0%=aQOkNAMNU|
zl?)tizBK+hv(<cTS^yn!$Nqh6w1(mj%2hPOapK=?p2=8W80<*mQ-kTP!3xZ1y91-A
z!!K?4@(N4vh9`sC(q$(G^JxVU8qTlgci#IjL%i)>d7CKbTIY#T3vDW0@}#WGUyCk5
z>%22Aas30;(Y8<Q>N~^ZrQsu~$xt2{N1%Zp8qcC}@7ZsM_S1z?_{3-~`FU&_8r^%#
zMqCtX^V8|(wvEYp_|RtC$9y+M8Kg@5b~98tFWh)kt@y4KiMjgJfD6J(39CMrFiJK@
z7U!Aq0kS4NAz4GKxu)o^B5QrTxqG#~tUk8-Tl-fMd1}1!sm&sbe4RNmzK3QjkppQH
z*E+}moQ+mO^5AbQ^?%q%G>+s|mX)8UxWV7}6Aug{_#ItxTyQ!w8#~2gX?%vc)|&E)
zY7a<wAlXk0X5a(XUrb(ow0ljLHsWc~o{n+$Fc|&Po_o>g%DaY(bR{|wSp`$@M5eim
zXLZ+B?2cVIE%plR8TqhKf#;9QT1y9@8&2)1`=)U-b#D4iyU_Jb;dl9>nX0m^-y5~C
zqpyv#<U#ygIO${3@Im1<)&MHsw!i!j{f{gE?y#)YO|9e-6q)uXMz8D#zr5mGr0Z`c
zZyqgR-Q}ae-SP~2n(BQS*RBy<uRHQ|^kkNR=Y`wd|A7Cod#`N8(dgJXe2sTS8-zaF
zCzm2Gw@nVtibX`CzOhv!UXeDuDd|{#Z(c9_iA(!~cg%YH|63=##B=+D-(P!$`{ai9
zEqM(Ni{6$Dz^U`{GnNQEY*rA-dRcx}bO68O2O>3!(&bOfGGZr?qJKAu;VDU_u3`Q0
zZIRoNl+5w?)Osj}KP|Mz13WLb1<K=BDthN9;{1yl3v#n>-F<c3^SHDK(AVO?D9cJH
zMj%%r-3P7lw0<gD=)L`{e2V5EyTZC@4Hy;k)n34ED}yD$Zrn9L=5ev+vhdKJtM%G_
zYHxRst(J@VmDu(zneuD>qi2P3SZQcf$Cgn0Yx7UOwErW%%u;YU^oer(c+03FyL)%Q
zmE+O7;FPg&_-m+@M-#6&W}g_AJ#MIBlTXfSKOAbj`6n_)C&r`m8f)IJJEqc6)77dY
zj^Movp(ymY#F>nET)b5{bIIOrKTF0vYi{t!mK1q@dnLof*P#QH4I##!Vq5d?(ppaO
z2A?HsHji^V!&-d9bNDS;s2ZDEr;&ZzhdtW&JGQ6z$G19P81Ewa&rIk3Vo^3;!)Kd+
zv48t{>d1%Jw(GS?36e9`TfxmC%kmS}Td&6jw!RH(SI_<PUEh&cPr6Z=R>d8P;zL$c
zJMm~}8pr%%^dxJ`6KF#G1;tAvUH{OcMY6Zx0f!&iI^o?ap2z1}iV#GtPX=~wpYvy0
z-76UOA`#D4eH`kH_@U1|%hVXpm$5&z6~@=b#v>1Sg7VkNF#lrLh=Fsa_wVgKm7w<@
z#;G26x%s_Ss1C{>XsUd3&K6VML1X-2f0Q+@Ewsnza9s<Nvc_KdBc=}Mu;6u`ji;5B
z%JNOtm>e;=V&&3utx8$t>HSQtbEAl|GMDCiP*0N&4dql<AgWQufh%Yke8bj*3j0d_
z8gBuJyk>A}SBTrmXyX5QMn3dV=80Wr$awYE%enuF;mN8|0f7&ml~ttP3Lk)*;tB34
z3)*6Lt7MO)8Nh)`>bb1~e$##P_>T(iQ=Ha5moa%%VwdLz3ALrnw~mkNJjFM!P0M{=
zRtea#2V`pSr{3EfZ%ZCGFjS;Vm4)Z(`qiO%wXEfZ#WiHE(17=C{kV2!zY&oTb>6ir
z=*LGzA2Q~V{l*$!*u6Rvu&)_2g|H38fmB>n7t{KZlOhj)V7OD;gLWRhOEXYE3VCi<
zIq*i$e^u5LoTlqK9+}~UC$nE$>k8Eq<bU{zhNr9RXbWokRQn@_l~qGOu+HGC(cu2}
zLqu^<bkv(N3JG>82r7;7Z#6F&>$`;)=o65Q#4aKQ^Xt9sOqqU1wpNjy?_sdrs-l(V
z)>8K~1gA!OxQHl`SlKniKN&p_ue3_g^LrbiI_&e!A8o`v`~8_olBAK`1wW~74Buj5
z=xO+&Xd$iMtAg{T{fjg+y1%yDtmar7tKvxA0$&mThJUHo^E*;-$9_i_kc;)JM8UP)
zX{G$8-nhTDf$~)Kku7|L@EeFdk*TP0jOFBh$xNS_Y*6!mY;?gAN^3qW7Lgj>JgwHx
z(ZilTmu>jc`3a830w7gH&dh<0k7z?N3BHnQ+p356W0c?9bK6o0-n%HijI1aYhIf8y
zb9uh3<*Poe#xwOOwpNzarR5YtBB6l1zU$MAC~!T+To#p~8RNU2a%*SI6g)RhfKRYe
z-m4;dMBYMjh2Fljamdko`&SZ$|AIw>rce{!duD%RB}bK|mIsvMzA!%oU4^%+njRQ^
zX@Bufkj1{%n$}luX8tkV=B&aTMMm~v%tbY&q?@*-*PJx&XZ~F&b!nUfU!l2Gb0Ma}
z-<71|2g7+&i@F`f&W*qDe2KT@15?94GcCWnee6+g_xFq`sD85R$>`0~c~{K0mF4Tc
zC(~J;p=`+--w@9cF9Y3&7Od-ntqvlV!gD6)M8C*<4AL8&VLdhpiEP5ubKK60{?6c<
z_h@`XhT)b$pnecy5tqPzZK%GQXSr9Ty^i8!Nj!p@#zvy{Pem(WkI)k2h`g&Ju$QNu
zGaYj=*EIi{Gvd=I3GeW*tZL}g^-p9f)YUzY58f0{?dO7>VnWqQd)WXY5wB#&TF@h|
z`tsxA(UJ!}Oa535t#@@XVhK9Ww*@_yphAn2c_P>5Il1#I%`SbWUQ4h?|BDLOdr#)e
zObd^X9$o2uWj-!S{s&*b_V8;et$Q}p?|+ZS@$-pLi2{DGpOGB8UHcr8vtW0OPta2j
zhTJk5oiT6unoNz>x|VVEQ|78PSrA6%PR7hZ5!KWq71Iy_`J5To`-T(wja(hAd-Zxb
zFV=s%Co>Ih6+F}xJ<TxG6be|03+Vg6AFgdl)-`jZG7Q0it`VWFV8Y|VV^_Zg)Z{uk
zQ&pB8On6WD=)}VGtq4}=R9li;rga>TrDrm{#3kecwVJGZ+qFy7;?X{tG%{z;jmH(A
z06RK_irh=%cslOEN^uIYPOdwPCUoiR2~j|neTsefh~!w%sC3!0R=I~cFrOcvvA%7v
z!u3EIwg@{YY^kCHJNAwpL%n>Xv@o_X;~ZGrH;JYv89yX<C)aU0{_xzm4E3#|ulv^5
zArFXwAC9X#N?qF%Ycf;TP#F?sp;XI*pXx5qEE(H8m9g>MUS!($P4(7(jG&&5%W&?K
z>Ql?z=a&{D#ZK$iVBNDfg(1GWTb@2{q4&4JYU!zr5Bs?88fWjDpEU1?i~MeeWS_j_
zSoNu@yW3E7?um@UL(_!h0zyyjpRU-ov#yVywF_CRdR&HcpS1Q`Qs6wIdJWNb^k4IA
z#*q5+)2n<tah!V?*eLdwV7p|^<==bn#>f)XIFa|m&aS~>er$$$yei~4pIY^G8bjVZ
zKD|9bvcz+k<)<=^{dECztxLV5iM)q=57uS62K8>Y@Emg9AYh#vongGrI?TcEJUI3K
zw!th@*7NXdaLmtTZ0mhlA;pnvpYG0bt@g^+jee=;A7bZvwrt_NtKiwyTDu=To!$3-
zJvU9tt_P%5*?g|RDLr10-(T<f3cBRG8GEwi>I8TAGR(eW&Yi)J>`)_bpxVQ9{el<U
zYE!^89g`v3g_3nVy&E0-F*ddZdCzw<v}2ixNI@%)M31zr=sohcdH;64_L?U$77>v~
z_eRSDo&lWtr|J}J`Ps8d7sk2$y~r*Ry^fkGXSF_S>tliQbWFx_pKCRx!ZO5bt!9fw
z|GAsOEbD<OPD?)aR5LF<k@47u58c=8b6-zW>WLoT_?-;PKDotVozhcx`YSx8<=p5D
z`!;l(`mueAZX?grIeVDbzHNV9+A$f+eXh_h5U*dg8jJpOHD<q<#iuhwJKU#Udp~az
z+B@hye=b6%`qIb@;YEt!-Gc}(-LKSMVa{fHcA5N=PF?9k4CTn?k<IixvFaw-uM0`Z
zIIMd%V|8TE&}By7t}>cA*O~Kxj-l^>YU^UzZy)#bP4CP>^JVb@>8gfiq2cI`y=_!d
z=jdb0fKn}ZbQKB53NMYDd$-nG``8?Jx?$;|y=C-rUj5u4>BTPXyGJoezt45Ir|0nb
zCV8<pi_bT<GMrP8`#9I*lb_D`^yH5^i`GOv=h2m{+_b6+I%mSAt%W4wg>@@28h>3_
zd-bsv*6_)DwcmB4Gn}pT*InG%FLI6vitA*Z==mnPx-{)w_YaO`cDdKP#b^9P#;NBC
z)YZOLb9w*7`iee#tf*kAR^V|0(TsLq#feUSFDjw#RrKIg1X9mFiZa$d?+~Cvy`m}U
zkd38dj(QbUAEI8yYzyP~9ko5AuZ8Nm&p(coY8p(fJiI||56f8V`?#99;^+!{tr-0)
ztO)tRtQY**{<$*wo%M+Eo9+|~R#(02c|xZ9c#I?QW6Ki$Y<Pghg}uis?R|`*Uasm}
z=&{jz=bp$IUk{FD{98Ek6B&+O@+eekvz1trNs*KymsAUp9ek5kt2mD@L#5o>ezIgo
z<_U3nM$Mn@E%xtjN5dA{Z8K3ly7Vj!nu1KR(<SU9p5}Jz#EOkqD(e8JUgohW_43^@
z^&-RS){~QP=y#9)K6My42YSXVB$y7EyH+vRo;Ny2TyCkNQ<wP6=6hc0!1d2$*yrqt
z&LW`~Mt&9@5g89E=B=H|R2@T<&+R%Y{XTtc8MhYNn#O(D;#5Gm4F2=oG1|xJb)<I1
zUX-&#*-@ucK;q;_^{?O`<vyV=?DsXRNiGlnMm=EUV96r2`(oxPG&jQ%?e^^<^?M$%
zzSu0fh-HaGs$DPi_|QA@(6w-y&XRMf!T!mwU{0NE^~!$IZd++<{2ROo)^!X+j$yHq
ztOrp+d+J=4f7cFc$LE#kTh2L3?0cO=i(juOBl@oMRkwx2*CBis_Zru|Z_V=|Yg#ew
z+X(+5Je|?~ygDbwLDJmXoijZ@&Gout0?+9h9c{fVe=Qerf<T7c&nlzCZJOb)&&i-V
zjn}I4=I|`llYWvkNXB~qb7zVnyLo?V$m4H~Qjw$I4|Vc<nIhT$r=m&r$Z3)F*EHW*
z>moWGsdz4*`<g4_?klW)?q(r}J9E}frwimWYe%rJdon|RVYH?Ohh?XV-0R`2tqS^#
zsPk_&8a;@Wk!O!A%i6mo&vd1~68OF?Ys21s_Gz-Shh6Uc4sYZ>=G~so*nMpf{rVwV
zkNv-@RKGOHvpzX1*-?6VfmQjnlhT37NzC8bny|+$$I<8$GOBBy$#5N8Bm|c$9zqw8
zkz)ni!y;Oc9wqY1od?r1l39_A5q?9Qw;F3PhBcp;n&o`$6WikEk{vt5ydQkDD{*N@
zSzd|j?zh{=T>GNP_4j~HvFYv4loYD|L_Y>y(sYc+4!k~Jh}OH#n5oou^rF|<B_2|n
z_x|>{dRiU#o%6A8w~xiTCwGOG6A84-!Sjaf!Uexpa(BgQH;uIh>*bj<RnAP`5@Ec$
z>dSj>U!6E^d_CXqQG0k$0x#(8l_q1anzV#gJ?m-Cq?L_VOs^eZ_17bgug(X+qEAO<
zm~R(7>~E3xOy@hht@$7Q>wc?pR}m>kz7=~&uRl-dyBR0;WSlg{YWL0>bKB_}G2Rfo
z@U2<J6T?_}47>r~<A&c`?+C!YE|1RmUlc2@lL)BQ$(H*nd0$&zEv)9#l1=qo2C*d1
zk;!4@i1yh(My~bM<`cV;u~C&4%U|!<x^EVi+O6-`I4fU3$e9nFLd@!K^K{1cxWv5~
z){x1JBPZD?-U7293br`|!Z{?~Cx>;$FO6JC{uYUQ4K23pNg;~{HSQFT6}<Ba<l8@a
zQ<&mMy(s>n&cx9w2j#>Ee3OA(FEX&rNmlFeockii^=8SGtM_`Lnd)4XuQRz5{~}1{
z9oOvAB~GPJK2&q|$%90a4g)%<mcubry>-kvxb@VG)5pTL?)G$EgMHHIp~*5F=~_Hf
zC0FxuS1tCLbBDASEmJE$%}TpwTaUALBCx-lEGF7)7s~Z!$rQx?WD7dY%JgErh%}s9
z&cAs_Oy0#DHQct+^Taep&VILNy!9!D-}z<Hhe03m_rzqQ({ZmqQ>I*-otdYTbRV`s
zzQR1c#BW$fzPWR=6l+fa!_x3glO=8&t-yG`Oub{18INt@CRNJSmF84Jr_#kvej7WB
ze~jgLf2C`uXG2Y;jNCsN0xCTor}i-GkIN9>DJzE_m0dfx-|I8%?%EyyI+R1g`R{y_
z2^+4H$EQ0TbDn1H_!=@Osj4`Bb(~w7D}e#gbT4?$z~`C2DiH`4O4WU4@1KwvZ<@=u
z%hvJl(g~e#gnGi3-Ym<Tvwyv_IlnT^fG<VNntjFgddB|5q>u9&_(}jeT-7M;t?;jQ
zd1tPB=8W;awhWU~pL0VV6e#e|^>pxK|89oq!r<w5!`D=WD*n|Y?&N+ybmV!F3qLzD
zLomIU-=BHhadsQPJLLyMqsUQVS8GYp3WZe!B6+y-bycg=UUbe><^COmxrTGy6B+uy
z823t(NRI>rf3dZIKeSWgQF_z#PM-0$;RddX0_lC?L`dzFBin{vi?dzCt3O)C;%Ui@
zwp|X{Q&49pc~I(>`j!E^bBP7uo19@>Gd4rL)_1LabzkS!w}HQ8rShqKZsBrVH}%Yk
zQISk4^2#QKJ&)Di_PJefB_46h6JFpv76I!N4}Dd!UM2rh-@4~A7Dt7~>XA`K2tLLV
z5lQ>X^mDpFy?zFFbbtJQ<u7=@zMyi?e#$3ly0(j%&x~hJ?T;k6x3cYs{PyqwIIWIv
zP=@4k&W$A3zbhHD_wMC+=e6m9N!{|<u8ympznb69>Ab}1`JJubD4pOd7#zqBAuNg3
zR}$u5eM6h7(~#&At&8T!a@eyyt!L(6s8i*rK9?G;<DL^4Kzx||eUN?3wVo>8qfqmA
zpH{veBM7q$?26@@Io4y>$3v^hsbubhxQ_kSe2BZY-maTM7FwJ&a$79tpK9^i{S<b3
z--w#PLmjh`*R1_m$w=mDc@TAXZOoR>0wybig(kMIXAPe<Q}BMVNW_ZtpoBEvGl{@f
z#hpxvx-T($)gn?>1ekH~tZD29uHn#E)uO&x!!o^_;X%u2WqNTb@f7)2I8Sjy?q~K0
z-2FT5`6)uO@b23&OJMlQ=JFabD}$Ya?yt(*n1O5gO<MJkSnWWezDotQ-ml}QiQ)|k
z_vrANp7M3i?2XrocbzNK^VBGSuJw9@qJg>H5=VvW@cp1RPdc9HQch%_?%wh4r}2mk
z(}?GM-69rQ+Rw2Zv*o=Y8TZ`p>$8ll>Re>xIQRIycP~?-e>#F&jj7~$zpJ<ttKu4>
zU88^|_X84n)L%}m>nl@u*F2puy6)Pp>jadI8L#bhmgTjLXQmvV^9(Jo=X;qF<akvx
z%Q0o>baA^XbAL1`3w`9;M-^i2o_7zLEVx(VGMt<bo~vUnrD!Ae1LnM#s@hAVGcKW(
z12(OJJZj?P@aCu78MMujqTrbFWTt3P+rJ!E^KTxz1hM2wx?9lK=Q^@Zs>g#%-5(0v
zZV9MrV*AkwxyPoDPmcb_BQor##U9~5OTy_qq92(KZ}NDd%VRZw2Ac>5@=F-)n(aZ+
z6w`UYQk}A{d;9Z%J^qeUCwl|R(ZmWflJR4E2^G*Z;TOb}OoyW~lW6ek6|H+7iey7_
zB4~&~6ya%4cOK#13qF;fU*~ih^Ev#ol>5tXsXewee&DISf%SlP_0!?+Ih=Vc64;(&
z7km+Rf!LiIdrft}mg#=K#Hn?zMe-t_%=?;DH;gZ7APab9uHz&#cvSWGO6xCC>$m*=
z=%$xeA%?8=-V?(ZS|JN$uJBUuMu{lN@*o3Vg<w_aw{%K~_o&446E&)!NblbDA&c05
z8LDY6z+s9z86w9%-oXhvxkBGQPp|MD!+naizad8CH|@46$StzCW<@yPnQYn=vbd8W
zx^KLOCZb;h%?FS2o22byWF{ilP@ms=oeaf3=iHuJ?t7wjqsy`%>4!vl#-&e%HCYF@
z^Gn#TnQMEj`}j%cZI{Uy!CzNM<}(#bwAf~@OpDq#@5zkp%JjQLo}&vosiss{GP90#
zj%dGGlVy86CPO{8$pMYax>vPgUzgvJ&lV?KELHDg9ot&h^iGEM+%ysvk6m&HR_VtI
zO;4`KdGyh#6?0?q8(A}X4BnT>o7JO6ya?u4X7#k8FX_F;W@0~cSB$<0@W3(<)RXcF
z48f7y>y5||jaO`q7d1U$s`iG~_)=}R?XpKTePW$o)pnT%e^2jZ8nJgUPE808FMNCF
zT-8e$`?*<CdUfRQ^ymc4L^1M$k%D-KYwH#+I`^o`kxf^x|M-Lj=Y#9ak*U!0F?$i^
z6xUjw@iaYxK{M4~Rm#!Im<qXr!6~7xRHEnDaZAr_y%Qz-)Kkh_Z{8(p5oO6s)~>xN
zT@(R1H%%!?M*tk9+IL-XUx$tI3)iR0c%Dp!Q7r50KgKlTVz*~cEYium(^ALdt<gKB
zi~NoGtBRkS1}1-+zn019X^ifXb#FYdu{vIf&)J6Q+EAl(-K_i{{X5gWgJT_~KD2dn
z>}O53qlqF)G{iLaTw1G^KbVF1L0O+3^<%Y^`)J2p2bzz;If~Y|=N)CKTK-zgHKV6@
z;g_W~T9#;+%{-I*p>{RHdu=hVr2?CP=Zd}DUAC5H$<!MAQ`$Es&Q`}|`^DO+Cp^u|
z_3b0NgN{_b&`Cz1{{9CwE_n-4X~-P1%hMU>6VrO&Mb?#XNGP-Er!tT=e_gtj)YF6Q
z!sAv(i2hw<Q}G))K7Hp_GUvbhlhP#etmxVd4}tSGzP7)7v&Z*9sz<l2SF<ODvAzp}
zZZLY(phE9-4j;eIxij@@@3L1(6>VHP{1nJ3%~XS;hUjY`f5NF3bcf<&+O6>^TY8V5
z$++GskdgT#7f6oUS6Fi1hqTWN-~hFP8*<j06I;lA@}|gf^IMCz&Q|iBS-#4dC$g*v
z?={b4ynicetiA%iRjyhg`=G~P?sm>!_f*Dru7k7AWke;-vlMh*6FHIH^0jjgAVQ~l
zLFWB(^GUUu?Bc#-vP~a$9jBuak#O($6wdmZHQ7Je4D174%T%ezz1NY#P0W5X6hkJU
z9JzG(o$nK9FLPZ1tFv?S6oVpungQnlX!kjkYiXHfWj)QdnSVE`Nry%avBzzq4}OX|
zOF~nu$K>2BkR+<5jC2OFRPWs1W*yego~hJ}+}Y1uOPbpk;-|<aucJYWE3#D643C6J
z{WMh!+A;Y=*ePet&zbQ(H@+uQz*6R11N8=KUZ2~&H}<dBzErynoTY7?9(8v8=^#ru
zkBfgNQ9Y#EHO#k)p@*~&ci6oFZ{&`!eb2j=PVyj}Lg<s44t!aHGm*WIYyUJ;e~Y5x
zmSS|mpw-EHB2R~=@wbtx-R53PJ8}!qBf6(Oipi3-e~Q(-LTpFWgGJnpyVlRQ4P|~b
z*?V28ydRsR=nntd{-U3eyBfci$EI{^cevNjw-$6?Z_BhjHkrc*%6%nRvYL`;E@evO
z`L?-*Tt}#JK-&Bi8SR;H$->s>v7g#o|7?Fht*+)BaA<ILU5sbQm_4Yhj^K6=rjCns
zuhl<_CPsS%GUPRkSnIx4cKJCszw&|oA%Z4K9Bb!Hz1`-`6uGcfBzIP?E%g;TV6%s(
z?@*#oh<AvGUT*%=o@GqmerHJGb9`e?ar{?Xt?-kxr?+Ok*Upr&+?J!gBglCJ3&dW3
z*RV*3GA-&yUB(|dC7aD@@A#qH^ZC*Y8Q+@EefONIxauczzvF$8bnQ;1Ldg1ZQaAj7
z%yXiLvex4`D6jLQBH8S514GX6IyIc>gVwH5zCX$?mvP*)>ueeS=n3;2Z>yc~(INu$
zb<LKuzo!0W?VjGLJ7;Tcu>4$xf7+wH1Z`+9JSJ)HI{%VA<$xwrdma4KCo<%{n7r04
zs!vhhgzJD&J0M0{L^UAvMZ0sdrtoxJhAZ|wll!ALOwm2PQBgY(*L!DS&h$`415Tng
zVD`>W-^Z<PUG0`^wP~wOJnsP4jjd#h59fW8S%v=OhiVH`=O0IU^m=n<de$1Iwv*s=
zQuGM&1m)Cc4}Xa^<OoL{to2-E7C4ti+%n>k)~lN1<o?)<+gx^?tPnjE`re0Y(P;)9
z&j@}Y*C_4c5r4hn*n)42TI{39t5#pn(4E<QP*3?y-V875J#Z$R-R@*^UB;|yzK^{$
zF2lo0d%Xdyr{`|C4t8omLp%)cPEp*~)<%`3MMsE#rd^|g^1f9g;C`}<*c@4xN5zxk
zN`2<iHm9QA)cl!x@Y=eQQGY8`Lla*#aqx91mFLXVf!7t^*8Re~Pthjca>z}4J<oM$
zJO_8GBUG6>Xv+M=I^r_AV-9R~q)X>DXr$sFMj`!p$H<ysqsru!27KecEBD%SAF>Pr
zJDxs%V0~^w?kbt$wdR?O^H`J7qm8D;`YHn0PKSAI{rtl`uHX6^DEBi(Ha?)hf6)%`
ze=D?APPv6K-r>|F@<XEst>Q|iM4O#tos@so`UWIUkGcy+I^0i*8^iI~V*mcxsSek4
zM22(!^i<!UPS?(PN=~DpTT?naOGVH^IRG>>`_x^JOBQN<{U;m2*|TAx1K+vbjq{^w
z%7mp;N4Iy*;2ZFzllnZ742inPu>_e<^40O1i1b`<a0=dS<5X#h={ErIZfd%qC4yJu
zjl>VruOGD5D@RHAZt?xMwNLMYSKe8HHuP?Q_A3-MM0xiZcGtTA^gW6`-5C|<H};;&
z@Z)KqtMCS;A2LTw<BB;?sD_=`LMM}9+eWaqqcUtq1`~4g^h&E_zpSqj`&>ajX!L&F
z%WvIZr*BP<UZ?MPM1}~<d3`FdyJO7zemB3jZ|OqIyY6!B9z2fDs&}$vOX&VW<|VX^
z&*QZV=1^A&{8`I9H3KTc$UK=ZWq;(W)cY`@@$%>v@9aOi9+ypzet7f}`78DiIxT8E
zl>@>yg9kgN+A5SRr8+}m7Jmm?k!~4v$G3VfV^yE_-e$C;n;vaQyvu20qxiO^*godY
z^zG#{eC;#+rqrrC5dN>OOHKd0+o#rI*Ioa)_vH0L4`g|8UiUR44;Z~X;%Mh!Whuh9
z^JkHLKXWu|?ZC<F?S85_+<I2>H6tp_J<;OxaZbO;*)Gw*yXRC3$=oh)c#an8bjxQ2
zP`$sHX!VwcbI)bE+$x>`U3~Nc@@)orfxYzwa{LA7fsBdkcf2+_z3Q*t1~1gv2<4>k
zoOM=m&W*#V=z8)HX#83u#k$vd2_nLLI&#f7`<O3Nua1RlO(i<wS>W|TfqsnOotIA4
zLyOyxC%!vKZREgkC%)iXZ4te9W!gask4#VUi++@)Co+zGkAVKs=+AN3+gQEcA(8n-
zobMj-uOIf)Ul^9-(+uIgyj#3|pQ;m{ea_y4)2hxAWbPP^$h44m>hlYSsF6fGo}+YD
z9)E!dz%$rn?eKG$!7~73I@dV2I695PM`Ly}#;?qiaCr_&Lqqp0{oNM^i^uWx(}78E
zEP0&e9r8IV<#p(MEmOGmAi=!dq0TjWW>uZZ`_IV*vG-h6@tg;q-pTL0u-WE#Zn+oS
zH8}6#i!@)F*3$kE?ANZn-usy?V|vf<RJMxvqRz}+7)8<Ec&vdBx)i+;acDj(Rl0V1
zzyHoV_69P3d@o2VyY$X{21#&Ez?ARjcRn=i(7(zn`j-TIRY|JB#G}fB($N(<p?5F8
zWq(m4Z_2$cVcqH~OAXt)Co;s)#Vc*-21Q+H16CeeBVSEt=X{YkVG1E~rthQ7L6t{k
zNRI4{(nGyBdnYl~+6=FDA5ygmFC=`6x(~&(Z|Gerk$5i7*K^qT8Dm73(N&`CD47+a
z=A7Hu$6T2*H^)`2J|RcLsa50k8$XdDerOUM@%wq9HFm@6(mD2v6?ia-;yKHfXr4}o
zI&VRSuZ{Vqqccp`v!<NgON3wBLV0xamb5*0Ecyws_)vui79SaJ0U2;zsBad<c=xG%
z=e_KFdvcju<%eB}r`FqNTW7g7I`hX_(UAM3G<rv0fFVBIh2{^7?i$b0qeA=Ewe%n=
z;VUwSC6kgV)85H6TI)CdV%Aan0oHnr4=qo`x8`(C{<1IT<1^%%p+1vVT8Qtrkk?b>
z@t|0Vyzkbf`H|5Bs;IX_db3wU#u`lPHg4IkH%q4XiOE>DWL`_ZFnn|>SM5d1lMnx$
zZY|}+rNzS9^gNapZuN;1u@aRlPZ^$)b{1e+7@^2^?wg`FGkc~Mx-#c_h{o%)%Ul<c
z@j+VATJsbn1Hf3f1Ih`#HcnC>%ZPKfqg{?7MqIS}jG0Ei1&-=}Q+HPm+IF@~jho<@
zeaPGhr}ccYW`<0O{dsGBIgh$78e>VPPEVxV@2tOl%%K1~3+eGArqiySuy*^T$LL*|
zO4;}IJh*Gq_r<RMXqJi&0x}tRCG+3KP(Rk!mQ&z#dCm-0o)k>mzRopcGpyg)+liRb
X@c8q&3qiF)WtH*7a~7a?PxJl{kq-U?

literal 0
HcmV?d00001


From 2d98c480da6e33b2238e671e177a90a2443bff95 Mon Sep 17 00:00:00 2001
From: Veit-Hendrik Schlenker <git@vhschlenker.de>
Date: Wed, 10 Jul 2019 12:00:38 +0200
Subject: [PATCH 06/21] Add touchbar support (#862)

* Add touchbar support for the password input

* Add touchbar support for entry list

* Set NSTouchBarItemIdentifier as static strings

* Simplify touchbar initialization in NSTextView

* Remove colored buttons in touchbar to adhere to the Human Interface Guidelines

* Add search action to touchbar

* Create a TouchBarButtonCreator

* Enable Touchbar customization

* Fix typo

* Add customizationLabel to all buttons

* Use localised strings instead of hardcoded

* Add a popover touchbar for editing

* Update localisation

* Set the bezel color of the show password button to selected if toggled
---
 MacPass.xcodeproj/project.pbxproj        | 12 +++++
 MacPass/MPAppDelegate.m                  |  8 ++++
 MacPass/MPDocumentWindowController.h     |  2 +-
 MacPass/MPDocumentWindowController.m     | 58 ++++++++++++++++++++++++
 MacPass/MPPasswordInputController.h      |  2 +-
 MacPass/MPPasswordInputController.m      | 39 ++++++++++++++++
 MacPass/MPTouchBarButtonCreator.h        | 22 +++++++++
 MacPass/MPTouchBarButtonCreator.m        | 50 ++++++++++++++++++++
 MacPass/NSTextView+MPTouchBarExtension.h | 13 ++++++
 MacPass/NSTextView+MPTouchBarExtension.m | 17 +++++++
 MacPass/de.lproj/Localizable.strings     | 36 +++++++++++++++
 MacPass/en.lproj/Localizable.strings     | 36 +++++++++++++++
 12 files changed, 293 insertions(+), 2 deletions(-)
 create mode 100644 MacPass/MPTouchBarButtonCreator.h
 create mode 100644 MacPass/MPTouchBarButtonCreator.m
 create mode 100644 MacPass/NSTextView+MPTouchBarExtension.h
 create mode 100644 MacPass/NSTextView+MPTouchBarExtension.m

diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 78504f2d..45ca21c9 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3C0CDECF21CFEDD200B2A10B /* NSTextView+MPTouchBarExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0CDECE21CFEDD200B2A10B /* NSTextView+MPTouchBarExtension.m */; };
+		3C0CDED821D28BF700B2A10B /* MPTouchBarButtonCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0CDED721D28BF700B2A10B /* MPTouchBarButtonCreator.m */; };
 		4C00E33817D8FA3500F37192 /* DDHotKeyCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C00E33717D8FA3500F37192 /* DDHotKeyCenter.m */; };
 		4C00E33B17D8FAC100F37192 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C00E33A17D8FAC100F37192 /* Carbon.framework */; };
 		4C01C2421764D8980016D5D0 /* MPContextMenuHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */; };
@@ -313,6 +315,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		3C0CDECD21CFED9000B2A10B /* NSTextView+MPTouchBarExtension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSTextView+MPTouchBarExtension.h"; sourceTree = "<group>"; };
+		3C0CDECE21CFEDD200B2A10B /* NSTextView+MPTouchBarExtension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSTextView+MPTouchBarExtension.m"; sourceTree = "<group>"; };
+		3C0CDED921D28C0E00B2A10B /* MPTouchBarButtonCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPTouchBarButtonCreator.h; sourceTree = "<group>"; };
+		3C0CDED721D28BF700B2A10B /* MPTouchBarButtonCreator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPTouchBarButtonCreator.m; sourceTree = "<group>"; };
 		4825CC811C414D57003E37E9 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
 		4825CC821C414D57003E37E9 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/PasswordEditWindow.strings; sourceTree = "<group>"; };
 		4825CC831C414D57003E37E9 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/WelcomeView.strings; sourceTree = "<group>"; };
@@ -1122,6 +1128,8 @@
 				4C769CA8213D59BF00A3F60A /* KPKEntry+MPCustomAttributeProperties.m */,
 				4C58A4A12192EC1600B13370 /* NSIndexPath+MPAdditions.h */,
 				4C58A4A22192EC1600B13370 /* NSIndexPath+MPAdditions.m */,
+				3C0CDECD21CFED9000B2A10B /* NSTextView+MPTouchBarExtension.h */,
+				3C0CDECE21CFEDD200B2A10B /* NSTextView+MPTouchBarExtension.m */,
 			);
 			name = Categories;
 			sourceTree = "<group>";
@@ -1174,6 +1182,8 @@
 				4C4B728418E4B9B400A1A5D5 /* MPDockTileHelper.m */,
 				4CB63A6018986530002DEC4C /* MPFlagsHelper.h */,
 				4C978E0C19AE54AB003067DF /* MPFlagsHelper.m */,
+				3C0CDED921D28C0E00B2A10B /* MPTouchBarButtonCreator.h */,
+				3C0CDED721D28BF700B2A10B /* MPTouchBarButtonCreator.m */,
 			);
 			name = Helper;
 			sourceTree = "<group>";
@@ -2010,6 +2020,7 @@
 				4C0F04402147A6FA000B8568 /* MPCustomFieldTableView.m in Sources */,
 				4CBA2ABA17074C07006D8139 /* MPSettingsHelper.m in Sources */,
 				4C77E37A15B84A240093A587 /* MPAppDelegate.m in Sources */,
+				3C0CDED821D28BF700B2A10B /* MPTouchBarButtonCreator.m in Sources */,
 				4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */,
 				4CA0B2F915BCAF6700654E32 /* MPGeneralPreferencesController.m in Sources */,
 				4C8F0C791FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.m in Sources */,
@@ -2135,6 +2146,7 @@
 				4C0F647B17B6BC9C00D9522A /* MPSavePanelAccessoryViewController.m in Sources */,
 				4C0949591FD6B89B004F2971 /* NSUserNotification+MPAdditions.m in Sources */,
 				4C3B42871F935316007B04FD /* MPDayCountFormatter.m in Sources */,
+				3C0CDECF21CFEDD200B2A10B /* NSTextView+MPTouchBarExtension.m in Sources */,
 				4C57AE1417BA422B00CA4F34 /* MPSegmentedContextCell.m in Sources */,
 				4CE2961518429AA5005F01CE /* MPAutotypeKeyPress.m in Sources */,
 				4C32B0E71A1D4436007E12F1 /* KPKFormat+MPUTIDetection.m in Sources */,
diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index a59bcd92..126c565e 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -45,6 +45,7 @@
 #import "MPAutotypeDoctor.h"
 
 #import "NSApplication+MPAdditions.h"
+#import "NSTextView+MPTouchBarExtension.h"
 
 #import "KeePassKit/KeePassKit.h"
 
@@ -222,6 +223,13 @@ typedef NS_OPTIONS(NSInteger, MPAppStartupState) {
   [SUUpdater sharedUpdater];
 #endif
   self.startupState |= MPAppStartupStateFinishedLaunch;
+  // Here we just opt-in for allowing our bar to be customized throughout the app.
+  if ([[NSApplication sharedApplication] respondsToSelector:@selector(isAutomaticCustomizeTouchBarMenuItemEnabled)])
+  {
+    if (@available(macOS 10.12.2, *)) {
+      [NSApplication sharedApplication].automaticCustomizeTouchBarMenuItemEnabled = YES;
+    }
+  }
 }
 
 #pragma mark -
diff --git a/MacPass/MPDocumentWindowController.h b/MacPass/MPDocumentWindowController.h
index 1750ad3f..92b55dce 100644
--- a/MacPass/MPDocumentWindowController.h
+++ b/MacPass/MPDocumentWindowController.h
@@ -31,7 +31,7 @@
 @class MPOutlineViewController;
 @class MPToolbarDelegate;
 
-@interface MPDocumentWindowController : NSWindowController
+@interface MPDocumentWindowController : NSWindowController <NSTouchBarDelegate>
 
 @property (readonly, strong) MPPasswordInputController *passwordInputController;
 @property (readonly, strong) MPEntryViewController *entryViewController;
diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 4e83993d..6af5a923 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -39,12 +39,26 @@
 #import "MPSettingsHelper.h"
 #import "MPToolbarDelegate.h"
 #import "MPTitlebarColorAccessoryViewController.h"
+#import "MPTouchBarButtonCreator.h"
+#import "MPIconHelper.h"
 
 #import "MPPluginHost.h"
 #import "MPPlugin.h"
 
 #import "KeePassKit/KeePassKit.h"
 
+static NSTouchBarCustomizationIdentifier touchBarIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow";
+static NSTouchBarItemIdentifier touchBarSearchIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.search";
+static NSTouchBarItemIdentifier touchBarEditPopoverIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.editPopover";
+static NSTouchBarItemIdentifier touchBarCopyUsernameIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.copyUsername";
+static NSTouchBarItemIdentifier touchBarCopyPasswordIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.copyPassword";
+static NSTouchBarItemIdentifier touchBarPerformAutotypeIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.performAutotype";
+static NSTouchBarItemIdentifier touchBarLockIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.lock";
+
+static NSTouchBarItemIdentifier secondaryTouchBarNewEntryIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.newEntry";
+static NSTouchBarItemIdentifier secondaryTouchBarNewGroupIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.newGroup";
+static NSTouchBarItemIdentifier secondaryTouchBarDeleteIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.delete";
+
 typedef NS_ENUM(NSUInteger, MPAlertContext) {
   MPAlertLossySaveWarning,
 };
@@ -652,4 +666,48 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
   return (nil != inspectorView.superview);
 }
 
+- (NSTouchBar *)makeTouchBar {
+  NSTouchBar *touchBar = [[NSTouchBar alloc] init];
+  touchBar.delegate = self;
+  touchBar.customizationIdentifier = touchBarIdentifier;
+  NSArray<NSTouchBarItemIdentifier> *defaultItemIdentifiers = @[touchBarSearchIdentifier, touchBarEditPopoverIdentifier, touchBarCopyUsernameIdentifier, touchBarCopyPasswordIdentifier,  touchBarPerformAutotypeIdentifier, NSTouchBarItemIdentifierFlexibleSpace, touchBarLockIdentifier];
+  touchBar.defaultItemIdentifiers = defaultItemIdentifiers;
+  touchBar.customizationAllowedItemIdentifiers = defaultItemIdentifiers;
+  return touchBar;
+}
+
+- (NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier  API_AVAILABLE(macos(10.12.2)) {
+ #pragma mark primary touchbar elements
+  if (identifier == touchBarSearchIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameTouchBarSearchTemplate] identifier:touchBarSearchIdentifier target:self selector:@selector(focusSearchField) customizationLabel:NSLocalizedString(@"TOUCHBAR_SEARCH","Touchbar button label for searching the database")];
+  } else if (identifier == touchBarEditPopoverIdentifier) {
+    NSTouchBar *secondaryTouchBar = [[NSTouchBar alloc] init];
+    secondaryTouchBar.delegate = self;
+    secondaryTouchBar.defaultItemIdentifiers = @[secondaryTouchBarNewEntryIdentifier, secondaryTouchBarNewGroupIdentifier, secondaryTouchBarDeleteIdentifier];
+    return [MPTouchBarButtonCreator popoverTouchBarButton:NSLocalizedString(@"TOUCHBAR_EDIT","Touchbar button label for opening the popover to edit") identifier:touchBarEditPopoverIdentifier popoverTouchBar:secondaryTouchBar customizationLabel:NSLocalizedString(@"TOUCHBAR_EDIT","Touchbar button label for opening the popover to edit")];
+  } else if (identifier == touchBarCopyUsernameIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username") identifier:touchBarCopyUsernameIdentifier target:self selector:@selector(copyUsername:) customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username")];
+  } else if (identifier == touchBarCopyPasswordIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password") identifier:touchBarCopyPasswordIdentifier target:self selector:@selector(copyPassword:) customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password")];
+  } else if (identifier == touchBarPerformAutotypeIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype") identifier:touchBarPerformAutotypeIdentifier target:self selector:@selector(performAutotypeForEntry:) customizationLabel:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")];
+  } else if (identifier == touchBarLockIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate] identifier:touchBarLockIdentifier target:self selector:@selector(lock:) customizationLabel:NSLocalizedString(@"TOUCHBAR_LOCK_DATABASE","Touchbar button label for locking the database")];
+  }
+#pragma mark secondary/popover touchbar elements
+  else if (identifier == secondaryTouchBarNewEntryIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item") identifier:secondaryTouchBarNewEntryIdentifier image:[MPIconHelper icon:MPIconAddEntry] target:self selector:@selector(createEntry:) customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item")];
+  } else if (identifier == secondaryTouchBarNewGroupIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group") identifier:secondaryTouchBarNewGroupIdentifier image:[MPIconHelper icon:MPIconAddFolder] target:self selector:@selector(createGroup:) customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group")];
+  } else if (identifier == secondaryTouchBarDeleteIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImageAndColor:NSLocalizedString(@"TOUCHBAR_DELETE","Touchbar button label for deleting elements") identifier:secondaryTouchBarDeleteIdentifier image:[MPIconHelper icon:MPIconTrash] color:[NSColor systemRedColor] target:self selector:@selector(delete:) customizationLabel:NSLocalizedString(@"TOUCHBAR_DELETE","Touchbar button label for deleting elements")];
+  } else {
+    return nil;
+  }
+}
+
+- (void)focusSearchField {
+  [self.window makeFirstResponder:[self searchField]];
+}
+
 @end
diff --git a/MacPass/MPPasswordInputController.h b/MacPass/MPPasswordInputController.h
index 7eb7d5d5..26ffd2b1 100644
--- a/MacPass/MPPasswordInputController.h
+++ b/MacPass/MPPasswordInputController.h
@@ -24,7 +24,7 @@
 
 @class KPKCompositeKey;
 
-@interface MPPasswordInputController : MPViewController
+@interface MPPasswordInputController : MPViewController <NSTouchBarDelegate>
 
 typedef BOOL (^passwordInputCompletionBlock)(NSString *password, NSURL *keyURL, BOOL didCancel, NSError *__autoreleasing*error);
 
diff --git a/MacPass/MPPasswordInputController.m b/MacPass/MPPasswordInputController.m
index 891a9785..0495eb48 100644
--- a/MacPass/MPPasswordInputController.m
+++ b/MacPass/MPPasswordInputController.m
@@ -26,13 +26,20 @@
 #import "MPDocument.h"
 #import "MPSettingsHelper.h"
 #import "MPPathControl.h"
+#import "MPTouchBarButtonCreator.h"
 
 #import "HNHUi/HNHUi.h"
 
 #import "NSError+Messages.h"
 
+static NSTouchBarCustomizationIdentifier touchBarIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput";
+static NSTouchBarItemIdentifier touchBarChooseKeyfileIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput.chooseKeyfile";
+static NSTouchBarItemIdentifier touchBarShowPasswordIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput.showPassword";
+static NSTouchBarItemIdentifier touchBarUnlockIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput.unlock";
+
 @interface MPPasswordInputController ()
 
+@property (strong) NSButton *showPasswordButton;
 @property (weak) IBOutlet HNHUISecureTextField *passwordTextField;
 @property (weak) IBOutlet MPPathControl *keyPathControl;
 @property (weak) IBOutlet NSImageView *messageImageView;
@@ -177,4 +184,36 @@
   self.messageInfoTextField.hidden = NO;
 }
 
+
+- (NSTouchBar *)makeTouchBar {
+  NSTouchBar *touchBar = [[NSTouchBar alloc] init];
+  touchBar.delegate = self;
+  touchBar.customizationIdentifier = touchBarIdentifier;
+  NSArray<NSTouchBarItemIdentifier> *defaultItemIdentifiers = @[touchBarShowPasswordIdentifier, touchBarChooseKeyfileIdentifier, NSTouchBarItemIdentifierFlexibleSpace,touchBarUnlockIdentifier];
+  touchBar.defaultItemIdentifiers = defaultItemIdentifiers;
+  touchBar.customizationAllowedItemIdentifiers = defaultItemIdentifiers;
+  return touchBar;
+}
+
+- (NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier  API_AVAILABLE(macos(10.12.2)) {
+  if (identifier == touchBarChooseKeyfileIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_CHOOSE_KEYFILE","Touchbar button label for choosing the keyfile") identifier:touchBarChooseKeyfileIdentifier image:[NSImage imageNamed:NSImageNameTouchBarFolderTemplate] target:self.keyPathControl selector:@selector(showOpenPanel:) customizationLabel:NSLocalizedString(@"TOUCHBAR_CHOOSE_KEYFILE","Touchbar button label for choosing the keyfile")];
+  } else if (identifier == touchBarShowPasswordIdentifier) {
+    NSTouchBarItem *item = [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_SHOW_PASSWORD","Touchbar button label for showing the password") identifier:touchBarShowPasswordIdentifier image:[NSImage imageNamed:NSImageNameTouchBarQuickLookTemplate] target:self selector:@selector(toggleShowPassword) customizationLabel:NSLocalizedString(@"TOUCHBAR_SHOW_PASSWORD","Touchbar button label for showing the password")];
+    _showPasswordButton = (NSButton *) item.view;
+    return item;
+  } else if (identifier == touchBarUnlockIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate] identifier:touchBarUnlockIdentifier target:self selector:@selector(_submit:) customizationLabel:NSLocalizedString(@"TOUCHBAR_UNLOCK_DATABASE","Touchbar button label for unlocking the database")];
+  } else {
+    return nil;
+  }
+}
+
+- (void)toggleShowPassword {
+  self.showPassword = !self.showPassword;
+  if (@available(macOS 10.12.2, *)) {
+    _showPasswordButton.bezelColor = self.showPassword ? [NSColor selectedControlColor] : [NSColor controlColor];
+  }
+}
+
 @end
diff --git a/MacPass/MPTouchBarButtonCreator.h b/MacPass/MPTouchBarButtonCreator.h
new file mode 100644
index 00000000..d82ed558
--- /dev/null
+++ b/MacPass/MPTouchBarButtonCreator.h
@@ -0,0 +1,22 @@
+//
+//  MPTouchBarButtonCreator.h
+//  MacPass
+//
+//  Created by Veit-Hendrik Schlenker on 25.12.18.
+//  Copyright © 2018 HicknHack Software GmbH. All rights reserved.
+//
+#import "MPPasswordInputController.h"
+
+@interface MPTouchBarButtonCreator: NSObject
+
++ (NSTouchBarItem *) touchBarButtonWithTitle:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
+
++ (NSTouchBarItem *) touchBarButtonWithTitleAndImage:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
+
++ (NSTouchBarItem *) touchBarButtonWithTitleAndImageAndColor:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image color:(NSColor *)color target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
+
++ (NSTouchBarItem *) touchBarButtonWithImage:(NSImage *)image identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
+
++ (NSPopoverTouchBarItem *) popoverTouchBarButton:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier popoverTouchBar:(NSTouchBar *)popoverTouchBar customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
+
+@end
diff --git a/MacPass/MPTouchBarButtonCreator.m b/MacPass/MPTouchBarButtonCreator.m
new file mode 100644
index 00000000..9bbaabb6
--- /dev/null
+++ b/MacPass/MPTouchBarButtonCreator.m
@@ -0,0 +1,50 @@
+//
+//  MPTouchBarButtonCreator.m
+//  MacPass
+//
+//  Created by Veit-Hendrik Schlenker on 25.12.18.
+//  Copyright © 2018 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPTouchBarButtonCreator.h"
+
+@implementation MPTouchBarButtonCreator
+
++ (NSTouchBarItem *) touchBarButtonWithTitle:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
+  NSCustomTouchBarItem *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier];
+  NSButton *button = [NSButton buttonWithTitle:title target:target action:selector];
+  item.view = button;
+  item.customizationLabel = customizationLabel;
+  return item;
+}
+
++ (NSTouchBarItem *) touchBarButtonWithTitleAndImage:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
+  return [self touchBarButtonWithTitleAndImageAndColor:title identifier:identifier image:image color:nil target:target selector:selector customizationLabel:customizationLabel];
+}
+
++ (NSTouchBarItem *) touchBarButtonWithTitleAndImageAndColor:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image color:(NSColor *)color target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
+  NSCustomTouchBarItem *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier];
+  NSButton *button = [NSButton buttonWithTitle:title image:image target:target action:selector];
+  button.bezelColor = color;
+  item.view = button;
+  item.customizationLabel = customizationLabel;
+  return item;
+}
+
++ (NSTouchBarItem *) touchBarButtonWithImage:(NSImage *)image identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
+  NSCustomTouchBarItem *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier];
+  NSButton *button = [NSButton buttonWithImage:image target:target action:selector];
+  item.view = button;
+  item.customizationLabel = customizationLabel;
+  return item;
+}
+
++ (NSPopoverTouchBarItem *) popoverTouchBarButton:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier popoverTouchBar:(NSTouchBar *)popoverTouchBar customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
+  NSPopoverTouchBarItem *item = [[NSPopoverTouchBarItem alloc] initWithIdentifier:identifier];
+  item.collapsedRepresentationLabel = title;
+  item.popoverTouchBar = popoverTouchBar;
+  item.customizationLabel = customizationLabel;
+  return item;
+}
+
+@end
diff --git a/MacPass/NSTextView+MPTouchBarExtension.h b/MacPass/NSTextView+MPTouchBarExtension.h
new file mode 100644
index 00000000..5b604ec7
--- /dev/null
+++ b/MacPass/NSTextView+MPTouchBarExtension.h
@@ -0,0 +1,13 @@
+//
+//  NSTextView+MPNSTextView_TouchBarExtension_h.h
+//  MacPass
+//
+//  Created by Veit-Hendrik Schlenker on 23.12.18.
+//  Copyright © 2018 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface NSTextView (TouchBarExtension)
+
+@end
diff --git a/MacPass/NSTextView+MPTouchBarExtension.m b/MacPass/NSTextView+MPTouchBarExtension.m
new file mode 100644
index 00000000..d85c67bd
--- /dev/null
+++ b/MacPass/NSTextView+MPTouchBarExtension.m
@@ -0,0 +1,17 @@
+//
+//  MP.m
+//  MacPass
+//
+//  Created by Veit-Hendrik Schlenker on 23.12.18.
+//  Copyright © 2018 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "NSTextView+MPTouchBarExtension.h"
+
+@implementation NSTextView (TouchBarExtension)
+
+- (NSTouchBar *) makeTouchBar {
+  return [self.window makeTouchBar];
+}
+
+@end
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 9aaf7d11..9abd63fc 100644
--- a/MacPass/de.lproj/Localizable.strings
+++ b/MacPass/de.lproj/Localizable.strings
@@ -676,6 +676,42 @@
 /* Toolbar item to perform autotype */
 "TOOLBAR_PERFORM_AUTOTYPE_FOR_ENTRY" = "Autotype";
 
+/* Touchbar button label for choosing the keyfile */
+"TOUCHBAR_CHOOSE_KEYFILE" = "Schlüsseldatei wählen";
+
+/* Touchbar button label for copying the password */
+"TOUCHBAR_COPY_PASSWORD" = "Passwort kopieren";
+
+/* Touchbar button label for copying the username */
+"TOUCHBAR_COPY_USERNAME" = "Benutzername kopieren";
+
+/* Touchbar button label for deleting elements */
+"TOUCHBAR_DELETE" = "Löschen";
+
+/* Touchbar button label for opening the popover to edit */
+"TOUCHBAR_EDIT" = "Bearbeiten";
+
+/* Touchbar button label for locking the database */
+"TOUCHBAR_LOCK_DATABASE" = "Datenbank sperren";
+
+/* Touchbar button label for creating a new item */
+"TOUCHBAR_NEW_ENTRY" = "Neuer Eintrag";
+
+/* Touchbar button label for creating a new group */
+"TOUCHBAR_NEW_GROUP" = "Neue Gruppe";
+
+/* Touchbar button label for performing autotype */
+"TOUCHBAR_PERFORM_AUTOTYPE" = "Autotype ausführen";
+
+/* Touchbar button label for searching the database */
+"TOUCHBAR_SEARCH" = "Datenbank durchsuchen";
+
+/* Touchbar button label for showing the password */
+"TOUCHBAR_SHOW_PASSWORD" = "Password anzeigen";
+
+/* Touchbar button label for unlocking the database */
+"TOUCHBAR_UNLOCK_DATABASE" = "Datenbank entsperren";
+
 /* Move Entry to Trash */
 "TRASH_ENTRY" = "Eintrag löschen";
 
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 31d4f721..14042171 100644
--- a/MacPass/en.lproj/Localizable.strings
+++ b/MacPass/en.lproj/Localizable.strings
@@ -685,6 +685,42 @@
 /* Toolbar item to perform autotype */
 "TOOLBAR_PERFORM_AUTOTYPE_FOR_ENTRY" = "Autotype";
 
+/* Touchbar button label for choosing the keyfile */
+"TOUCHBAR_CHOOSE_KEYFILE" = "Choose Keyfile";
+
+/* Touchbar button label for copying the password */
+"TOUCHBAR_COPY_PASSWORD" = "Copy Password";
+
+/* Touchbar button label for copying the username */
+"TOUCHBAR_COPY_USERNAME" = "Copy Username";
+
+/* Touchbar button label for deleting elements */
+"TOUCHBAR_DELETE" = "Delete";
+
+/* Touchbar button label for opening the popover to edit */
+"TOUCHBAR_EDIT" = "Edit";
+
+/* Touchbar button label for locking the database */
+"TOUCHBAR_LOCK_DATABASE" = "Lock Database";
+
+/* Touchbar button label for creating a new item */
+"TOUCHBAR_NEW_ENTRY" = "New Entry";
+
+/* Touchbar button label for creating a new group */
+"TOUCHBAR_NEW_GROUP" = "New Group";
+
+/* Touchbar button label for performing autotype */
+"TOUCHBAR_PERFORM_AUTOTYPE" = "Perform Autotype";
+
+/* Touchbar button label for searching the database */
+"TOUCHBAR_SEARCH" = "Search Database";
+
+/* Touchbar button label for showing the password */
+"TOUCHBAR_SHOW_PASSWORD" = "Show Password";
+
+/* Touchbar button label for unlocking the database */
+"TOUCHBAR_UNLOCK_DATABASE" = "Unlock Database";
+
 /* Move Entry to Trash */
 "TRASH_ENTRY" = "Trash Entry";
 

From 55f1ce22a965ede1f5d742eed0b25c0ed5961145 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Wed, 10 Jul 2019 12:13:56 +0200
Subject: [PATCH 07/21] Codestyle

---
 MacPass/MPAppDelegate.m | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index 126c565e..f7a06b2a 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -224,10 +224,9 @@ typedef NS_OPTIONS(NSInteger, MPAppStartupState) {
 #endif
   self.startupState |= MPAppStartupStateFinishedLaunch;
   // Here we just opt-in for allowing our bar to be customized throughout the app.
-  if ([[NSApplication sharedApplication] respondsToSelector:@selector(isAutomaticCustomizeTouchBarMenuItemEnabled)])
-  {
-    if (@available(macOS 10.12.2, *)) {
-      [NSApplication sharedApplication].automaticCustomizeTouchBarMenuItemEnabled = YES;
+  if([NSApplication.sharedApplication respondsToSelector:@selector(isAutomaticCustomizeTouchBarMenuItemEnabled)]) {
+    if(@available(macOS 10.12.2, *)) {
+      NSApplication.sharedApplication.automaticCustomizeTouchBarMenuItemEnabled = YES;
     }
   }
 }

From d5592774d10d143cfae1cd4f616cc84e871ad546 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Wed, 10 Jul 2019 12:27:11 +0200
Subject: [PATCH 08/21] Disable plugin alert when running tests

---
 MacPass/MPPluginHost.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MacPass/MPPluginHost.m b/MacPass/MPPluginHost.m
index e8cbcf4f..761ff632 100644
--- a/MacPass/MPPluginHost.m
+++ b/MacPass/MPPluginHost.m
@@ -282,7 +282,7 @@ NSString *const MPPluginHostPluginBundleIdentifiyerKey = @"MPPluginHostPluginBun
     }
   }
   if(incompatiblePlugins.count > 0) {
-    BOOL hideAlert = NO;
+    BOOL hideAlert = NSApplication.sharedApplication.isRunningTests ? YES : NO;
     if(nil != [NSUserDefaults.standardUserDefaults objectForKey:kMPSettingsKeyHideIncopatiblePluginsWarning]) {
       hideAlert = [NSUserDefaults.standardUserDefaults boolForKey:kMPSettingsKeyHideIncopatiblePluginsWarning];
     }

From 9d2819ce2caa86632025f2ee83219a76b3a2870c Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Wed, 10 Jul 2019 12:27:18 +0200
Subject: [PATCH 09/21] Codestyle

---
 MacPass/MPTouchBarButtonCreator.h | 10 +++++-----
 MacPass/MPTouchBarButtonCreator.m | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MacPass/MPTouchBarButtonCreator.h b/MacPass/MPTouchBarButtonCreator.h
index d82ed558..5bbc0dda 100644
--- a/MacPass/MPTouchBarButtonCreator.h
+++ b/MacPass/MPTouchBarButtonCreator.h
@@ -9,14 +9,14 @@
 
 @interface MPTouchBarButtonCreator: NSObject
 
-+ (NSTouchBarItem *) touchBarButtonWithTitle:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
++ (NSTouchBarItem *)touchBarButtonWithTitle:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
 
-+ (NSTouchBarItem *) touchBarButtonWithTitleAndImage:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
++ (NSTouchBarItem *)touchBarButtonWithTitleAndImage:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
 
-+ (NSTouchBarItem *) touchBarButtonWithTitleAndImageAndColor:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image color:(NSColor *)color target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
++ (NSTouchBarItem *)touchBarButtonWithTitleAndImageAndColor:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image color:(NSColor *)color target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
 
-+ (NSTouchBarItem *) touchBarButtonWithImage:(NSImage *)image identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
++ (NSTouchBarItem *)touchBarButtonWithImage:(NSImage *)image identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
 
-+ (NSPopoverTouchBarItem *) popoverTouchBarButton:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier popoverTouchBar:(NSTouchBar *)popoverTouchBar customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
++ (NSPopoverTouchBarItem *)popoverTouchBarButton:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier popoverTouchBar:(NSTouchBar *)popoverTouchBar customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
 
 @end
diff --git a/MacPass/MPTouchBarButtonCreator.m b/MacPass/MPTouchBarButtonCreator.m
index 9bbaabb6..da63de25 100644
--- a/MacPass/MPTouchBarButtonCreator.m
+++ b/MacPass/MPTouchBarButtonCreator.m
@@ -10,7 +10,7 @@
 
 @implementation MPTouchBarButtonCreator
 
-+ (NSTouchBarItem *) touchBarButtonWithTitle:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
++ (NSTouchBarItem *)touchBarButtonWithTitle:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
   NSCustomTouchBarItem *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier];
   NSButton *button = [NSButton buttonWithTitle:title target:target action:selector];
   item.view = button;
@@ -18,11 +18,11 @@
   return item;
 }
 
-+ (NSTouchBarItem *) touchBarButtonWithTitleAndImage:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
++ (NSTouchBarItem *)touchBarButtonWithTitleAndImage:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
   return [self touchBarButtonWithTitleAndImageAndColor:title identifier:identifier image:image color:nil target:target selector:selector customizationLabel:customizationLabel];
 }
 
-+ (NSTouchBarItem *) touchBarButtonWithTitleAndImageAndColor:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image color:(NSColor *)color target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
++ (NSTouchBarItem *)touchBarButtonWithTitleAndImageAndColor:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image color:(NSColor *)color target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
   NSCustomTouchBarItem *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier];
   NSButton *button = [NSButton buttonWithTitle:title image:image target:target action:selector];
   button.bezelColor = color;
@@ -31,7 +31,7 @@
   return item;
 }
 
-+ (NSTouchBarItem *) touchBarButtonWithImage:(NSImage *)image identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
++ (NSTouchBarItem *)touchBarButtonWithImage:(NSImage *)image identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
   NSCustomTouchBarItem *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier];
   NSButton *button = [NSButton buttonWithImage:image target:target action:selector];
   item.view = button;
@@ -39,7 +39,7 @@
   return item;
 }
 
-+ (NSPopoverTouchBarItem *) popoverTouchBarButton:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier popoverTouchBar:(NSTouchBar *)popoverTouchBar customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
++ (NSPopoverTouchBarItem *)popoverTouchBarButton:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier popoverTouchBar:(NSTouchBar *)popoverTouchBar customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){
   NSPopoverTouchBarItem *item = [[NSPopoverTouchBarItem alloc] initWithIdentifier:identifier];
   item.collapsedRepresentationLabel = title;
   item.popoverTouchBar = popoverTouchBar;

From 2381acfde94ce99f57a688c88be3dc4ba01b3b65 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Wed, 10 Jul 2019 12:27:34 +0200
Subject: [PATCH 10/21] Codestyle. Do not use == for string compare

---
 MacPass/MPDocumentWindowController.h |  3 +-
 MacPass/MPDocumentWindowController.m | 93 +++++++++++++++++++++-------
 2 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/MacPass/MPDocumentWindowController.h b/MacPass/MPDocumentWindowController.h
index 92b55dce..e02521b4 100644
--- a/MacPass/MPDocumentWindowController.h
+++ b/MacPass/MPDocumentWindowController.h
@@ -39,8 +39,7 @@
 @property (readonly, strong) MPInspectorViewController *inspectorViewController;
 @property (readonly, strong) MPToolbarDelegate *toolbarDelegate;
 
-#pragma mark Search
-- (NSSearchField *)searchField;
+@property (readonly, nonatomic, strong) NSSearchField *searchField;
 
 - (void)showEntries;
 - (void)showPasswordInput;
diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 6af5a923..10cb573b 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -677,37 +677,88 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
 }
 
 - (NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier  API_AVAILABLE(macos(10.12.2)) {
- #pragma mark primary touchbar elements
-  if (identifier == touchBarSearchIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameTouchBarSearchTemplate] identifier:touchBarSearchIdentifier target:self selector:@selector(focusSearchField) customizationLabel:NSLocalizedString(@"TOUCHBAR_SEARCH","Touchbar button label for searching the database")];
-  } else if (identifier == touchBarEditPopoverIdentifier) {
+#pragma mark primary touchbar elements
+  if([identifier isEqualToString:touchBarSearchIdentifier]) {
+    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameTouchBarSearchTemplate]
+                                                 identifier:touchBarSearchIdentifier
+                                                     target:self
+                                                   selector:@selector(focusSearchField)
+                                         customizationLabel:NSLocalizedString(@"TOUCHBAR_SEARCH","Touchbar button label for searching the database")];
+  }
+  
+  if(identifier == touchBarEditPopoverIdentifier) {
     NSTouchBar *secondaryTouchBar = [[NSTouchBar alloc] init];
     secondaryTouchBar.delegate = self;
     secondaryTouchBar.defaultItemIdentifiers = @[secondaryTouchBarNewEntryIdentifier, secondaryTouchBarNewGroupIdentifier, secondaryTouchBarDeleteIdentifier];
-    return [MPTouchBarButtonCreator popoverTouchBarButton:NSLocalizedString(@"TOUCHBAR_EDIT","Touchbar button label for opening the popover to edit") identifier:touchBarEditPopoverIdentifier popoverTouchBar:secondaryTouchBar customizationLabel:NSLocalizedString(@"TOUCHBAR_EDIT","Touchbar button label for opening the popover to edit")];
-  } else if (identifier == touchBarCopyUsernameIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username") identifier:touchBarCopyUsernameIdentifier target:self selector:@selector(copyUsername:) customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username")];
-  } else if (identifier == touchBarCopyPasswordIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password") identifier:touchBarCopyPasswordIdentifier target:self selector:@selector(copyPassword:) customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password")];
-  } else if (identifier == touchBarPerformAutotypeIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype") identifier:touchBarPerformAutotypeIdentifier target:self selector:@selector(performAutotypeForEntry:) customizationLabel:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")];
-  } else if (identifier == touchBarLockIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate] identifier:touchBarLockIdentifier target:self selector:@selector(lock:) customizationLabel:NSLocalizedString(@"TOUCHBAR_LOCK_DATABASE","Touchbar button label for locking the database")];
+    return [MPTouchBarButtonCreator popoverTouchBarButton:NSLocalizedString(@"TOUCHBAR_EDIT","Touchbar button label for opening the popover to edit")
+                                               identifier:touchBarEditPopoverIdentifier
+                                          popoverTouchBar:secondaryTouchBar
+                                       customizationLabel:NSLocalizedString(@"TOUCHBAR_EDIT","Touchbar button label for opening the popover to edit")];
+  }
+  
+  if(identifier == touchBarCopyUsernameIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username")
+                                                 identifier:touchBarCopyUsernameIdentifier
+                                                     target:self
+                                                   selector:@selector(copyUsername:)
+                                         customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username")];
+  }
+  
+  if (identifier == touchBarCopyPasswordIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password")
+                                                 identifier:touchBarCopyPasswordIdentifier
+                                                     target:self
+                                                   selector:@selector(copyPassword:)
+                                         customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password")];
+  }
+  
+  if (identifier == touchBarPerformAutotypeIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")
+                                                 identifier:touchBarPerformAutotypeIdentifier
+                                                     target:self
+                                                   selector:@selector(performAutotypeForEntry:)
+                                         customizationLabel:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")];
+  }
+  else if (identifier == touchBarLockIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate]
+                                                 identifier:touchBarLockIdentifier
+                                                     target:self
+                                                   selector:@selector(lock:)
+                                         customizationLabel:NSLocalizedString(@"TOUCHBAR_LOCK_DATABASE","Touchbar button label for locking the database")];
   }
 #pragma mark secondary/popover touchbar elements
-  else if (identifier == secondaryTouchBarNewEntryIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item") identifier:secondaryTouchBarNewEntryIdentifier image:[MPIconHelper icon:MPIconAddEntry] target:self selector:@selector(createEntry:) customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item")];
-  } else if (identifier == secondaryTouchBarNewGroupIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group") identifier:secondaryTouchBarNewGroupIdentifier image:[MPIconHelper icon:MPIconAddFolder] target:self selector:@selector(createGroup:) customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group")];
-  } else if (identifier == secondaryTouchBarDeleteIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImageAndColor:NSLocalizedString(@"TOUCHBAR_DELETE","Touchbar button label for deleting elements") identifier:secondaryTouchBarDeleteIdentifier image:[MPIconHelper icon:MPIconTrash] color:[NSColor systemRedColor] target:self selector:@selector(delete:) customizationLabel:NSLocalizedString(@"TOUCHBAR_DELETE","Touchbar button label for deleting elements")];
-  } else {
+  else if(identifier == secondaryTouchBarNewEntryIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item")
+                                                         identifier:secondaryTouchBarNewEntryIdentifier
+                                                              image:[MPIconHelper icon:MPIconAddEntry]
+                                                             target:self
+                                                           selector:@selector(createEntry:)
+                                                 customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item")];
+  }
+  else if (identifier == secondaryTouchBarNewGroupIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group")
+                                                         identifier:secondaryTouchBarNewGroupIdentifier
+                                                              image:[MPIconHelper icon:MPIconAddFolder]
+                                                             target:self
+                                                           selector:@selector(createGroup:)
+                                                 customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group")];
+  }
+  else if (identifier == secondaryTouchBarDeleteIdentifier) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImageAndColor:NSLocalizedString(@"TOUCHBAR_DELETE","Touchbar button label for deleting elements")
+                                                                 identifier:secondaryTouchBarDeleteIdentifier
+                                                                      image:[MPIconHelper icon:MPIconTrash]
+                                                                      color:NSColor.systemRedColor
+                                                                     target:self
+                                                                   selector:@selector(delete:)
+                                                         customizationLabel:NSLocalizedString(@"TOUCHBAR_DELETE","Touchbar button label for deleting elements")];
+  }
+  else {
     return nil;
   }
 }
 
 - (void)focusSearchField {
-  [self.window makeFirstResponder:[self searchField]];
+  [self.window makeFirstResponder:self.searchField];
 }
 
 @end

From 71e795c4f4bb08129ef537f6217e1a9f6ba5ab20 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 11:14:45 +0200
Subject: [PATCH 11/21] Updated Xcode version

---
 MacPass/Base.lproj/PluginPreferences.xib | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MacPass/Base.lproj/PluginPreferences.xib b/MacPass/Base.lproj/PluginPreferences.xib
index 706563df..d6b3980a 100644
--- a/MacPass/Base.lproj/PluginPreferences.xib
+++ b/MacPass/Base.lproj/PluginPreferences.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -104,7 +104,7 @@
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="q1P-PD-0LW">
-                                                        <rect key="frame" x="0.0" y="18" width="127" height="17"/>
+                                                        <rect key="frame" x="0.0" y="18" width="145" height="17"/>
                                                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Table View Cell" id="fug-79-n9g">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -125,7 +125,7 @@
                                                     <constraint firstAttribute="trailing" secondItem="fQy-Sz-4VA" secondAttribute="trailing" constant="2" id="Iy0-iV-Mbx"/>
                                                     <constraint firstItem="fQy-Sz-4VA" firstAttribute="top" secondItem="q1P-PD-0LW" secondAttribute="bottom" constant="2" id="RZb-58-Zwr"/>
                                                     <constraint firstItem="q1P-PD-0LW" firstAttribute="leading" secondItem="vVt-P3-yLp" secondAttribute="leading" constant="2" id="bTc-2c-BYB"/>
-                                                    <constraint firstAttribute="trailing" secondItem="q1P-PD-0LW" secondAttribute="trailing" constant="20" symbolic="YES" id="gSi-vN-xzX"/>
+                                                    <constraint firstAttribute="trailing" secondItem="q1P-PD-0LW" secondAttribute="trailing" constant="2" id="gSi-vN-xzX"/>
                                                     <constraint firstItem="q1P-PD-0LW" firstAttribute="top" secondItem="vVt-P3-yLp" secondAttribute="top" id="tTs-2E-33f"/>
                                                     <constraint firstItem="fQy-Sz-4VA" firstAttribute="leading" secondItem="vVt-P3-yLp" secondAttribute="leading" constant="2" id="zLP-Ci-nUM"/>
                                                 </constraints>

From 52720a79d4f071d7ccb1ad53c9cb980b0d69bb42 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 11:26:00 +0200
Subject: [PATCH 12/21] Fixed memory leak in taking a screenshot

---
 MacPass/MPAutotypeDoctor.m | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MacPass/MPAutotypeDoctor.m b/MacPass/MPAutotypeDoctor.m
index 55412bb4..8ea8ce53 100644
--- a/MacPass/MPAutotypeDoctor.m
+++ b/MacPass/MPAutotypeDoctor.m
@@ -75,6 +75,9 @@
                                                     kCGNullWindowID,
                                                     kCGWindowImageDefault);
     BOOL canRecordScreen = !screenshot;
+    if(!canRecordScreen) {
+      CFRelease(screenshot);
+    }
     if(!canRecordScreen && error) {
       *error = [NSError errorInDomain:MPAutotypeErrorDomain withCode:MPErrorAutotypeIsMissingScreenRecordingPermissions description:NSLocalizedString(@"ERROR_NO_PERMISSION_TO_RECORD_SCREEN", "Error description for missing screen recording permissions")];
     }

From 02840548bab91fa51496c2110d7f48e119a849a4 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 11:26:11 +0200
Subject: [PATCH 13/21] use isEqualToString instead of ==

---
 MacPass/MPDocumentWindowController.m | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 10cb573b..764cdf6b 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -686,7 +686,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_SEARCH","Touchbar button label for searching the database")];
   }
   
-  if(identifier == touchBarEditPopoverIdentifier) {
+  if([identifier isEqualToString:touchBarEditPopoverIdentifier]) {
     NSTouchBar *secondaryTouchBar = [[NSTouchBar alloc] init];
     secondaryTouchBar.delegate = self;
     secondaryTouchBar.defaultItemIdentifiers = @[secondaryTouchBarNewEntryIdentifier, secondaryTouchBarNewGroupIdentifier, secondaryTouchBarDeleteIdentifier];
@@ -696,7 +696,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
                                        customizationLabel:NSLocalizedString(@"TOUCHBAR_EDIT","Touchbar button label for opening the popover to edit")];
   }
   
-  if(identifier == touchBarCopyUsernameIdentifier) {
+  if([identifier isEqualToString:touchBarCopyUsernameIdentifier]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username")
                                                  identifier:touchBarCopyUsernameIdentifier
                                                      target:self
@@ -704,7 +704,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username")];
   }
   
-  if (identifier == touchBarCopyPasswordIdentifier) {
+  if([identifier isEqualToString:touchBarCopyPasswordIdentifier]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password")
                                                  identifier:touchBarCopyPasswordIdentifier
                                                      target:self
@@ -712,14 +712,14 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password")];
   }
   
-  if (identifier == touchBarPerformAutotypeIdentifier) {
+  if([identifier isEqualToString:touchBarPerformAutotypeIdentifier]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")
                                                  identifier:touchBarPerformAutotypeIdentifier
                                                      target:self
                                                    selector:@selector(performAutotypeForEntry:)
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")];
   }
-  else if (identifier == touchBarLockIdentifier) {
+  if([identifier isEqualToString:touchBarLockIdentifier]) {
     return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate]
                                                  identifier:touchBarLockIdentifier
                                                      target:self
@@ -727,7 +727,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_LOCK_DATABASE","Touchbar button label for locking the database")];
   }
 #pragma mark secondary/popover touchbar elements
-  else if(identifier == secondaryTouchBarNewEntryIdentifier) {
+  if([identifier isEqualToString:secondaryTouchBarNewEntryIdentifier]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item")
                                                          identifier:secondaryTouchBarNewEntryIdentifier
                                                               image:[MPIconHelper icon:MPIconAddEntry]
@@ -735,7 +735,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
                                                            selector:@selector(createEntry:)
                                                  customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item")];
   }
-  else if (identifier == secondaryTouchBarNewGroupIdentifier) {
+  if([identifier isEqualToString:secondaryTouchBarNewGroupIdentifier]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group")
                                                          identifier:secondaryTouchBarNewGroupIdentifier
                                                               image:[MPIconHelper icon:MPIconAddFolder]
@@ -743,7 +743,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
                                                            selector:@selector(createGroup:)
                                                  customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group")];
   }
-  else if (identifier == secondaryTouchBarDeleteIdentifier) {
+  if([identifier isEqualToString:secondaryTouchBarDeleteIdentifier]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImageAndColor:NSLocalizedString(@"TOUCHBAR_DELETE","Touchbar button label for deleting elements")
                                                                  identifier:secondaryTouchBarDeleteIdentifier
                                                                       image:[MPIconHelper icon:MPIconTrash]
@@ -752,9 +752,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
                                                                    selector:@selector(delete:)
                                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_DELETE","Touchbar button label for deleting elements")];
   }
-  else {
-    return nil;
-  }
+  return nil;
 }
 
 - (void)focusSearchField {

From a5c97469eb17249cac49f26852f8ed43dee20d17 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 13:26:21 +0200
Subject: [PATCH 14/21] Moved constants into MPTouchBarButtonCreator, adjusted
 naming of constants to current convention

---
 MacPass/MPDocumentWindowController.m | 54 +++++++++++-----------------
 MacPass/MPPasswordInputController.m  | 21 +++++------
 MacPass/MPTouchBarButtonCreator.h    | 18 ++++++++++
 MacPass/MPTouchBarButtonCreator.m    | 18 ++++++++++
 4 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 764cdf6b..38d8bba2 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -47,18 +47,6 @@
 
 #import "KeePassKit/KeePassKit.h"
 
-static NSTouchBarCustomizationIdentifier touchBarIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow";
-static NSTouchBarItemIdentifier touchBarSearchIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.search";
-static NSTouchBarItemIdentifier touchBarEditPopoverIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.editPopover";
-static NSTouchBarItemIdentifier touchBarCopyUsernameIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.copyUsername";
-static NSTouchBarItemIdentifier touchBarCopyPasswordIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.copyPassword";
-static NSTouchBarItemIdentifier touchBarPerformAutotypeIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.performAutotype";
-static NSTouchBarItemIdentifier touchBarLockIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.lock";
-
-static NSTouchBarItemIdentifier secondaryTouchBarNewEntryIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.newEntry";
-static NSTouchBarItemIdentifier secondaryTouchBarNewGroupIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.newGroup";
-static NSTouchBarItemIdentifier secondaryTouchBarDeleteIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.delete";
-
 typedef NS_ENUM(NSUInteger, MPAlertContext) {
   MPAlertLossySaveWarning,
 };
@@ -669,8 +657,8 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
 - (NSTouchBar *)makeTouchBar {
   NSTouchBar *touchBar = [[NSTouchBar alloc] init];
   touchBar.delegate = self;
-  touchBar.customizationIdentifier = touchBarIdentifier;
-  NSArray<NSTouchBarItemIdentifier> *defaultItemIdentifiers = @[touchBarSearchIdentifier, touchBarEditPopoverIdentifier, touchBarCopyUsernameIdentifier, touchBarCopyPasswordIdentifier,  touchBarPerformAutotypeIdentifier, NSTouchBarItemIdentifierFlexibleSpace, touchBarLockIdentifier];
+  touchBar.customizationIdentifier = MPTouchBarCustomizationIdentifierDocument;
+  NSArray<NSTouchBarItemIdentifier> *defaultItemIdentifiers = @[MPTouchBarItemIdentifierSearch, MPTouchBarItemIdentifierEditPopover, MPTouchBarItemIdentifierCopyUsername, MPTouchBarItemIdentifierCopyPassword,  MPTouchBarItemIdentifierPerformAutotype, NSTouchBarItemIdentifierFlexibleSpace, MPTouchBarItemIdentifierLock];
   touchBar.defaultItemIdentifiers = defaultItemIdentifiers;
   touchBar.customizationAllowedItemIdentifiers = defaultItemIdentifiers;
   return touchBar;
@@ -678,74 +666,74 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
 
 - (NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier  API_AVAILABLE(macos(10.12.2)) {
 #pragma mark primary touchbar elements
-  if([identifier isEqualToString:touchBarSearchIdentifier]) {
+  if([identifier isEqualToString:MPTouchBarItemIdentifierSearch]) {
     return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameTouchBarSearchTemplate]
-                                                 identifier:touchBarSearchIdentifier
+                                                 identifier:MPTouchBarItemIdentifierSearch
                                                      target:self
                                                    selector:@selector(focusSearchField)
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_SEARCH","Touchbar button label for searching the database")];
   }
   
-  if([identifier isEqualToString:touchBarEditPopoverIdentifier]) {
+  if([identifier isEqualToString:MPTouchBarItemIdentifierEditPopover]) {
     NSTouchBar *secondaryTouchBar = [[NSTouchBar alloc] init];
     secondaryTouchBar.delegate = self;
-    secondaryTouchBar.defaultItemIdentifiers = @[secondaryTouchBarNewEntryIdentifier, secondaryTouchBarNewGroupIdentifier, secondaryTouchBarDeleteIdentifier];
+    secondaryTouchBar.defaultItemIdentifiers = @[MPTouchBarItemIdentifierNewEntry, MPTouchBarItemIdentifierNewGroup, MPTouchBarItemIdentifierDelete];
     return [MPTouchBarButtonCreator popoverTouchBarButton:NSLocalizedString(@"TOUCHBAR_EDIT","Touchbar button label for opening the popover to edit")
-                                               identifier:touchBarEditPopoverIdentifier
+                                               identifier:MPTouchBarItemIdentifierEditPopover
                                           popoverTouchBar:secondaryTouchBar
                                        customizationLabel:NSLocalizedString(@"TOUCHBAR_EDIT","Touchbar button label for opening the popover to edit")];
   }
   
-  if([identifier isEqualToString:touchBarCopyUsernameIdentifier]) {
+  if([identifier isEqualToString:MPTouchBarItemIdentifierCopyUsername]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username")
-                                                 identifier:touchBarCopyUsernameIdentifier
+                                                 identifier:MPTouchBarItemIdentifierCopyUsername
                                                      target:self
                                                    selector:@selector(copyUsername:)
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_USERNAME","Touchbar button label for copying the username")];
   }
   
-  if([identifier isEqualToString:touchBarCopyPasswordIdentifier]) {
+  if([identifier isEqualToString:MPTouchBarItemIdentifierCopyPassword]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password")
-                                                 identifier:touchBarCopyPasswordIdentifier
+                                                 identifier:MPTouchBarItemIdentifierCopyPassword
                                                      target:self
                                                    selector:@selector(copyPassword:)
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_COPY_PASSWORD","Touchbar button label for copying the password")];
   }
   
-  if([identifier isEqualToString:touchBarPerformAutotypeIdentifier]) {
+  if([identifier isEqualToString:MPTouchBarItemIdentifierPerformAutotype]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitle:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")
-                                                 identifier:touchBarPerformAutotypeIdentifier
+                                                 identifier:MPTouchBarItemIdentifierPerformAutotype
                                                      target:self
                                                    selector:@selector(performAutotypeForEntry:)
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")];
   }
-  if([identifier isEqualToString:touchBarLockIdentifier]) {
+  if([identifier isEqualToString:MPTouchBarItemIdentifierLock]) {
     return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate]
-                                                 identifier:touchBarLockIdentifier
+                                                 identifier:MPTouchBarItemIdentifierLock
                                                      target:self
                                                    selector:@selector(lock:)
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_LOCK_DATABASE","Touchbar button label for locking the database")];
   }
 #pragma mark secondary/popover touchbar elements
-  if([identifier isEqualToString:secondaryTouchBarNewEntryIdentifier]) {
+  if([identifier isEqualToString:MPTouchBarItemIdentifierNewEntry]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item")
-                                                         identifier:secondaryTouchBarNewEntryIdentifier
+                                                         identifier:MPTouchBarItemIdentifierNewEntry
                                                               image:[MPIconHelper icon:MPIconAddEntry]
                                                              target:self
                                                            selector:@selector(createEntry:)
                                                  customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_ENTRY","Touchbar button label for creating a new item")];
   }
-  if([identifier isEqualToString:secondaryTouchBarNewGroupIdentifier]) {
+  if([identifier isEqualToString:MPTouchBarItemIdentifierNewGroup]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group")
-                                                         identifier:secondaryTouchBarNewGroupIdentifier
+                                                         identifier:MPTouchBarItemIdentifierNewGroup
                                                               image:[MPIconHelper icon:MPIconAddFolder]
                                                              target:self
                                                            selector:@selector(createGroup:)
                                                  customizationLabel:NSLocalizedString(@"TOUCHBAR_NEW_GROUP","Touchbar button label for creating a new group")];
   }
-  if([identifier isEqualToString:secondaryTouchBarDeleteIdentifier]) {
+  if([identifier isEqualToString:MPTouchBarItemIdentifierDelete]) {
     return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImageAndColor:NSLocalizedString(@"TOUCHBAR_DELETE","Touchbar button label for deleting elements")
-                                                                 identifier:secondaryTouchBarDeleteIdentifier
+                                                                 identifier:MPTouchBarItemIdentifierDelete
                                                                       image:[MPIconHelper icon:MPIconTrash]
                                                                       color:NSColor.systemRedColor
                                                                      target:self
diff --git a/MacPass/MPPasswordInputController.m b/MacPass/MPPasswordInputController.m
index 0495eb48..02438664 100644
--- a/MacPass/MPPasswordInputController.m
+++ b/MacPass/MPPasswordInputController.m
@@ -32,11 +32,6 @@
 
 #import "NSError+Messages.h"
 
-static NSTouchBarCustomizationIdentifier touchBarIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput";
-static NSTouchBarItemIdentifier touchBarChooseKeyfileIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput.chooseKeyfile";
-static NSTouchBarItemIdentifier touchBarShowPasswordIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput.showPassword";
-static NSTouchBarItemIdentifier touchBarUnlockIdentifier = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput.unlock";
-
 @interface MPPasswordInputController ()
 
 @property (strong) NSButton *showPasswordButton;
@@ -188,22 +183,22 @@ static NSTouchBarItemIdentifier touchBarUnlockIdentifier = @"com.hicknhacksoftwa
 - (NSTouchBar *)makeTouchBar {
   NSTouchBar *touchBar = [[NSTouchBar alloc] init];
   touchBar.delegate = self;
-  touchBar.customizationIdentifier = touchBarIdentifier;
-  NSArray<NSTouchBarItemIdentifier> *defaultItemIdentifiers = @[touchBarShowPasswordIdentifier, touchBarChooseKeyfileIdentifier, NSTouchBarItemIdentifierFlexibleSpace,touchBarUnlockIdentifier];
+  touchBar.customizationIdentifier = MPTouchBarCustomizationIdentifierPasswordInput;
+  NSArray<NSTouchBarItemIdentifier> *defaultItemIdentifiers = @[MPTouchBarItemIdentifierShowPassword, MPTouchBarItemIdentifierChooseKeyfile, NSTouchBarItemIdentifierFlexibleSpace,MPTouchBarItemIdentifierUnlock];
   touchBar.defaultItemIdentifiers = defaultItemIdentifiers;
   touchBar.customizationAllowedItemIdentifiers = defaultItemIdentifiers;
   return touchBar;
 }
 
 - (NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier  API_AVAILABLE(macos(10.12.2)) {
-  if (identifier == touchBarChooseKeyfileIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_CHOOSE_KEYFILE","Touchbar button label for choosing the keyfile") identifier:touchBarChooseKeyfileIdentifier image:[NSImage imageNamed:NSImageNameTouchBarFolderTemplate] target:self.keyPathControl selector:@selector(showOpenPanel:) customizationLabel:NSLocalizedString(@"TOUCHBAR_CHOOSE_KEYFILE","Touchbar button label for choosing the keyfile")];
-  } else if (identifier == touchBarShowPasswordIdentifier) {
-    NSTouchBarItem *item = [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_SHOW_PASSWORD","Touchbar button label for showing the password") identifier:touchBarShowPasswordIdentifier image:[NSImage imageNamed:NSImageNameTouchBarQuickLookTemplate] target:self selector:@selector(toggleShowPassword) customizationLabel:NSLocalizedString(@"TOUCHBAR_SHOW_PASSWORD","Touchbar button label for showing the password")];
+  if (identifier == MPTouchBarItemIdentifierChooseKeyfile) {
+    return [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_CHOOSE_KEYFILE","Touchbar button label for choosing the keyfile") identifier:MPTouchBarItemIdentifierChooseKeyfile image:[NSImage imageNamed:NSImageNameTouchBarFolderTemplate] target:self.keyPathControl selector:@selector(showOpenPanel:) customizationLabel:NSLocalizedString(@"TOUCHBAR_CHOOSE_KEYFILE","Touchbar button label for choosing the keyfile")];
+  } else if (identifier == MPTouchBarItemIdentifierShowPassword) {
+    NSTouchBarItem *item = [MPTouchBarButtonCreator touchBarButtonWithTitleAndImage:NSLocalizedString(@"TOUCHBAR_SHOW_PASSWORD","Touchbar button label for showing the password") identifier:MPTouchBarItemIdentifierShowPassword image:[NSImage imageNamed:NSImageNameTouchBarQuickLookTemplate] target:self selector:@selector(toggleShowPassword) customizationLabel:NSLocalizedString(@"TOUCHBAR_SHOW_PASSWORD","Touchbar button label for showing the password")];
     _showPasswordButton = (NSButton *) item.view;
     return item;
-  } else if (identifier == touchBarUnlockIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate] identifier:touchBarUnlockIdentifier target:self selector:@selector(_submit:) customizationLabel:NSLocalizedString(@"TOUCHBAR_UNLOCK_DATABASE","Touchbar button label for unlocking the database")];
+  } else if (identifier == MPTouchBarItemIdentifierUnlock) {
+    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate] identifier:MPTouchBarItemIdentifierUnlock target:self selector:@selector(_submit:) customizationLabel:NSLocalizedString(@"TOUCHBAR_UNLOCK_DATABASE","Touchbar button label for unlocking the database")];
   } else {
     return nil;
   }
diff --git a/MacPass/MPTouchBarButtonCreator.h b/MacPass/MPTouchBarButtonCreator.h
index 5bbc0dda..ab6fbdf4 100644
--- a/MacPass/MPTouchBarButtonCreator.h
+++ b/MacPass/MPTouchBarButtonCreator.h
@@ -9,6 +9,24 @@
 
 @interface MPTouchBarButtonCreator: NSObject
 
+APPKIT_EXTERN NSTouchBarCustomizationIdentifier MPTouchBarCustomizationIdentifierPasswordInput;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierChooseKeyfile;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierShowPassword;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierUnlock;
+
+APPKIT_EXTERN NSTouchBarCustomizationIdentifier MPTouchBarCustomizationIdentifierDocument;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierSearch;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierEditPopover;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierCopyUsername;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierCopyPassword;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierPerformAutotype;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierLock;
+
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierNewEntry;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierNewGroup;
+APPKIT_EXTERN NSTouchBarItemIdentifier MPTouchBarItemIdentifierDelete;
+
+
 + (NSTouchBarItem *)touchBarButtonWithTitle:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
 
 + (NSTouchBarItem *)touchBarButtonWithTitleAndImage:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier image:(NSImage *)image target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2));
diff --git a/MacPass/MPTouchBarButtonCreator.m b/MacPass/MPTouchBarButtonCreator.m
index da63de25..06cdeb57 100644
--- a/MacPass/MPTouchBarButtonCreator.m
+++ b/MacPass/MPTouchBarButtonCreator.m
@@ -8,6 +8,24 @@
 
 #import "MPTouchBarButtonCreator.h"
 
+NSTouchBarCustomizationIdentifier MPTouchBarCustomizationIdentifierPasswordInput = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierChooseKeyfile = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput.chooseKeyfile";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierShowPassword = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput.showPassword";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierUnlock = @"com.hicknhacksoftware.MacPass.TouchBar.passwordInput.unlock";
+
+NSTouchBarCustomizationIdentifier MPTouchBarCustomizationIdentifierDocument = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierSearch = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.search";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierEditPopover = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.editPopover";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierCopyUsername = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.copyUsername";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierCopyPassword = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.copyPassword";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierPerformAutotype = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.performAutotype";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierLock = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.lock";
+
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierNewEntry = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.newEntry";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierNewGroup = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.newGroup";
+NSTouchBarItemIdentifier MPTouchBarItemIdentifierDelete = @"com.hicknhacksoftware.MacPass.TouchBar.documentWindow.delete";
+
+
 @implementation MPTouchBarButtonCreator
 
 + (NSTouchBarItem *)touchBarButtonWithTitle:(NSString *)title identifier:(NSTouchBarItemIdentifier)identifier target:(id)target selector:(SEL)selector customizationLabel:(NSString *)customizationLabel API_AVAILABLE(macos(10.12.2)){

From 3191e56e5867c87a576fa8312273bd735494c085 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 14:40:14 +0200
Subject: [PATCH 15/21] Used more appropriate buttons for unlock/lock in Touch-
 and Toolbar

---
 MacPass/MPDocumentWindowController.m | 2 +-
 MacPass/MPToolbarDelegate.m          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 10cb573b..74bbdb65 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -720,7 +720,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
                                          customizationLabel:NSLocalizedString(@"TOUCHBAR_PERFORM_AUTOTYPE","Touchbar button label for performing autotype")];
   }
   else if (identifier == touchBarLockIdentifier) {
-    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockUnlockedTemplate]
+    return [MPTouchBarButtonCreator touchBarButtonWithImage:[NSImage imageNamed:NSImageNameLockLockedTemplate]
                                                  identifier:touchBarLockIdentifier
                                                      target:self
                                                    selector:@selector(lock:)
diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m
index 54858ec7..22852525 100644
--- a/MacPass/MPToolbarDelegate.m
+++ b/MacPass/MPToolbarDelegate.m
@@ -216,7 +216,7 @@ NSString *const MPToolbarItemAutotype = @"TOOLBAR_AUTOTYPE";
 }
 
 - (NSDictionary *)createToolbarImages {
-  NSDictionary *imageDict = @{ MPToolbarItemLock: [NSImage imageNamed:NSImageNameLockUnlockedTemplate],
+  NSDictionary *imageDict = @{ MPToolbarItemLock: [NSImage imageNamed:NSImageNameLockLockedTemplate],
                                MPToolbarItemAddEntry: [MPIconHelper icon:MPIconAddEntry],
                                MPToolbarItemAddGroup: [MPIconHelper icon:MPIconAddFolder],
                                MPToolbarItemCopyUsername : [MPIconHelper icon:MPIconIdentity],

From 9a625dd57d8b6b600f1249ae9750e266a7b7eca4 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 16:03:58 +0200
Subject: [PATCH 16/21] Updated german and english localizations

---
 .../AutotypeCandidateSelectionView.xib        |  5 +-
 ...AutotypeCandidateSelectionViewController.h |  1 +
 ...AutotypeCandidateSelectionViewController.m |  7 ++-
 MacPass/MPAutotypeDaemon.m                    |  5 +-
 MacPass/de.lproj/GeneralPreferences.strings   | 12 ++---
 .../de.lproj/IntegrationPreferences.strings   |  4 +-
 MacPass/de.lproj/Localizable.strings          | 46 ++++++++++++-------
 MacPass/de.lproj/MainMenu.strings             |  5 +-
 .../PluginRepositoryBrowserView.strings       | 24 ++++++++++
 .../de.lproj/SavePanelAccessoryView.strings   |  2 +-
 MacPass/de.lproj/WorkflowPreferences.strings  |  6 +++
 MacPass/en.lproj/GeneralPreferences.strings   | 10 +++-
 MacPass/en.lproj/Localizable.strings          |  9 ++--
 13 files changed, 98 insertions(+), 38 deletions(-)
 create mode 100644 MacPass/de.lproj/PluginRepositoryBrowserView.strings

diff --git a/MacPass/Base.lproj/AutotypeCandidateSelectionView.xib b/MacPass/Base.lproj/AutotypeCandidateSelectionView.xib
index 5662a493..116456d7 100644
--- a/MacPass/Base.lproj/AutotypeCandidateSelectionView.xib
+++ b/MacPass/Base.lproj/AutotypeCandidateSelectionView.xib
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPAutotypeCandidateSelectionViewController">
             <connections>
                 <outlet property="contextTableView" destination="Ih2-lo-t2W" id="8uy-Mz-1vc"/>
+                <outlet property="messageTextField" destination="kDw-2l-7gQ" id="7bW-as-yGU"/>
                 <outlet property="selectAutotypeContextButton" destination="V5B-Qq-GN8" id="mqv-H3-N01"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
diff --git a/MacPass/MPAutotypeCandidateSelectionViewController.h b/MacPass/MPAutotypeCandidateSelectionViewController.h
index f76c390e..0247b4e0 100644
--- a/MacPass/MPAutotypeCandidateSelectionViewController.h
+++ b/MacPass/MPAutotypeCandidateSelectionViewController.h
@@ -25,6 +25,7 @@
 @interface MPAutotypeCandidateSelectionViewController : NSViewController
 
 @property (copy) NSArray *candidates;
+@property (copy) NSString *windowTitle;
 
 - (IBAction)selectAutotypeContext:(id)sender;
 - (IBAction)cancelSelection:(id)sender;
diff --git a/MacPass/MPAutotypeCandidateSelectionViewController.m b/MacPass/MPAutotypeCandidateSelectionViewController.m
index c3284919..5eb20ab8 100644
--- a/MacPass/MPAutotypeCandidateSelectionViewController.m
+++ b/MacPass/MPAutotypeCandidateSelectionViewController.m
@@ -28,8 +28,9 @@
 #import <KeePassKit/KeePassKit.h>
 
 @interface MPAutotypeCandidateSelectionViewController () <NSTableViewDataSource, NSTableViewDelegate>
-@property (weak) IBOutlet NSButton *selectAutotypeContextButton;
-@property (weak) IBOutlet NSTableView *contextTableView;
+@property (strong) IBOutlet NSButton *selectAutotypeContextButton;
+@property (strong) IBOutlet NSTableView *contextTableView;
+@property (strong) IBOutlet NSTextField *messageTextField;
 
 @end
 
@@ -41,6 +42,8 @@
 
 - (void)viewDidLoad {
   [super viewDidLoad];
+  NSString *template = NSLocalizedString(@"AUTOTYPE_CANDIDATE_SELECTION_WINDOW_MESSAGE_%@", "Message text in the autotype selection window. Placeholder is %1 - windowTitle");
+  self.messageTextField.stringValue = [NSString stringWithFormat:template, self.windowTitle];
   self.selectAutotypeContextButton.enabled = NO;
   NSNotification *notification = [NSNotification notificationWithName:NSTableViewSelectionDidChangeNotification object:self.contextTableView];
   [self tableViewSelectionDidChange:notification];
diff --git a/MacPass/MPAutotypeDaemon.m b/MacPass/MPAutotypeDaemon.m
index 8f4dc034..ace24103 100644
--- a/MacPass/MPAutotypeDaemon.m
+++ b/MacPass/MPAutotypeDaemon.m
@@ -264,7 +264,7 @@ static MPAutotypeDaemon *_sharedInstance;
   if(candidates == 1 ) {
     return autotypeCandidates.lastObject;
   }
-  [self _presentSelectionWindow:autotypeCandidates];
+  [self _presentCandiadates:autotypeCandidates forWindowTitle:windowTitle];
   return nil; // Nothing to do, we get called back by the window
 }
 
@@ -352,7 +352,7 @@ static MPAutotypeDaemon *_sharedInstance;
   return infoDict;
 }
 
-- (void)_presentSelectionWindow:(NSArray *)candidates {
+- (void)_presentCandiadates:(NSArray *)candidates forWindowTitle:(NSString *)windowTitle {
   if(!self.matchSelectionWindow) {
     self.matchSelectionWindow = [[NSPanel alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
                                                            styleMask:NSWindowStyleMaskNonactivatingPanel|NSWindowStyleMaskTitled
@@ -361,6 +361,7 @@ static MPAutotypeDaemon *_sharedInstance;
     self.matchSelectionWindow.level = kCGAssistiveTechHighWindowLevel;
     MPAutotypeCandidateSelectionViewController *vc = [[MPAutotypeCandidateSelectionViewController alloc] init];
     vc.candidates = candidates;
+    vc.windowTitle = windowTitle;
     self.matchSelectionWindow.collectionBehavior |= (NSWindowCollectionBehaviorFullScreenAuxiliary |
                                                      NSWindowCollectionBehaviorMoveToActiveSpace |
                                                      NSWindowCollectionBehaviorTransient );
diff --git a/MacPass/de.lproj/GeneralPreferences.strings b/MacPass/de.lproj/GeneralPreferences.strings
index 0f4e75c9..d4d583f8 100644
--- a/MacPass/de.lproj/GeneralPreferences.strings
+++ b/MacPass/de.lproj/GeneralPreferences.strings
@@ -46,18 +46,12 @@
 /* Class = "NSButtonCell"; title = "Lock after sleep"; ObjectID = "631"; */
 "631.title" = "Datenbank im Ruhezustand sperren";
 
-/* Class = "NSButtonCell"; title = "Enable Autosave"; ObjectID = ""wG7-bi-2fi""; */
-"wG7-bi-2fi.title" = "Automatisches Speichern aktivieren";
-
 /* Class = "NSMenuItem"; title = "Never"; ObjectID = "804"; */
 "804.title" = "Nie";
 
 /* Class = "NSTextFieldCell"; title = "Lock while idle"; ObjectID = "806"; */
 "806.title" = "Sperren nach Inaktivität";
 
-/* Class = "NSTextFieldCell"; title = "Close and open all documents for changes to take effect"; ObjectID = "3Bo-Ml-1KB"; */
-"3Bo-Ml-1KB.title" = "Die Änderungen werden erst für Dokumente wirksam, welche geschlossen und erneut geöffnet werden.";
-
 /* Class = "NSBox"; title = "File Handling"; ObjectID = "888"; */
 "888.title" = "Dateibehandlung";
 
@@ -79,3 +73,9 @@
 /* Class = "NSButtonCell"; title = "Remember Keyfile for Databases"; ObjectID = "r6q-He-nYU"; */
 "r6q-He-nYU.title" = "Schlüsseldatei merken";
 
+/* Class = "NSButtonCell"; title = "Enable Autosave"; ObjectID = "wG7-bi-2fi"; */
+"wG7-bi-2fi.title" = "Automatisches Speichern aktivieren";
+
+/* Class = "NSTextFieldCell"; title = "Close and open all documents for changes to take effect"; ObjectID = "ya5-ps-c4W"; */
+"ya5-ps-c4W.title" = "Die Änderungen werden erst für Dokumente wirksam, welche geschlossen und erneut geöffnet werden.";
+
diff --git a/MacPass/de.lproj/IntegrationPreferences.strings b/MacPass/de.lproj/IntegrationPreferences.strings
index 857b8826..a926f27e 100644
--- a/MacPass/de.lproj/IntegrationPreferences.strings
+++ b/MacPass/de.lproj/IntegrationPreferences.strings
@@ -10,13 +10,13 @@
 /* Class = "NSButtonCell"; title = "Enable Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
 "ERs-ct-Eyx.title" = "Quicklook Preview aktivieren";
 
-/* Class = "NSTextFieldCell"; title = "Autotype is not available, because MacPass is not allowed to control your computer. To enable Autotype, go to the Security and Privacy Preferences and add MacPass to the Accessibilty group. Changes require a restart of MacPass."; ObjectID = "H37-ku-aTc"; */
+/* Class = "NSTextFieldCell"; title = "Autotype might not work properly. Some issues where found that prevent Autotype or Global Autotype to work. Please run the Autotype Doctor to fix those issues."; ObjectID = "H37-ku-aTc"; */
 "H37-ku-aTc.title" = "Autotype steht nicht zur Verfügung, da MacPass den Computer nicht steuern darf. Um Autotype zu ermöglichen, fügen Sie MacPass in den Einstellungen zur Privatsphäre zu den Bedienungshilfen hinzu.";
 
 /* Class = "NSTextFieldCell"; title = "Shortcut is missing Key"; ObjectID = "Lxp-wI-yQy"; */
 "Lxp-wI-yQy.title" = "Der Kurzbefehl ist unvollständig";
 
-/* Class = "NSButtonCell"; title = "Open Preferences…"; ObjectID = "NP0-R3-m6n"; */
+/* Class = "NSButtonCell"; title = "Run Autotype Doctor…"; ObjectID = "NP0-R3-m6n"; */
 "NP0-R3-m6n.title" = "Systemeinstellungen öffnen…";
 
 /* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 9abd63fc..e26e82fb 100644
--- a/MacPass/de.lproj/Localizable.strings
+++ b/MacPass/de.lproj/Localizable.strings
@@ -37,18 +37,6 @@
 /* Action to add an entry via template */
 "ADD_TREMPLATE_ENTRY" = "Vorgabeeintrag erstellen";
 
-/* Button in dialog to leave autotype disabled and continiue! */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OK" = "Autotype deaktiviert lassen.";
-
-/* Button in dialog to open accessibilty preferences pane! */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OPEN_PREFERENCES" = "Systemeinstellung Bedienungshilfen öffnen …";
-
-/* Alert informative text displayed when Autotype performs self check and lacks accessibilty permissions */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_INFORMATIVE_TEXT" = "Das System erlaubt MacPass nicht, Autotype-Tastenbefehle an andere Anwendungen zu schicken. Um Autotype zu ermöglichen fügen Sie MacPass zu den Bedienungshilfen in den Datenschutzeinstellung hinzu. ";
-
-/* Alert message displayed when Autotype performs self check and lacks accessibilty permissions */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_MESSAGE_TEXT" = "MacPass kann Autotype nicht ausführen.";
-
 /* Button in dialog to leave plugin ds disabled and continiue! */
 "ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_BUTTON_OK" = "OK";
 
@@ -101,6 +89,12 @@
 /* Menu item for automatic trash creation */
 "AUTOCREATE_TRASH_FOLDER" = "Automatisch erstellen";
 
+/* Message text in the autotype selection window. Placeholder is %1 - windowTitle */
+"AUTOTYPE_CANDIDATE_SELECTION_WINDOW_MESSAGE_%@" = "Es gibt mehrere Treffer für den aktuellen Fenstertitel: %@. Bitte wählen Sie den Eintrag aus der Liste aus, welcher verwendet werden soll.";
+
+/* Window title for the stand-alone password creator window */
+"AUTOTYPE_DOCTOR_RESULTS_WINDOW_TITLE" = "Autotype Doktor";
+
 /* Inherit autotype settings menu item */
 "AUTOTYPE_INHERIT" = "Autotype Einstellungen vererben";
 
@@ -110,8 +104,8 @@
 /* Disable autotype menu item */
 "AUTOTYPE_NO" = "Autotype deaktivieren";
 
-/* Notification: Autotype failed, MacPass has no permission to send key strokes */
-"AUTOTYPE_NOTIFICATION_MACPASS_HAS_NO_ACCESSIBILTY_PERMISSIONS" = "Autotype ist deaktivert, weil keine Rechte zum Steuern des Computers vorhanden sind.";
+/* Notification: Autotype failed, MacPass has not enough permissions to perform autotype */
+"AUTOTYPE_NOTIFICATION_MACPASS_IS_MISSING_PERMISSIONS" = "MacPass hat nicht alle notwendigen Berechtigungen um Autotype ausführen zu können";
 
 /* Notification: Autotype failed, no documents are open */
 "AUTOTYPE_OVERLAY_NO_DOCUMENTS" = "Bitte öffnen Sie eine Datei, um Global-Autotype zu nutzen!";
@@ -122,6 +116,18 @@
 /* Notification: Autotype found a single match for %@ (string placeholder). */
 "AUTOTYPE_OVERLAY_SINGLE_MATCH_FOR_%@" = "Treffer für %@!";
 
+/* Status lable when no issue were found in accessibilty */
+"AUTOTYPE_STATUS_ACCESSIBILTY_PERMISSIONS_OK" = "MacPass hat die Berechtigung den Computer zu steuern (Eingabehilfe)";
+
+/* Status MacPass has no accessibilty permissions */
+"AUTOTYPE_STATUS_NO_ACCESSIBILTY_PERMISSIONS" = "MacPass hat keine Berechtigung den Computer zu steuern (Eingabehilfe)";
+
+/* Status MacPass has no screen recording permissions */
+"AUTOTYPE_STATUS_NO_SCREEN_RECORDING_PERMISSIONS" = "MacPass hat keine Berechtigung den Bildschirminhalt aufzuzeichnen";
+
+/* Status lable when no issue were found in screen recording permissions */
+"AUTOTYPE_STATUS_SCREEN_RECORDING_PERMISSIONS_OK" = "MacPass hat die Berechtigung den Bildschirminhalt aufzuzeichnen";
+
 /* Notficication: Autotype timed out */
 "AUTOTYPE_TIMED_OUT" = "Autotype wegen zu langer Wartezeit abgebrochen";
 
@@ -325,6 +331,12 @@
 /* Error description given when adding an invalid plugin */
 "ERROR_INVALID_PLUGIN" = "Kein MacPass-Plugin";
 
+/* Error description for missing accessibilty permissions */
+"ERROR_NO_ACCESSIBILTY_PERMISSIONS" = "MacPass hat keine Berechtigung den Bildschirminhalt aufzuzeichen.";
+
+/* Error description for missing screen recording permissions */
+"ERROR_NO_PERMISSION_TO_RECORD_SCREEN" = "MacPass hat keine Berechtigungen den Bildschirminhalt aufzuzeichnen";
+
 /* Passwords do not match */
 "ERROR_PASSWORD_MISSMATCH" = "Passwörter stimmen nicht überein";
 
@@ -486,9 +498,6 @@
 /* Action button in Notification to open a document */
 "OPEN_DOCUMENT" = "Datei öffnen";
 
-/* Action button in Notification to show the Accessibilty preferences */
-"OPEN_PREFERENCES" = "Systemeinstellung Bedienungshilfen öffnen …";
-
 /* Menu item to open the URL with the default application */
 "OPEN_URL" = "Adresse öffnen";
 
@@ -660,6 +669,9 @@
 /* Checkbox in dialog to set the selection as default file change strategy! */
 "SET_AS_DEFAULT_FILE_CHANGE_STRATEGY" = "Die gewählte Strategie immer verwenden. Sie können die Strategie jederzeit in den Einstellungen anpassen.";
 
+/* Action button in Notification to show the Autotype Doctor */
+"SHOW_AUTOTYPE_DOCTOR" = "Autotype Doktor anzeigen";
+
 /* Menu item to show the history of the selected entry
    Toolbar item to toggle history display */
 "SHOW_HISTORY" = "Historie anzeigen";
diff --git a/MacPass/de.lproj/MainMenu.strings b/MacPass/de.lproj/MainMenu.strings
index 1f414b41..06d44b59 100644
--- a/MacPass/de.lproj/MainMenu.strings
+++ b/MacPass/de.lproj/MainMenu.strings
@@ -139,7 +139,7 @@
 /* Class = "NSMenuItem"; title = "Toggle Inspector"; ObjectID = "1181"; */
 "1181.title" = "Inspector ein/ausblenden";
 
-/* Class = "NSMenuItem"; title = "Show Password Generator"; ObjectID = "1200"; */
+/* Class = "NSMenuItem"; title = "Password Generator"; ObjectID = "1200"; */
 "1200.title" = "Passwortgenerator anzeigen";
 
 /* Class = "NSMenuItem"; title = "Change Master Password…"; ObjectID = "1203"; */
@@ -193,3 +193,6 @@
 /* Class = "NSMenuItem"; title = "Merge With…"; ObjectID = "zvE-0h-UxI"; */
 "zvE-0h-UxI.title" = "Synchronisieren…";
 
+/* Class = "NSMenuItem"; title = "Autotype Doctor"; ObjectID = "zWx-Re-iuJ"; */
+"zWx-Re-iuJ.title" = "Autotype Doktor";
+
diff --git a/MacPass/de.lproj/PluginRepositoryBrowserView.strings b/MacPass/de.lproj/PluginRepositoryBrowserView.strings
new file mode 100644
index 00000000..f5b5b4a9
--- /dev/null
+++ b/MacPass/de.lproj/PluginRepositoryBrowserView.strings
@@ -0,0 +1,24 @@
+/* Class = "NSButtonCell"; title = "Action"; ObjectID = "6jQ-Uk-uqD"; */
+"6jQ-Uk-uqD.title" = "Aktion";
+
+/* Class = "NSTextFieldCell"; title = "Updated at"; ObjectID = "DhR-ED-6gV"; */
+"DhR-ED-6gV.title" = "Aktualisiert am";
+
+/* Class = "NSTableColumn"; headerCell.title = "Status"; ObjectID = "g1Q-BS-vCR"; */
+"g1Q-BS-vCR.headerCell.title" = "Status";
+
+/* Class = "NSTableColumn"; headerCell.title = "Latest Version"; ObjectID = "hFg-AD-SqD"; */
+"hFg-AD-SqD.headerCell.title" = "Aktuelle Version";
+
+/* Class = "NSButtonCell"; title = "Done"; ObjectID = "j9a-fn-Pye"; */
+"j9a-fn-Pye.title" = "Fertig";
+
+/* Class = "NSTextFieldCell"; title = "Last updated:"; ObjectID = "ntD-sJ-NRw"; */
+"ntD-sJ-NRw.title" = "Letze Aktualisierung:";
+
+/* Class = "NSTableColumn"; headerCell.title = "Plugin"; ObjectID = "Nzo-rR-Hfx"; */
+"Nzo-rR-Hfx.headerCell.title" = "Plugin";
+
+/* Class = "NSButtonCell"; title = "Refresh"; ObjectID = "NZw-nO-lZ3"; */
+"NZw-nO-lZ3.title" = "Aktualisieren";
+
diff --git a/MacPass/de.lproj/SavePanelAccessoryView.strings b/MacPass/de.lproj/SavePanelAccessoryView.strings
index b2cb9be9..42f4e45f 100644
--- a/MacPass/de.lproj/SavePanelAccessoryView.strings
+++ b/MacPass/de.lproj/SavePanelAccessoryView.strings
@@ -1,4 +1,3 @@
-
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "4"; */
 "4.title" = "OtherViews";
 
@@ -13,3 +12,4 @@
 
 /* Class = "NSTextFieldCell"; title = "Not all Information inside your current database can be stored with this format."; ObjectID = "52"; */
 "52.title" = "Es können nicht alle Informationen der Datenbank in diesem Format gespeichert werden.";
+
diff --git a/MacPass/de.lproj/WorkflowPreferences.strings b/MacPass/de.lproj/WorkflowPreferences.strings
index 54490729..33fad6f0 100644
--- a/MacPass/de.lproj/WorkflowPreferences.strings
+++ b/MacPass/de.lproj/WorkflowPreferences.strings
@@ -1,3 +1,6 @@
+/* Class = "NSButtonCell"; title = "Hide application after copying to clipboard "; ObjectID = "1Vr-nY-Ogv"; */
+"1Vr-nY-Ogv.title" = "MacPass nach dem jedem Kopieren in die Zwischenablage ausblenden";
+
 /* Class = "NSBox"; title = "Entry Table"; ObjectID = "2"; */
 "2.title" = "Passwort-Tabelle";
 
@@ -31,6 +34,9 @@
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
 "gej-kA-GzQ.title" = "Item 2";
 
+/* Class = "NSBox"; title = "Clipboard"; ObjectID = "Kff-Xp-hAT"; */
+"Kff-Xp-hAT.title" = "Zwischenablage";
+
 /* Class = "NSButtonCell"; title = "Update password for new entries"; ObjectID = "RaM-t2-DVR"; */
 "RaM-t2-DVR.title" = "Passwörter für neue Einträge aktualisieren";
 
diff --git a/MacPass/en.lproj/GeneralPreferences.strings b/MacPass/en.lproj/GeneralPreferences.strings
index 9e2b5acd..9844edf3 100644
--- a/MacPass/en.lproj/GeneralPreferences.strings
+++ b/MacPass/en.lproj/GeneralPreferences.strings
@@ -62,8 +62,8 @@
 /* Class = "NSButtonCell"; title = "Lock after log out"; ObjectID = "Dzn-9R-JjE"; */
 "Dzn-9R-JjE.title" = "Lock after log out";
 
-/* Class = "NSTextFieldCell"; title = "Disabling this compromises security. If disabled, anything copied to the Clipboard in MacPass will be available on your connected iOS devices. You should clear the clipboard on those devices manually."; ObjectID = "JGX-Tp-KJk"; */
-"JGX-Tp-KJk.title" = "Disabling this compromises security. If disabled, anything copied to the Clipboard in MacPass will be available on your connected iOS devices. You should clear the clipboard on those devices manually.";
+/* Class = "NSTextFieldCell"; title = "Disabling this compromises security. If enabled, anything copied to the Clipboard in MacPass will be available on your connected iOS devices. You should clear the clipboard on those devices manually."; ObjectID = "JGX-Tp-KJk"; */
+"JGX-Tp-KJk.title" = "Disabling this compromises security. If enabled, anything copied to the Clipboard in MacPass will be available on your connected iOS devices. You should clear the clipboard on those devices manually.";
 
 /* Class = "NSTextFieldCell"; title = "If file changes:"; ObjectID = "QrK-hM-Xt1"; */
 "QrK-hM-Xt1.title" = "If file changes:";
@@ -73,3 +73,9 @@
 
 /* Class = "NSButtonCell"; title = "Remember Keyfile for Databases"; ObjectID = "r6q-He-nYU"; */
 "r6q-He-nYU.title" = "Remember Keyfile for Databases";
+
+/* Class = "NSButtonCell"; title = "Enable Autosave"; ObjectID = "wG7-bi-2fi"; */
+"wG7-bi-2fi.title" = "Enable Autosave";
+
+/* Class = "NSTextFieldCell"; title = "Close and open all documents for changes to take effect"; ObjectID = "ya5-ps-c4W"; */
+"ya5-ps-c4W.title" = "Close and open all documents for changes to take effect";
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 14042171..67cd91cb 100644
--- a/MacPass/en.lproj/Localizable.strings
+++ b/MacPass/en.lproj/Localizable.strings
@@ -89,6 +89,9 @@
 /* Menu item for automatic trash creation */
 "AUTOCREATE_TRASH_FOLDER" = "Create Automatically";
 
+/* Message text in the autotype selection window. Placeholder is %1 - windowTitle */
+"AUTOTYPE_CANDIDATE_SELECTION_WINDOW_MESSAGE_%@" = "There are multiple matches for the current window: %@. Please select which match should be used.";
+
 /* Window title for the stand-alone password creator window */
 "AUTOTYPE_DOCTOR_RESULTS_WINDOW_TITLE" = "Autotype Doctor";
 
@@ -101,8 +104,8 @@
 /* Disable autotype menu item */
 "AUTOTYPE_NO" = "Disable Autotype";
 
-/* Notification: Autotype failed, MacPass has no permission to send key strokes */
-"AUTOTYPE_NOTIFICATION_MACPASS_HAS_NO_ACCESSIBILTY_PERMISSIONS" = "Autotype disabled because of missing accessibilty access.";
+/* Notification: Autotype failed, MacPass has not enough permissions to perform autotype */
+"AUTOTYPE_NOTIFICATION_MACPASS_IS_MISSING_PERMISSIONS" = "MacPass does not have all necessary permissions to perform Autotype.";
 
 /* Notification: Autotype failed, no documents are open */
 "AUTOTYPE_OVERLAY_NO_DOCUMENTS" = "Please open a database file to use Global Autotype!";
@@ -667,7 +670,7 @@
 "SET_AS_DEFAULT_FILE_CHANGE_STRATEGY" = "Use this method as default. You can change this at any time in the preferences.";
 
 /* Action button in Notification to show the Autotype Doctor */
-"SHOW_AUTOTYPE_DOCTOR" = "SHOW_AUTOTYPE_DOCTOR";
+"SHOW_AUTOTYPE_DOCTOR" = "Show Autotype Doctor";
 
 /* Menu item to show the history of the selected entry
    Toolbar item to toggle history display */

From add09827bacd74f89691decf8e5377d49c186544 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 16:04:06 +0200
Subject: [PATCH 17/21] added missing changes to project file

---
 MacPass.xcodeproj/project.pbxproj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 45ca21c9..4305773a 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -317,8 +317,8 @@
 /* Begin PBXFileReference section */
 		3C0CDECD21CFED9000B2A10B /* NSTextView+MPTouchBarExtension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSTextView+MPTouchBarExtension.h"; sourceTree = "<group>"; };
 		3C0CDECE21CFEDD200B2A10B /* NSTextView+MPTouchBarExtension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSTextView+MPTouchBarExtension.m"; sourceTree = "<group>"; };
-		3C0CDED921D28C0E00B2A10B /* MPTouchBarButtonCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPTouchBarButtonCreator.h; sourceTree = "<group>"; };
 		3C0CDED721D28BF700B2A10B /* MPTouchBarButtonCreator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPTouchBarButtonCreator.m; sourceTree = "<group>"; };
+		3C0CDED921D28C0E00B2A10B /* MPTouchBarButtonCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPTouchBarButtonCreator.h; sourceTree = "<group>"; };
 		4825CC811C414D57003E37E9 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
 		4825CC821C414D57003E37E9 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/PasswordEditWindow.strings; sourceTree = "<group>"; };
 		4825CC831C414D57003E37E9 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/WelcomeView.strings; sourceTree = "<group>"; };
@@ -379,7 +379,6 @@
 		4C10412A178CDD44001B5239 /* NSDate+Humanized.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Humanized.h"; sourceTree = "<group>"; };
 		4C10412B178CDD44001B5239 /* NSDate+Humanized.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Humanized.m"; sourceTree = "<group>"; };
 		4C15B74518BCA3B1003F8008 /* MPDocument+Search.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPDocument+Search.m"; sourceTree = "<group>"; };
-		4C168CB02216CEC300BB1EB0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralPreferences.strings; sourceTree = "<group>"; };
 		4C17D11F2250EFBC00C650C4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SavePanelAccessoryView.xib; sourceTree = "<group>"; };
 		4C17D1222250EFBF00C650C4 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SavePanelAccessoryView.strings; sourceTree = "<group>"; };
 		4C17D1242250EFC500C650C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SavePanelAccessoryView.strings; sourceTree = "<group>"; };
@@ -527,6 +526,8 @@
 		4C473A8518AFD7250073FD2E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		4C4A100D176286FD00BBF2CA /* MPTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPTableView.h; sourceTree = "<group>"; };
 		4C4A100E176286FD00BBF2CA /* MPTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTableView.m; sourceTree = "<group>"; };
+		4C4B2ED022D8C9B400EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralPreferences.strings; sourceTree = "<group>"; };
+		4C4B2ED122D8CA6100EB6BFD /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PluginRepositoryBrowserView.strings; sourceTree = "<group>"; };
 		4C4B728318E4B9B400A1A5D5 /* MPDockTileHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDockTileHelper.h; sourceTree = "<group>"; };
 		4C4B728418E4B9B400A1A5D5 /* MPDockTileHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDockTileHelper.m; sourceTree = "<group>"; };
 		4C4B7EE617A45EC5000234C7 /* MPDatePickingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatePickingViewController.h; sourceTree = "<group>"; };
@@ -2301,7 +2302,7 @@
 				4C840C471D773E5D0081F605 /* pl */,
 				4C4161041F50333B003BC0AF /* es */,
 				6A74B0652076F4B40049BC29 /* sv-SE */,
-				4C168CB02216CEC300BB1EB0 /* en */,
+				4C4B2ED022D8C9B400EB6BFD /* en */,
 			);
 			name = GeneralPreferences.xib;
 			sourceTree = "<group>";
@@ -2637,6 +2638,7 @@
 				78371130225540D8009BD28D /* ru */,
 				78371132225540DE009BD28D /* en */,
 				4C1D56382271F4BC00C3E594 /* fr */,
+				4C4B2ED122D8CA6100EB6BFD /* de */,
 			);
 			name = PluginRepositoryBrowserView.xib;
 			sourceTree = "<group>";

From d37164ad8923738e8163ac58053661d3994be479 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 16:40:51 +0200
Subject: [PATCH 18/21] Updated english localization for database settings
 window

---
 MacPass.xcodeproj/project.pbxproj             |  4 +-
 MacPass/Base.lproj/DatabaseSettingsWindow.xib | 16 +++---
 .../en.lproj/DatabaseSettingsWindow.strings   | 54 +++++++++----------
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 4305773a..216dd6df 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -528,6 +528,7 @@
 		4C4A100E176286FD00BBF2CA /* MPTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTableView.m; sourceTree = "<group>"; };
 		4C4B2ED022D8C9B400EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralPreferences.strings; sourceTree = "<group>"; };
 		4C4B2ED122D8CA6100EB6BFD /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PluginRepositoryBrowserView.strings; sourceTree = "<group>"; };
+		4C4B2ED322D8D31F00EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
 		4C4B728318E4B9B400A1A5D5 /* MPDockTileHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDockTileHelper.h; sourceTree = "<group>"; };
 		4C4B728418E4B9B400A1A5D5 /* MPDockTileHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDockTileHelper.m; sourceTree = "<group>"; };
 		4C4B7EE617A45EC5000234C7 /* MPDatePickingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatePickingViewController.h; sourceTree = "<group>"; };
@@ -625,7 +626,6 @@
 		4C735FBF2035FCBF00708D53 /* MPPluginEntryActionContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPPluginEntryActionContext.m; sourceTree = "<group>"; };
 		4C73B6EE215E64A7009787F7 /* MPWelcomeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPWelcomeViewController.h; sourceTree = "<group>"; };
 		4C73B6EF215E64A7009787F7 /* MPWelcomeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPWelcomeViewController.m; sourceTree = "<group>"; };
-		4C73EB941FBB58730033000F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
 		4C73EB951FBB5A8F0033000F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/AutotypeCandidateSelectionView.strings; sourceTree = "<group>"; };
 		4C73EB961FBB5A910033000F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/AutotypeBuilderView.strings; sourceTree = "<group>"; };
 		4C76155F1764C0590015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/GeneralPreferences.xib; sourceTree = "<group>"; };
@@ -2625,8 +2625,8 @@
 				4825CC811C414D57003E37E9 /* it */,
 				4C840C441D773E5D0081F605 /* pl */,
 				4C4161021F50333B003BC0AF /* es */,
-				4C73EB941FBB58730033000F /* en */,
 				6A74B0622076F4B30049BC29 /* sv-SE */,
+				4C4B2ED322D8D31F00EB6BFD /* en */,
 			);
 			name = DatabaseSettingsWindow.xib;
 			sourceTree = "<group>";
diff --git a/MacPass/Base.lproj/DatabaseSettingsWindow.xib b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
index 092e1eaf..fe6f5b03 100644
--- a/MacPass/Base.lproj/DatabaseSettingsWindow.xib
+++ b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -51,13 +51,13 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="500" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="500" height="360"/>
+                <rect key="frame" x="0.0" y="0.0" width="553" height="484"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="288">
-                        <rect key="frame" x="427" y="13" width="59" height="32"/>
+                        <rect key="frame" x="480" y="13" width="59" height="32"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="289">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -70,7 +70,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="956">
-                        <rect key="frame" x="345" y="13" width="82" height="32"/>
+                        <rect key="frame" x="398" y="13" width="82" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="957">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -83,7 +83,7 @@ Gw
                         </connections>
                     </button>
                     <tabView translatesAutoresizingMaskIntoConstraints="NO" id="357">
-                        <rect key="frame" x="13" y="41" width="474" height="313"/>
+                        <rect key="frame" x="13" y="41" width="527" height="437"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="General" identifier="1" id="358">
@@ -265,7 +265,7 @@ Gw
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P98-Cu-Tha">
-                                                        <rect key="frame" x="251.5" y="18" width="143" height="23"/>
+                                                        <rect key="frame" x="251" y="18" width="143" height="23"/>
                                                         <buttonCell key="cell" type="roundTextured" title="Generate Parameters" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PoI-Er-Y8P">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="system"/>
diff --git a/MacPass/en.lproj/DatabaseSettingsWindow.strings b/MacPass/en.lproj/DatabaseSettingsWindow.strings
index 235ca5b0..2a22988e 100644
--- a/MacPass/en.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/en.lproj/DatabaseSettingsWindow.strings
@@ -1,18 +1,7 @@
+
 /* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
 "1.title" = "Window";
 
-/* Class = "NSTextFieldCell"; title = "Threads"; ObjectID = "2QI-ne-N5d"; */
-"2QI-ne-N5d.title" = "Threads";
-
-/* Class = "NSTextFieldCell"; title = "Iterations"; ObjectID = "2ZA-Gc-JdZ"; */
-"2ZA-Gc-JdZ.title" = "Iterations";
-
-/* Class = "NSTextFieldCell"; title = "Enforce key change"; ObjectID = "5QH-N1-FHK"; */
-"5QH-N1-FHK.title" = "Enforce key change";
-
-/* Class = "NSTabViewItem"; label = "Argon2"; ObjectID = "6qB-sH-9FI"; */
-"6qB-sH-9FI.label" = "Argon2";
-
 /* Class = "NSTextFieldCell"; title = "Database name:"; ObjectID = "190"; */
 "190.title" = "Database name:";
 
@@ -73,18 +62,39 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OtherViews";
 
-/* Class = "NSTextFieldCell"; title = "File format:"; ObjectID = "bTk-YZ-x0G"; */
-"bTk-YZ-x0G.title" = "File format:";
+/* Class = "NSTextFieldCell"; title = "Threads"; ObjectID = "2QI-ne-N5d"; */
+"2QI-ne-N5d.title" = "Threads";
+
+/* Class = "NSTextFieldCell"; title = "Iterations"; ObjectID = "2ZA-Gc-JdZ"; */
+"2ZA-Gc-JdZ.title" = "Iterations";
+
+/* Class = "NSTextFieldCell"; title = "Enforce key change"; ObjectID = "5QH-N1-FHK"; */
+"5QH-N1-FHK.title" = "Enforce key change";
+
+/* Class = "NSTabViewItem"; label = "Argon2"; ObjectID = "6qB-sH-9FI"; */
+"6qB-sH-9FI.label" = "Argon2";
 
 /* Class = "NSButtonCell"; title = "Recommend key change"; ObjectID = "CtU-Eq-dgy"; */
 "CtU-Eq-dgy.title" = "Recommend key change";
 
-/* Class = "NSTabViewItem"; label = "Aes"; ObjectID = "ft1-pl-lpO"; */
-"ft1-pl-lpO.label" = "Aes";
-
 /* Class = "NSTextFieldCell"; title = "Algorithm"; ObjectID = "GVd-KH-pHc"; */
 "GVd-KH-pHc.title" = "Algorithm";
 
+/* Class = "NSButtonCell"; title = "Generate Parameters"; ObjectID = "PoI-Er-Y8P"; */
+"PoI-Er-Y8P.title" = "Generate Parameters";
+
+/* Class = "NSTextFieldCell"; title = "VersionInfo"; ObjectID = "Ush-4r-A1A"; */
+"Ush-4r-A1A.title" = "VersionInfo";
+
+/* Class = "NSTextFieldCell"; title = "Recommend key change"; ObjectID = "Xib-Fn-sqx"; */
+"Xib-Fn-sqx.title" = "Recommend key change";
+
+/* Class = "NSTextFieldCell"; title = "File format:"; ObjectID = "bTk-YZ-x0G"; */
+"bTk-YZ-x0G.title" = "File format:";
+
+/* Class = "NSTabViewItem"; label = "Aes"; ObjectID = "ft1-pl-lpO"; */
+"ft1-pl-lpO.label" = "Aes";
+
 /* Class = "NSTextFieldCell"; title = "Encryption:"; ObjectID = "gxY-UL-bEG"; */
 "gxY-UL-bEG.title" = "Encryption:";
 
@@ -100,18 +110,8 @@
 /* Class = "NSBox"; title = "Key derivation"; ObjectID = "pbl-Mb-r8V"; */
 "pbl-Mb-r8V.title" = "Key derivation";
 
-/* Class = "NSButtonCell"; title = "Generate Parameters"; ObjectID = "PoI-Er-Y8P"; */
-"PoI-Er-Y8P.title" = "Generate Parameters";
-
-/* Class = "NSTextFieldCell"; title = "VersionInfo"; ObjectID = "Ush-4r-A1A"; */
-"Ush-4r-A1A.title" = "VersionInfo";
-
 /* Class = "NSTextFieldCell"; title = "Rounds"; ObjectID = "uUQ-9s-M5E"; */
 "uUQ-9s-M5E.title" = "Rounds";
 
-/* Class = "NSTextFieldCell"; title = "Recommend key change"; ObjectID = "Xib-Fn-sqx"; */
-"Xib-Fn-sqx.title" = "Recommend key change";
-
 /* Class = "NSButtonCell"; title = "Force key change"; ObjectID = "z6u-YT-7LE"; */
 "z6u-YT-7LE.title" = "Force key change";
-

From f7eb7147f3ac3aacff084359a49140e79ac4e3a0 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 16:42:21 +0200
Subject: [PATCH 19/21] Updated english localization

---
 MacPass/Base.lproj/PasswordEditWindow.xib       |  6 +++---
 MacPass/en.lproj/IntegrationPreferences.strings | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/MacPass/Base.lproj/PasswordEditWindow.xib b/MacPass/Base.lproj/PasswordEditWindow.xib
index e39a624c..481cb32c 100644
--- a/MacPass/Base.lproj/PasswordEditWindow.xib
+++ b/MacPass/Base.lproj/PasswordEditWindow.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -189,7 +189,7 @@ Gw
                     <constraint firstItem="6" firstAttribute="leading" secondItem="9" secondAttribute="leading" id="zeJ-6i-fY3"/>
                 </constraints>
             </view>
-            <point key="canvasLocation" x="-312" y="-21"/>
+            <point key="canvasLocation" x="-8" y="-14"/>
         </window>
     </objects>
     <resources>
diff --git a/MacPass/en.lproj/IntegrationPreferences.strings b/MacPass/en.lproj/IntegrationPreferences.strings
index a7ff3899..50d6223e 100644
--- a/MacPass/en.lproj/IntegrationPreferences.strings
+++ b/MacPass/en.lproj/IntegrationPreferences.strings
@@ -1,3 +1,4 @@
+
 /* Class = "NSButtonCell"; title = "Enable global Autotype"; ObjectID = "1qb-Rd-jYu"; */
 "1qb-Rd-jYu.title" = "Enable global Autotype";
 
@@ -22,17 +23,11 @@
 /* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
 "P9N-HM-wER.title" = "Autotype";
 
-/* Class = "NSButtonCell"; title = "Interpret ⌃ as ⌘"; ObjectID = "QfO-yG-l3F"; */
-"QfO-yG-l3F.title" = "Interpret ⌃ as ⌘";
-
 /* Class = "NSTextFieldCell"; title = "If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to."; ObjectID = "QRy-CY-ENC"; */
 "QRy-CY-ENC.title" = "If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to.";
 
-/* Class = "NSButtonCell"; title = "Include Entry Tags for matches"; ObjectID = "rbu-G7-MT8"; */
-"rbu-G7-MT8.title" = "Include Entry Tags for matches";
-
-/* Class = "NSButtonCell"; title = "Include Entry Title for matches"; ObjectID = "tmL-dT-D0G"; */
-"tmL-dT-D0G.title" = "Include Entry Title for matches";
+/* Class = "NSButtonCell"; title = "Interpret ⌃ as ⌘"; ObjectID = "QfO-yG-l3F"; */
+"QfO-yG-l3F.title" = "Interpret ⌃ as ⌘";
 
 /* Class = "NSButtonCell"; title = "Include Entry URL for matches"; ObjectID = "TzR-00-Vp3"; */
 "TzR-00-Vp3.title" = "Include Entry URL for matches";
@@ -43,3 +38,8 @@
 /* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a temporary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
 "WmI-IB-Aso.title" = "If enabled attached files will be copied to a temporary location for preview and deleted after the preview is closed.";
 
+/* Class = "NSButtonCell"; title = "Include Entry Tags for matches"; ObjectID = "rbu-G7-MT8"; */
+"rbu-G7-MT8.title" = "Include Entry Tags for matches";
+
+/* Class = "NSButtonCell"; title = "Include Entry Title for matches"; ObjectID = "tmL-dT-D0G"; */
+"tmL-dT-D0G.title" = "Include Entry Title for matches";

From 50dad4de3048cbf2cfc76dc3da2a9d7d88c80793 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 16:43:34 +0200
Subject: [PATCH 20/21] Updated english localization

---
 MacPass.xcodeproj/project.pbxproj            |  8 +++----
 MacPass/en.lproj/WorkflowPreferences.strings | 24 ++++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 216dd6df..8db60517 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -529,6 +529,8 @@
 		4C4B2ED022D8C9B400EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralPreferences.strings; sourceTree = "<group>"; };
 		4C4B2ED122D8CA6100EB6BFD /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PluginRepositoryBrowserView.strings; sourceTree = "<group>"; };
 		4C4B2ED322D8D31F00EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
+		4C4B2ED522D8D3B100EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/IntegrationPreferences.strings; sourceTree = "<group>"; };
+		4C4B2ED822D8D40200EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/WorkflowPreferences.strings; sourceTree = "<group>"; };
 		4C4B728318E4B9B400A1A5D5 /* MPDockTileHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDockTileHelper.h; sourceTree = "<group>"; };
 		4C4B728418E4B9B400A1A5D5 /* MPDockTileHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDockTileHelper.m; sourceTree = "<group>"; };
 		4C4B7EE617A45EC5000234C7 /* MPDatePickingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatePickingViewController.h; sourceTree = "<group>"; };
@@ -904,11 +906,9 @@
 		6021FE5318E13F2900C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/GroupInspectorView.strings; sourceTree = "<group>"; };
 		6021FE5518E13F2A00C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/GroupInspectorView.strings"; sourceTree = "<group>"; };
 		6021FE5718E1429500C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/IntegrationPreferences.xib; sourceTree = "<group>"; };
-		6021FE5A18E142A000C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/IntegrationPreferences.strings; sourceTree = "<group>"; };
 		6021FE5C18E142A200C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/IntegrationPreferences.strings; sourceTree = "<group>"; };
 		6021FE5E18E142A300C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/IntegrationPreferences.strings; sourceTree = "<group>"; };
 		6021FE6218E15D9100C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/WorkflowPreferences.xib; sourceTree = "<group>"; };
-		6021FE6518E15D9800C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/WorkflowPreferences.strings; sourceTree = "<group>"; };
 		6021FE6718E15D9A00C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/WorkflowPreferences.strings; sourceTree = "<group>"; };
 		6021FE6918E15D9B00C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WorkflowPreferences.strings; sourceTree = "<group>"; };
 		6021FE6D18E15E6D00C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UpdatePreferences.xib; sourceTree = "<group>"; };
@@ -2509,7 +2509,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				6021FE5718E1429500C3BC51 /* Base */,
-				6021FE5A18E142A000C3BC51 /* en */,
 				6021FE5C18E142A200C3BC51 /* de */,
 				6021FE5E18E142A300C3BC51 /* fr */,
 				BD6C365919484CF40089EB37 /* nl */,
@@ -2519,6 +2518,7 @@
 				60ECAD271F12262400EA9DB3 /* zh-Hans */,
 				4C4161051F50333B003BC0AF /* es */,
 				6A74B0662076F4B40049BC29 /* sv-SE */,
+				4C4B2ED522D8D3B100EB6BFD /* en */,
 			);
 			name = IntegrationPreferences.xib;
 			sourceTree = "<group>";
@@ -2527,7 +2527,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				6021FE6218E15D9100C3BC51 /* Base */,
-				6021FE6518E15D9800C3BC51 /* en */,
 				6021FE6718E15D9A00C3BC51 /* de */,
 				6021FE6918E15D9B00C3BC51 /* fr */,
 				BD6C365A19484CF40089EB37 /* nl */,
@@ -2537,6 +2536,7 @@
 				60ECAD251F12253C00EA9DB3 /* zh-Hans */,
 				4C4161061F50333B003BC0AF /* es */,
 				6A74B0672076F4B40049BC29 /* sv-SE */,
+				4C4B2ED822D8D40200EB6BFD /* en */,
 			);
 			name = WorkflowPreferences.xib;
 			sourceTree = "<group>";
diff --git a/MacPass/en.lproj/WorkflowPreferences.strings b/MacPass/en.lproj/WorkflowPreferences.strings
index 8ee4dc0e..a5af44ad 100644
--- a/MacPass/en.lproj/WorkflowPreferences.strings
+++ b/MacPass/en.lproj/WorkflowPreferences.strings
@@ -1,9 +1,7 @@
+
 /* Class = "NSBox"; title = "Entry Table"; ObjectID = "2"; */
 "2.title" = "Entry Table";
 
-/* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
-"7YX-EA-9KA.title" = "Default Browser";
-
 /* Class = "NSTextFieldCell"; title = "Double-click on URL:"; ObjectID = "10"; */
 "10.title" = "Double-click on URL:";
 
@@ -28,21 +26,29 @@
 /* Class = "NSMenuItem"; title = "Opens Inspector"; ObjectID = "44"; */
 "44.title" = "Opens Inspector";
 
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
-"gej-kA-GzQ.title" = "Item 2";
+/* Class = "NSButtonCell"; title = "Hide application after copying to clipboard "; ObjectID = "1Vr-nY-Ogv"; */
+"1Vr-nY-Ogv.title" = "Hide application after copying to clipboard ";
+
+/* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
+"7YX-EA-9KA.title" = "Default Browser";
+
+/* Class = "NSBox"; title = "Clipboard"; ObjectID = "Kff-Xp-hAT"; */
+"Kff-Xp-hAT.title" = "Clipboard";
 
 /* Class = "NSButtonCell"; title = "Update password for new entries"; ObjectID = "RaM-t2-DVR"; */
 "RaM-t2-DVR.title" = "Update password for new entries";
 
-/* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
-"soD-wI-YOH.title" = "Open URLs in:";
-
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
 "XgO-Tj-QjO.title" = "OtherViews";
 
 /* Class = "NSBox"; title = "Templates"; ObjectID = "Xvt-tP-TbR"; */
 "Xvt-tP-TbR.title" = "Templates";
 
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
+"gej-kA-GzQ.title" = "Item 2";
+
+/* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
+"soD-wI-YOH.title" = "Open URLs in:";
+
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
 "zC2-cM-KDv.title" = "Item 3";
-

From e82db2fe9d469bef70af9ae92ff5d64647024e27 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 12 Jul 2019 16:47:26 +0200
Subject: [PATCH 21/21] Added missing contraints

---
 MacPass/Base.lproj/PasswordCreatorView.xib        |  4 ++--
 MacPass/Base.lproj/PasswordInputView.xib          |  6 +++---
 .../Base.lproj/PluginRepositoryBrowserView.xib    |  6 +++---
 MacPass/Base.lproj/UpdatePreferences.xib          | 15 ++++++++-------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/MacPass/Base.lproj/PasswordCreatorView.xib b/MacPass/Base.lproj/PasswordCreatorView.xib
index 25d837bf..6d949496 100644
--- a/MacPass/Base.lproj/PasswordCreatorView.xib
+++ b/MacPass/Base.lproj/PasswordCreatorView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
diff --git a/MacPass/Base.lproj/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib
index 52a50e46..24b65fbf 100644
--- a/MacPass/Base.lproj/PasswordInputView.xib
+++ b/MacPass/Base.lproj/PasswordInputView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -152,7 +152,7 @@ Gw
                 <constraint firstItem="d8O-Ha-rrS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="1" secondAttribute="leading" constant="20" symbolic="YES" id="vxq-YP-UhR"/>
                 <constraint firstItem="2" firstAttribute="leading" secondItem="2pb-ZG-spA" secondAttribute="trailing" constant="12" id="ytJ-5Z-5rT"/>
             </constraints>
-            <point key="canvasLocation" x="-217" y="-96"/>
+            <point key="canvasLocation" x="147" y="-80"/>
         </customView>
     </objects>
     <resources>
diff --git a/MacPass/Base.lproj/PluginRepositoryBrowserView.xib b/MacPass/Base.lproj/PluginRepositoryBrowserView.xib
index 63a6e188..b6615e93 100644
--- a/MacPass/Base.lproj/PluginRepositoryBrowserView.xib
+++ b/MacPass/Base.lproj/PluginRepositoryBrowserView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -228,7 +228,7 @@
                 <constraint firstItem="bGv-Zc-Vrk" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="tk3-kF-k22"/>
                 <constraint firstItem="d2Q-7O-ilP" firstAttribute="leading" secondItem="fjQ-ni-Ayx" secondAttribute="trailing" constant="8" symbolic="YES" id="wHQ-Lk-2fv"/>
             </constraints>
-            <point key="canvasLocation" x="-130" y="-66"/>
+            <point key="canvasLocation" x="193" y="-18"/>
         </customView>
     </objects>
 </document>
diff --git a/MacPass/Base.lproj/UpdatePreferences.xib b/MacPass/Base.lproj/UpdatePreferences.xib
index 0be5fd99..2fa4ab20 100644
--- a/MacPass/Base.lproj/UpdatePreferences.xib
+++ b/MacPass/Base.lproj/UpdatePreferences.xib
@@ -18,8 +18,8 @@
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="1">
             <rect key="frame" x="0.0" y="0.0" width="400" height="95"/>
             <subviews>
-                <button verticalHuggingPriority="500" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Z6x-oU-NC5">
-                    <rect key="frame" x="21" y="59" width="228" height="18"/>
+                <button verticalHuggingPriority="500" translatesAutoresizingMaskIntoConstraints="NO" id="Z6x-oU-NC5">
+                    <rect key="frame" x="22" y="59" width="221" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="14" id="ppB-Ka-SVN"/>
                     </constraints>
@@ -28,8 +28,8 @@
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
-                <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pWJ-eJ-MBf">
-                    <rect key="frame" x="145" y="17" width="112" height="26"/>
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pWJ-eJ-MBf">
+                    <rect key="frame" x="144" y="17" width="114" height="25"/>
                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="Hl5-gO-B1c">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="menu"/>
@@ -45,8 +45,8 @@
                         </menu>
                     </popUpButtonCell>
                 </popUpButton>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ckg-9t-MDS">
-                    <rect key="frame" x="21" y="23" width="120" height="17"/>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ckg-9t-MDS">
+                    <rect key="frame" x="22" y="22" width="118" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Check for Updates" id="9tL-CA-Vdg">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -62,10 +62,11 @@
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="pWJ-eJ-MBf" secondAttribute="trailing" constant="20" symbolic="YES" id="QsU-uT-lfo"/>
                 <constraint firstItem="ckg-9t-MDS" firstAttribute="leading" secondItem="Z6x-oU-NC5" secondAttribute="leading" id="W0y-Rp-Ucq"/>
                 <constraint firstItem="pWJ-eJ-MBf" firstAttribute="top" secondItem="Z6x-oU-NC5" secondAttribute="bottom" constant="20" symbolic="YES" id="fhM-Ri-Op9"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Z6x-oU-NC5" secondAttribute="trailing" constant="20" symbolic="YES" id="mpe-6b-p3W"/>
                 <constraint firstItem="ckg-9t-MDS" firstAttribute="baseline" secondItem="pWJ-eJ-MBf" secondAttribute="baseline" id="ozZ-bW-f7y"/>
                 <constraint firstAttribute="bottom" secondItem="pWJ-eJ-MBf" secondAttribute="bottom" constant="20" symbolic="YES" id="pHW-e8-EU6"/>
             </constraints>
-            <point key="canvasLocation" x="504" y="511.5"/>
+            <point key="canvasLocation" x="21" y="2"/>
         </customView>
     </objects>
 </document>