rhodes 2.2.6 → 2.3.0.beta.1

data/platform/iphone/Classes/Rhodes.m

@@ -9,7 +9,7 @@
 #include "logging/RhoLog.h"
 #include "common/RhoConf.h"
 #include "common/RhodesApp.h"
-#include "common/app_build_configs.h"
+//#include "common/app_build_configs.h"
 #import "SplitView/SplittedMainView.h"
 
 
@@ -35,7 +35,7 @@ static BOOL app_created = NO;
 
 @implementation Rhodes
 
-@synthesize window, player, cookies, signatureDelegate, start_parameters;
+@synthesize window, player, cookies, signatureDelegate, nvDelegate;
 #ifdef __IPHONE_4_0
 @synthesize eventStore;
 #endif
@@ -284,12 +284,38 @@ static Rhodes *instance = NULL;
         RAWLOG_ERROR2("startSignatureViewController failed(%s): %s", [[theException name] UTF8String], [[theException reason] UTF8String] );
     }
     
-	
-	//[self startCameraPicker:pickImageDelegate 
-    //             sourceType:UIImagePickerControllerSourceTypeCamera];
-	
 }
 
+- (void)openFullScreenNativeView:(UIView*)view {
+    if (!rho_rhodesapp_check_mode())
+        return;
+	[self hideSplash];
+	[nvDelegate setParentView:window];
+	[nvDelegate setPrevView:mainView.view];
+	@try {
+		CGRect rect = window.frame;
+		rect.origin.x = 0;
+		rect.origin.y = 0;
+		NVViewController* svc = [[NVViewController alloc] initWithRect:rect nvview:view delegate:nvDelegate];
+		[nvDelegate setNVViewControllerValue:svc];
+
+		[mainView.view retain];
+		[mainView.view removeFromSuperview];
+		[window addSubview:svc.view];
+		
+		[window layoutSubviews];
+		[window setNeedsDisplay];
+		
+	} @catch(NSException* theException) {
+        RAWLOG_ERROR2("startFullSreeenNativeViewViewController failed(%s): %s", [[theException name] UTF8String], [[theException reason] UTF8String] );
+    }
+}
+
+- (void)closeFullScreenNativeView {
+	[nvDelegate doClose];
+}
+
+
 - (void)choosePicture:(NSString*) url {
     if (!rho_rhodesapp_check_mode())
         return;
@@ -447,6 +473,7 @@ static Rhodes *instance = NULL;
         
         NSLog(@"Start rhodes app");
         rho_rhodesapp_start();
+		rho_rhodesapp_callUiCreatedCallback();
     }
     @finally {
         [pool release];
@@ -498,6 +525,7 @@ static Rhodes *instance = NULL;
     dateTimePickerDelegate = [[DateTimePickerDelegate alloc] init];
     pickImageDelegate = [[PickImageDelegate alloc] init];
     signatureDelegate = [[SignatureDelegate alloc] init];
+    nvDelegate = [[NVDelegate alloc] init];
     
 #ifdef __IPHONE_3_0
     [[UIApplication sharedApplication] registerForRemoteNotificationTypes:
@@ -613,11 +641,6 @@ static Rhodes *instance = NULL;
 #endif
 
 - (void) saveLastUsedTime {
-    /*
-    int now = [[NSDate date] timeIntervalSince1970];
-    rho_conf_setInt("last_time_used",now);
-    rho_conf_save();
-    */
 }
 
 - (void)playStart:(NSString *)fileName mediaType:(NSString *)type {
@@ -671,7 +694,8 @@ static Rhodes *instance = NULL;
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
 	NSURL* url = [launchOptions objectForKey:UIApplicationLaunchOptionsURLKey];
-
+    NSLog(@"didFinishLaunchingWithOptions: %@", url);
+	
 	// store start parameter
 	NSString* start_parameter = [NSString stringWithUTF8String:""];
 	if (url != nil) {
@@ -683,72 +707,23 @@ static Rhodes *instance = NULL;
 			}
 		}
 	}	
-	self.start_parameters = [NSString stringWithUTF8String:[start_parameter UTF8String]];
-	
-	
 	[self doStartUp];
 	[self processDoSync:launchOptions];
-	
-	/*
-	BOOL rhogallery_only = rho_conf_getBool("rhogallery_only_app");
-	
-	// check for only from gallery app
-	if (rhogallery_only) {
-		if ([start_parameter compare:@"rhogallery_app"] != NSOrderedSame) {
-			NSLog(@"ALERT ! Application should be executed only from RhoGallery application !!!");
-			exit(EXIT_SUCCESS);
-		}
-	}
-	 */
-	const char* security_token = get_app_build_config_item("security_token");
-	
-	if (security_token != NULL) {
-		NSString* ns_security_token = [NSString stringWithUTF8String:security_token];
-		if ([ns_security_token length] > 0) {
-			BOOL can_start = NO;
-			
-			NSString* security_token_key = [NSString stringWithUTF8String:"security_token="];
-			NSRange st_range = [start_parameter rangeOfString:security_token_key];	
-			if (st_range.location >= 0) {
-				NSString* tmp = [start_parameter substringFromIndex:(st_range.location + st_range.length)];
-				NSRange t_range = [tmp rangeOfString:@","];
-				if (t_range.location >= 0) {
-					tmp = [tmp substringToIndex:t_range.location];
-				}
-				t_range = [tmp rangeOfString:@" "];
-				if (t_range.location >= 0) {
-					tmp = [tmp substringToIndex:t_range.location];
-				}
-				
-				// check for app security_token
-				if ([tmp compare:ns_security_token] == NSOrderedSame) {
-					can_start = YES;
-				}
-			}
-			
-			if (!can_start) {
-				NSLog(@"ALERT ! SECURITY_TOKEN is not valid !!!");
-				exit(EXIT_SUCCESS);
-			}
-		}
-	}
-	
-	
+
+    if ( !rho_rhodesapp_canstartapp([start_parameter UTF8String], ", ") )
+    {
+		NSLog(@"This is hidden app and can be started only with security key.");
+		exit(EXIT_SUCCESS);
+    }
 	
 	return NO;
 }
 #endif
