rhodes 3.3.1 → 3.3.2.beta.1

data/installer/rhostudio.nsi

@@ -78,6 +78,14 @@ section
     # point the new shortcut at the program uninstaller
     createShortCut "$SMPROGRAMS\RhoStudio\Uninstall RhoStudio.lnk" "$INSTDIR\uninstall.exe"
     createShortCut "$SMPROGRAMS\RhoStudio\RhoStudio.lnk" "$INSTDIR\eclipse\RhoStudio.exe"
+
+    # added information in 'unistall programs' in contorol panel
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+                 "DisplayName" "RhoStudio - RAD tool for develop and debug rhodes/rhoconnect applications"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+                 "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+                 "DisplayIcon" "$\"$INSTDIR\uninstall.exe$\""
     
     Goto okFinishSection
     
@@ -120,11 +128,12 @@ section "uninstall"
     Push "PATH" 
     Push "R" 
     Push "HKLM" 
-    Push "$INSTDIR\redis-2.2.2"
+    Push "$INSTDIR\redis-2.4.0"
     Call un.EnvVarUpdate
     Pop $R0
 
     DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" REDIS_HOME
+    DeleteRegKey HKLM  "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio"
 
     # remove $INSTDIR
     RMDir /r /REBOOTOK $INSTDIR
@@ -212,21 +221,21 @@ Section "Redis" redisSection
  
   SetOutPath $INSTDIR
  
-  File /r "redis-2.2.2"
+  File /r "redis-2.4.0"
  
   ;add to path here
 
   Push "PATH" 
   Push "P" 
   Push "HKLM" 
-  Push "$INSTDIR\redis-2.2.2"
+  Push "$INSTDIR\redis-2.4.0"
   Call EnvVarUpdate
   Pop $R0
 
   Push "REDIS_HOME" 
   Push "P" 
   Push "HKLM" 
-  Push "$INSTDIR\redis-2.2.2"
+  Push "$INSTDIR\redis-2.4.0"
   Call EnvVarUpdate
   Pop $R0
 

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/barcode.m

