diff --git a/HNHUi b/HNHUi
index 7bf39a4b..435f37c2 160000
--- a/HNHUi
+++ b/HNHUi
@@ -1 +1 @@
-Subproject commit 7bf39a4be92cef2a9d4076ccd1612c92a8a0c01b
+Subproject commit 435f37c2540bf66698eb66b6990343c35937eafb
diff --git a/KeePassKit b/KeePassKit
index 4ab74119..a232bbd6 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 4ab74119260df7ad62696d90939c46edd95eefa2
+Subproject commit a232bbd6017d0e7d5c6f1034c1001d4bc64bcc9e
diff --git a/MacPass/DatabaseSettingsWindow.xib b/MacPass/DatabaseSettingsWindow.xib
index bf1b227d..526a8944 100644
--- a/MacPass/DatabaseSettingsWindow.xib
+++ b/MacPass/DatabaseSettingsWindow.xib
@@ -1,4183 +1,503 @@
-
-
-
- 1080
- 12E55
- 3084
- 1187.39
- 626.00
-
-
- IBNSLayoutConstraint
- NSButton
- NSButtonCell
- NSColorWell
- NSCustomObject
- NSMenu
- NSMenuItem
- NSPopUpButton
- NSPopUpButtonCell
- NSScrollView
- NSScroller
- NSStepper
- NSStepperCell
- NSTabView
- NSTabViewItem
- NSTextField
- NSTextFieldCell
- NSTextView
- NSView
- NSWindowTemplate
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
- YES
- 3
-
- {11, 11}
- {10, 3}
- {15, 15}
-
- YES
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MacPass/MPAttachmentTableDataSource.m b/MacPass/MPAttachmentTableDataSource.m
index 49e86964..6e17db77 100644
--- a/MacPass/MPAttachmentTableDataSource.m
+++ b/MacPass/MPAttachmentTableDataSource.m
@@ -11,11 +11,7 @@
@implementation MPAttachmentTableDataSource
-- (NSDragOperation)tableView:(NSTableView *)tableView
- validateDrop:(id)info
- proposedRow:(NSInteger)row
- proposedDropOperation:(NSTableViewDropOperation)dropOperation {
-
+- (NSDragOperation)tableView:(NSTableView *)tableView validateDrop:(id)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)dropOperation {
NSPasteboard *draggingPasteBoard = [info draggingPasteboard];
NSArray *classArray = [NSArray arrayWithObject:[NSURL class]];
NSArray *arrayOfURLs = [draggingPasteBoard readObjectsForClasses:classArray options:nil];
@@ -37,11 +33,7 @@
return NSDragOperationCopy;
}
-- (BOOL)tableView:(NSTableView *)tableView
- acceptDrop:(id)info
- row:(NSInteger)row
- dropOperation:(NSTableViewDropOperation)dropOperation {
-
+- (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation {
MPDocument *document = [[[tableView window] windowController] document];
id entry = document.selectedEntry;
@@ -54,8 +46,10 @@
}
return YES;
}
-/*
- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard {
+ return NO;
+
+ /*
NSString *extension;
if([rowIndexes count] != 1) {
@@ -77,42 +71,7 @@
[pboard setPropertyList:@[uti] forType:(NSString *)kPasteboardTypeFilePromiseContent];
[pboard setPropertyList:@[uti] forType:(NSString *)kPasteboardTypeFileURLPromise ];
- return YES;
+ return YES;*/
}
-- (NSArray *)tableView:(NSTableView *)tableView namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination forDraggedRowsWithIndexes:(NSIndexSet *)indexSet {
- if([indexSet count] != 1) {
- return nil; // We only work with one file at a time
- }
-
- if(![dropDestination isFileURL]) {
- return nil;
- }
-
- NSUInteger row = [indexSet lastIndex];
- NSData *fileData;
- NSString *filename;
-
- MPDocument *document = [[[tableView window] windowController] document];
- id entry = document.selectedEntry;
-
- if([entry isKindOfClass:[Kdb3Entry class]]) {
- Kdb3Entry *entryV3 = (Kdb3Entry *)entry;
- filename = entryV3.binaryDesc;
- fileData = entryV3.binary;
- }
- else if([entry isKindOfClass:[Kdb4Entry class]]) {
- Kdb4Entry *entryV4 = (Kdb4Entry *)entry;
- BinaryRef *binaryRef = entryV4.binaries[row];
- filename = binaryRef.key;
- fileData = [document attachmentDataForItem:binaryRef];
- }
- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
- NSURL *writeURL = [dropDestination URLByAppendingPathComponent:filename];
- // Create unique filename if already present
- [fileData writeToURL:writeURL atomically:YES];
- });
- return @[filename];
-}
- */
@end
diff --git a/MacPass/MPDatabaseSettingsWindowController.h b/MacPass/MPDatabaseSettingsWindowController.h
index 9f3251d5..3f7a43c9 100644
--- a/MacPass/MPDatabaseSettingsWindowController.h
+++ b/MacPass/MPDatabaseSettingsWindowController.h
@@ -24,7 +24,9 @@ typedef NS_ENUM(NSUInteger, MPDatabaseSettingsTab) {
/* General Tab */
@property (weak) IBOutlet NSTextField *databaseNameTextField;
+@property (weak) IBOutlet NSPopUpButton *databaseCompressionPopupButton;
@property (unsafe_unretained) IBOutlet NSTextView *databaseDescriptionTextView;
+@property (weak) IBOutlet NSColorWell *databaseColorColorWell;
/* Security Tab */
@property (weak) IBOutlet NSButton *protectTitleCheckButton;
diff --git a/MacPass/MPDatabaseSettingsWindowController.m b/MacPass/MPDatabaseSettingsWindowController.m
index 32cea240..5d95d8e8 100644
--- a/MacPass/MPDatabaseSettingsWindowController.m
+++ b/MacPass/MPDatabaseSettingsWindowController.m
@@ -14,6 +14,7 @@
#import "MPSettingsHelper.h"
#import "MPNumericalInputFormatter.h"
+#import "KPKXmlFormat.h"
#import "KPKGroup.h"
#import "KPKTree.h"
#import "KPKMetaData.h"
@@ -66,9 +67,19 @@
KPKMetaData *metaData = _document.tree.metaData;
metaData.databaseDescription = [self.databaseDescriptionTextView string];
metaData.databaseName = [self.databaseNameTextField stringValue];
-
- /* Display */
-
+
+ NSInteger compressionIndex = [self.databaseCompressionPopupButton indexOfSelectedItem];
+ if(compressionIndex >= KPKCompressionNone && compressionIndex < KPKCompressionCount) {
+ metaData.compressionAlgorithm = compressionIndex;
+ }
+ NSColor *databaseColor = [self.databaseColorColorWell color];
+ if([databaseColor isEqual:[NSColor clearColor]]) {
+ metaData.color = nil;
+ }
+ else {
+ metaData.color = databaseColor;
+ }
+
/* Advanced */
metaData.recycleBinEnabled = self.trashEnabled;
NSMenuItem *trashMenuItem = [self.selectRecycleBinGroupPopUpButton selectedItem];
@@ -122,7 +133,7 @@
}
/* Update all stuff that might have changed */
KPKMetaData *metaData = _document.tree.metaData;
- [self _setupDatabase:metaData];
+ [self _setupDatabaseTab:metaData];
[self _setupProtectionTab:metaData];
[self _setupAdvancedTab:_document.tree];
self.isDirty = NO;
@@ -154,9 +165,12 @@
}
#pragma mark Private Helper
-- (void)_setupDatabase:(KPKMetaData *)metaData {
+- (void)_setupDatabaseTab:(KPKMetaData *)metaData {
[self.databaseNameTextField setStringValue:metaData.databaseName];
[self.databaseDescriptionTextView setString:metaData.databaseDescription];
+ [self.databaseCompressionPopupButton selectItemAtIndex:metaData.compressionAlgorithm];
+ NSColor *databaseColor = metaData.color ? metaData.color : [NSColor clearColor];
+ [self.databaseColorColorWell setColor:databaseColor];
}
- (void)_setupProtectionTab:(KPKMetaData *)metaData {
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 04993de2..f2133cf8 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -166,7 +166,7 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
NSSortDescriptor *userNameSortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"username" ascending:YES selector:@selector(compare:)];
NSSortDescriptor *urlSortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"url" ascending:YES selector:@selector(compare:)];
NSSortDescriptor *groupnameSortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"parent.name" ascending:YES selector:@selector(compare:)];
- NSSortDescriptor *dateSortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"lastModificationTime" ascending:YES selector:@selector(compare:)];
+ NSSortDescriptor *dateSortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"timeInfo.lastModificationTime" ascending:YES selector:@selector(compare:)];
[titleColumn setSortDescriptorPrototype:titleColumSortDescriptor];
[userNameColumn setSortDescriptorPrototype:userNameSortDescriptor];