-
-- (void)applicationDidFinishLaunching:(UIApplication *)application {
-	self.start_parameters = [NSString stringWithUTF8String:""];
-
+/*
+- (void)applicationDidFinishLaunching:(UIApplication *)application 
+{
 	[self doStartUp];
-	BOOL rhogallery_only = rho_conf_getBool("rhogallery_only_app");
-	if (rhogallery_only) {
-		NSLog(@"ALERT ! Application should be executed only from RhoGallery application !!!");
-		exit(EXIT_SUCCESS);
-	}
-}
+} */
 
 #ifdef __IPHONE_3_0
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
@@ -806,6 +781,7 @@ static Rhodes *instance = NULL;
 
 - (void)applicationWillTerminate:(UIApplication *)application {
     RAWLOG_INFO("Runner will terminate");
+    rho_rhodesapp_callUiDestroyedCallback();
     [self saveLastUsedTime];
     rho_rhodesapp_destroy();
 }
@@ -848,14 +824,6 @@ static Rhodes *instance = NULL;
 
 // Native functions
 
-const char* rho_sys_get_start_params() {
-	if ([Rhodes sharedInstance].start_parameters == nil) {
-		return "";
-	}
-    return [[Rhodes sharedInstance].start_parameters UTF8String];
-}
-
-
 void rho_map_location(char* query) {
     [[Rhodes sharedInstance] mapLocation:[NSString stringWithUTF8String:query]];
 }

data/platform/iphone/Classes/Signature/SignatureViewController.m

@@ -33,6 +33,7 @@
 	//1ontent.backgroundColor = [UIColor groupTableViewBackgroundColor];
 	
 	toolbar = [[UIToolbar alloc] init];
+	toolbar.barStyle = UIBarStyleBlack;
 	
 	toolbar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
 	toolbar.autoresizesSubviews = YES;

data/platform/iphone/Classes/SimpleMainView.h

@@ -22,7 +22,11 @@
 	id<NativeViewOC,NSObject> nativeView;
 	NSString* nativeViewType;
 	UIView* nativeViewView;
+	BOOL urlBasedNativeView;
 	RhoViewController* mTabBarCallback;
+	NSString* url_after_set_background;
+	BOOL is_url_after_set_background_redirect;
+	BOOL isBackgroundSetted;
 }
 
 @property (nonatomic,retain) UIWebView *webView;
