diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib index b28b5790..037e0a23 100644 --- a/MacPass/Base.lproj/InspectorView.xib +++ b/MacPass/Base.lproj/InspectorView.xib @@ -307,7 +307,7 @@ {{80, 243}, {124, 22}} - + _NS:9 YES @@ -323,6 +323,17 @@ NO + + + 268 + + {224, 30} + + + + _NS:9 + HNHGradientView + {224, 487} @@ -428,6 +439,54 @@ 455 + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + 6 @@ -887,6 +946,7 @@ + @@ -1230,6 +1290,49 @@ + + 662 + + + + + 8 + 0 + + 0 + 1 + + 30 + + 1000 + + 9 + 40 + 1 + + + + + + 663 + + + + + 665 + + + + + 667 + + + + + 669 + + + @@ -1269,6 +1372,9 @@ + + + @@ -1344,15 +1450,32 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 661 + 677 + + HNHGradientView + NSView + + IBProjectSource + ./Classes/HNHGradientView.h + + HNHRoundedSecureTextFieldCell HNHRoundedTextFieldCell diff --git a/MacPass/DocumentWindow.xib b/MacPass/DocumentWindow.xib index 0fecc6de..c32b65b2 100644 --- a/MacPass/DocumentWindow.xib +++ b/MacPass/DocumentWindow.xib @@ -36,7 +36,7 @@ 15 2 - {{196, 240}, {560, 429}} + {{196, 240}, {560, 490}} 1618477056 Window NSWindow @@ -46,9 +46,10 @@ 256 - {560, 429} + {560, 490} + {{0, 0}, {1920, 1058}} {10000000000000, 10000000000000} @@ -150,7 +151,7 @@ - 709 + 732 diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib index 0c0cd5c1..e0393961 100644 --- a/MacPass/EntryView.xib +++ b/MacPass/EntryView.xib @@ -12,6 +12,8 @@ IBNSLayoutConstraint + NSButton + NSButtonCell NSCustomObject NSCustomView NSImageCell @@ -46,6 +48,51 @@ 268 + + + 268 + + + + 268 + {{7, 5}, {32, 19}} + + + + _NS:9 + YES + + -2080374784 + 134217728 + Round Rect Button + + LucidaGrande + 12 + 16 + + _NS:9 + + -2033958912 + 164 + + NSImage + NSAddTemplate + + + + 400 + 75 + + NO + + + {684, 30} + + + + _NS:9 + HNHGradientView + 4364 @@ -58,10 +105,10 @@ 256 - {788, 511} + {684, 548} - + _NS:13 YES NO @@ -69,7 +116,7 @@ 256 - {788, 17} + {684, 17} @@ -229,7 +276,7 @@ - 292 + 188 10 3.4028234663852886e+38 @@ -292,7 +339,7 @@ 1 - {{0, 17}, {788, 511}} + {{0, 17}, {684, 548}} @@ -320,6 +367,7 @@ {{0, 310}, {480, 16}} + _NS:60 NO 1 @@ -333,7 +381,7 @@ - {788, 17} + {684, 17} @@ -342,10 +390,10 @@ 4 - {788, 528} + {{0, 30}, {684, 565}} - + _NS:9 133680 @@ -358,7 +406,7 @@ 1 - {788, 527} + {684, 594} @@ -602,7 +650,7 @@ 266 - {292, 17} + {188, 17} {250, 750} @@ -619,7 +667,7 @@ NO - {{494, 1}, {292, 17}} + {{494, 1}, {188, 17}} @@ -657,11 +705,11 @@ 336 - - + + 4 0 - + 4 1 @@ -669,6 +717,54 @@ 1000 + 9 + 40 + 3 + + + + 3 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 9 + 40 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 29 3 @@ -707,6 +803,7 @@ 3 + @@ -1352,10 +1449,130 @@ - 685 - + 690 + + + + + 5 + 0 + + 5 + 1 + + 7 + + 1000 + + 9 + 40 + 3 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + + + 8 + 0 + + 0 + 1 + + 30 + + 1000 + + 9 + 40 + 1 + + + + + 694 + + + + + 695 + + + + + 697 + + + + + 705 + + + + + 708 + + + + + 732 + + + + + + 7 + 0 + + 0 + 1 + + 32 + + 1000 + + 3 + 9 + 1 + + + + + + 733 + + + + + 736 + + + + + 741 + + + + + 743 + + + @@ -1416,11 +1633,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + - + + + + @@ -1489,16 +1709,44 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 686 + 743 + + HNHGradientView + NSView + + IBProjectSource + ./Classes/HNHGradientView.h + + MPEntryViewController MPViewController @@ -1586,10 +1834,10 @@ IBCocoaFramework YES 3 - - NSActionTemplate - {15, 15} - + + {15, 15} + {8, 8} + YES diff --git a/MacPass/KdbEntry+Undo.h b/MacPass/KdbEntry+Undo.h index 6f976b87..4f04cc64 100644 --- a/MacPass/KdbEntry+Undo.h +++ b/MacPass/KdbEntry+Undo.h @@ -31,7 +31,4 @@ APPKIT_EXTERN NSString *const MPEntryNotesUndoableKey; - (void)setUrlUndoable:(NSString *)url; - (void)setNotesUndoable:(NSString *)notes; -- (void)moveToIndexUndoable:(NSNumber *)index; -- (void)moveToGroupUndoable:(KdbGroup *)newGroup; - @end diff --git a/MacPass/KdbEntry+Undo.m b/MacPass/KdbEntry+Undo.m index dda22d8d..07f04a6a 100644 --- a/MacPass/KdbEntry+Undo.m +++ b/MacPass/KdbEntry+Undo.m @@ -72,27 +72,4 @@ NSString *const MPEntryNotesUndoableKey = @"notesUndoable"; [self setNotes:notes]; } -- (void)moveToIndexUndoable:(NSNumber *)index { - if(!self.parent) { - return; - } - NSUInteger iIndex = [index unsignedIntegerValue]; - NSNumber *oldIndex = @([self.parent.entries indexOfObject:self]); - [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(moveToIndexUndoable:) object:oldIndex]; - [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_POSITION", "Undo set entry position")]; - - [self.parent moveEntry:self toIndex:iIndex]; -} - -- (void)moveToGroupUndoable:(KdbGroup *)newGroup { - if(self.parent == newGroup) { - return; - } - if(!self.parent || !newGroup) { - return; - } - [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(moveToGroupUndoable:) object:self.parent]; - [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_MOVE_ENTRY", "Undo move entry to group")]; - [self.parent moveEntry:self toGroup:newGroup]; -} @end \ No newline at end of file diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m index e9d6a996..5f6546ff 100644 --- a/MacPass/MPDocumentWindowController.m +++ b/MacPass/MPDocumentWindowController.m @@ -74,7 +74,7 @@ [self.toolbar setAllowsUserCustomization:YES]; [self.toolbar setDelegate:self.toolbarDelegate]; [self.window setToolbar:self.toolbar]; - + [self.splitView setTranslatesAutoresizingMaskIntoConstraints:NO]; NSView *outlineView = [_outlineViewController view]; @@ -123,9 +123,10 @@ metrics:nil views:NSDictionaryOfVariableBindings(newContentView)]]; - [contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[newContentView]|" + NSNumber *border = @([[self window] contentBorderThicknessForEdge:NSMinYEdge]); + [contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[newContentView]-border-|" options:0 - metrics:nil + metrics:NSDictionaryOfVariableBindings(border) views:NSDictionaryOfVariableBindings(newContentView)]]; [contentView layout]; @@ -209,14 +210,16 @@ options:0 metrics:nil views:views]]; - [contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_splitView]|" + NSNumber *border = @([[self window] contentBorderThicknessForEdge:NSMinYEdge]); + [contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_splitView]-border-|" options:0 - metrics:nil + metrics:NSDictionaryOfVariableBindings(border) views:views]]; [contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_splitView]|" options:0 metrics:nil views:views]]; + [contentView layout]; [_entryViewController updateResponderChain]; [_inspectorTabViewController updateResponderChain]; diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 06dec301..7f0a4253 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -48,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - B85 + BD5 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright diff --git a/MacPass/OutlineView.xib b/MacPass/OutlineView.xib index 19bbf340..21858876 100644 --- a/MacPass/OutlineView.xib +++ b/MacPass/OutlineView.xib @@ -12,6 +12,8 @@ IBNSLayoutConstraint + NSButton + NSButtonCell NSCustomObject NSCustomView NSImageCell @@ -45,6 +47,51 @@ 268 + + + 268 + + + + 268 + {{7, 5}, {32, 19}} + + + + _NS:9 + YES + + -2080374784 + 134217728 + + + LucidaGrande + 12 + 16 + + _NS:9 + + -2033434624 + 164 + + NSImage + NSAddTemplate + + + + 400 + 75 + + NO + + + {272, 30} + + + + _NS:9 + HNHGradientView + 268 @@ -57,7 +104,7 @@ 256 - {177, 299} + {272, 419} @@ -74,7 +121,7 @@ AutomaticTableColumnIdentifier.0 - 174 + 269 16 1000 @@ -157,7 +204,7 @@ MC41AA - 24 + 17 -767557632 @@ -172,7 +219,7 @@ NO - {177, 299} + {272, 419} @@ -200,6 +247,7 @@ {{1, 119}, {238, 15}} + _NS:60 NO 1 @@ -208,7 +256,7 @@ 0.99328859060402686 - {177, 299} + {{0, 30}, {272, 419}} @@ -223,7 +271,7 @@ 1 - {177, 299} + {272, 449} @@ -259,7 +307,7 @@ 266 - {{0, 1}, {174, 14}} + {{0, 1}, {269, 14}} _NS:101 @@ -289,7 +337,7 @@ NO - {{1, 0}, {174, 17}} + {{1, 0}, {269, 17}} HeaderCell @@ -339,7 +387,7 @@ 266 - {{25, 0}, {149, 17}} + {{25, 0}, {244, 17}} _NS:80 @@ -357,7 +405,7 @@ NO - {{1, 17}, {174, 17}} + {{1, 17}, {269, 17}} DataCell @@ -404,8 +452,24 @@ 196 + + + 3 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 9 + 40 + 3 + - + 4 0 @@ -420,6 +484,38 @@ 29 3 + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + 6 @@ -469,6 +565,7 @@ 3 + @@ -776,11 +873,6 @@ - - 270 - - - 349 @@ -801,6 +893,131 @@ + + 394 + + + + + 5 + 0 + + 5 + 1 + + 7 + + 1000 + + 9 + 40 + 3 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + + + 8 + 0 + + 0 + 1 + + 30 + + 1000 + + 9 + 40 + 1 + + + + + + + 397 + + + + + 400 + + + + + 402 + + + + + 408 + + + + + 409 + + + + + 425 + + + + + + 7 + 0 + + 0 + 1 + + 32 + + 1000 + + 3 + 9 + 1 + + + + + + 426 + + + + + 428 + + + + + 429 + + + + + 432 + + + @@ -811,7 +1028,10 @@ + + + @@ -869,17 +1089,37 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 389 + 432 @@ -899,6 +1139,14 @@ ./Classes/HNHBadgedTextFieldCell.h + + HNHGradientView + NSView + + IBProjectSource + ./Classes/HNHGradientView.h + + MPOutlineViewController MPViewController @@ -940,10 +1188,10 @@ IBCocoaFramework YES 3 - - NSActionTemplate - {15, 15} - + + {15, 15} + {8, 8} + YES