rhodes 2.2.3 → 2.2.4.beta.1

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

@@ -0,0 +1,22 @@
+//
+//  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 "RightViewController.h"
+
+@interface SplitViewDelegate : NSObject <UISplitViewControllerDelegate> {
+
+	RightViewController* rightController;
+
+}
+
+@property(nonatomic, retain) RightViewController* rightController;
+
+@end

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

@@ -0,0 +1,92 @@
+    //
+//  TabbedMainView.m
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 26.03.10.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "SplitViewDelegate.h"
+#import "SimpleMainView.h"
+#import "Rhodes.h"
+#import "AppManager.h"
+
+#include "common/RhodesApp.h"
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "SplitViewDelegate"
+
+@implementation SplitViewDelegate
+
+
+@synthesize rightController;
+
+
+// the master view controller will be displayed in a popover
+- (void)splitViewController:(UISplitViewController*)svc 
+		  popoverController:(UIPopoverController*)pc 
+  willPresentViewController:(UIViewController *)aViewController {
+	
+	//empty for the moment
+	
+}
+
+
+//the master view controller will be hidden
+- (void)splitViewController:(UISplitViewController*)svc 
+	 willHideViewController:(UIViewController *)aViewController 
+		  withBarButtonItem:(UIBarButtonItem*)barButtonItem 
+	   forPopoverController:(UIPopoverController*)pc {
+	
+	//[barButtonItem setTitle:@"my title"];
+    //self.navigationItem.leftBarButtonItem = barButtonItem;	
+	
+	
+	
+	
+	
+	
+	/*
+	//if we keep master view in portrait mode we do not need
+	//a extra toolbar
+	if(svc.keepMasterInPortraitMode == YES)
+		return;
+	
+	if(toolBar == nil) {
+		
+		//set title of master button
+		barButtonItem.title = @"Show Master";
+		
+		//create a toolbar
+		toolBar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, 1024, 44)];
+		[toolBar setItems:[NSArray arrayWithObject:barButtonItem] animated:YES];
+		
+	}
+	 UINavigationController
+	
+	//add the toolbar to the details view
+	[detailController.view addSubview:toolBar];
+	*/
+}
+
+
+//the master view will be shown again
+- (void)splitViewController:(UISplitViewController*)svc 
+	 willShowViewController:(UIViewController *)aViewController 
+  invalidatingBarButtonItem:(UIBarButtonItem *)button {
+	
+   //self.navigationItem.leftBarButtonItem = nil;	
+	
+	
+	
+	//remove the toolbar
+	//if(self.toolBar != nil)
+	//	[toolBar removeFromSuperview];
+}
+
+
+
+
+
+@end

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

@@ -0,0 +1,65 @@
+//
+//  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"
+
+
+@interface RhoUISplitView : UIView {
+	int leftWidth;
+}
+@property (nonatomic,assign) int leftWidth;
+
+- (void)layoutSubviews;
+
+@end
+
+
+@interface SplittedMainView : RhoViewController<RhoMainView> {
+	NSArray* viewControllers;
+
+}
+
+@property (nonatomic,retain) NSArray *viewControllers;
+
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p tabs:(NSArray*)items;
+
+
+
+
+
+
+//- (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/SplittedMainView.m

