]> git.saurik.com Git - cydia.git/blobdiff - UICaboodle/RVBook.mm
OMG, that was a stupid Browser bug.
[cydia.git] / UICaboodle / RVBook.mm
index b639958bf452e41d1d93daf65cc729a89f95a101..18de2b6d364a5c4d88ec9ea7ba315d6a65a5b5ec 100644 (file)
@@ -65,6 +65,9 @@
     if (toolbar_ != nil)
         [toolbar_ setDelegate:nil];
 
+    for (RVPage *page in pages_)
+        [page setBook:nil];
+
     [pages_ release];
     [navbar_ release];
     [transition_ release];
     delegate_ = delegate;
 }
 
+- (void) setHook:(id)hook {
+    hook_ = hook;
+}
+
 - (void) setPage:(RVPage *)page {
     if ([pages_ count] != 0)
         [[pages_ lastObject] setPageActive:NO];
     [navbar_ enableAnimation];
 }
 
-- (void) pushPage:(RVPage *)page {
-    if ([pages_ count] != 0)
-        [[pages_ lastObject] setPageActive:NO];
+- (void) swapPage:(RVPage *)page {
+    if ([pages_ count] == 0)
+        return [self pushPage:page];
+
+    [[pages_ lastObject] setPageActive:NO];
 
+    [navbar_ disableAnimation];
+    resetting_ = true;
+    [navbar_ popNavigationItem];
+    resetting_ = false;
+
+    [self pushPage:page animated:NO];
+    [navbar_ enableAnimation];
+}
+
+- (void) pushPage:(RVPage *)page animated:(BOOL)animated {
     NSString *title = [self getTitleForPage:page];
 
     NSString *backButtonTitle = [page backButtonTitle];
     [navitem setBackButtonTitle:backButtonTitle];
     [navbar_ pushNavigationItem:navitem];
 
-    BOOL animated = [pages_ count] == 0 ? NO : YES;
     [page setFrame:[transition_ bounds]];
     [transition_ transition:(animated ? 1 : 0) toView:page];
     [page setPageActive:YES];
     [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 {
+    if ([pages_ count] != 0)
+        [[pages_ lastObject] setPageActive:NO];
+    [self pushPage:page animated:([pages_ count] == 0 ? NO : YES)];
 }
 
 - (void) pushBook:(RVBook *)book {
     [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) reloadData {
-    for (int i(0), e([pages_ count]); i != e; ++i) {
-        RVPage *page([pages_ objectAtIndex:(e - i - 1)]);
+    size_t count([pages_ count]);
+    for (size_t i(0); i != count; ++i) {
+        RVPage *page([pages_ objectAtIndex:(count - i - 1)]);
         [page reloadData];
     }
+
+    if (count != 0) {
+        RVPage *page([pages_ lastObject]);
+        [self reloadButtonsForPage:page];
+    }
+}
+
+- (void) reloadButtons {
+    size_t count([pages_ count]);
+    if (count != 0) {
+        RVPage *page([pages_ lastObject]);
+        [self reloadButtonsForPage:page];
+    }
 }
 
 - (CGRect) pageBounds {
 }
 
 - (void) close {
+    if (hook_ != nil)
+        [hook_ didCloseBook:self];
 }
 
 @end
 - (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;
     }
 }
 
 - (void) close {
     [self popFromSuperviewAnimated:YES];
+    [super close];
 }
 
 @end