rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/android/build/android.rake

@@ -179,6 +179,7 @@ namespace "config" do
     $rho_android_r = File.join $androidpath, "Rhodes", "src", "com", "rhomobile", "rhodes", "AndroidR.java"
     $app_android_r = File.join $tmpdir, "AndroidR.java"
     $app_rjava_dir = File.join $tmpdir
+    $app_native_libs_java = File.join $tmpdir, "NativeLibraries.java"
 
     if RUBY_PLATFORM =~ /(win|w)32$/
       $emulator = #"cmd /c " + 
@@ -406,16 +407,17 @@ namespace "build" do
       File.open(File.join(assets, "name"), "w") { |f| f.write($appname) }
     end
 
-    task :extensions => "config:android" do
+    task :extensions => :genconfig do
 
       ENV['RHO_PLATFORM'] = 'android'
       ENV["ANDROID_NDK"] = $androidndkpath
       ENV["ANDROID_API_LEVEL"] = ANDROID_API_LEVEL.to_s
       ENV["TARGET_TEMP_DIR"] = $extensionsdir
-      ENV["RHODES_ROOT_DIR"] = $startdir
+      ENV["RHO_ROOT"] = $startdir
       ENV["BUILD_DIR"] ||= $startdir + "/platform/android/build"
+      ENV["RHO_INC"] = $appincdir
 
-      mkdir_p $bindir + "/libs/" + $confdir + "/extensions" unless File.exist? $bindir + "/libs/" + $confdir + "/extensions"
+      mkdir_p $extensionsdir unless File.directory? $extensionsdir
 
       $app_config["extensions"].each do |ext|
         $app_config["extpaths"].each do |p|
@@ -488,7 +490,7 @@ namespace "build" do
         cc_compile f, objdir, args or exit 1
       end
 
-      cc_ar libname, Dir.glob(objdir + "/**/*.o") + Dir.glob($extensionsdir + "/*.a") or exit 1
+      cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
     task :libjson => "config:android" do
@@ -699,9 +701,28 @@ namespace "build" do
         puts "No need to regenerate rhocaps.inc"
         $stdout.flush
       end
-   end
+    end
+
+    task :gen_java_ext => "config:android" do
+      File.open($app_native_libs_java, "w") do |f|
+        f.puts "package com.rhomobile.rhodes;"
+        f.puts "public class NativeLibraries {"
+        f.puts "  public static void load() {"
+        f.puts "    // Load native .so libraries"
+        Dir.glob($extensionsdir + "/lib*.so").each do |lib|
+          libname = File.basename(lib).gsub(/^lib/, '').gsub(/\.so$/, '')
+          f.puts "    System.loadLibrary(\"#{libname}\");"
+        end
+        f.puts "    // Load native implementation of rhodes"
+        f.puts "    System.loadLibrary(\"rhodes\");"
+        f.puts "  }"
+        f.puts "};"
+      end
+    end
+
+    task :gensources => [:genconfig, :gen_java_ext]
 
-    task :librhodes => [:libs, :genconfig] do
+    task :librhodes => [:libs, :gensources] do
       srcdir = File.join $androidpath, "Rhodes", "jni", "src"
       objdir = File.join $bindir, "libs", $confdir, "librhodes"
       libname = File.join $bindir, "libs", $confdir, "librhodes.so"
@@ -731,24 +752,30 @@ namespace "build" do
       args << "-L#{$rhobindir}/#{$confdir}"
       args << "-L#{$bindir}/libs/#{$confdir}"
       args << "-L#{$extensionsdir}"
-      args << "-lrhomain"
-      args << "-lruby"
-      args << "-lrhosync"
-      args << "-lrhodb"
-      args << "-lrholog"
-      args << "-lrhocommon"
-      args << "-ljson"
-      args << "-lstlport" if USE_STLPORT
-      args << "-lcurl"
-      args << "-lrhocommon" # Need to specify twice because libcurl depends on librhocommon and vice versa
-      args << "-lsqlite"
-      args << "-llog"
-      args << "-ldl"
-      args << "-lz"
 
