diff --git a/MacPass/Base.lproj/EntryInspectorView.xib b/MacPass/Base.lproj/EntryInspectorView.xib
index e1319c88..a6a9b06c 100644
--- a/MacPass/Base.lproj/EntryInspectorView.xib
+++ b/MacPass/Base.lproj/EntryInspectorView.xib
@@ -26,6 +26,7 @@
+
@@ -44,13 +45,12 @@
-
+
-
@@ -244,207 +244,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -464,13 +263,13 @@
-
+
-
+
-
+
@@ -478,7 +277,7 @@
-
+
@@ -492,7 +291,7 @@
-
+
@@ -500,7 +299,7 @@
-
+
@@ -514,7 +313,7 @@
-
+
@@ -528,7 +327,7 @@
-
+
@@ -536,7 +335,7 @@
-
+
@@ -544,7 +343,7 @@
-
+
@@ -572,7 +371,7 @@
-
+
@@ -622,11 +421,11 @@
-
+
-
+
@@ -634,7 +433,7 @@
-
+
@@ -642,7 +441,7 @@
-
+
@@ -652,6 +451,28 @@
+
+
@@ -685,19 +506,24 @@
+
-
+
+
+
+
+
+
-
-
+
@@ -952,8 +778,111 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MacPass/Base.lproj/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib
index ae7de6e1..3c95046f 100644
--- a/MacPass/Base.lproj/PasswordInputView.xib
+++ b/MacPass/Base.lproj/PasswordInputView.xib
@@ -1,8 +1,7 @@
-
+
-
-
+
@@ -130,7 +129,7 @@ DQ
-
+
diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib
index 215df408..90d7e190 100644
--- a/MacPass/EntryView.xib
+++ b/MacPass/EntryView.xib
@@ -1,8 +1,7 @@
-
+
-
-
+
diff --git a/MacPass/MPCustomFieldTableCellView.m b/MacPass/MPCustomFieldTableCellView.m
index bcc0542b..21a73fcb 100644
--- a/MacPass/MPCustomFieldTableCellView.m
+++ b/MacPass/MPCustomFieldTableCellView.m
@@ -33,4 +33,5 @@
[super setValue:value forKeyPath:keyPath];
}
}
+
@end
diff --git a/MacPass/MPEntryInspectorViewController.h b/MacPass/MPEntryInspectorViewController.h
index 327e6ea4..ca568a28 100644
--- a/MacPass/MPEntryInspectorViewController.h
+++ b/MacPass/MPEntryInspectorViewController.h
@@ -40,7 +40,10 @@
@property (weak) IBOutlet NSButtonCell *addAttachmentButton;
@property (weak) IBOutlet NSTableView *attachmentTableView;
+
+/* Custom Fields */
@property (weak) IBOutlet NSTableView *customFieldsTableView;
+@property (weak) IBOutlet NSButton *showCustomDataButton;
/* Autotype */
@property (strong) IBOutlet NSView *autotypView;
diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m
index 023e0356..f363a3e8 100644
--- a/MacPass/MPEntryInspectorViewController.m
+++ b/MacPass/MPEntryInspectorViewController.m
@@ -34,7 +34,6 @@
typedef NS_ENUM(NSUInteger, MPEntryTab) {
MPEntryTabGeneral,
MPEntryTabFiles,
- MPEntryTabCustomFields,
MPEntryTabAutotype
};
@@ -106,11 +105,34 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
self.attachmentTableView.dataSource = _attachmentDataSource;
[self.attachmentTableView registerForDraggedTypes:@[NSFilenamesPboardType]];
- self.customFieldsTableView.backgroundColor = [NSColor clearColor];
+ /* extract custom field table view */
+ self.customFieldsTableView.translatesAutoresizingMaskIntoConstraints = NO;
+ NSView *customFieldTableView = self.customFieldsTableView;
+ [self.customFieldsTableView.enclosingScrollView removeFromSuperviewWithoutNeedingDisplay];
+
+
+ [self.generalView addSubview:customFieldTableView];
+
+ NSDictionary *dict = NSDictionaryOfVariableBindings(customFieldTableView, _tagsTokenField, _addCustomFieldButton);
+ [self.generalView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-16-[customFieldTableView]-16-|"
+ options:0
+ metrics:nil
+ views:dict]];
+ [self.generalView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[_tagsTokenField]-[customFieldTableView]-[_addCustomFieldButton]"
+ options:0
+ metrics:nil
+ views:dict]];
+
+
+
+
+ self.customFieldsTableView.backgroundColor = NSColor.clearColor;
[self.customFieldsTableView bind:NSContentBinding toObject:_customFieldsController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil];
self.customFieldsTableView.delegate = _customFieldTableDelegate;
- self.windowAssociationsTableView.backgroundColor = [NSColor clearColor];
+ [self.customFieldsTableView sizeLastColumnToFit];
+
+ self.windowAssociationsTableView.backgroundColor = NSColor.clearColor;
self.windowAssociationsTableView.delegate = _windowAssociationsTableDelegate;
[self.windowAssociationsTableView bind:NSContentBinding toObject:_windowAssociationsController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil];
[self.windowAssociationsTableView bind:NSSelectionIndexesBinding toObject:_windowAssociationsController withKeyPath:NSSelectionIndexesBinding options:nil];
@@ -386,7 +408,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
withKeyPath:[NSString stringWithFormat:@"%@.%@", NSStringFromSelector(@selector(representedObject)), NSStringFromSelector(@selector(isHistory))]
options:@{NSConditionallySetsEditableBindingOption: @NO, NSValueTransformerNameBindingOption: NSNegateBooleanTransformerName}];
}
-
+
/* general */
[self.titleTextField bind:NSValueBinding
toObject:self
@@ -471,7 +493,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
withKeyPath:[NSString stringWithFormat:@"selection.%@", NSStringFromSelector(@selector(keystrokeSequence))]
options:nil];
-
+
}
diff --git a/MacPass/SettingsWindow.xib b/MacPass/SettingsWindow.xib
index 18d483e2..976bde4b 100644
--- a/MacPass/SettingsWindow.xib
+++ b/MacPass/SettingsWindow.xib
@@ -1,8 +1,8 @@
-
-
+
+
-
-
+
+
@@ -20,6 +20,7 @@
+
diff --git a/MacPass/de.lproj/EntryInspectorView.strings b/MacPass/de.lproj/EntryInspectorView.strings
index f3febdd5..06426648 100644
--- a/MacPass/de.lproj/EntryInspectorView.strings
+++ b/MacPass/de.lproj/EntryInspectorView.strings
@@ -65,11 +65,8 @@
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
"238.ibShadowedLabels[1]" = "Files";
-/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "Custom";
-
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[3]" = "Autotype";
+"238.ibShadowedLabels[2]" = "Autotype";
/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
"0ok-MC-QMP.title" = "Save";
diff --git a/MacPass/en.lproj/EntryInspectorView.strings b/MacPass/en.lproj/EntryInspectorView.strings
index f3febdd5..06426648 100644
--- a/MacPass/en.lproj/EntryInspectorView.strings
+++ b/MacPass/en.lproj/EntryInspectorView.strings
@@ -65,11 +65,8 @@
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
"238.ibShadowedLabels[1]" = "Files";
-/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "Custom";
-
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[3]" = "Autotype";
+"238.ibShadowedLabels[2]" = "Autotype";
/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
"0ok-MC-QMP.title" = "Save";
diff --git a/MacPass/fr.lproj/EntryInspectorView.strings b/MacPass/fr.lproj/EntryInspectorView.strings
index 242f4f2c..f0a3d44d 100644
--- a/MacPass/fr.lproj/EntryInspectorView.strings
+++ b/MacPass/fr.lproj/EntryInspectorView.strings
@@ -65,11 +65,8 @@
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
"238.ibShadowedLabels[1]" = "Fichiers";
-/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "Personnalisé";
-
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[3]" = "Saisie automatique";
+"238.ibShadowedLabels[2]" = "Saisie automatique";
/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
"0ok-MC-QMP.title" = "Sauvegarder";
diff --git a/MacPass/it.lproj/EntryInspectorView.strings b/MacPass/it.lproj/EntryInspectorView.strings
index ed898e76..2897dcba 100644
--- a/MacPass/it.lproj/EntryInspectorView.strings
+++ b/MacPass/it.lproj/EntryInspectorView.strings
@@ -65,11 +65,8 @@
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
"238.ibShadowedLabels[1]" = "Files";
-/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "Personalizzato";
-
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[3]" = "Autotype";
+"238.ibShadowedLabels[2]" = "Autotype";
/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
"0ok-MC-QMP.title" = "Salva";
diff --git a/MacPass/nl.lproj/EntryInspectorView.strings b/MacPass/nl.lproj/EntryInspectorView.strings
index 9100584f..fe117eeb 100644
--- a/MacPass/nl.lproj/EntryInspectorView.strings
+++ b/MacPass/nl.lproj/EntryInspectorView.strings
@@ -65,11 +65,8 @@
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
"238.ibShadowedLabels[1]" = "Bestanden";
-/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "Aangepast";
-
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[3]" = "Autotype";
+"238.ibShadowedLabels[2]" = "Autotype";
/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
"0ok-MC-QMP.title" = "Bewaar";
diff --git a/MacPass/pl.lproj/EntryInspectorView.strings b/MacPass/pl.lproj/EntryInspectorView.strings
index 38d65de2..05309526 100644
--- a/MacPass/pl.lproj/EntryInspectorView.strings
+++ b/MacPass/pl.lproj/EntryInspectorView.strings
@@ -65,11 +65,8 @@
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
"238.ibShadowedLabels[1]" = "Pliki";
-/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "Własne";
-
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[3]" = "Autouzupełnienie";
+"238.ibShadowedLabels[2]" = "Autouzupełnienie";
/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
"0ok-MC-QMP.title" = "Zapisz";
diff --git a/MacPass/ru.lproj/EntryInspectorView.strings b/MacPass/ru.lproj/EntryInspectorView.strings
index d8813df3..ad9517c6 100644
--- a/MacPass/ru.lproj/EntryInspectorView.strings
+++ b/MacPass/ru.lproj/EntryInspectorView.strings
@@ -65,11 +65,8 @@
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
"238.ibShadowedLabels[1]" = "Файлы";
-/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "Пользовательские поля";
-
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[3]" = "Автоввод";
+"238.ibShadowedLabels[2]" = "Автоввод";
/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
"0ok-MC-QMP.title" = "Сохранить";
diff --git a/MacPass/zh-Hans.lproj/EntryInspectorView.strings b/MacPass/zh-Hans.lproj/EntryInspectorView.strings
index 67550daa..2574c8e6 100644
--- a/MacPass/zh-Hans.lproj/EntryInspectorView.strings
+++ b/MacPass/zh-Hans.lproj/EntryInspectorView.strings
@@ -65,11 +65,8 @@
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
"238.ibShadowedLabels[1]" = "文件";
-/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "自定义";
-
/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[3]" = "自动键入";
+"238.ibShadowedLabels[2]" = "自动键入";
/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
"0ok-MC-QMP.title" = "保存";