diff --git a/KeePassKit b/KeePassKit
index a232bbd6..76975731 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit a232bbd6017d0e7d5c6f1034c1001d4bc64bcc9e
+Subproject commit 76975731c37c9108d9e707b9bc170505c65882c4
diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib
index e8763ff9..cc7a57bc 100644
--- a/MacPass/EntryView.xib
+++ b/MacPass/EntryView.xib
@@ -1,1867 +1,295 @@
-
-
-
- 1080
- 12E55
- 3084
- 1187.39
- 626.00
-
-
- IBNSLayoutConstraint
- NSButton
- NSButtonCell
- NSCustomObject
- NSCustomView
- NSImageCell
- NSImageView
- NSScrollView
- NSScroller
- NSTableCellView
- NSTableColumn
- NSTableHeaderView
- NSTableView
- NSTextField
- NSTextFieldCell
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
- YES
- 3
-
- {15, 15}
- {8, 8}
-
- YES
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index f2133cf8..fecb1105 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -149,6 +149,9 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
NSTableColumn *attachmentsColumn = [[NSTableColumn alloc] initWithIdentifier:MPEntryTableAttachmentColumnIdentifier];
NSTableColumn *notesColumn = [[NSTableColumn alloc] initWithIdentifier:MPEntryTableNotesColumnIdentifier];
NSTableColumn *modifiedColumn = [[NSTableColumn alloc] initWithIdentifier:MPEntryTableModfiedColumnIdentifier];
+ [notesColumn setMinWidth:40.0];
+ [attachmentsColumn setMinWidth:40.0];
+ [modifiedColumn setMinWidth:40.0];
[self.entryTable addTableColumn:notesColumn];
[self.entryTable addTableColumn:attachmentsColumn];
[self.entryTable addTableColumn:modifiedColumn];
@@ -232,7 +235,7 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
[[view imageView] setImage:entry.iconImage];
}
}
- else if( isPasswordColum ) {
+ else if(isPasswordColum) {
view = [tableView makeViewWithIdentifier:_MPTAbleSecurCellView owner:self];
NSDictionary *options = @{ NSValueTransformerBindingOption : [NSValueTransformer valueTransformerForName:MPStringLengthValueTransformerName] };
[[view textField] bind:NSValueBinding toObject:entry withKeyPath:@"password" options:options];
@@ -242,18 +245,17 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
if(isURLColumn) {
[[view textField] bind:NSValueBinding toObject:entry withKeyPath:@"url" options:nil];
}
- else if( isUsernameColumn) {
+ else if(isUsernameColumn) {
[[view textField] bind:NSValueBinding toObject:entry withKeyPath:@"username" options:nil];
}
- else if( isNotesColumn ) {
+ else if(isNotesColumn) {
NSDictionary *options = @{ NSValueTransformerNameBindingOption : MPStripLineBreaksTransformerName };
[[view textField] bind:NSValueBinding toObject:entry withKeyPath:@"notes" options:options];
}
- else if( isAttachmentColumn ) {
- [[view textField] setStringValue:@""];
- //[[view textField] bind:NSValueBinding toObject:entry withKeyPath:@"countOfBinaries" options:nil];
+ else if(isAttachmentColumn) {
+ [[view textField] bind:NSValueBinding toObject:entry withKeyPath:@"binaries.@count" options:nil];
}
- else if( isModifedColumn ) {
+ else if(isModifedColumn) {
NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
[formatter setDateStyle:NSDateFormatterMediumStyle];
[formatter setTimeStyle:NSDateFormatterMediumStyle];