rhodes 2.2.3 → 2.2.4.beta.1

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

@@ -0,0 +1,30 @@
+//
+//  TabbedMainView.h
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 26.03.10.
+//  Copyright 2010 Rhomobile. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "RhoMainView.h"
+#import "RhoViewController.h"
+#import "SplittedMainView.h"
+
+@interface LeftViewController : UITableViewController {
+	SplittedMainView* splittedView;
+    NSArray *itemsData;
+	int preferredSize;
+	UIFont* myFont;
+}
+
+@property (nonatomic,retain) NSArray *itemsData;
+@property (nonatomic,assign) int preferredSize;
+@property (nonatomic,retain) UIFont *myFont;
+
+- (id)initWithItems:(NSArray*)items parent:(SplittedMainView*)p;
+- (void)setSelection:(int)index;
+
+- (int)getPreferredWidth;
+
+@end

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

@@ -0,0 +1,189 @@
+    //
+//  TabbedMainView.m
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 26.03.10.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "LeftViewController.h"
+#import "SimpleMainView.h"
+#import "Rhodes.h"
+#import "AppManager.h"
+
+#include "common/RhodesApp.h"
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "LeftViewController"
+
+
+
+@interface RhoLeftItem : NSObject {
+@public
+    NSString *url;
+    UIImage* image;
+    NSString *title;
+}
+
+@property (retain) NSString *url;
+@property (retain) UIImage *image;
+@property (retain) NSString *title;
+
+- (id)init;
+- (void)dealloc;
+
+@end
+
+@implementation RhoLeftItem
+
+@synthesize url, image, title;
+
+- (id)init {
+    url = nil;
+    image = nil;
+    title = nil;
+    return self;
+}
+
+- (void)dealloc {
+    [url release];
+    [image release];
+    [title release];
+    [super dealloc];
+}
+
+@end
+
+
+
+@implementation LeftViewController
+
+@synthesize itemsData, preferredSize, myFont;
+
+- (id)initWithItems:(NSArray*)items parent:(SplittedMainView*)parent {
+	self = [self initWithStyle:UITableViewStylePlain];
+	
+	splittedView = parent;
+
+    int count = [items count]/5;
+    NSMutableArray *tabs = [[NSMutableArray alloc] initWithCapacity:count];
+    
+    NSString *initUrl = nil;
+    
+	self.myFont = [UIFont fontWithName:@"Helvetica-Bold" size:20.0];
+	[self.myFont release];
+	
+	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];
+        
+        if (!initUrl)
+            initUrl = url;
+        
+        if (label && url && icon) {
+            RhoLeftItem *td = [[RhoLeftItem alloc] init];
+            td.url = url;
+			td.title = label;
+            
+			NSString *imagePath = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:icon];
+			td.image = [UIImage imageWithContentsOfFile:imagePath];
+            [tabs addObject:td];
+
+			CGSize textSize = [label sizeWithFont:myFont];
+			int pref_size = td.image.size.width + textSize.width + 32;
+			if (self.preferredSize < pref_size) {
+				self.preferredSize = pref_size;
+			}
+            
+			
+			[td release];
+        
+		}
+    }
+
+
+    self.itemsData = tabs;
+    [tabs release];
+	
+	self.view.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight;
+
+	[self.tableView reloadData];
+	[self setSelection:0];
+	
+	return self;
+}
+
+/*
+- (void)loadView {
+	UITableView* tv = [[UITableView alloc] initWithFrame:CGRectMake(0,0, 100, 100) style:UITableViewStylePlain];
+	self.view = tv;
+}
+ */
+
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    // Return the number of sections.
+    return 1;
+}
+
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    // Return the number of rows in the section.
+    return [self.itemsData count];
+}
+
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    static NSString *CellIdentifier = @"Cell";
+    
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    if (cell == nil) {
+        cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+    }
+    
+	cell.imageView.image = [[self.itemsData objectAtIndex:indexPath.row] image];
+	cell.textLabel.text = [NSString stringWithFormat:[[self.itemsData objectAtIndex:indexPath.row] title], indexPath.section, indexPath.row];
+    cell.textLabel.font = myFont; 
+	
+	
+    return cell;
+}
+
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+	return YES;
+}
+
+
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+	int selectedItem = indexPath.row;
+	[splittedView switchTab:selectedItem];
+}
+
+
+- (void)setSelectionCommand:(NSIndexPath*)index {
+
+	[self.tableView selectRowAtIndexPath:index animated:YES scrollPosition:UITableViewScrollPositionNone];
+
+}
+
+- (void)setSelection:(int)index {
+	NSIndexPath* path = [NSIndexPath indexPathForRow:index inSection:0];
+	[self performSelectorOnMainThread:@selector(setSelectionCommand:) withObject:path waitUntilDone:NO];	
+}
+
+- (int)getPreferredWidth {
+	return self.preferredSize;
+}
+
+
+@end

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