+      rlibs = []
+      rlibs << "rhomain"
+      rlibs << "ruby"
+      rlibs << "rhosync"
+      rlibs << "rhodb"
+      rlibs << "rholog"
+      rlibs << "rhocommon"
+      rlibs << "json"
+      rlibs << "stlport" if USE_STLPORT
+      rlibs << "curl"
+      rlibs << "sqlite"
+      rlibs << "log"
+      rlibs << "dl"
+      rlibs << "z"
+
+      rlibs.map! { |x| "-l#{x}" }
+
+      args += rlibs
+
+      extlibs = Dir.glob($extensionsdir + "/lib*.a") + Dir.glob($extensionsdir + "/lib*.so")
       stub = []
-      Dir.glob($extensionsdir + "/*.a").reverse.each do |f|
-        lparam = "-l" + File.basename(f).gsub(/^lib/,"").gsub(/\.a$/,"")
+      extlibs.reverse.each do |f|
+        lparam = "-l" + File.basename(f).gsub(/^lib/,"").gsub(/\.(a|so)$/,"")
         args << lparam
         # Workaround for GNU ld: this way we have specified one lib multiple times
         # command line so ld's dependency mechanism will find required functions
@@ -759,6 +786,8 @@ namespace "build" do
         stub << lparam
       end
 
+      args += rlibs
+
   	  mkdir_p File.dirname(libname) unless File.directory? File.dirname(libname)
       cc_link libname, Dir.glob(objdir + "/**/*.o"), args, deps or exit 1
 
@@ -808,6 +837,14 @@ namespace "build" do
         end
       end
       lines << $app_android_r
+      lines << $app_native_libs_java
+      if File.exists? File.join($extensionsdir, "ext_build.files")
+        File.open(File.join($extensionsdir, "ext_build.files")) do |f|
+          while line = f.gets
+            lines << line
+          end
+        end
+      end
       File.open(newsrclist, "w") { |f| f.write lines.join("\n") }
       srclist = newsrclist
 
@@ -901,8 +938,16 @@ namespace "package" do
     rm_rf File.join($tmpdir, "lib")
     mkdir_p File.join($tmpdir, "lib/armeabi")
     cp_r File.join($bindir, "libs", $confdir, "librhodes.so"), File.join($tmpdir, "lib/armeabi")
-    cc_run($stripbin, [$tmpdir + "/lib/armeabi/librhodes.so"])
-    args = ["add", resourcepkg, "lib/armeabi/librhodes.so"]
+    # Add extensions .so libraries
+    Dir.glob($extensionsdir + "/lib*.so").each do |lib|
+      cp_r lib, File.join($tmpdir, "lib/armeabi")
+    end
+    args = ["add", resourcepkg]
+    # Strip them all to decrease size
+    Dir.glob($tmpdir + "/lib/armeabi/lib*.so").each do |lib|
+      cc_run($stripbin, [lib])
+      args << "lib/armeabi/#{File.basename(lib)}"
+    end
     puts Jake.run($aapt, args, $tmpdir)
     err = $?
     rm_rf $tmpdir + "/lib"

data/platform/android/build/androidcommon.rb

@@ -16,15 +16,20 @@ else
 end
 
 def setup_ndk(ndkpath,apilevel)
-  $ndkgccver = "4.2.1"
-  $ndktools = ndkpath + "/build/prebuilt/#{$ndkhost}/arm-eabi-#{$ndkgccver}"
-  $ndksysroot = ndkpath + "/build/platforms/android-#{apilevel}/arch-arm"
-
-  $gccbin = $ndktools + "/bin/arm-eabi-gcc" + $exe_ext
-  $gppbin = $ndktools + "/bin/arm-eabi-g++" + $exe_ext
-  $arbin = $ndktools + "/bin/arm-eabi-ar" + $exe_ext
-  $ranlib = $ndktools + "/bin/arm-eabi-ranlib" + $exe_ext
-  $stripbin = $ndktools + "/bin/arm-eabi-strip" + $exe_ext
+  $ndkgccver = "unknown"
+  ["4.4.0", "4.2.1"].each do |ver|
+    tools = File.join(ndkpath, "build/prebuilt", $ndkhost, "arm-eabi-#{ver}")
+    next unless File.directory? tools
+    $ndkgccver = ver
+    $ndktools = tools
+    break
+  end
+  $ndksysroot = File.join(ndkpath, "build/platforms/android-#{apilevel}/arch-arm")
+
+  ['gcc', 'g++', 'ar', 'strip', 'objdump'].each do |tool|
+    name = tool.gsub('+', 'p')
+    eval "$#{name}bin = $ndktools + '/bin/arm-eabi-#{tool}' + $exe_ext"
+  end
 end
 
 def cc_def_args
