rhodes 3.3.3.beta.3 → 3.3.3.beta.4

data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java

@@ -212,7 +212,7 @@ public class RubyAPI {
 			className = ((RubyClass)receiver).getName() + "::";
 		else
 		{
-			if ( receiver.getRubyClass() != null )
+			if ( receiver != null && receiver.getRubyClass() != null )
 				className = receiver.getRubyClass().getName() + ".";
 		}
 		

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -99,6 +99,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 	public static final String LABEL_CLOSE = "Close";
 	public static final String LABEL_EXIT = "Exit";
 	public static final String LABEL_NONE = "none";
+	public static final String LABEL_COPYPASTE = "copy_paste";
 	
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		new RhoLogger("RhodesApplication");
@@ -507,7 +508,9 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	if ( ClientRegister.getInstance() != null )
     		ClientRegister.getInstance().Destroy();
     	
-    	RhoRuby.rho_ruby_deactivateApp();
+    	if (!m_bInDeactivate)
+    		RhoRuby.rho_ruby_deactivateApp();
+    	
     	RhoRuby.rho_ruby_uiDestroyed();
     	
 		GeoLocation.stop();
@@ -565,6 +568,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     private static boolean m_bRubyInit = false;
 	public void activate()
 	{
+		m_bInDeactivate = false;
 		if (!m_bActivate)
 			rhodes_activate();
 		else
@@ -670,9 +674,11 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	}
     }
 
+    boolean m_bInDeactivate = false;
 	public void deactivate() {
     	LOG.TRACE("Rhodes deactivate ***--------------------------***");		
     	
+    	m_bInDeactivate = true;
     	RhoRuby.rho_ruby_deactivateApp();
     	
 //		SyncEngine.stop(null);
@@ -839,7 +845,8 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	}
     	
 		private Vector menuItems = new Vector();
-
+		private boolean m_bMenuCopyPaste = false;
+		
 		private MenuItem homeItem = new MenuItem("", 200000, 10) {
 			public void run() {
 					navigateHome();
@@ -895,8 +902,11 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 				super.makeMenu(menu, instance);
 				return;
 			}
+			//return;
+			
+			if (!m_bMenuCopyPaste)
+				menu.deleteAll();
 			
-			menu.deleteAll();
 			// Don't draw menu if menuItems is null
 			if (menuItems == null)
 				return;
@@ -955,6 +965,8 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	    	setDefaultItemToMenuItems(label, closeItem);
     	    } else if (label.equalsIgnoreCase(RhodesApplication.LABEL_NONE)) {
     	    	menuItems = null;
+    	    } else if (value.equalsIgnoreCase(RhodesApplication.LABEL_COPYPASTE)) {
+    	    	m_bMenuCopyPaste = true;
     	    } else {
 				MenuItem itemToAdd = new MenuItem(label, 200000, 10) 
 				{
@@ -1029,6 +1041,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 
 		public void setMenuItems(Vector menuItems) {
 			this.menuItems = menuItems;
+	    	m_bMenuCopyPaste = false;
 		}
 
 		public MenuItem getSavedGetLinkItem() {
@@ -1371,6 +1384,14 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 				_mainScreen.close();
             }
     	});
+    	
+    	this.invokeLater(new Runnable() {
+            public void run() 
+            {
+				System.exit(1);
+            }
+    	});
+    	
     }
 
     boolean m_bDisableInput = false;

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -406,7 +406,7 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 #endif
 	}
     
-	rho_logconf_Init_with_separate_user_path(rho_native_rhopath(), "", rho_native_rhouserpath());
+	rho_logconf_Init_with_separate_user_path(rho_native_rhopath(), rho_native_rhopath(), "", rho_native_rhouserpath());
 	rho_rhodesapp_create_with_separate_user_path(rho_native_rhopath(), rho_native_rhouserpath());
 	RAWLOG_INFO("Rhodes started");
 }

data/platform/iphone/Classes/Camera/PickImageDelegate.m

@@ -485,10 +485,11 @@ VALUE get_camera_info(const char* camera_type) {
         }
     }
     