@@ -0,0 +1,54 @@
+//
+//  TabbedMainView.h
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 26.03.10.
+//  Copyright 2010 Rhomobile. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "RhoMainView.h"
+#import "RhoViewController.h"
+#import "SplittedMainView.h"
+
+@interface RightViewController : UIViewController<RhoMainView> {
+	SplittedMainView* splittedView;
+    NSArray *itemsData;
+    int tabindex;	
+	
+}
+
+@property (nonatomic,retain) NSArray *itemsData;
+@property (nonatomic,assign) int tabindex;
+
+- (id)initWithItems:(NSArray*)items parent:(SplittedMainView*)parent;
+
+
+
+
+//- (UIView*)view;
+
+- (UIWebView*)detachWebView;
+
+- (void)loadHTMLString:(NSString*)data;
+
+- (void)back:(int)index;
+- (void)forward:(int)index;
+- (void)navigate:(NSString*)url tab:(int)index;
+- (void)navigateRedirect:(NSString*)url tab:(int)index;
+- (void)reload:(int)index;
+
+- (void)executeJs:(NSString*)js tab:(int)index;
+
+- (NSString*)currentLocation:(int)index;
+
+- (void)switchTab:(int)index;
+- (int)activeTab;
+
+- (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right;
+- (void)removeNavBar;
+
+- (UIWebView*)getWebView:(int)tab_index;
+
+
+@end

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

@@ -0,0 +1,268 @@
+    //
+//  TabbedMainView.m
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 26.03.10.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "RightViewController.h"
+#import "SimpleMainView.h"
+#import "Rhodes.h"
+#import "AppManager.h"
+
+#include "common/RhodesApp.h"
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "RightViewController"
+
+
+
+
+@interface RhoRightItem : NSObject {
+@public
+    NSString *url;
+	SimpleMainView* view;
+    BOOL loaded;
+    BOOL reload;
+}
+
+@property (retain) NSString *url;
+@property (retain) SimpleMainView *view;
+@property (assign) BOOL loaded;
+@property (assign) BOOL reload;
+
+- (id)init;
+- (void)dealloc;
+
+@end
+
+@implementation RhoRightItem
+
+@synthesize url, loaded, reload, view;
+
+- (id)init {
+    url = nil;
+	view = nil;
+    loaded = NO;
+    reload = NO;
+    return self;
+}
+
+- (void)dealloc {
+    [url release];
+	[view release];
+    [super dealloc];
+}
+
+@end
+
+
+
+
+
+@implementation RightViewController
+
+@synthesize itemsData, tabindex;
+
+- (id)initWithItems:(NSArray*)items parent:(SplittedMainView*)parent {
+	self = [self initWithNibName:nil bundle:nil];
+
+	CGRect rect = CGRectMake(0,0,200,200);//self.view.frame;
+	
+
+    int count = [items count]/5;
+
+    NSMutableArray *tabs = [[NSMutableArray alloc] initWithCapacity:count];
+    
+    NSString *initUrl = nil;
+    
+    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];
+        
+        if (!initUrl)
+            initUrl = url;
+        
+        if (label && url && icon) {
+            RhoRightItem *td = [[RhoRightItem alloc] init];
+            td.url = url;
+            td.reload = [reload isEqualToString:@"true"];
+            
+            SimpleMainView *subController = [[SimpleMainView alloc] initWithParentView:parent frame:rect];
+            
+			subController.title = label;
+			//subController.view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+            
+			td.view = subController;
+            
+            [tabs addObject:td];
+            
+            [td release];
+            [subController release];
+        }
+    }
+    
+    self.itemsData = tabs;
+    [tabs release];
+	
+	self.view.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+	self.view.autoresizesSubviews = YES;
+	
+    self.tabindex = 0;
+    if (initUrl){
+        [self navigateRedirect:initUrl tab:0];
+		RhoRightItem *ri = [self.itemsData objectAtIndex:tabindex];
+		ri.loaded = YES;
+	}
+	// set first tab
+	SimpleMainView* v = [[self.itemsData objectAtIndex:0] view];
+	if (v != NULL) {
+		[v navigateRedirect:initUrl tab:0];
+		[self.view addSubview:v.view];
+		[self.view setNeedsLayout];
+		[v.view setNeedsDisplay];
+	}
+	
+	return self;
+}
+
+
+- (void)loadView {
+	CGRect rect = CGRectMake(0,0,200,200);//self.view.frame;
+	UIView* v = [[UIView alloc] initWithFrame:rect];;
+	self.view = v;
+	[v release];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+	return YES;
+}
+
+
+
+- (SimpleMainView*) getSimpleView:(int)index {
+	if (index == -1) {
+		index = self.tabindex;
+	}
+	return [[self.itemsData objectAtIndex:index] view];
+}
+
+
+- (UIWebView*)detachWebView {
+	SimpleMainView* v = [self getSimpleView:-1];
+	return [v detachWebView];
+}
+
+- (void)loadHTMLString:(NSString*)data {
+	SimpleMainView* v = [self getSimpleView:-1];
+	[v loadHTMLString:data];
+}
+
+- (void)back:(int)index {
+	SimpleMainView* v = [self getSimpleView:index];
+	[v back:index];
+}
+
+- (void)forward:(int)index {
+	SimpleMainView* v = [self getSimpleView:index];
+	[v forward:index];
+}
+
+- (void)navigate:(NSString*)url tab:(int)index {
+	SimpleMainView* v = [self getSimpleView:index];
+	[v navigate:url tab:index];
+}
+
+- (void)navigateRedirect:(NSString*)url tab:(int)index {
+	SimpleMainView* v = [self getSimpleView:index];
+	[v navigateRedirect:url tab:index];
+}
+
+- (void)reload:(int)index {
+	SimpleMainView* v = [self getSimpleView:index];
+	[v reload:index];
+}
+
+- (void)executeJs:(NSString*)js tab:(int)index {
+	SimpleMainView* v = [self getSimpleView:index];
+	[v executeJs:js tab:index];
+}
+
+- (NSString*)currentLocation:(int)index {
+	SimpleMainView* v = [self getSimpleView:index];
+	return [v currentLocation:index];
+}
+
+- (void)switchTabCommand:(SimpleMainView*)new_v {
+	int index = 0;
+	int i;
+	for (i = 0; i < [self.itemsData count]; i++) {
+		if ([[self.itemsData objectAtIndex:i] view] == new_v) {
+			index = i;
+		}
+	}
+	SimpleMainView* cur_v = [self getSimpleView:tabindex];
+	if (cur_v == new_v) {
+		return;
+	}
+	tabindex = index;
+    RhoRightItem *ri = [self.itemsData objectAtIndex:tabindex];
+    if (!ri.loaded || ri.reload) {
+        const char *s = [ri.url UTF8String];
+        rho_rhodesapp_load_url(s);
+        ri.loaded = YES;
+    }
+	CGRect myframe = self.view.bounds;
+	new_v.view.frame = myframe;
+	[cur_v.view removeFromSuperview];
+	[self.view addSubview:new_v.view];
+	[self.view setNeedsLayout];
+	//[self.view layoutSubviews];
+	//[self.view.superview setNeedsLayout];
+	//[new_v.view setNeedsDisplay];
+}
+
+- (void)switchTab:(int)index {
+	SimpleMainView* new_v = [self getSimpleView:index];
+	[self performSelectorOnMainThread:@selector(switchTabCommand:) withObject:new_v waitUntilDone:NO];	
+}
+
+- (int)activeTab {
+	return tabindex;
+}
+
+- (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
+	SimpleMainView* v = [self getSimpleView:index];
+	[v addNavBar:title left:left right:right];
+}
+
+- (void)removeNavBar {
+	SimpleMainView* v = [self getSimpleView:index];
+	[v removeNavBar];
+}
+
+- (UIWebView*)getWebView:(int)tab_index {
+	SimpleMainView* v = [self getSimpleView:index];
+	return [v getWebView:tab_index];
+}
+
+
+
+- (void)dealloc {
+	[itemsData release];
+    [super dealloc];
+}
+
+
+
+
+
+
+
+
+@end