@@ -163,13 +168,13 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   args << outname
   args += objects
   args += additional if additional.is_a? Array and not additional.empty?
+  args << "-L#{$ndksysroot}/usr/lib"
+  args << "-Wl,-rpath-link=#{$ndksysroot}/usr/lib"
   args << "#{$ndksysroot}/usr/lib/libstdc++.so"
   args << "#{$ndksysroot}/usr/lib/libsupc++.so" unless USE_STLPORT
+  args << "#{$ndktools}/lib/gcc/arm-eabi/#{$ndkgccver}/libgcc.a"
   args << "#{$ndksysroot}/usr/lib/libc.so"
   args << "#{$ndksysroot}/usr/lib/libm.so"
-  args << "-L#{$ndksysroot}/usr/lib"
-  args << "-Wl,-rpath-link=#{$ndksysroot}/usr/lib"
-  args << "#{$ndktools}/lib/gcc/arm-eabi/#{$ndkgccver}/interwork/libgcc.a"
   cc_run($gccbin, args)
 end
 

data/platform/bb/build/bb.rake

@@ -128,7 +128,7 @@ namespace "config" do
     $preverified = $app_path + "/preverified"
     $targetdir = $bindir + "/target/" + $bbver
     $rubyVMdir = $app_path + "/RubyVM"
-    $excludelib = ['**/rational.rb','**/rhoframework.rb','**/dateOrig.rb']
+    $excludelib = ['**/rational.rb','**/dateOrig.rb']
     $excludeextlib = ['rexml/parsers/baseparser.rb', 'rexml/set.rb']
     $compileERB = $app_path + "/build/compileERB.rb"
     $tmpdir =  $bindir +"/tmp"
@@ -225,6 +225,26 @@ namespace "build" do
       cp $app_path+"/rhoconfig.txt", sdcardpath if File.exists? sdcardpath
     end
 
+    def create_jarmanifest
+      mf = File.join($builddir, "MANIFEST.MF")
+      puts "mf: #{mf}"
+      f = File.new(mf, "w")
+
+      f.write "Manifest-Version: 1.0\n"
+      f.write "MIDlet-Vendor: <unknown>\n"
+      f.write "MIDlet-Version: 1.40\n"
+      f.write "MicroEdition-Configuration: CLDC-1.1\n"
+      f.write "MIDlet-1: ,resources/icon.png,\n"
+      f.write "Created-By: 1.6.0_02 (Sun Microsystems Inc.)\n"
+      f.write "MIDlet-Jar-URL: rhodes.jar\n"
+      f.write "MIDlet-Name: rhodes\n"
+      f.write "MicroEdition-Profile: MIDP-2.0\n"
+      f.write "MIDlet-Jar-Size: 0\n"
+      f.write "RIM-MIDlet-Flags-1: 1\n" if $service_enabled
+      f.close
+    
+    end
+    
     task :gensources => "config:bb" do
       caps = $app_config["capabilities"]
       caps = [] if caps.nil?
@@ -233,26 +253,8 @@ namespace "build" do
       has_push = caps.index("push") != nil
 
       $service_enabled = has_push
-
-      puts "Modify MANIFEST.MF"
-      $stdout.flush
-      mf = File.join($builddir, "MANIFEST.MF")
-      tmpmf = File.join($builddir, "MANIFEST.MF.new")
-      File.open(tmpmf, "w") do |nf|
-        File.open(mf, "r") do |f|
-          while line = f.gets
-            if line =~ /^\s*RIM-MIDlet-Flags-1\s*:/
-              nf.puts "RIM-MIDlet-Flags-1: 1" if has_push
-            else
-              nf.puts line
-            end
-          end
-        end
-      end
-      rm mf
-      cp tmpmf, mf
-      rm tmpmf
-
+      create_jarmanifest()
+        
       puts "Modify Capabilities.java"
       $stdout.flush
       capabilities = File.join($builddir, "..", "..", "..", "platform", "shared", "rubyJVM", "src", "com", "rho", "Capabilities.java")