@@ -31,14 +35,27 @@
 @property (nonatomic,retain) NSString *nativeViewType;
 @property (nonatomic,retain) UIView *nativeViewView;
 @property (nonatomic,assign) RhoViewController* mTabBarCallback;
+@property (assign) BOOL urlBasedNativeView;
+@property (assign) BOOL isBackgroundSetted;
+@property (assign) BOOL is_url_after_set_background_redirect;
+@property (nonatomic,retain) NSString* url_after_set_background;
+
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p;
-- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p toolbar:(NSArray*)items;
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p bar_info:(NSDictionary*)bar_info;
 - (id)initWithParentView:(UIView *)p frame:(CGRect)frame;
+- (id)initWithParentView:(UIView *)p frame:(CGRect)frame web_bkg_color:(UIColor*)web_bkg_color;
 
 - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation;
 - (void)loadView;
 
+- (void)removeToolbar;
+- (void)addToolbar:(NSDictionary*)bar_info;
+
+-(void)setWebBackgroundColor:(int)bkg_color;
+	
+-(void)restoreWebView;
+
 - (UIWebView*)getWebView:(int)tab_index;
 
 + (void) disableHiddenOnStart;

data/platform/iphone/Classes/SimpleMainView.m

@@ -16,6 +16,8 @@
 
 #include "TabbedMainView.h"
 
+#include "NativeBar.h"
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "SimpleMainView"
 
@@ -62,7 +64,7 @@ int rho_sys_get_screen_height();
 
 @implementation SimpleMainView
 
-@synthesize webView, toolbar, navbar, nativeViewType, nativeViewView, mTabBarCallback;
+@synthesize webView, toolbar, navbar, nativeViewType, nativeViewView, mTabBarCallback, urlBasedNativeView, url_after_set_background, isBackgroundSetted, is_url_after_set_background_redirect;
 
 
 static BOOL makeHiddenUntilLoadContent = YES;
@@ -168,14 +170,30 @@ static BOOL makeHiddenUntilLoadContent = YES;
     return btn;
 }
 
