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

Merge branch 'master' of https://github.com/mstarke/MacPass

Browse Source 
Conflicts:
	MacPass/MPDatePickingViewController.m
This commit is contained in:
michael starke
2014-08-22 12:12:09 +02:00
parent c3e957125c e8dfcf6cda
commit 26f6fd2202
6 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MacPass/MPDatePickingViewController.m
View File

@@ -16,6 +16,7 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) {
MPDatePresetTomorrow,
MPDatePresetOneWeek,
MPDatePresetOneMonth,
MPDatePreset90Days,
MPDatePresetOneYear,
};
@@ -33,8 +34,8 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) {
- (void)awakeFromNib {
NSMenu *presetMenu = [[NSMenu alloc] init];
NSUInteger tags[] = { MPDatePresetTomorrow, MPDatePresetOneWeek, MPDatePresetOneMonth, MPDatePresetOneYear };
NSArray *dateItems = @[ NSLocalizedString(@"TOMORROW", ""), NSLocalizedString(@"ONE_WEEK", ""), NSLocalizedString(@"ONE_MONTH", ""), NSLocalizedString(@"ONE_YEAR", "") ];
NSUInteger tags[] = { MPDatePresetTomorrow, MPDatePresetOneWeek, MPDatePresetOneMonth, MPDatePreset90Days, MPDatePresetOneYear };
NSArray *dateItems = @[ NSLocalizedString(@"TOMORROW", ""), NSLocalizedString(@"ONE_WEEK", ""), NSLocalizedString(@"ONE_MONTH", ""), NSLocalizedString(@"90_DAYS", ""), NSLocalizedString(@"ONE_YEAR", "") ];
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"SELECT_DATE_PRESET", "") action:NULL keyEquivalent:@""];
[item setTag:-1];
@@ -81,6 +82,9 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) {
case MPDatePresetOneMonth:
[offsetComponents setMonth:1];
break;
case MPDatePreset90Days:
[offsetComponents setDay:90];
break;
case MPDatePresetOneYear:
[offsetComponents setYear:1];
break;