data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java

@@ -197,13 +197,16 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
                 	
                     synchronized (Application.getEventLock()) 
                     {
-                    	if ( m_oMainScreen.getFieldCount() > 0 )
+                    	m_oMainScreen.deleteAll();
+                    	m_oMainScreen.add(field);
+                    	
+                    	/*if ( m_oMainScreen.getFieldCount() > 0 )
                     	{
 	                    	Field old = m_oMainScreen.getField(0);
 	                    	m_oMainScreen.add(field);
 	                    	m_oMainScreen.delete(old);
                     	}else
-                    		m_oMainScreen.add(field);
+                    		m_oMainScreen.add(field);*/
 /*                        
                         _mainScreen.doPaint();
                         if ( e == null )

data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java

@@ -66,7 +66,7 @@ public class RhoRubyHelper implements IRhoRubyHelper {
         RubyProgram p = (RubyProgram) o;
 		
 		return p;*/
-		return new xruby.ServeME.main();
+		return new xruby.rhoframework.main();
 	}
 
 	public String getPlatform() {
@@ -184,6 +184,11 @@ public class RhoRubyHelper implements IRhoRubyHelper {
 			return new Jsr75RAFileImpl();
 	}
 
+	public IRAFile createFSRAFile()
+	{
+		return new Jsr75RAFileImpl();
+	}
+	
 	public String getGeoLocationText()
 	{
 		return GeoLocation.getGeoLocationText();

data/platform/bb/rhodes/src/com/rho/rubyext/System.java

@@ -126,7 +126,9 @@ public class System {
     	if ( strPropName.equalsIgnoreCase("has_network") )
     		return ObjectFactory.createBoolean(hasNetwork()); 
     	if ( strPropName.equalsIgnoreCase("locale") )
-    		return ObjectFactory.createString(getLocale()); 
+    		return ObjectFactory.createString(getLocale());
+    	if ( strPropName.equalsIgnoreCase("country") )
+    		return ObjectFactory.createString(getCountry());
     	if ( strPropName.equalsIgnoreCase("screen_width") )
     		return ObjectFactory.createInteger(getScreenWidth()); 
     	if ( strPropName.equalsIgnoreCase("screen_height") )
@@ -159,6 +161,12 @@ public class System {
 		return lang;
 	}
 	
+	private static String getCountry() {
+		Locale loc = Locale.getDefault();
+		String country = loc != null ? loc.getCountry() : "US";
+		return country;
+	}
+	
 	public static boolean hasCamera() 
 	{
 		return DeviceInfo.hasCamera();

data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java

@@ -2,6 +2,7 @@ package com.rho.rubyext;
 
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
+import com.rho.RhodesApp;
 import com.xruby.runtime.builtin.*;
 import com.xruby.runtime.lang.*;
 import rhomobile.RhodesApplication;
@@ -43,17 +44,31 @@ public class WebView
 				}
 			}
 		});