-- (UIToolbar*)newToolbar:(NSArray*)items frame:(CGRect)mainFrame {
-    if ([items count] % 5 != 0) {
-        RAWLOG_ERROR("Illegal arguments for createNewToolbar");
-        return nil;
-    }
+- (UIToolbar*)newToolbar:(NSDictionary*)bar_info frame:(CGRect)mainFrame {
     
     UIToolbar *tb = [UIToolbar new];
     tb.barStyle = UIBarStyleBlack;//Opaque;
+	
+
+	NSString *background_color = nil;
+
+	NSDictionary* global_properties = (NSDictionary*)[bar_info objectForKey:NATIVE_BAR_PROPERTIES];
+	if (global_properties != nil) {
+		background_color = (NSString*)[global_properties objectForKey:NATIVE_BAR_BACKGOUND_COLOR];
+	}
+	
+	
+	if (background_color != nil) {
+		tb.barStyle = UIBarStyleDefault;
+		int c = [background_color intValue];
+		int cR = (c & 0xFF0000) >> 16;
+		int cG = (c & 0xFF00) >> 8;
+		int cB = (c & 0xFF);
+		tb.tintColor = [UIColor colorWithRed:( ((float)(cR)) / 255.0) green:(((float)(cG)) / 255.0) blue:(((float)(cB)) / 255.0) alpha:1.0];
+	}
+	
+	
     
     [tb sizeToFit];
     
@@ -195,17 +213,25 @@ static BOOL makeHiddenUntilLoadContent = YES;
                               initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace
                               target:nil action:nil];
     
-    NSMutableArray *btns = [NSMutableArray arrayWithCapacity:[items count]/4];
-    for(int i = 0, lim = [items count]/5; i < lim; i++) {
-        int index = i*5 - 1;
-        NSString *label = (NSString*)[items objectAtIndex:++index];
-        NSString *url = (NSString*)[items objectAtIndex:++index];
-        NSString *icon = (NSString*)[items objectAtIndex:++index];
-        NSString *reload = (NSString*)[items objectAtIndex:++index];
-		NSString *colored_icon = (NSString*)[items objectAtIndex:++index];  
+	NSArray* items = (NSArray*)[bar_info objectForKey:NATIVE_BAR_ITEMS];
+	if (items == nil) {
+		RAWLOG_ERROR("Illegal arguments for createNewToolbar - array of items not found");
+		[tb release];
+		[fixed release];
+		return nil;
+	}
+
+    NSMutableArray *btns = [NSMutableArray arrayWithCapacity:[items count]];
+	
+    for(int i = 0, lim = [items count]; i < lim; i++) {
+		NSDictionary* item = (NSDictionary*)[items objectAtIndex:i];
         
-		reload = nil;
 		
+		NSString *label = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_LABEL];
+        NSString *url = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_ACTION];
+        NSString *icon = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_ICON];
+		NSString *colored_icon = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_COLORED_ICON];  
+        
         if ([url length] == 0) {
             RAWLOG_ERROR("Illegal arguments for createNewToolbar");
             [tb release];
@@ -248,18 +274,18 @@ static BOOL makeHiddenUntilLoadContent = YES;
     self.toolbar = nil;
 }
 