-	if ([platform isEqualToString:@"iPad1,1"])  {
+	if ([platform hasPrefix:@"iPad1"])  {
         // iPad
     }
-	if ([platform isEqualToString:@"iPad2,1"])  {
+    else
+	if ([platform hasPrefix:@"iPad2"])  {
         // iPad 2
         if (!isFront) {
             w = 960;
@@ -498,6 +499,30 @@ VALUE get_camera_info(const char* camera_type) {
             w = 640;
             h = 480;
         }
+    } 
+    else 
+    if ([platform hasPrefix:@"iPad3"])  {
+        // iPad 3
+        if (!isFront) {
+            w = 2592;
+            h = 1936;
+        }
+        else {
+            w = 640;
+            h = 480;
+        }
+    } 
+    else 
+    if ([platform hasPrefix:@"iPad"]) {
+        // iPad 3/4 ?
+        if (!isFront) {
+            w = 2592;
+            h = 1936;
+        }
+        else {
+            w = 640;
+            h = 480;
+        }
     }
     
     if ((w <= 0) || (h <= 0)) {

data/platform/iphone/Classes/DateTimePickerDelegate.h

@@ -28,6 +28,7 @@
 #import <Foundation/Foundation.h>
 #import "RhoDelegate.h"
 #import "DateTime.h"
+#import "DateTimePickerViewController.h"
 
 @interface DateTimePickerDelegate : RhoDelegate <UIPickerViewDelegate>
 {
@@ -37,6 +38,7 @@
     UIToolbar *toolbar;
     UILabel *barLabel;
     DateTime *dateTime;
+    DateTimePickerViewController* dt_controller;
 }
 
 @property (nonatomic, retain) DateTime *dateTime;

data/platform/iphone/Classes/DateTimePickerDelegate.m

@@ -27,6 +27,8 @@
 #import "DateTimePickerDelegate.h"
 #import "common/RhodesApp.h"
 #import "ruby/ext/rho/rhoruby.h"
+#import "DateTimePickerViewController.h"
+#import "Rhodes.h"
 
 
 static NSString* ourChangeValueCallback = nil;
@@ -166,6 +168,20 @@ static NSString* ourChangeValueCallback = nil;
         // Add toolbar to view
         [self createPickerBar:pickerFrame];
         
+        
+        //pickerFrame.origin.y = self.toolbar.frame.size.height;
+        
+        CGRect totalrect = CGRectMake(  parentFrame.origin.x,
+                                        parentFrame.origin.y + parentFrame.size.height - pickerSize.height - self.toolbar.frame.size.height,
+                                        pickerSize.width,
+                                        pickerSize.height + self.toolbar.frame.size.height);
+        
+        
+        [self.pickerView setFrame:pickerFrame];
+
+        
+        
+        /*
         // Add picker to view
         [parentView addSubview:self.pickerView];
         
@@ -181,22 +197,62 @@ static NSString* ourChangeValueCallback = nil;
         self.pickerView.frame = pickerFrame;
         
         [UIView commitAnimations];
+        */
+        
+        //parentFrame.origin.y += totalrect.size.height;
+        
+        dt_controller = [[DateTimePickerViewController alloc] initWithRect:parentFrame];
+        
+        [dt_controller makeTransparencyBackground];
+        
+        [dt_controller.view addSubview:self.toolbar];
+        [dt_controller.view addSubview:self.barLabel];
+        [dt_controller.view addSubview:self.pickerView];
+        
+        self.pickerView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+        self.barLabel.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+        self.toolbar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+        
+        //[[[[Rhodes sharedInstance] mainView] getMainViewController] presentViewController:ctrl animated:YES completion:nil];
+        //[ctrl release];
+
+        
+        
+        [parentView addSubview:dt_controller.view];
+        
+        CGRect startFrame = parentFrame;
+        startFrame.origin.y = parentFrame.origin.y + parentFrame.size.height - totalrect.size.height;
+        dt_controller.view.frame = startFrame;
+        
+        [UIView beginAnimations:nil context:NULL];
+        [UIView setAnimationDuration:0.3];
+        
+        [UIView setAnimationDelegate:self];
+        [UIView setAnimationDidStopSelector:@selector(slideUpDidStop)];
+        
+        dt_controller.view.frame = parentFrame;
+        
+        [UIView commitAnimations];
+        
+        
     }
 }
 
 - (void)slideUpDidStop
 {
     // the date picker has finished sliding upwards, so add toolbar
-    [self.parentView addSubview:self.toolbar];
-    [self.parentView addSubview:self.barLabel];
+    //[self.parentView addSubview:self.toolbar];
+    //[self.parentView addSubview:self.barLabel];
+    [dt_controller makeGrayBacground];
     [self.pickerView addTarget:self action:@selector(onChangeValue:) forControlEvents:UIControlEventValueChanged]; 
 }
 
 - (void)slideDownDidStop
 {
     // the date picker has finished sliding downwards, so remove it
-    [self.pickerView removeFromSuperview];
-	[self.pickerView release];
+    [dt_controller.view removeFromSuperview];
+	[dt_controller release];
+    [self.pickerView release];
 	self.pickerView = nil;
     [self.barLabel release];
     self.barLabel = nil;
@@ -207,9 +263,11 @@ static NSString* ourChangeValueCallback = nil;
 - (void)animateDown
 {
     CGRect parentFrame = parentView.frame;
-    CGRect endFrame = pickerView.frame;
-    endFrame.origin.y = parentFrame.origin.y + parentFrame.size.height;
+    CGRect endFrame = dt_controller.view.frame;
+    endFrame.origin.y += self.pickerView.frame.size.height + self.toolbar.frame.size.height;
     // start the slide down animation
+    [dt_controller makeTransparencyBackground];
+
     [UIView beginAnimations:nil context:NULL];
     [UIView setAnimationDuration:0.3];
     
@@ -218,10 +276,10 @@ static NSString* ourChangeValueCallback = nil;
     [UIView setAnimationDidStopSelector:@selector(slideDownDidStop)];
     
     // Remove toolbar immediately
-    [self.barLabel removeFromSuperview];
-    [self.toolbar removeFromSuperview];
+    //[self.barLabel removeFromSuperview];
+    //[self.toolbar removeFromSuperview];
 
-    self.pickerView.frame = endFrame;
+    dt_controller.view.frame = endFrame;
     [UIView commitAnimations];
 }
 
@@ -235,6 +293,15 @@ static NSString* ourChangeValueCallback = nil;
         [postUrl cStringUsingEncoding:[NSString defaultCStringEncoding]],
         0, [self.dateTime.data cStringUsingEncoding:[NSString defaultCStringEncoding]], 1 );	
     [self animateDown];
+    /*
+     [[[[Rhodes sharedInstance] mainView] getMainViewController] dismissViewControllerAnimated:YES completion:nil];
+    [self.pickerView release];
+	self.pickerView = nil;
+    [self.barLabel release];
+    self.barLabel = nil;
+    [self.toolbar release];
+    self.toolbar = nil;
+     */
 }
 
 - (IBAction)dateAction:(id)sender
@@ -252,6 +319,15 @@ static NSString* ourChangeValueCallback = nil;
         ldate, [self.dateTime.data cStringUsingEncoding:[NSString defaultCStringEncoding]], 0 );
     
     [self animateDown];
