X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/dc63e78f274cc5733250b137b1ad09ea248445ff..6a1551179f96bb1e8138adec72b006201aad05f9:/UICaboodle/RVBook.mm?ds=sidebyside diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm index 4b5a3999..433de39d 100644 --- a/UICaboodle/RVBook.mm +++ b/UICaboodle/RVBook.mm @@ -172,7 +172,10 @@ [pages_ addObject:page]; [self reloadButtonsForPage:page]; - [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO]; + if ([navbar_ respondsToSelector:@selector(setAccessoryView:animate:removeOnPop:)]) + [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO]; + else + [navbar_ setAccessoryView:[page accessoryView] animate:animated]; } - (void) pushPage:(RVPage *)page { @@ -223,7 +226,10 @@ [page setPageActive:YES]; [self reloadButtonsForPage:page]; - [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO]; + if ([navbar_ respondsToSelector:@selector(setAccessoryView:animate:removeOnPop:)]) + [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO]; + else + [navbar_ setAccessoryView:[page accessoryView] animate:animated]; } - (void) setBackButtonTitle:(NSString *)title forPage:(RVPage *)page { @@ -282,6 +288,14 @@ } } +- (void) reloadButtons { + size_t count([pages_ count]); + if (count != 0) { + RVPage *page([pages_ lastObject]); + [self reloadButtonsForPage:page]; + } +} + - (CGRect) pageBounds { return [transition_ bounds]; } @@ -298,7 +312,7 @@ - (void) _leftButtonTitle:(NSString *&)leftButtonTitle style:(UINavigationButtonStyle &)leftButtonStyle forPage:(RVPage *)page { [super _leftButtonTitle:leftButtonTitle style:leftButtonStyle forPage:page]; if ((cancel_ = leftButtonTitle == nil && [pages_ count] == 1)) { - leftButtonTitle = @"Cancel"; + leftButtonTitle = [[NSBundle mainBundle] localizedStringForKey:@"CANCEL" value:nil table:nil]; leftButtonStyle = UINavigationButtonStyleNormal; } }