-- (void)addToolbar:(NSArray*)items {
+- (void)addToolbar:(NSDictionary*)bar_info {
     [self removeToolbar];
     assert(!toolbar);
     
-    if (!items)
+    if (!bar_info)
         return;
     
     CGRect wFrame = [self getContentRect];
 	wFrame.size.height += wFrame.origin.y;
 	wFrame.origin.y = 0;
     
-    toolbar = [self newToolbar:items frame:wFrame];
+    toolbar = [self newToolbar:bar_info frame:wFrame];
     assert([toolbar retainCount] == 1);
     toolbar.tag = RHO_TAG_TOOLBAR;
     UIView* root = self.view;
@@ -289,14 +315,23 @@ static BOOL makeHiddenUntilLoadContent = YES;
     return w;
 }
 
-- (id)init:(UIView*)p webView:(UIWebView*)w frame:(CGRect)frame toolbar:(NSArray*)items {
+- (id)init:(UIView*)p webView:(UIWebView*)w frame:(CGRect)frame bar_info:(NSDictionary*)bar_info web_bkg_color:(UIColor*)web_bkg_color {
 	[self init];
 	
 	self.mTabBarCallback = nil;
     
     rootFrame = frame;
+	
+	self.urlBasedNativeView = NO;
     
+	self.url_after_set_background = nil;
+	self.isBackgroundSetted = YES;
+	self.is_url_after_set_background_redirect = NO;
+	
     UIView* root = self.view;
+	if (web_bkg_color != nil) {
+		self.view.backgroundColor = web_bkg_color;
+	}
     
     assert(!webView || [webView retainCount] == 2);
     [webView removeFromSuperview];
@@ -314,11 +349,23 @@ static BOOL makeHiddenUntilLoadContent = YES;
     
     webView.autoresizesSubviews = YES;
     webView.autoresizingMask = /*UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin |*/ UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+
+	if (web_bkg_color != nil) {
+		self.webView.backgroundColor = web_bkg_color;
+		int cr = (int)(CGColorGetComponents([web_bkg_color CGColor])[0] * 255);
+		int cg = (int)(CGColorGetComponents([web_bkg_color CGColor])[1] * 255);
+		int cb = (int)(CGColorGetComponents([web_bkg_color CGColor])[2] * 255);
+		int c = (cr << 16) | (cg << 8) | cb;
+		[self setWebBackgroundColor:c];
+		assert([webView retainCount] == 1);
+	}
+	else {
+		[root addSubview:webView];
+		assert([webView retainCount] == 2);
+    }
 	
-    [root addSubview:webView];
-    assert([webView retainCount] == 2);
 
-    [self addToolbar:items];
+    [self addToolbar:bar_info];
     self.navbar = nil;
 	nativeView = nil;
 	nativeViewType = nil;
@@ -437,24 +484,32 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	rho_rhodesapp_callScreenRotationCallback(width, height, angle);
 }
 
-- (id)initWithParentView:(UIView *)p frame:(CGRect)frame toolbar:(NSArray*)items {
-    return [self init:p webView:nil frame:frame toolbar:items];
+- (id)initWithParentView:(UIView *)p frame:(CGRect)frame bar_info:(NSDictionary*)bar_info {
+    return [self init:p webView:nil frame:frame bar_info:bar_info web_bkg_color:nil];
+}
+
+- (id)initWithParentView:(UIView *)p frame:(CGRect)frame bar_info:(NSDictionary*)bar_info web_bkg_color:(UIColor*)web_bkg_color {
+    return [self init:p webView:nil frame:frame bar_info:bar_info web_bkg_color:web_bkg_color];
 }
 
 - (id)initWithParentView:(UIView *)p frame:(CGRect)frame {
-    return [self initWithParentView:p frame:frame toolbar:nil];
+    return [self initWithParentView:p frame:frame bar_info:nil];
+}
+
+- (id)initWithParentView:(UIView *)p frame:(CGRect)frame web_bkg_color:(UIColor*)web_bkg_color {
+    return [self initWithParentView:p frame:frame bar_info:nil web_bkg_color:web_bkg_color];
 }
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p {
-    return [self initWithMainView:v parent:p toolbar:nil];
+    return [self initWithMainView:v parent:p bar_info:nil];
 }
 
-- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p toolbar:(NSArray*)items {
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p bar_info:(NSDictionary*)bar_info {
     CGRect frame = [[v view] frame];
 	frame.origin.x = 0;
     //UIWebView *w = (UIWebView*)[Rhodes subviewWithTag:RHO_TAG_WEBVIEW ofView:[v view]];
     UIWebView *w = [v detachWebView];
-    id result = [self init:p webView:w frame:frame toolbar:items];
+    id result = [self init:p webView:w frame:frame bar_info:bar_info web_bkg_color:nil];
     return result;
 }
 
@@ -512,7 +567,9 @@ static BOOL makeHiddenUntilLoadContent = YES;
 }
 
 - (void)goForward:(id)sender {
-	[self restoreWebView];
+	if ((nativeViewView != nil) && (self.urlBasedNativeView == YES)) {
+		[self restoreWebView];
+	}
     [self forward:0];
 }
 
@@ -542,6 +599,24 @@ static BOOL makeHiddenUntilLoadContent = YES;
     return w;
 }
 
+-(void)setWebBackgroundColor:(int)bkg_color {
+	self.isBackgroundSetted = NO;
+	int cR = (bkg_color & 0xFF0000) >> 16;
+	int cG = (bkg_color & 0xFF00) >> 8;
+	int cB = (bkg_color & 0xFF);
+	UIColor* bc = [UIColor colorWithRed:( ((float)(cR)) / 255.0) green:(((float)(cG)) / 255.0) blue:(((float)(cB)) / 255.0) alpha:1.0];
+	
+	self.webView.backgroundColor = bc;
+	self.view.backgroundColor = bc;
+	
+	NSString* data = [NSString stringWithFormat:@"<body bgcolor=\"#%X\"></body>", bkg_color]; 
+	
+	self.webView.hidden = YES;
+	
+	[self loadHTMLString:data];
+}
+
+
 - (void)loadHTMLString:(NSString *)data {
 	[self restoreWebView];
     [webView loadHTMLString:data baseURL:[NSURL URLWithString:@""]];
@@ -549,8 +624,10 @@ static BOOL makeHiddenUntilLoadContent = YES;
 
 - (void)back:(int)index {
 	//if (nativeViewView != nil) {
+	if ((nativeViewView != nil) && (self.urlBasedNativeView == YES)) {
 		[self restoreWebView];
-		//[webView setNeedsDisplay];
+	}
+	//[webView setNeedsDisplay];
 	//}
 	//else {
 		[webView goBack];
@@ -558,7 +635,9 @@ static BOOL makeHiddenUntilLoadContent = YES;
 }
 
 - (void)forward:(int)index {
-	[self restoreWebView];
+	if ((nativeViewView != nil) && (self.urlBasedNativeView == YES)) {
+		[self restoreWebView];
+	}
     [webView goForward];
 }
 
@@ -589,6 +668,27 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	}
 }
 
+
+-(void)openNativeView:(UIView*)nv_view tab_index:(int)tab_index {
+	nativeViewView = nv_view;
+	if (nativeViewView != nil) {
+		CGRect rect = [webView frame];
+		[webView removeFromSuperview];
+		nativeViewView.frame = rect;
+		nativeViewView.autoresizesSubviews = YES;
+		nativeViewView.clipsToBounds = NO;
+		nativeViewView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+		[self.view addSubview:nativeViewView];
+		self.urlBasedNativeView = NO;
+	}
+}
+
+-(void)closeNativeView:(int)tab_index {
+	[self restoreWebView];
+}
+
+
+
 - (NSString*)processForNativeView:(NSString*)url {
 
 	//stringWithUTF8String
@@ -630,18 +730,23 @@ static BOOL makeHiddenUntilLoadContent = YES;
 						//w.delegate = self;
 						nativeViewView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
 						[root addSubview:nativeViewView];
+						self.urlBasedNativeView = YES;
 					}
 					[nativeView navigate:navto];
 					return nil;
 				}
 				else {
-					[self restoreWebView];
+					if ((nativeViewView != nil) && (self.urlBasedNativeView == YES)) {
+						[self restoreWebView];
+					}
 					return url;
 				}
 			}
 		}
 		else {
-			[self restoreWebView];
+			if ((nativeViewView != nil) && (self.urlBasedNativeView == YES)) {
+				[self restoreWebView];
+			}
 			return url;
 		}
 