+    /*
+     [[[[Rhodes sharedInstance] mainView] getMainViewController] dismissViewControllerAnimated:YES completion:nil];
+     [self.pickerView release];
+	self.pickerView = nil;
+    [self.barLabel release];
+    self.barLabel = nil;
+    [self.toolbar release];
+    self.toolbar = nil;
+     */
 }
 
 +(void)setChangeValueCallback:(NSString*)callback {

data/platform/iphone/Classes/DateTimePickerViewController.h

@@ -0,0 +1,21 @@
+//
+//  DateTimePickerViewController.h
+//  rhorunner
+//
+//  Created by Dmitry Soldatenkov on 02.03.12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "RhoViewController.h"
+
+@interface DateTimePickerViewController : RhoViewController {
+    CGRect myrect;
+}
+    
+- (id)initWithRect:(CGRect)rect;
+
+-(void)makeTransparencyBackground;
+-(void)makeGrayBacground;
+
+@end

data/platform/iphone/Classes/DateTimePickerViewController.m

@@ -0,0 +1,75 @@
+//
+//  DateTimePickerViewController.m
+//  rhorunner
+//
+//  Created by Dmitry Soldatenkov on 02.03.12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#import "DateTimePickerViewController.h"
+
+@interface DateTimePickerViewController ()
+
+@end
+
+@implementation DateTimePickerViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (id)initWithRect:(CGRect)rect
+{
+    self = [super initWithNibName:nil bundle:nil];
+    if (self) {
+        // Custom initialization
+        myrect = rect;
+    }
+    return self;
+}
+
+
+- (void)loadView
+{
+    // If you create your views manually, you MUST override this method and use it to create your views.
+    // If you use Interface Builder to create your views, then you must NOT override this method.
+    UIView* v = [[UIView alloc] initWithFrame:myrect];
+    v.autoresizesSubviews = YES;
+    v.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    v.backgroundColor = [UIColor colorWithWhite:0.5 alpha:0];
+    v.opaque = NO;
+    self.view = v;
+}
+
+-(void)makeTransparencyBackground
+{
+    self.view.backgroundColor = [UIColor colorWithWhite:0.5 alpha:0];
+    [self.view setNeedsDisplay];
+}
+
+-(void)makeGrayBacground
+{
+    self.view.backgroundColor = [UIColor colorWithWhite:0.5 alpha:0.4];
+    [self.view setNeedsDisplay];
+}
+
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+	// Do any additional setup after loading the view, typically from a nib.
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+}
+
+
+@end

data/platform/iphone/Classes/GeoLocation/LocationController.h

@@ -29,20 +29,24 @@
 @interface LocationController : NSObject<CLLocationManagerDelegate> {
 	CLLocationManager* _locationManager;
 	CFRunLoopTimerRef  _timer;
+    
+    bool isErrorState;
 	
 @public	
 	double _dLatitude, _dLongitude, _dAccuracy;
 	bool _bKnownPosition;
 	
-	SEL onUpdateLocation;	
+	//SEL onUpdateLocation;	
 }
 
 @property (nonatomic, retain) CLLocationManager *_locationManager;
 @property (assign) SEL onUpdateLocation;
 
-- (void) initLocationManager;
+- (void) initLocationManager:(NSObject*)param;
 - (void)  stop; 
 
+- (void)doUpdateLocation;
+
 - (double) getLatitude;
 - (double) getLongitude;
 - (double) getAccuracy;