@@ -0,0 +1,304 @@
+    //
+//  TabbedMainView.m
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 26.03.10.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "SplittedMainView.h"
+#import "SimpleMainView.h"
+#import "Rhodes.h"
+#import "AppManager.h"
+
+#include "common/RhodesApp.h"
+#include "logging/RhoLog.h"
+
+
+#import "LeftViewController.h"
+#import "RightViewController.h"
+#import "SplitViewDelegate.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "SplittedMainView"
+
+
+#import "TabbedMainView.h"
+#import "SignatureViewController.h"
+
+
+
+@implementation RhoUISplitView 
+
+@synthesize leftWidth;
+
+- (void)layoutSubviews {
+	//[super layoutSubviews];
+	
+	CGRect my_frame = self.bounds;
+	UIView* leftView = [[self subviews] objectAtIndex:0];
+	UIView* rightView = [[self subviews] objectAtIndex:1];
+	
+	CGSize leftSize;
+	leftSize.width = self.leftWidth;
+	leftSize.height = my_frame.size.height;
+	
+	leftSize = [leftView sizeThatFits:leftSize];
+	CGRect left_frame = leftView.bounds;
+	CGRect right_frame = rightView.bounds;
+	
+	left_frame.origin.x = 0;//my_frame.origin.x;
+	left_frame.origin.y = 0;//my_frame.origin.y;
+	left_frame.size.width = leftSize.width;
+	left_frame.size.height = my_frame.size.height; 
+	
+	right_frame.origin.x = left_frame.origin.x + left_frame.size.width + 2;
+	right_frame.origin.y = 0;//my_frame.origin.y;
+	right_frame.size.width = my_frame.size.width - left_frame.size.width - 2;
+	right_frame.size.height = my_frame.size.height;
+	
+	leftView.frame = left_frame;
+	rightView.frame = right_frame;
+	
+}
+
+
+@end
+
+
+
+@implementation SplittedMainView
+
+
+@synthesize viewControllers;
+
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p tabs:(NSArray *)items {
+    
+	self = [self initWithNibName:nil bundle:nil];
+
+	RightViewController *rightView = NULL;
+	LeftViewController *leftView = NULL;
+	//create the master view
+	leftView = [[LeftViewController alloc]
+										initWithItems:items
+										parent:self];
+	
+	//create the details view
+	rightView = [[RightViewController alloc]
+									  initWithItems:items
+									  parent:self];
+
+	//RhoUISplitView* rv = [[RhoUISplitView alloc] init];
+	
+	
+	
+	CGRect parent_frame = [[v view] frame];
+	self.view.frame = parent_frame;
+	
+	
+	self.viewControllers = [NSArray arrayWithObjects:leftView, rightView, nil];
+	[self.view addSubview:leftView.view];
+	[self.view addSubview:rightView.view];
+
+	
+	
+	
+	//create and set the split view delegate
+	//SplitViewDelegate* splitViewDelegate = [[SplitViewDelegate alloc] init];
+	//splitViewDelegate.rightController = rightView;
+	//self.delegate = splitViewDelegate;
+	
+	// undocumented feature
+	//TODO: make legal way for not hide Master view in portrait mode 
+	//if ( [self respondsToSelector:@selector(setHidesMasterViewInPortrait:)] ) {
+	//	[self setHidesMasterViewInPortrait:NO];
+	//}
+	
+
+	RhoUISplitView* rv = (RhoUISplitView*)self.view;
+	rv.leftWidth = [leftView getPreferredWidth];
+
+	
+	[leftView release];
+	[rightView release];
+	
+	
+	//[self.view layoutSubviews];
+	//[self.view setNeedsLayout];
+	
+    return self;
+}
+
+
+
+
+- (void)loadView {
+	RhoUISplitView* rv = [[RhoUISplitView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+    rv.hidden = NO;
+    rv.userInteractionEnabled = YES;
+    rv.autoresizesSubviews = YES;
+    rv.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+
+	self.view = rv;
+	[rv release];
+}
+
+/*
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+}
+*/
+
+
+
+
+
+
+/*
+ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+    // MUST return YES to allow all orientations
+    return YES;
+}
+ */
+
+- (RightViewController*)getRightViewController {
+	RightViewController* rvc = (RightViewController*)[self.viewControllers objectAtIndex:1];
+	return rvc;
+}
+
+
+- (LeftViewController*)getLeftViewController {
+	LeftViewController* lvc = (LeftViewController*)[self.viewControllers objectAtIndex:0];
+	return lvc;
+}
+
+
+- (UIWebView*)detachWebView {
+	RightViewController* rvc = [self getRightViewController];
+	return [rvc detachWebView];
+}
+
+- (void)loadHTMLString:(NSString*)data {
+	RightViewController* rvc = [self getRightViewController];
+	[rvc loadHTMLString:data];
+}
+
+- (void)back:(int)index {
+	RightViewController* rvc = [self getRightViewController];
+	[rvc back:index];
+}
+
+- (void)forward:(int)index {
+	RightViewController* rvc = [self getRightViewController];
+	[rvc forward:index];
+}
+
+- (void)navigate:(NSString*)url tab:(int)index {
+	RightViewController* rvc = [self getRightViewController];
+	[rvc navigate:url tab:index];
+}
+
+- (void)navigateRedirect:(NSString*)url tab:(int)index {
+	RightViewController* rvc = [self getRightViewController];
+	[rvc navigateRedirect:url tab:index];
+}
+
+- (void)reload:(int)index {
+	RightViewController* rvc = [self getRightViewController];
+	[rvc reload:index];
+}
+
+- (void)executeJs:(NSString*)js tab:(int)index {
+	RightViewController* rvc = [self getRightViewController];
+	[rvc executeJs:js tab:index];
+}
+
+- (NSString*)currentLocation:(int)index {
+	RightViewController* rvc = [self getRightViewController];
+	return [rvc currentLocation:index];
+}
+
+
+
+
+- (void)switchTab:(int)index {
+	// right
+	RightViewController* rvc = [self getRightViewController];
+	[rvc switchTab:index];
+	// left
+	LeftViewController* lvc = [self getLeftViewController];
+	[lvc setSelection:index];
+}
+
+- (int)activeTab {
+	RightViewController* rvc = [self getRightViewController];
+	return [rvc activeTab];
+}
+
+- (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
+	RightViewController* rvc = [self getRightViewController];
+	[rvc addNavBar:title left:left right:right];
+}
+
+- (void)removeNavBar {
+	RightViewController* rvc = [self getRightViewController];
+	[rvc removeNavBar];
+}
+
+- (UIWebView*)getWebView:(int)tab_index {
+	RightViewController* rvc = [self getRightViewController];
+	return [rvc getWebView:tab_index];
+}
+ 
+/*
+
+- (UIWebView*)detachWebView {
+	return NULL;
+}
+
+- (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 {
+	return NULL;
+}
+
+- (void)switchTab:(int)index {
+}
+
+- (int)activeTab {
+	return 0;
+}
+
+- (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
+}
+
+- (void)removeNavBar {
+}
+
+- (UIWebView*)getWebView:(int)tab_index {
+	return NULL;
+}
+
+*/
+
+@end