nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-15 18:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mergen custom fields view into general tab

Browse Source
This commit is contained in:
michael starke
2017-06-16 10:09:56 +02:00
parent 1d1d444da3
commit ae36b9fb32
15 changed files with 204 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
MacPass/MPEntryInspectorViewController.m
View File

@@ -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];
}