rhodes 3.4.2 → 3.5.1.12

data/platform/shared/qt/rhodes/impl/WebViewImpl.cpp

@@ -111,4 +111,16 @@ void rho_webview_set_cookie(const char *url, const char *cookie)
     CMainWindow::getInstance()->setCookie(url, cookie);
 }
 
+void rho_webview_save(const char* format, const char* path, int tab_index)
+{
+    RAWLOG_ERROR("rho_webview_save is not implemented");
+}
+    
+VALUE rho_webview_get_current_url(int tab_index)
+{
+    RAWLOG_ERROR("rho_webview_get_current_url is not implemented");
+    return rho_ruby_get_NIL();
+}
+   
+
 } //extern "C"

data/platform/shared/qt/rhodes/main.cpp

@@ -203,13 +203,6 @@ int main(int argc, char *argv[])
 
     RHODESAPP().startApp();
 
-#ifdef RHODES_EMULATOR
-    int width = RHOSIMCONF().getInt("screen_width");
-    int height = RHOSIMCONF().getInt("screen_height");
-    if ((width>0) && (height>0))
-        m_appWindow->setSize(width, height);
-#endif
-
     // Navigate to the "loading..." page
     m_appWindow->navigate(L"about:blank", -1);
 

data/platform/shared/ruby/encoding.c

@@ -1159,7 +1159,11 @@ enc_set_filesystem_encoding(void)
     idx = rb_enc_to_index(rb_default_external_encoding());
 #elif defined _WIN32 || defined __CYGWIN__
     char cp[sizeof(int) * 8 / 3 + 4];
+
+#if !defined(_WP8_LIB)
     snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
+#endif 
+
     idx = rb_enc_find_index(cp);
     if (idx < 0) idx = rb_ascii8bit_encindex();
 #else

data/platform/shared/ruby/ext/calendar/calendar.i

@@ -10,6 +10,8 @@ extern const char* event_save(VALUE event);
 #define save event_save
 extern void event_delete(const char *id);
 #define delete event_delete
