Skip to content

Commit

Permalink
Merge pull request escoz#459 from pepibumur/master
Browse files Browse the repository at this point in the history
UIDatePickerMode selection
  • Loading branch information
escoz committed Apr 8, 2013
2 parents 2ec48dd + 17c54d2 commit dd04f03
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions quickdialog/QDateTimeInlineElement.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@
@property(nonatomic, strong) NSDate *minimumDate;


- (QDateTimeInlineElement *)initWithDate:(NSDate *)date;

- (QDateTimeInlineElement *)initWithTitle:(NSString *)string date:(NSDate *)date;
- (QDateTimeInlineElement *)initWithDate:(NSDate *)date andMode:(UIDatePickerMode)mode;

- (QDateTimeInlineElement *)initWithTitle:(NSString *)string date:(NSDate *)date andMode:(UIDatePickerMode)mode;

@end
8 changes: 4 additions & 4 deletions quickdialog/QDateTimeInlineElement.m
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ - (QDateTimeInlineElement *)initWithKey:(NSString *)key {
return self;
}

- (QDateTimeInlineElement *)initWithTitle:(NSString *)string date:(NSDate *)date {
- (QDateTimeInlineElement *)initWithTitle:(NSString *)string date:(NSDate *)date andMode:(UIDatePickerMode)mode{
self = [super initWithTitle:string Value:[date description]];
if (self!=nil){
_dateValue = date;
_mode = UIDatePickerModeDateAndTime;
_mode = mode;
}
return self;
}
Expand All @@ -68,8 +68,8 @@ -(NSNumber *)ticksValue {
return [NSNumber numberWithDouble:[self.dateValue timeIntervalSince1970]];
}

- (QDateTimeInlineElement *)initWithDate:(NSDate *)date {
return [self initWithTitle:nil date:date];
- (QDateTimeInlineElement *)initWithDate:(NSDate *)date andMode:(UIDatePickerMode)mode{
return [self initWithTitle:nil date:date andMode:mode];
}

- (UITableViewCell *)getCellForTableView:(QuickDialogTableView *)tableView controller:(QuickDialogController *)controller {
Expand Down

0 comments on commit dd04f03

Please sign in to comment.