@@ -25,6 +25,9 @@ void rho_barcode_take_barcode(const char* callback, VALUE options) {
 
 
 const char* rho_barcode_barcode_recognize(const char* filename) {
+
+   //NSLog(@"$$$$$$$$$$$$$$$$$$$$  Barcode File : %@: ", [NSString stringWithUTF8String:filename]);
+
     void* img_buf = 0;
     int img_width;
     int img_height;	

data/lib/framework/rho/rhoapplication.rb

@@ -176,6 +176,10 @@ module Rho
         Rho::RhoFSConnector::get_base_app_path
       end
 
+      def get_user_path
+          Rho::RhoFSConnector::get_user_path
+      end
+      
       def get_model_path(appname, modelname)
         Rho::RhoFSConnector::get_model_path(appname, modelname)
       end

data/lib/framework/rho/rhoevent.rb

@@ -35,9 +35,8 @@ end
 
 module Rho
 	module RhoEvent
-    # These values determined experimentally on iPhone
-    MIN_TIME = Time.utc(2008, 'jan', 1, 0, 0, 0)
-    MAX_TIME = Time.utc(2030, 'dec', 31, 23, 59, 59)
+    MIN_TIME = Time.utc(1900, 'jan', 1, 0, 0, 0)
+    MAX_TIME = Time.utc(2100, 'dec', 31, 23, 59, 59)
     
     #TODO: update examples    
     # Examples of how to use select method:

data/lib/framework/rho/rhoevent_c.rb

@@ -43,8 +43,8 @@ module Rho
         params['start_date'] = params['start_date'].to_time if !params['start_date'].nil? and !params['start_date'].is_a?(Time)
         params['end_date'] = params['end_date'].to_time if !params['end_date'].nil? and !params['end_date'].is_a?(Time)
         
-        params['start_date'] = MIN_TIME if params['start_date'].nil? or params['start_date'] < MIN_TIME
-        params['end_date'] = MAX_TIME if params['end_date'].nil? or params['end_date'] > MAX_TIME
+        params['start_date'] = MIN_TIME if params['start_date'].nil? #or params['start_date'] < MIN_TIME
+        params['end_date'] = MAX_TIME if params['end_date'].nil? #or params['end_date'] > MAX_TIME
         
         if params['start_date'] == MIN_TIME or params['end_date'] == MAX_TIME
           params['include_repeating'] = false

data/lib/framework/rho/rhofsconnector.rb

@@ -36,6 +36,14 @@ module Rho
       def get_base_app_path
         File.join(__rhoGetCurrentDir(), RHO_APPS_DIR)
       end
+
+      def get_user_path
+          if System::get_property('platform') == 'APPLE'
+                File.join(__rhoGetUserDir(), RHO_APPS_DIR)
+          else
+                File.join(__rhoGetCurrentDir(), RHO_APPS_DIR)
+          end
+      end
       
       def get_app_manifest_filename
         File.join(__rhoGetCurrentDir(), RHO_APPS_DIR + 'app_manifest.txt')
@@ -53,7 +61,12 @@ module Rho
 if defined?( RHODES_EMULATOR )                  
           File.join(__rhoGetCurrentDir(), RHO_EMULATOR_DIR + '/db/syncdb' + postfix + '.sqlite')
 else
-          File.join(__rhoGetCurrentDir(), 'db/syncdb' + postfix + '.sqlite')
+          if System::get_property('platform') == 'APPLE'
+                File.join(__rhoGetUserDir(), 'db/syncdb' + postfix + '.sqlite')
+          else
+                File.join(__rhoGetCurrentDir(), 'db/syncdb' + postfix + '.sqlite')
+          end
+          
 end          
       end
 
@@ -61,7 +74,12 @@ end
 if defined?( RHODES_EMULATOR )                        
         File.join(__rhoGetCurrentDir(), RHO_EMULATOR_DIR + '/db/db-files')
 else
-        File.join(__rhoGetCurrentDir(), 'db/db-files')
+          if System::get_property('platform') == 'APPLE'
+                return File.join(__rhoGetUserDir(), 'db/db-files')
+          else
+                return File.join(__rhoGetCurrentDir(), 'db/db-files')
+          end
+        
 end        
       end
 
@@ -71,7 +89,11 @@ end
 
       def get_blob_path(relative_path)
         cur_dir = __rhoGetCurrentDir()
+          if System::get_property('platform') == 'APPLE'
+                 cur_dir = __rhoGetUserDir()
+          end
 if defined?( RHODES_EMULATOR )
+        cur_dir = __rhoGetCurrentDir()
         cur_dir = File.join(cur_dir, RHO_EMULATOR_DIR)
 end
         if cur_dir && cur_dir.length()>0

data/lib/framework/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '3.3.0'
+    VERSION = '3.3.2'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '3.3.0'
+    VERSION = '3.3.2'
   end
   unless defined? RhodesFramework::DBVERSION
     DBVERSION = '2.2.2'

data/lib/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '3.3.0'
+    VERSION = '3.3.2'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/platform/android/Rhodes/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rhomobile.rhodes"
     android:installLocation="auto"
-    android:versionCode="36"
-    android:versionName="3.2.1">
+    android:versionCode="37"
+    android:versionName="3.3.2">
     
     <uses-sdk android:minSdkVersion="8" />
     
@@ -104,7 +104,7 @@
         <uses-library android:name="com.google.android.maps" />
         
     </application>
-    
+    <supports-screens android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java

@@ -11,8 +11,32 @@ public final class R {
     public static final class attr {
     }
     public static final class color {
-        public static final int sig_bkgColor=0x7f050000;
-        public static final int sig_penColor=0x7f050001;
+        public static final int contents_text=0x7f050000;
+        public static final int encode_view=0x7f050001;
+        public static final int help_button_view=0x7f050002;
+        public static final int help_view=0x7f050003;
+        public static final int possible_result_points=0x7f050004;
+        public static final int result_image_border=0x7f050005;
+        public static final int result_minor_text=0x7f050006;
+        public static final int result_points=0x7f050007;
+        public static final int result_text=0x7f050008;
+        public static final int result_view=0x7f050009;
+        public static final int sbc_header_text=0x7f05000a;
+        public static final int sbc_header_view=0x7f05000b;
+        public static final int sbc_layout_view=0x7f05000d;
+        public static final int sbc_list_item=0x7f05000c;
+        public static final int sbc_page_number_text=0x7f05000e;
+        public static final int sbc_snippet_text=0x7f05000f;
+        public static final int share_text=0x7f050010;
+        public static final int share_view=0x7f050011;
+        public static final int sig_bkgColor=0x7f050018;
+        public static final int sig_penColor=0x7f050019;
+        public static final int status_text=0x7f050013;
+        public static final int status_view=0x7f050012;
+        public static final int transparent=0x7f050014;
+        public static final int viewfinder_frame=0x7f050015;
+        public static final int viewfinder_laser=0x7f050016;
+        public static final int viewfinder_mask=0x7f050017;
     }
     public static final class drawable {
         public static final int alert_alert=0x7f020000;
@@ -20,108 +44,158 @@ public final class R {
         public static final int alert_question=0x7f020002;
         public static final int back=0x7f020003;
         public static final int callout=0x7f020004;
-        public static final int callout_link=0x7f020005;
-        public static final int camera=0x7f020006;
-        public static final int esri=0x7f020007;
-        public static final int exit=0x7f020008;
-        public static final int home=0x7f020009;
-        public static final int icon=0x7f02000a;
-        public static final int info=0x7f02000b;
-        public static final int marker=0x7f02000c;
-        public static final int next=0x7f02000d;
-        public static final int options=0x7f02000e;
-        public static final int refresh=0x7f02000f;
-        public static final int signature_cancel=0x7f020010;
-        public static final int signature_clear=0x7f020011;
-        public static final int signature_ok=0x7f020012;
-        public static final int sync=0x7f020013;
+        public static final int callout_a1=0x7f020005;
+        public static final int callout_a2=0x7f020006;
+        public static final int callout_a3=0x7f020007;
+        public static final int callout_b1=0x7f020008;
+        public static final int callout_b2=0x7f020009;
+        public static final int callout_b3=0x7f02000a;
+        public static final int callout_c1=0x7f02000b;
+        public static final int callout_c2=0x7f02000c;
+        public static final int callout_c3=0x7f02000d;
+        public static final int callout_d=0x7f02000e;
+        public static final int callout_link=0x7f02000f;
+        public static final int camera=0x7f020010;
+        public static final int cancel_icon=0x7f020011;
+        public static final int esri=0x7f020012;
+        public static final int exit=0x7f020013;
+        public static final int google=0x7f020014;
+        public static final int home=0x7f020015;
+        public static final int icon=0x7f020016;
+        public static final int info=0x7f020017;
+        public static final int location=0x7f020018;
+        public static final int marker=0x7f020019;
+        public static final int next=0x7f02001a;
+        public static final int ok_icon=0x7f02001b;
+        public static final int options=0x7f02001c;
+        public static final int refresh=0x7f02001d;
+        public static final int retake_icon=0x7f02001e;
+        public static final int signature_cancel=0x7f02001f;
+        public static final int signature_clear=0x7f020020;
+        public static final int signature_ok=0x7f020021;
+        public static final int sync=0x7f020022;
     }
     public static final class id {
-        public static final int LinearLayout01=0x7f08000a;
-        public static final int appIcon=0x7f080023;
-        public static final int buttonLayout=0x7f080010;
-        public static final int button_scan=0x7f080004;
-        public static final int cameraButton=0x7f080006;
-        public static final int cancelButton=0x7f08000c;
-        public static final int datePicker=0x7f080008;
-        public static final int datetime=0x7f080007;
-        public static final int excludeClasses=0x7f080016;
-        public static final int filesList=0x7f080012;
-        public static final int includeClasses=0x7f080015;
-        public static final int logcontent=0x7f08001a;
-        public static final int loglevel=0x7f080014;
-        public static final int logoptsCloseButton=0x7f080018;
-        public static final int logoptsSaveButton=0x7f080017;
-        public static final int logviewClearButton=0x7f08001c;
-        public static final int logviewCloseButton=0x7f08001e;
-        public static final int logviewRefreshButton=0x7f08001b;
-        public static final int logviewSendButton=0x7f08001d;
-        public static final int lookIn=0x7f08000f;
-        public static final int new_devices=0x7f080003;
-        public static final int okButton=0x7f08000b;
-        public static final int paired_devices=0x7f080001;
-        public static final int preview=0x7f080011;
-        public static final int progress_bar=0x7f080026;
-        public static final int progress_text=0x7f080024;
-        public static final int scrollview=0x7f080019;
-        public static final int sig_cancelButton=0x7f080020;
-        public static final int sig_clearButton=0x7f080021;
-        public static final int sig_okButton=0x7f080022;
-        public static final int signature_view=0x7f08001f;
-        public static final int surface=0x7f080005;
-        public static final int text=0x7f08000d;
-        public static final int text1=0x7f080013;
-        public static final int timePicker=0x7f080009;
-        public static final int title=0x7f080025;
-        public static final int title_new_devices=0x7f080002;
-        public static final int title_paired_devices=0x7f080000;
-        public static final int widget28=0x7f08000e;
+        public static final int LinearLayout01=0x7f060020;
+        public static final int appIcon=0x7f060039;
+        /**  Messages IDs 
+         */
+        public static final int auto_focus=0x7f060000;
+        public static final int barcode_image_view=0x7f060016;
+        public static final int buttonLayout=0x7f060026;
+        public static final int button_scan=0x7f060010;
+        public static final int cameraButton=0x7f060012;
+        public static final int cancelButton=0x7f060022;
+        public static final int cancel_button=0x7f060019;
+        public static final int cancel_button_a=0x7f06001c;
+        public static final int contents_text_view=0x7f060017;
+        public static final int datePicker=0x7f06001e;
+        public static final int datetime=0x7f06001d;
+        public static final int decode=0x7f060001;
+        public static final int decode_failed=0x7f060002;
+        public static final int decode_succeeded=0x7f060003;
+        public static final int encode_failed=0x7f060004;
+        public static final int encode_succeeded=0x7f060005;
+        public static final int excludeClasses=0x7f06002c;
+        public static final int filesList=0x7f060028;
+        public static final int includeClasses=0x7f06002b;
+        public static final int launch_product_query=0x7f060006;
+        public static final int logcontent=0x7f060030;
+        public static final int loglevel=0x7f06002a;
+        public static final int logoptsCloseButton=0x7f06002e;
+        public static final int logoptsSaveButton=0x7f06002d;
+        public static final int logviewClearButton=0x7f060032;
+        public static final int logviewCloseButton=0x7f060034;
+        public static final int logviewRefreshButton=0x7f060031;
+        public static final int logviewSendButton=0x7f060033;
+        public static final int lookIn=0x7f060025;
+        public static final int new_devices=0x7f06000f;
+        public static final int okButton=0x7f060021;
+        public static final int ok_button=0x7f06001b;
+        public static final int paired_devices=0x7f06000d;
+        public static final int preview=0x7f060027;
+        public static final int preview_view=0x7f060013;
+        public static final int progress_bar=0x7f06003c;
+        public static final int progress_text=0x7f06003a;
+        public static final int quit=0x7f060007;
+        public static final int restart_preview=0x7f060008;
+        public static final int result_button_view=0x7f060018;
+        public static final int result_view=0x7f060015;
+        public static final int retake_button=0x7f06001a;
+        public static final int return_scan_result=0x7f060009;
+        public static final int scrollview=0x7f06002f;
+        public static final int search_book_contents_failed=0x7f06000a;
+        public static final int search_book_contents_succeeded=0x7f06000b;
+        public static final int sig_cancelButton=0x7f060036;
+        public static final int sig_clearButton=0x7f060037;
+        public static final int sig_okButton=0x7f060038;
+        public static final int signature_view=0x7f060035;
+        public static final int surface=0x7f060011;
+        public static final int text=0x7f060023;
+        public static final int text1=0x7f060029;
+        public static final int timePicker=0x7f06001f;
+        public static final int title=0x7f06003b;
+        public static final int title_new_devices=0x7f06000e;
+        public static final int title_paired_devices=0x7f06000c;
+        public static final int viewfinder_view=0x7f060014;
+        public static final int widget28=0x7f060024;
     }
     public static final class layout {
         public static final int bt_device_list=0x7f030000;
         public static final int bt_device_name=0x7f030001;
         public static final int camera=0x7f030002;
-        public static final int datetime=0x7f030003;
-        public static final int dialog_activity=0x7f030004;
-        public static final int directory_list=0x7f030005;
-        public static final int file_row=0x7f030006;
-        public static final int logoptions=0x7f030007;
-        public static final int logview=0x7f030008;
-        public static final int signature=0x7f030009;
-        public static final int status_bar_ongoing_event_progress_bar=0x7f03000a;
+        public static final int capture=0x7f030003;
+        public static final int datetime=0x7f030004;
+        public static final int dialog_activity=0x7f030005;
+        public static final int directory_list=0x7f030006;
+        public static final int file_row=0x7f030007;
+        public static final int logoptions=0x7f030008;
+        public static final int logview=0x7f030009;
+        public static final int signature=0x7f03000a;
+        public static final int status_bar_ongoing_event_progress_bar=0x7f03000b;
     }
     public static final class menu {
-        public static final int options=0x7f070000;
+        public static final int options=0x7f090000;
+    }
+    public static final class raw {
+        public static final int beep=0x7f040000;
     }
     public static final class string {
-        public static final int about=0x7f040006;
-        public static final int about_rhodes=0x7f04000e;
-        public static final int app_name=0x7f040000;
-        public static final int back=0x7f040004;
-        public static final int button_scan=0x7f040017;
-        public static final int cancel=0x7f040010;
-        public static final int exit=0x7f040007;
-        public static final int forward=0x7f040003;
-        public static final int home=0x7f040001;
-        public static final int logoptions=0x7f04000b;
-        public static final int logview=0x7f04000a;
-        public static final int navigation=0x7f040005;
-        public static final int no_files=0x7f04000c;
-        public static final int none_found=0x7f040014;
-        public static final int none_paired=0x7f040013;
-        public static final int ok=0x7f04000f;
-        public static final int options=0x7f040009;
-        public static final int refresh=0x7f040002;
+        public static final int about=0x7f070006;
+        public static final int about_rhodes=0x7f07000e;
+        public static final int app_name=0x7f070000;
+        public static final int back=0x7f070004;
+        public static final int button_scan=0x7f070017;
+        public static final int cancel=0x7f070010;
+        public static final int exit=0x7f070007;
+        public static final int forward=0x7f070003;
+        public static final int home=0x7f070001;
+        public static final int logoptions=0x7f07000b;
+        public static final int logview=0x7f07000a;
+        public static final int navigation=0x7f070005;
+        public static final int no_files=0x7f07000c;
+        public static final int none_found=0x7f070014;
+        public static final int none_paired=0x7f070013;
+        public static final int ok=0x7f07000f;
+        public static final int options=0x7f070009;
+        public static final int refresh=0x7f070002;
         /**   RhoBluetoothDeviceListActivity 
          */
-        public static final int scanning=0x7f040011;
-        public static final int select_device=0x7f040012;
-        public static final int sync=0x7f040008;
-        public static final int title_other_devices=0x7f040016;
-        public static final int title_paired_devices=0x7f040015;
-        public static final int to_top=0x7f04000d;
+        public static final int scanning=0x7f070011;
+        public static final int select_device=0x7f070012;
+        public static final int sync=0x7f070008;
+        public static final int title_other_devices=0x7f070016;
+        public static final int title_paired_devices=0x7f070015;
+        public static final int to_top=0x7f07000d;
     }
     public static final class style {
-        public static final int PopupTheme=0x7f060000;
+        public static final int PopupTheme=0x7f080000;
     }
+    public static final class styleable {
+        /** Attributes that can be used with a ViewfinderView.
+         */
+        public static final int[] ViewfinderView = {
+            
+        };
+    };
 }