+
+extern const char* calendar_get_authorization_status(void);
 %}
 
 %typemap(check) VALUE {
@@ -26,3 +28,4 @@ extern const char* save(VALUE event);
 
 extern void delete(const char *id);
 
+extern const char* calendar_get_authorization_status(void);

data/platform/shared/ruby/ext/calendar/calendar_wrap.c

@@ -1836,6 +1836,8 @@ extern const char* event_save(VALUE event);
 extern void event_delete(const char *id);
 #define delete event_delete
 
+extern const char* calendar_get_authorization_status(void);
+
 
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor(void)
@@ -2007,6 +2009,22 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_calendar_get_authorization_status(int argc, VALUE *argv, VALUE self) {
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (char *)calendar_get_authorization_status();
+  vresult = SWIG_FromCharPtr((const char *)result);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2318,5 +2336,6 @@ SWIGEXPORT void Init_Calendar(void) {
   rb_define_module_function(mCalendar, "fetch_by_id", _wrap_fetch_by_id, -1);
   rb_define_module_function(mCalendar, "save", _wrap_save, -1);
   rb_define_module_function(mCalendar, "delete", _wrap_delete, -1);
+  rb_define_module_function(mCalendar, "calendar_get_authorization_status", _wrap_calendar_get_authorization_status, -1);
 }
 

data/platform/shared/ruby/ext/camera/camera.i

@@ -7,6 +7,7 @@ extern void take_picture(char* callback_url, rho_param *options_hash);
 extern void choose_picture(char* callback_url, rho_param *options_hash);
 
 extern VALUE get_camera_info(const char* camera_type);
+extern void save_image_to_device_gallery(const char* image_path, rho_param* options_hash);
 
 %}
 
@@ -27,3 +28,4 @@ extern void take_picture(char* callback_url, rho_param *options_hash );
 extern void choose_picture(char* callback_url, rho_param *options_hash);
 
 extern VALUE get_camera_info(const char* camera_type);
+extern void save_image_to_device_gallery(const char* image_path, rho_param* options_hash);

data/platform/shared/ruby/ext/camera/camera_wrap.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1818,7 +1818,7 @@ static VALUE mCamera;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020004 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1832,6 +1832,7 @@ extern void take_picture(char* callback_url, rho_param *options_hash);
 extern void choose_picture(char* callback_url, rho_param *options_hash);
 
 extern VALUE get_camera_info(const char* camera_type);
+extern void save_image_to_device_gallery(const char* image_path, rho_param* options_hash);
 
 
 
@@ -1993,6 +1994,45 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_save_image_to_device_gallery(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  rho_param *arg2 = (rho_param *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  
+  {
+    arg2 = NULL;
+  }
+  if ((argc < 1) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","save_image_to_device_gallery", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  if (argc > 1) {
+    {
+      arg2 = rho_param_fromvalue(argv[1]);
+    }
+  }
+  save_image_to_device_gallery((char const *)arg1,arg2);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    rho_param_free(arg2);
+  }
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    rho_param_free(arg2);
+  }
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2306,5 +2346,6 @@ SWIGEXPORT void Init_Camera(void) {
   rb_define_module_function(mCamera, "take_picture", _wrap_take_picture, -1);
   rb_define_module_function(mCamera, "choose_picture", _wrap_choose_picture, -1);
   rb_define_module_function(mCamera, "get_camera_info", _wrap_get_camera_info, -1);
+  rb_define_module_function(mCamera, "save_image_to_device_gallery", _wrap_save_image_to_device_gallery, -1);
 }
 

data/platform/shared/ruby/ext/geolocation/geolocation.i

@@ -10,6 +10,9 @@ extern double rho_geo_latitude();
 #define longitude rho_geo_longitude
 extern double rho_geo_longitude();
 
+#define altitude rho_geo_altitude
+extern double rho_geo_altitude();
+
 #define accuracy rho_geo_accuracy
 extern float rho_geo_accuracy();
 
@@ -54,6 +57,7 @@ extern void rho_geoimpl_do_geocoding(rho_param* p, const char* callback, int cal
 
 extern double latitude();
 extern double longitude();
+extern double altitude();
 extern float  accuracy();
 extern int    known_position();
 extern void   set_view_notification( const char *url, char* params, int timeout_sec);

data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1818,7 +1818,7 @@ static VALUE mGeoLocation;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020004 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1835,6 +1835,9 @@ extern double rho_geo_latitude();
 #define longitude rho_geo_longitude
 extern double rho_geo_longitude();
 
+#define altitude rho_geo_altitude
+extern double rho_geo_altitude();
+
 #define accuracy rho_geo_accuracy
 extern float rho_geo_accuracy();
 
@@ -1939,7 +1942,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1984,7 +1987,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
-/*@SWIG:/usr/local/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2044,6 +2047,22 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_altitude(int argc, VALUE *argv, VALUE self) {
+  double result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (double)altitude();
+  vresult = SWIG_From_double((double)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_accuracy(int argc, VALUE *argv, VALUE self) {
   float result;
@@ -2601,6 +2620,7 @@ SWIGEXPORT void Init_GeoLocation(void) {
   SWIG_RubyInitializeTrackings();
   rb_define_module_function(mGeoLocation, "latitude", _wrap_latitude, -1);
   rb_define_module_function(mGeoLocation, "longitude", _wrap_longitude, -1);
+  rb_define_module_function(mGeoLocation, "altitude", _wrap_altitude, -1);
   rb_define_module_function(mGeoLocation, "accuracy", _wrap_accuracy, -1);
   rb_define_module_function(mGeoLocation, "known_position?", _wrap_known_positionq___, -1);
   rb_define_module_function(mGeoLocation, "set_view_notification", _wrap_set_view_notification, -1);

data/platform/shared/ruby/ext/phonebook/phonebook.i

@@ -32,6 +32,9 @@ extern int addRecord(void* pb, void* record);
 extern int saveRecord(void* pb, void* record);
 extern int deleteRecord(void* pb, void* record);
 
+
+extern const char* phonebook_get_authorization_status(void);
+#define get_authorization_status phonebook_get_authorization_status
 %}
 
 %typemap(default) (rho_param* params) {
@@ -60,4 +63,5 @@ extern int setRecordValue(void* record, char* property, char* value);
 extern int addRecord(void* pb, void* record);
 extern int saveRecord(void* pb, void* record);
 extern int deleteRecord(void* pb, void* record);
+extern const char* get_authorization_status(void);
 

data/platform/shared/ruby/ext/phonebook/phonebook_wrap.c

@@ -1859,6 +1859,9 @@ extern int saveRecord(void* pb, void* record);
 extern int deleteRecord(void* pb, void* record);
 
 
+extern const char* phonebook_get_authorization_status(void);
+#define get_authorization_status phonebook_get_authorization_status
+
 
 #include <limits.h>
 #if !defined(SWIG_NO_LLONG_MAX)
@@ -1940,6 +1943,30 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 
 
 
+
+SWIGINTERNINLINE VALUE 
+SWIG_FromCharPtrAndSize(const char* carray, size_t size)
+{
+  if (carray) {
+    if (size > LONG_MAX) {
+      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+      return pchar_descriptor ? 
+	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : Qnil;
+    } else {
+      return rb_str_new(carray, (long)(size));
+    }
+  } else {
+    return Qnil;
+  }
+}
+
+
+SWIGINTERNINLINE VALUE 
+SWIG_FromCharPtr(const char *cptr)
+{ 
+  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
+}
+
 SWIGINTERN VALUE
 _wrap_openPhonebook(int argc, VALUE *argv, VALUE self) {
   void *result = 0 ;
@@ -2331,6 +2358,22 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_get_authorization_status(int argc, VALUE *argv, VALUE self) {
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (char *)get_authorization_status();
+  vresult = SWIG_FromCharPtr((const char *)result);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2659,5 +2702,6 @@ SWIGEXPORT void Init_Phonebook(void) {
   rb_define_module_function(mPhonebook, "addRecord", _wrap_addRecord, -1);
   rb_define_module_function(mPhonebook, "saveRecord", _wrap_saveRecord, -1);
   rb_define_module_function(mPhonebook, "deleteRecord", _wrap_deleteRecord, -1);
+  rb_define_module_function(mPhonebook, "get_authorization_status", _wrap_get_authorization_status, -1);
 }
 

data/platform/shared/ruby/ext/rho/extensions.c

@@ -1,5 +1,3 @@
 // WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
-extern void Init_AnsPush_extension(void);
 void Init_Extensions(void) {
-    Init_AnsPush_extension();
 }

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -221,6 +221,7 @@ void RhoRubyStart()
 
 #endif
 
+#if !defined(_WP8_LIB)
     Init_strscan();
     Init_sqlite3_api();
     Init_GeoLocation();
@@ -254,6 +255,7 @@ void RhoRubyStart()
 #if !defined(RHO_SYMBIAN)
     Init_Extensions();
 #endif //RHO_SYMBIAN
+#endif //_WP8_LIB
 
 #if defined(APP_BUILD_CAPABILITY_MOTOROLA)
     rb_require("rhomotoapi");

data/platform/shared/ruby/ext/rho/rhosupport.c

@@ -377,6 +377,14 @@ static VALUE find_file(VALUE fname)
                     rb_str_append(res,fname);
                     rb_str_cat2(res,RHO_RB_EXT);
 
+                    if ( eaccess(RSTRING_PTR(res), R_OK) == 0 )
+                        break;
+
+                    res = rb_str_new( szPath, szSep-szPath);
+                    rb_str_cat2(res,"/app/");
+                    rb_str_append(res,fname);
+                    rb_str_cat2(res,RHO_RB_EXT);
+
                     if ( eaccess(RSTRING_PTR(res), R_OK) == 0 )
                         break;
 

data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c

@@ -307,7 +307,7 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self)
             rb_raise(rb_eArgError, "could not prepare statement: %d; Message: %s",nRes, (szErrMsg?szErrMsg:""));
         }
 
-        if ( argc > 2 )
+        if ( (argc > 2) && (TYPE(argv[2]) == T_ARRAY) )
         {
             int i = 0;
             VALUE args = argv[2];

data/platform/shared/ruby/ext/syncengine/syncengine.i

@@ -3,7 +3,7 @@
 %{
 /* Put header files here or function declarations like below */
 	#define dosync rho_sync_doSyncAllSources
-	extern VALUE rho_sync_doSyncAllSources(int show_status_popup, const char * query_params);
+	extern VALUE rho_sync_doSyncAllSources(int show_status_popup, const char * query_params, int sync_only_changed_sources);
 	#define dosync_source rho_sync_doSyncSource
 	extern VALUE rho_sync_doSyncSource(VALUE source_id,int show_status_popup, const char * query_params);
 	#define dosearch rho_sync_doSearch
@@ -91,7 +91,11 @@
  $1 = 0;
 }
 
-extern VALUE dosync(bool show_status_popup, const char * query_params);
+%typemap(default) bool sync_only_changed_sources {
+  $1 = 0;
+}
+
+extern VALUE dosync(bool show_status_popup, const char * query_params,bool sync_only_changed_sources);
 extern VALUE dosync_source(VALUE source_id, bool show_status_popup, const char * query_params);
 extern VALUE dosearch(VALUE ar_sources, const char *from, const char *params, bool sync_changes, int nProgressStep, const char* callback, const char* callback_params);
 extern VALUE login(const char *login, const char *password, const char* callback);

data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.8
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1817,7 +1817,7 @@ static VALUE mSyncEngine;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020004 
+#define SWIGVERSION 0x020008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1827,7 +1827,7 @@ static VALUE mSyncEngine;
 
 /* Put header files here or function declarations like below */
 	#define dosync rho_sync_doSyncAllSources
-	extern VALUE rho_sync_doSyncAllSources(int show_status_popup, const char * query_params);
+	extern VALUE rho_sync_doSyncAllSources(int show_status_popup, const char * query_params, int sync_only_changed_sources);
 	#define dosync_source rho_sync_doSyncSource
 	extern VALUE rho_sync_doSyncSource(VALUE source_id,int show_status_popup, const char * query_params);
 	#define dosearch rho_sync_doSearch
@@ -1924,7 +1924,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:C:\Install\swigwin-2.0.4\Lib\ruby\rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2063,11 +2063,14 @@ SWIGINTERN VALUE
 _wrap_dosync(int argc, VALUE *argv, VALUE self) {
   bool arg1 ;
   char *arg2 = (char *) 0 ;
+  bool arg3 ;
   bool val1 ;
   int ecode1 = 0 ;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
   VALUE result;
   VALUE vresult = Qnil;
   
@@ -2077,7 +2080,10 @@ _wrap_dosync(int argc, VALUE *argv, VALUE self) {
   {
     arg2 = 0;
   }
-  if ((argc < 0) || (argc > 2)) {
+  {
+    arg3 = 0;
+  }
+  if ((argc < 0) || (argc > 3)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
   if (argc > 0) {
@@ -2094,7 +2100,14 @@ _wrap_dosync(int argc, VALUE *argv, VALUE self) {
     }
     arg2 = (char *)(buf2);
   }
-  result = (VALUE)dosync(arg1,(char const *)arg2);
+  if (argc > 2) {
+    ecode3 = SWIG_AsVal_bool(argv[2], &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "bool","dosync", 3, argv[2] ));
+    } 
+    arg3 = (bool)(val3);
+  }
+  result = (VALUE)dosync(arg1,(char const *)arg2,arg3);
   vresult = result;
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;