nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 22:52:26 +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

4
MacPass/MPDatePickingViewController.h
View File

@@ -10,12 +10,8 @@
@interface MPDatePickingViewController : MPViewController
@property (strong) NSDate *date;
@property (weak) IBOutlet NSDatePicker *datePicker;
@property (weak) IBOutlet NSPopUpButton *presetPopupButton;
@property (assign, readonly) BOOL didCancel;
@property (weak) NSPopover *popover;
- (IBAction)useDate:(id)sender;
- (IBAction)cancel:(id)sender;

18
MacPass/MPDatePickingViewController.m
View File

@@ -23,8 +23,6 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) {
@interface MPDatePickingViewController ()
@property (assign) BOOL didCancel;
@end
@implementation MPDatePickingViewController
@@ -53,15 +51,21 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) {
self.presetPopupButton.menu = presetMenu;
}
- (void)setRepresentedObject:(id)representedObject {
[super setRepresentedObject:representedObject];
if(self.representedObject) {
self.datePicker.dateValue = [self.representedObject timeInfo].expirationDate;
}
}
- (IBAction)useDate:(id)sender {
self.didCancel = NO;
self.date = self.datePicker.dateValue;
[self.popover performClose:self];
KPKTimeInfo *timeInfo = [self.representedObject timeInfo];
timeInfo.expirationDate = self.datePicker.dateValue;
[self.view.window performClose:sender];
}
- (IBAction)cancel:(id)sender {
self.didCancel = YES;
[self.popover performClose:self];
[self.view.window performClose:sender];
}
- (IBAction)setDatePreset:(id)sender {

9
MacPass/MPIconSelectViewController.h
View File

@@ -8,19 +8,10 @@
#import "MPViewController.h"
FOUNDATION_EXTERN NSInteger const kMPDefaultIcon;
@interface MPIconSelectViewController : MPViewController <NSCollectionViewDelegate>
/**
* Is the selected Icon, kMPDefaultIcon if the default icons was selected
*/
@property (nonatomic, readonly, assign) NSInteger selectedIcon;
@property (nonatomic, readonly, assign) BOOL didCancel;
@property (weak) NSPopover *popover;
- (void)reset;
- (IBAction)cancel:(id)sender;
- (IBAction)useDefault:(id)sender;

38
MacPass/MPIconSelectViewController.m
View File

@@ -10,14 +10,8 @@
#import "MPIconHelper.h"
#import "MPDocument.h"
NSInteger const kMPDefaultIcon = -1;
@interface MPIconSelectViewController ()
@property (nonatomic, assign) NSInteger selectedIcon;
@property (nonatomic, assign) BOOL didCancel;
/* UI properties */
@property (weak) IBOutlet NSCollectionView *iconCollectionView;
@property (weak) IBOutlet NSButton *imageButton;
@@ -30,15 +24,6 @@ NSInteger const kMPDefaultIcon = -1;
return @"IconSelection";
}
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) {
_didCancel = YES;
_selectedIcon = kMPDefaultIcon;
}
return self;
}
- (void)didLoadView {
//[[self.imageButton cell] setBackgroundStyle:NSBackgroundStyleLowered];
self.iconCollectionView.backgroundColors = @[[NSColor clearColor]];
@@ -48,28 +33,23 @@ NSInteger const kMPDefaultIcon = -1;
}
- (IBAction)useDefault:(id)sender {
self.didCancel = NO;
self.selectedIcon = kMPDefaultIcon;
[self.popover performClose:self];
KPKNode *node = self.representedObject;
node.iconId = [[node class] defaultIcon];
[self.view.window performClose:sender];
}
- (IBAction)cancel:(id)sender {
self.didCancel = YES;
[self.popover performClose:self];
}
- (void)reset {
self.didCancel = YES;
self.selectedIcon = kMPDefaultIcon;
[self.view.window performClose:sender];
}
- (IBAction)_selectImage:(id)sender {
self.didCancel = NO;
NSButton *button = sender;
NSImage *image = button.image;
NSUInteger buttonIndex = [self.iconCollectionView.content indexOfObject:image];
self.selectedIcon = ((NSNumber *)[MPIconHelper databaseIconTypes][buttonIndex]).integerValue;
[self.popover performClose:self];
NSInteger newIconId = ((NSNumber *)[MPIconHelper databaseIconTypes][buttonIndex]).integerValue;
KPKNode *node = self.representedObject;
node.iconId = newIconId;
[self.view.window performClose:sender];
}
@end

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 {