diff options
| author | Grant Paul <chpwn@chpwn.com> | 2010-12-30 01:52:12 -0800 |
|---|---|---|
| committer | Grant Paul <chpwn@chpwn.com> | 2010-12-30 01:52:12 -0800 |
| commit | f6e1356137e494e0746becbfda851c8858de1c98 (patch) | |
| tree | fcdde073e8d373af8d02d3ac529fb5dbc68fec31 /UICaboodle | |
| parent | df30fbeeffdde520154ea445b7ac9ff2c99ce198 (diff) | |
Switch to native UITabBarController handling, and rewrite URL subsystem. Also make a number of changes, creating and renaming classes for the different pages dispalyed in Cydia. Incomplete; -urlForPage methods are not implemented or used and CYSearchController does not yet exist.
Diffstat (limited to 'UICaboodle')
| -rw-r--r-- | UICaboodle/BrowserView.h | 2 | ||||
| -rw-r--r-- | UICaboodle/BrowserView.mm | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h index f224326..efc1e6c 100644 --- a/UICaboodle/BrowserView.h +++ b/UICaboodle/BrowserView.h @@ -52,7 +52,7 @@ @protocol BrowserControllerDelegate - (void) retainNetworkActivityIndicator; - (void) releaseNetworkActivityIndicator; -- (CYViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag; +- (CYViewController *) pageForURL:(NSURL *)url; @end @interface BrowserController : CYViewController < diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm index 168cff1..921e6aa 100644 --- a/UICaboodle/BrowserView.mm +++ b/UICaboodle/BrowserView.mm @@ -638,7 +638,7 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se if ([scheme isEqualToString:@"mailto"]) [self _openMailToURL:url]; - CYViewController *page([delegate_ pageForURL:url hasTag:NULL]); + CYViewController *page([delegate_ pageForURL:url]); if (page == nil) { BrowserController *browser([[[class_ alloc] init] autorelease]); @@ -653,13 +653,11 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se [[self navigationController] pushViewController:page animated:YES]; } else { - UCNavigationController *navigation([[[UCNavigationController alloc] init] autorelease]); + UCNavigationController *navigation([[[UCNavigationController alloc] initWithRootViewController:page] autorelease]); [navigation setHook:indirect_]; [navigation setDelegate:delegate_]; - [navigation setViewControllers:[NSArray arrayWithObject:page]]; - [[page navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] initWithTitle:UCLocalize("CLOSE") style:UIBarButtonItemStylePlain |