Use the correct color for 'Loading...'.

[cydia.git] / CyteKit / WebViewController.h

diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index d2f9fb5a8c77515ffe31ade5544f48c49fa4b71d..b6cd768ba13589dd3882bfa962c7c402302ad82f 100644 (file)
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -44,8 +44,9 @@
 #include "CyteKit/WebView.h"
 
 #include <UIKit/UIKit.h>
+#include <MessageUI/MessageUI.h>
 
-#include <CydiaSubstrate/CydiaSubstrate.h>
+#include <Menes/ObjectHandle.h>
 
 @class IndirectDelegate;
 
@@ -58,22 +59,27 @@
 
 @interface CyteWebViewController : CyteViewController <
     CyteWebViewDelegate,
+    MFMailComposeViewControllerDelegate,
     UIWebViewDelegate
 > {
-    _transient CyteWebView *webview_;
+    _H<CyteWebView, 1> webview_;
     _transient UIScrollView *scroller_;
 
-    UIActivityIndicatorView *indicator_;
-    IndirectDelegate *indirect_;
-    NSURLAuthenticationChallenge *challenge_;
+    _H<UIActivityIndicatorView> indicator_;
+    _H<IndirectDelegate, 1> indirect_;
+    _H<NSURLAuthenticationChallenge> challenge_;
 
     bool error_;
     _H<NSURLRequest> request_;
+    bool ready_;
+
+    _H<NSURLRequest> stage1_;
+    _H<NSURLRequest> stage2_;
 
     _transient NSNumber *sensitive_;
 
-    NSString *title_;
-    NSMutableSet *loading_;
+    _H<NSString> title_;
+    _H<NSMutableSet> loading_;
 
     // XXX: NSString * or UIImage *
     _H<NSObject> custom_;
@@ -84,8 +90,8 @@
     float width_;
     Class class_;
 
-    UIBarButtonItem *reloaditem_;
-    UIBarButtonItem *loadingitem_;
+    _H<UIBarButtonItem> reloaditem_;
+    _H<UIBarButtonItem> loadingitem_;
 
     bool visible_;
     bool hidesNavigationBar_;
@@ -94,6 +100,8 @@
 
 + (void) _initialize;
 
+- (CyteWebView *) webView;
+
 - (void) setURL:(NSURL *)url;
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
@@ -125,8 +133,12 @@
 - (void) customButtonClicked;
 
 - (void) applyRightButton;
+- (UIBarButtonItem *) customButton;
 - (UIBarButtonItem *) rightButton;
 
+- (void) applyLeftButton;
+- (UIBarButtonItem *) leftButton;
+
 - (void) _didStartLoading;
 - (void) _didFinishLoading;