-		klass.getSingletonClass().defineMethod("current_location", new RubyNoArgMethod() {
+		klass.getSingletonClass().defineMethod("current_location", new RubyNoOrOneArgMethod() {
 			protected RubyValue run(RubyValue receiver, RubyBlock block) 
 			{
 				try {
-					String url = RhodesApplication.getInstance().getCurrentPageUrl();
+					String url = RhodesApp.getInstance().getCurrentUrl(0); 
+						//RhodesApplication.getInstance().getCurrentPageUrl();
 					return ObjectFactory.createString(url);
 				} catch(Exception e) {
 					LOG.ERROR("current_location failed.", e);
 					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 				}
 			}
+			protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block) 
+			{
+				try {
+					int nIndex = arg.toInt();
+					String url = RhodesApp.getInstance().getCurrentUrl(nIndex); 
+						//RhodesApplication.getInstance().getCurrentPageUrl();
+					return ObjectFactory.createString(url);
+				} catch(Exception e) {
+					LOG.ERROR("current_location failed.", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+			
 		});		
 		klass.getSingletonClass().defineMethod("set_menu_items", new RubyOneArgMethod() {
 			protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyBlock block) 
@@ -95,6 +110,20 @@ public class WebView
 		 		return ObjectFactory.createInteger(0);
 		 	}
 		});
+		klass.getSingletonClass().defineMethod("set_cookie", new RubyTwoArgMethod() {
+			protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyValue arg2, RubyBlock block) {
+				try {
+					String url = arg1.toString();
+					String cookie = arg2.toString();
+					RhodesApplication.getInstance().setCookie(url, cookie);
+					return RubyConstant.QNIL;
+				}
+				catch (Exception e) {
+					LOG.ERROR("set_cookie failed.", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
 	}
 	
 }

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

@@ -62,6 +62,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
 	public static final String LABEL_LOG = "Log";
 	public static final String LABEL_SEPARATOR = "separator";
 	public static final String LABEL_CLOSE = "Close";
+	public static final String LABEL_EXIT = "Exit";
 	public static final String LABEL_NONE = "none";
 	
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
@@ -780,7 +781,8 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	    } else if (label.equalsIgnoreCase(RhodesApplication.LABEL_SEPARATOR) || 
     	    		   (value != null && value.equalsIgnoreCase(RhodesApplication.LABEL_SEPARATOR))) {
     	    	menuItems.addElement(separatorItem);
-    	    } else if (value.equalsIgnoreCase(RhodesApplication.LABEL_CLOSE)) {
+    	    } else if (value.equalsIgnoreCase(RhodesApplication.LABEL_CLOSE) ||
+    	    		value.equalsIgnoreCase(RhodesApplication.LABEL_EXIT)) {
     	    	setDefaultItemToMenuItems(label, closeItem);
     	    } else if (label.equalsIgnoreCase(RhodesApplication.LABEL_NONE)) {
     	    	menuItems = null;
@@ -990,6 +992,19 @@ final public class RhodesApplication extends UiApplication implements SystemList
         } );
     }
     
+    private Hashtable cookies = new Hashtable();
+    
+    public String getCookie(String url) {
+    	Object c = cookies.get(url);
+    	if (c instanceof String)
+    		return (String)c;
+    	return null;
+    }
+    
+    public void setCookie(String url, String cookie) {
+    	cookies.put(url, cookie);
+    }
+    
     private void createBrowserControl()
     {
     	//touch;5
@@ -1086,11 +1101,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
     }
 
     public void refreshCurrentPage(){
-		navigateUrl(getCurrentPageUrl());
-    }
-
-    public String getCurrentPageUrl(){
-    	return (String)_history.lastElement();
+		navigateUrl((String)_history.lastElement());
     }
 
     void navigateHome(){

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

@@ -58,6 +58,12 @@ public class Utilities {
 						&& !StringUtilities.startsWithIgnoreCase(url, "https:")) {
 					sendReferrer = false;
 				}
+				
+				// Set cookie
+				String cookie = RhodesApplication.getInstance().getCookie(url);
+				if (cookie != null) {
+					conn.setRequestProperty("Cookie", cookie);
+				}
 
 				int size = requestHeaders.size();
 				for (int i = 0; i < size;) {

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

@@ -213,6 +213,12 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
         {*resValue = rho_ruby_create_string("APPLE"); return 1;}
     else if (strcasecmp("locale", szPropName) == 0)
         {*resValue = rho_sys_get_locale(); return 1; }
+    else if (strcasecmp("country", szPropName) == 0) {
+        NSLocale *locale = [NSLocale currentLocale];
+        NSString *cl = [locale objectForKey:NSLocaleCountryCode];
+        *resValue = rho_ruby_create_string([cl UTF8String]);
+        return 1;
+    }
     else if (strcasecmp("screen_width", szPropName) == 0)
         {*resValue = rho_ruby_create_integer(rho_sys_get_screen_width()); return 1; }
     else if (strcasecmp("screen_height", szPropName) == 0)
@@ -235,10 +241,16 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
         
         return 1;
     }
-    else if (strcasecmp("device_name", szPropName) == 0) 
-    { *resValue = rho_ruby_create_string([[[UIDevice currentDevice] systemName] UTF8String]);  return 1; }
-    else if (strcasecmp("os_version", szPropName) == 0) 
-    { *resValue = rho_ruby_create_string([[[UIDevice currentDevice] systemVersion] UTF8String]);  return 1; }
+    else if (strcasecmp("device_name", szPropName) == 0) {
+        NSString *model = [[UIDevice currentDevice] model];
+        *resValue = rho_ruby_create_string([model UTF8String]);
+        return 1;
+    }
+    else if (strcasecmp("os_version", szPropName) == 0) {
+        NSString *version = [[UIDevice currentDevice] systemVersion];
+        *resValue = rho_ruby_create_string([version UTF8String]);
+        return 1;
+    }
     /*
     // Removed because it's possibly dangerous: Apple could reject application
     // used such approach from its AppStore

data/platform/iphone/Classes/DateTime.h

@@ -10,13 +10,12 @@
 
 
 @interface DateTime : NSObject {
-
 @private
-	NSString* url;
-	NSString* title;
-	long	  initialTime;
-	int		  format;
-	NSString* data;
+    NSString* url;
+    NSString* title;
+    long	  initialTime;
+    int		  format;
+    NSString* data;
 }
 
 @property (nonatomic, retain) NSString* url;

data/platform/iphone/Classes/DateTimePicker.m

@@ -6,30 +6,16 @@
 //  Copyright 2010 __MyCompanyName__. All rights reserved.
 //
 
-#import "DateTimePicker.h"
 #import "DateTime.h"
 #import "Rhodes.h"
 
-@implementation DateTimePicker
-
-+ (void)chooseDateTime:(NSString*)url title:(NSString*)title initialTime:(long)initial_time
-                format:(int)format data:(NSString*)data {
+void choose_datetime(char* callback, char* title, long initial_time, int format, char* data) {
     DateTime* dateTime = [[DateTime alloc] init];
-    dateTime.url = url;
-    dateTime.title = title;
+    dateTime.url = [NSString stringWithUTF8String:callback];
+    dateTime.title = [NSString stringWithUTF8String:title];
     dateTime.initialTime = initial_time;
     dateTime.format = format;
-    dateTime.data = data;
+    dateTime.data = [NSString stringWithUTF8String:data];
     [[Rhodes sharedInstance] performSelectorOnMainThread:@selector(chooseDateTime:) withObject:dateTime waitUntilDone:YES];
     [dateTime release];
-}
-
-@end
-
-void choose_datetime(char* callback, char* title, long initial_time, int format, char* data) {
-	[DateTimePicker chooseDateTime:[NSString stringWithUTF8String:callback] 
-                              title:[NSString stringWithUTF8String:title]
-                        initialTime:initial_time 
-                             format:format
-                               data:[NSString stringWithUTF8String:data]];
 }

data/platform/iphone/Classes/DateTimePickerDelegate.h

@@ -14,23 +14,21 @@
 @interface DateTimePickerDelegate : RhoDelegate <UIPickerViewDelegate>
 {
 @private
-	UIDatePicker *pickerView;
-	UIWindow *mainWindow;
-	UIToolbar *toolbar;
-	UILabel *barLabel;
-	DateTime *dateTime;
-	NSDateFormatter *dateFormatter;
+    UIDatePicker *pickerView;
+    UIView *parentView;
+    UIToolbar *toolbar;
+    UILabel *barLabel;
+    DateTime *dateTime;
 }
 
 @property (nonatomic, retain) DateTime *dateTime;
 @property (nonatomic, retain) UIDatePicker *pickerView;
-@property (nonatomic, retain) UIWindow *mainWindow;
+@property (nonatomic, retain) UIView *parentView;
 @property (nonatomic, retain) UIToolbar *toolbar;
 @property (nonatomic, retain) UILabel *barLabel;
-@property (nonatomic, retain) NSDateFormatter *dateFormatter; 
 
 - (IBAction)dateAction:(id)sender;
 - (IBAction)cancelAction:(id)sender;
-- (void)createPicker:(UIWindow*)window;
+- (void)createPicker:(UIView*)parent;
 
 @end