nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-19 10:49:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using new KeePassKit API, simple multi selection support

Browse Source
This commit is contained in:
michael starke
2016-02-25 18:41:50 +01:00
parent 06c5f4d740
commit eb6e6bcaa9
22 changed files with 213 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MacPass/MPInspectorViewController.m
View File

@@ -190,9 +190,9 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
self.popover.behavior = NSPopoverBehaviorTransient;
MPDatePickingViewController *controller = [[MPDatePickingViewController alloc] init];
controller.popover = self.popover;
MPDocument *document = self.windowController.document;
if(document.selectedItem.timeInfo.expirationDate) {
controller.date = document.selectedItem.timeInfo.expirationDate;
KPKNode *node = self.representedObject;
if(node.timeInfo.expirationDate) {
controller.date = node.timeInfo.expirationDate;
}
self.popover.contentViewController = controller;
[self.popover showRelativeToRect:NSZeroRect ofView:sender preferredEdge:NSMinYEdge];
@@ -216,16 +216,19 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
}
- (void)_setIcon:(NSInteger)iconId {
MPDocument *document = [[self windowController] document];
BOOL useDefault = (iconId == -1);
switch (self.activeTab) {
case MPGroupTab:
document.selectedGroup.iconId = useDefault ? [KPKGroup defaultIcon] : iconId;
case MPGroupTab: {
KPKGroup *group = self.nodeController.content;
group.iconId = useDefault ? [KPKGroup defaultIcon] : iconId;
break;
}
case MPEntryTab:
document.selectedEntry.iconId = useDefault ? [KPKEntry defaultIcon]: iconId;
case MPEntryTab: {
KPKEntry *entry = self.nodeController.content;
entry.iconId = useDefault ? [KPKEntry defaultIcon]: iconId;
break;
}
default:
break;
@@ -233,8 +236,8 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
}
- (void)_setExpiryDate:(NSDate *)date {
MPDocument *document = [[self windowController] document];
document.selectedItem.timeInfo.expirationDate = date;
KPKNode *node = self.representedObject;
node.timeInfo.expirationDate = date;
}
#pragma mark -
@@ -268,18 +271,19 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
- (void)_didChangeCurrentItem:(NSNotification *)notification {
MPDocument *document = notification.object;
if(document.selectedItem.asGroup) {
KPKNode *node = document.selectedNodes.count == 1 ? document.selectedNodes.firstObject : nil;
if(node.asGroup) {
self.activeTab = MPGroupTab;
}
else if(document.selectedItem.asEntry) {
else if(node.asEntry) {
self.activeTab = MPEntryTab;
}
else {
self.activeTab = MPEmptyTab;
}
self.nodeController.content = document.selectedItem;
self.entryViewController.representedObject = document.selectedItem.asEntry;
self.groupViewController.representedObject = document.selectedItem.asGroup;
self.nodeController.content = node;
self.entryViewController.representedObject = node.asEntry;
self.groupViewController.representedObject = node.asGroup;
}
- (IBAction)beginEditing:(id)sender {