@@ -649,6 +754,11 @@ static BOOL makeHiddenUntilLoadContent = YES;
 }
 
 - (void)navigate:(NSString *)url tab:(int)index {
+	if (!self.isBackgroundSetted) {
+		self.url_after_set_background = url;
+		self.is_url_after_set_background_redirect = NO;
+		return;
+	}
 	[SimpleMainView disableHiddenOnStart];
     NSString *encodedUrl = [self encodeUrl:url];
 	NSString* cleared_url = [self processForNativeView:encodedUrl];
@@ -664,6 +774,11 @@ static BOOL makeHiddenUntilLoadContent = YES;
 }
 
 - (void)navigateRedirect:(NSString *)url tab:(int)index {
+	if (!self.isBackgroundSetted) {
+		self.url_after_set_background = url;
+		self.is_url_after_set_background_redirect = YES;
+		return;
+	}
 	[SimpleMainView disableHiddenOnStart];
     NSString *encodedUrl = [self encodeUrl:url];
 	NSString* cleared_url = [self processForNativeView:encodedUrl];
@@ -862,9 +977,30 @@ static BOOL makeHiddenUntilLoadContent = YES;
 		self.view.hidden = NO;
 		[self.view.superview bringSubviewToFront:self.view];
     }
+	if (self.nativeViewView == nil) {
+		if ([self.webView superview] == nil) {
+			[self.view addSubview:self.webView];
+		}
+		if (self.webView.hidden) {
+			self.webView.hidden = NO;
+			[self.webView.superview bringSubviewToFront:self.webView];
+		}
+	}
 	
