Porting, webkit stability.

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index caafaa52e665410c0f0cc3d083ce5715442ce0b0..7a227d0be42c73d5a57e583a530d7261683d4784 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -7,18 +7,20 @@
 
 @class UIProgressIndicator;
 @class UIScroller;
 
 @class UIProgressIndicator;
 @class UIScroller;

-@class UIWebView;
+@class UIDocumentWebView;

 
 @class WebView;
 
 @class Database;
 
 @class WebView;
 
 @class Database;

+@class IndirectDelegate;

 
 @interface BrowserView : RVPage {
     _transient Database *database_;
     UIScroller *scroller_;
 
 @interface BrowserView : RVPage {
     _transient Database *database_;
     UIScroller *scroller_;

-    UIWebView *webview_;
+    UIWebDocumentView *webview_;

     NSMutableArray *urls_;
     UIProgressIndicator *indicator_;
     NSMutableArray *urls_;
     UIProgressIndicator *indicator_;

+    IndirectDelegate *indirect_;

 
     NSString *title_;
     bool loading_;
 
     NSString *title_;
     bool loading_;

diff --git a/UICaboodle/RVBook.h b/UICaboodle/RVBook.h
index 43078fcb5ea65ea8d613eacb798bd869ab676edf..8b0518515db98b569eb3a16a8ae5e634bf7e2876 100644 (file)
--- a/UICaboodle/RVBook.h
+++ b/UICaboodle/RVBook.h
@@ -21,6 +21,8 @@
     _transient id delegate_;
 }
 
     _transient id delegate_;
 }
 

+- (UINavigationBar *) navigationBar;
+

 - (id) initWithFrame:(CGRect)frame;
 - (void) setDelegate:(id)delegate;
 
 - (id) initWithFrame:(CGRect)frame;
 - (void) setDelegate:(id)delegate;
 


@@ -29,8 +31,6 @@
 - (void) pushPage:(RVPage *)page;
 - (void) popPages:(unsigned)pages;
 
 - (void) pushPage:(RVPage *)page;
 - (void) popPages:(unsigned)pages;
 

-- (void) setPrompt:(NSString *)prompt;
-

 - (void) resetViewAnimated:(BOOL)animated;
 - (void) resetViewAnimated:(BOOL)animated toPage:(RVPage *)page;
 
 - (void) resetViewAnimated:(BOOL)animated;
 - (void) resetViewAnimated:(BOOL)animated toPage:(RVPage *)page;
 

diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm
index 9315cae91c1e14dd39418acadd963ced754b52fd..cef1acee62e297fb58d8ac6e6f68792f4753030b 100644 (file)
--- a/UICaboodle/RVBook.mm
+++ b/UICaboodle/RVBook.mm
@@ -29,6 +29,10 @@
     [super dealloc];
 }
 
     [super dealloc];
 }
 

+- (UINavigationBar *) navigationBar {
+    return navbar_;
+}
+

 - (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
     _assert([pages_ count] != 0);
     RVPage *page = [pages_ lastObject];
 - (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
     _assert([pages_ count] != 0);
     RVPage *page = [pages_ lastObject];


@@ -52,7 +56,7 @@
         pages_ = [[NSMutableArray arrayWithCapacity:4] retain];
 
         struct CGRect bounds = [self bounds];
         pages_ = [[NSMutableArray arrayWithCapacity:4] retain];
 
         struct CGRect bounds = [self bounds];

-        CGSize navsize = [UINavigationBar defaultSizeWithPrompt];
+        CGSize navsize = [UINavigationBar defaultSize];

         CGRect navrect = {{0, 0}, navsize};
 
         navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
         CGRect navrect = {{0, 0}, navsize};
 
         navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];


@@ -61,8 +65,6 @@
         [navbar_ setBarStyle:0];
         [navbar_ setDelegate:self];
 
         [navbar_ setBarStyle:0];
         [navbar_ setDelegate:self];
 

-        [navbar_ setPrompt:@""];
-

         transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
             bounds.origin.x, bounds.origin.y + navsize.height, bounds.size.width, bounds.size.height - navsize.height
         )];
         transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
             bounds.origin.x, bounds.origin.y + navsize.height, bounds.size.width, bounds.size.height - navsize.height
         )];


@@ -104,6 +106,7 @@
     [navbar_ pushNavigationItem:navitem];
 
     BOOL animated = [pages_ count] == 0 ? NO : YES;
     [navbar_ pushNavigationItem:navitem];
 
     BOOL animated = [pages_ count] == 0 ? NO : YES;

+    [page setFrame:[transition_ bounds]];

     [transition_ transition:(animated ? 1 : 0) toView:page];
     [page setPageActive:YES];
 
     [transition_ transition:(animated ? 1 : 0) toView:page];
     [page setPageActive:YES];
 


@@ -127,10 +130,6 @@
     [self resetViewAnimated:YES toPage:[pages_ lastObject]];
 }
 
     [self resetViewAnimated:YES toPage:[pages_ lastObject]];
 }
 

