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

moved picking into view controllers (date and icon)

Browse Source
This commit is contained in:
michael starke
2016-08-24 17:53:37 +02:00
parent c43e99832b
commit e06ade6a8f
5 changed files with 28 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
MacPass/MPInspectorViewController.m
View File

@@ -35,7 +35,6 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
@property (strong) MPEntryInspectorViewController *entryViewController;
@property (strong) MPGroupInspectorViewController *groupViewController;
@property (strong) MPIconSelectViewController *iconSelectionViewController;
@property (strong) NSPopover *popover;
@property (nonatomic, strong) NSDate *modificationDate;
@@ -163,12 +162,10 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
self.popover = [[NSPopover alloc] init];
self.popover.delegate = self;
self.popover.behavior = NSPopoverBehaviorTransient;
if(!self.iconSelectionViewController) {
self.iconSelectionViewController = [[MPIconSelectViewController alloc] init];
}
[self.iconSelectionViewController reset];
self.iconSelectionViewController.popover = self.popover;
self.popover.contentViewController = self.iconSelectionViewController;
MPIconSelectViewController *vc = [[MPIconSelectViewController alloc] init];
vc.representedObject = self.representedObject;
vc.popover = self.popover;
self.popover.contentViewController = vc;
[self.popover showRelativeToRect:NSZeroRect ofView:sender preferredEdge:NSMinYEdge];
}
@@ -180,59 +177,17 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
self.popover = [[NSPopover alloc] init];
self.popover.delegate = self;
self.popover.behavior = NSPopoverBehaviorTransient;
MPDatePickingViewController *controller = [[MPDatePickingViewController alloc] init];
controller.popover = self.popover;
KPKNode *node = self.representedObject;
if(node.timeInfo.expirationDate) {
controller.date = node.timeInfo.expirationDate;
}
self.popover.contentViewController = controller;
MPDatePickingViewController *vc = [[MPDatePickingViewController alloc] init];
vc.representedObject = self.representedObject;
self.popover.contentViewController = vc;
[self.popover showRelativeToRect:NSZeroRect ofView:sender preferredEdge:NSMinYEdge];
}
- (void)popoverDidClose:(NSNotification *)notification {
NSPopover *popover = [notification object];
if([popover.contentViewController isKindOfClass:[MPIconSelectViewController class]]) {
MPIconSelectViewController *viewController = (MPIconSelectViewController *)popover.contentViewController;
if(!viewController.didCancel) {
[self _setIcon:viewController.selectedIcon];
}
}
if([popover.contentViewController isKindOfClass:[MPDatePickingViewController class]]) {
MPDatePickingViewController *viewController = (MPDatePickingViewController *)popover.contentViewController;
if(!viewController.didCancel) {
[self _setExpiryDate:viewController.date];
}
}
/* clear out the popover */
self.popover = nil;
}
- (void)_setIcon:(NSInteger)iconId {
/* TODO move to ViewController */
BOOL useDefault = (iconId == -1);
switch (self.activeTab) {
case MPGroupTab: {
KPKGroup *group = self.representedObject;
group.iconId = useDefault ? [KPKGroup defaultIcon] : iconId;
break;
}
case MPEntryTab: {
KPKEntry *entry = self.representedObject;
entry.iconId = useDefault ? [KPKEntry defaultIcon]: iconId;
break;
}
default:
break;
}
}
- (void)_setExpiryDate:(NSDate *)date {
KPKNode *node = self.representedObject;
node.timeInfo.expirationDate = date;
}
#pragma mark -
#pragma mark Bindings
- (void)_establishBindings {