From 554da9dfc797bc6a5baca0cfbe778b7876a874a8 Mon Sep 17 00:00:00 2001 From: michael starke Date: Tue, 26 Aug 2014 23:18:32 +0200 Subject: [PATCH] Date picker uses the actual date of the selected item --- MacPass/MPDatePickingViewController.h | 2 +- MacPass/MPDatePickingViewController.m | 1 - MacPass/MPInspectorViewController.m | 7 ++++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/MacPass/MPDatePickingViewController.h b/MacPass/MPDatePickingViewController.h index 426d52cf..5dbd4008 100644 --- a/MacPass/MPDatePickingViewController.h +++ b/MacPass/MPDatePickingViewController.h @@ -10,7 +10,7 @@ @interface MPDatePickingViewController : MPViewController -@property (strong,readonly) NSDate *date; +@property (strong) NSDate *date; @property (weak) IBOutlet NSDatePicker *datePicker; @property (weak) IBOutlet NSPopUpButton *presetPopupButton; @property (assign, readonly) BOOL didCancel; diff --git a/MacPass/MPDatePickingViewController.m b/MacPass/MPDatePickingViewController.m index 8e268cd8..63a0e72b 100644 --- a/MacPass/MPDatePickingViewController.m +++ b/MacPass/MPDatePickingViewController.m @@ -23,7 +23,6 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) { @interface MPDatePickingViewController () -@property (strong) NSDate *date; @property (assign) BOOL didCancel; @end diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m index 1c90327c..38893f94 100644 --- a/MacPass/MPInspectorViewController.m +++ b/MacPass/MPInspectorViewController.m @@ -221,7 +221,12 @@ typedef NS_ENUM(NSUInteger, MPContentTab) { self.popover = [[NSPopover alloc] init]; self.popover.delegate = self; self.popover.behavior = NSPopoverBehaviorTransient; - self.popover.contentViewController = [[MPDatePickingViewController alloc] init]; + MPDatePickingViewController *controller = [[MPDatePickingViewController alloc] init]; + MPDocument *document = [[self windowController] document]; + if(document.selectedItem.timeInfo.expiryTime) { + controller.date = document.selectedItem.timeInfo.expiryTime; + } + self.popover.contentViewController = controller; [self.popover showRelativeToRect:NSZeroRect ofView:sender preferredEdge:NSMinYEdge]; }