20 minutes of typing.

[cydia.git] / UICaboodle / RVBook.mm

diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm
index 4b5a3999303e56812adf5181460851e8afef8a3c..433de39dedd55dcd4f476d74483d977c71021323 100644 (file)
--- a/UICaboodle/RVBook.mm
+++ b/UICaboodle/RVBook.mm
@@ -172,7 +172,10 @@
     [pages_ addObject:page];
     [self reloadButtonsForPage:page];
 
     [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 {
 }
 
 - (void) pushPage:(RVPage *)page {


@@ -223,7 +226,10 @@
     [page setPageActive:YES];
     [self reloadButtonsForPage:page];
 
     [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 {
 }
 
 - (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];
 }
 - (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)) {
 - (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;
     }
 }
         leftButtonStyle = UINavigationButtonStyleNormal;
     }
 }