-	
-    // TODO
+	if (!self.isBackgroundSetted) {
+		self.isBackgroundSetted = YES;
+		if (self.url_after_set_background != nil) {
+			if (self.is_url_after_set_background_redirect) {
+				[self navigateRedirect:url_after_set_background tab:0];
+			}
+			else {
+				[self navigate:url_after_set_background tab:0];
+			}
+		}
+	}
+	self.url_after_set_background = nil;	
+    
+	// TODO
     /*
      [self inactive];
      
@@ -894,6 +1030,15 @@ static BOOL makeHiddenUntilLoadContent = YES;
 		self.view.hidden = NO;
 		[self.view.superview bringSubviewToFront:self.view];
     }
+	if ([self.webView superview] == nil) {
+		[self.view addSubview:self.webView];
+	}
+	if (self.webView.hidden) {
+		self.webView.hidden = NO;
+		[self.webView.superview bringSubviewToFront:self.webView];
+    }
+	self.isBackgroundSetted = YES;
+	self.url_after_set_background = nil;
 }
 
 - (void)viewWillAppear:(BOOL)animated {

data/platform/iphone/Classes/SplitView/LeftViewController.h

@@ -22,7 +22,7 @@
 @property (nonatomic,assign) int preferredSize;
 @property (nonatomic,retain) UIFont *myFont;
 
-- (id)initWithItems:(NSArray*)items parent:(SplittedMainView*)p;
+- (id)initWithItems:(NSDictionary*)bar_info parent:(SplittedMainView*)p;
 - (void)setSelection:(int)index;
 
 - (int)getPreferredWidth;

data/platform/iphone/Classes/SplitView/LeftViewController.m

@@ -14,6 +14,8 @@
 #include "common/RhodesApp.h"
 #include "logging/RhoLog.h"
 
+#include "NativeBar.h"
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "LeftViewController"
 
@@ -61,12 +63,16 @@
 
 @synthesize itemsData, preferredSize, myFont;
 
-- (id)initWithItems:(NSArray*)items parent:(SplittedMainView*)parent {
+- (id)initWithItems:(NSDictionary*)bar_info parent:(SplittedMainView*)parent {
 	self = [self initWithStyle:UITableViewStylePlain];
 	
 	splittedView = parent;
+	
+	
+	NSArray* items = (NSArray*)[bar_info objectForKey:NATIVE_BAR_ITEMS];
+
+    int count = [items count];
 
-    int count = [items count]/5;
     NSMutableArray *tabs = [[NSMutableArray alloc] initWithCapacity:count];
     
     NSString *initUrl = nil;
@@ -77,11 +83,11 @@
 	self.preferredSize = 0;
 	
     for (int i = 0; i < count; ++i) {
-        int index = i*5 - 1;
-        NSString *label = [items objectAtIndex:++index];
-        NSString *url = [items objectAtIndex:++index];
-        NSString *icon = [items objectAtIndex:++index];
-        NSString *reload = [items objectAtIndex:++index];
+		NSDictionary* item = (NSDictionary*)[items objectAtIndex:i];
+        
+        NSString *label = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_LABEL];
+        NSString *url = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_ACTION];
+        NSString *icon = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_ICON];
         
         if (!initUrl)
             initUrl = url;

data/platform/iphone/Classes/SplitView/RightViewController.h

@@ -21,7 +21,7 @@
 @property (nonatomic,retain) NSArray *itemsData;
 @property (nonatomic,assign) int tabindex;
 
-- (id)initWithItems:(NSArray*)items parent:(SplittedMainView*)parent;
+- (id)initWithItems:(NSDictionary*)bar_info parent:(SplittedMainView*)parent;