-- (void) setPrompt:(NSString *)prompt {
-    [navbar_ setPrompt:prompt];
-}
-

 - (void) resetViewAnimated:(BOOL)animated {
     resetting_ = true;
 
 - (void) resetViewAnimated:(BOOL)animated {
     resetting_ = true;
 


@@ -150,6 +149,7 @@
 
 - (void) resetViewAnimated:(BOOL)animated toPage:(RVPage *)page {
     [page resetViewAnimated:animated];
 
 - (void) resetViewAnimated:(BOOL)animated toPage:(RVPage *)page {
     [page resetViewAnimated:animated];

+    [page setFrame:[transition_ bounds]];

     [transition_ transition:(animated ? 2 : 0) toView:page];
     [page setPageActive:YES];
     [self reloadButtonsForPage:page];
     [transition_ transition:(animated ? 2 : 0) toView:page];
     [page setPageActive:YES];
     [self reloadButtonsForPage:page];


@@ -175,8 +175,8 @@
     if ([pages_ count] == 0 || page != [pages_ lastObject])
         return;
     NSString *leftButtonTitle([page leftButtonTitle]);
     if ([pages_ count] == 0 || page != [pages_ lastObject])
         return;
     NSString *leftButtonTitle([page leftButtonTitle]);

-    RVUINavBarButtonStyle leftButtonStyle = [page leftButtonStyle];
-    RVUINavBarButtonStyle rightButtonStyle = [page rightButtonStyle];
+    UINavigationButtonStyle leftButtonStyle = [page leftButtonStyle];
+    UINavigationButtonStyle rightButtonStyle = [page rightButtonStyle];

     //[navbar_ showButtonsWithLeftTitle:leftButtonTitle rightTitle:[page rightButtonTitle] leftBack:(leftButtonTitle == nil)];
 
     [navbar_
     //[navbar_ showButtonsWithLeftTitle:leftButtonTitle rightTitle:[page rightButtonTitle] leftBack:(leftButtonTitle == nil)];
 
     [navbar_

diff --git a/UICaboodle/RVPage.h b/UICaboodle/RVPage.h
index 8b0a2e41619e0478a88406bc471fbbb330a44840..67b73d68744a1fca2286f3ff84b8d797a9c3a422 100644 (file)
--- a/UICaboodle/RVPage.h
+++ b/UICaboodle/RVPage.h
@@ -1,13 +1,6 @@
 #import "UICaboodle.h"
 
 #import "UICaboodle.h"
 

-#import <UIKit/UIView.h>
-
-enum RVUINavBarButtonStyle {
-    RVUINavBarButtonStyleNormal,
-    RVUINavBarButtonStyleBack,
-    RVUINavBarButtonStyleHighlighted,
-    RVUINavBarButtonStyleDestructive
-};
+#import <UIKit/UIKit.h>

 
 @class NSString;
 @class RVBook;
 
 @class NSString;
 @class RVBook;


@@ -23,8 +16,8 @@ enum RVUINavBarButtonStyle {
 - (NSString *) leftButtonTitle;
 - (UIView *) accessoryView;
 
 - (NSString *) leftButtonTitle;
 - (UIView *) accessoryView;
 

-- (RVUINavBarButtonStyle) leftButtonStyle;
-- (RVUINavBarButtonStyle) rightButtonStyle;
+- (UINavigationButtonStyle) leftButtonStyle;
+- (UINavigationButtonStyle) rightButtonStyle;

 
 - (void) _rightButtonClicked;
 - (void) _leftButtonClicked;
 
 - (void) _rightButtonClicked;
 - (void) _leftButtonClicked;

diff --git a/UICaboodle/RVPage.mm b/UICaboodle/RVPage.mm
index ee85a7ed6c4b6ca7d7a7f521b4dfbed6e93a3112..5d29a2668f6586ba4827f6521bd68de601d0051c 100644 (file)
--- a/UICaboodle/RVPage.mm
+++ b/UICaboodle/RVPage.mm
@@ -1,7 +1,7 @@
 #import "RVPage.h"
 
 #import <Foundation/Foundation.h>
 #import "RVPage.h"
 
 #import <Foundation/Foundation.h>

-#import <UIKit/UIView.h>
+#import <UIKit/UIKit.h>

 
 #import "RVBook.h"
 
 
 #import "RVBook.h"
 


@@ -24,12 +24,12 @@
     return nil;
 }
 
     return nil;
 }
 

-- (RVUINavBarButtonStyle) leftButtonStyle {
-    return [self leftButtonTitle] == nil ? RVUINavBarButtonStyleBack : RVUINavBarButtonStyleNormal;
+- (UINavigationButtonStyle) leftButtonStyle {
+    return [self leftButtonTitle] == nil ? UINavigationButtonStyleBack : UINavigationButtonStyleNormal;

 }
 
 }
 

-- (RVUINavBarButtonStyle) rightButtonStyle {
-    return RVUINavBarButtonStyleNormal;
+- (UINavigationButtonStyle) rightButtonStyle {
+    return UINavigationButtonStyleNormal;

 }
 
 - (void) _rightButtonClicked {
 }
 
 - (void) _rightButtonClicked {

diff --git a/UICaboodle/ResetView.h b/UICaboodle/ResetView.h
index c4eb3f72fb5f36f10d8268e0b17f1282469832c8..903bec083b981d390508efd7202511ba4efe1305 100644 (file)
--- a/UICaboodle/ResetView.h
+++ b/UICaboodle/ResetView.h
@@ -1,8 +1,7 @@
 #import <RVPage.h>
 #import <RVBook.h>
 
 #import <RVPage.h>
 #import <RVBook.h>
 

-#import <UIKit/UISectionList.h>
-#import <UIKit/UITable.h>
+#import <UIKit/UIKit.h>

 
 @interface UIView (RVBook)
 - (void) resetViewAnimated:(BOOL)animated;
 
 @interface UIView (RVBook)
 - (void) resetViewAnimated:(BOOL)animated;