rhodes 2.2.6 → 2.3.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (486) hide show
  1. data/CHANGELOG +20 -0
  2. data/README.md +46 -0
  3. data/Rakefile +85 -80
  4. data/bin/rhodes +2 -2
  5. data/bin/rhogen +1 -1
  6. data/doc/application.txt +277 -0
  7. data/doc/bb-css.txt +209 -0
  8. data/doc/build.txt +785 -0
  9. data/doc/configuration.txt +236 -0
  10. data/doc/connect-to-web-services.txt +282 -0
  11. data/doc/contributing.txt +64 -0
  12. data/doc/css-framework.txt +144 -0
  13. data/doc/device-caps.txt +1152 -0
  14. data/doc/extensions.txt +528 -0
  15. data/doc/files.txt +4 -0
  16. data/doc/generator.txt +141 -0
  17. data/doc/install.txt +35 -0
  18. data/doc/introduction.txt +88 -0
  19. data/doc/rhom.txt +826 -0
  20. data/doc/standard-css.txt +392 -0
  21. data/doc/synchronization.txt +542 -0
  22. data/doc/test-log-debug.txt +148 -0
  23. data/doc/tutorial.txt +136 -0
  24. data/doc/ui.txt +766 -0
  25. data/installer/EnvVarUpdate.nsh +328 -0
  26. data/installer/README.html +81 -0
  27. data/installer/RHOSYNC-LICENSE.txt +675 -0
  28. data/installer/icon.ico +0 -0
  29. data/installer/instant-rhodes.nsi +427 -0
  30. data/lib/build/jake.rb +15 -1
  31. data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/imageprovider.cpp +1 -1
  32. data/lib/extensions/barcode/ext/barcode/platform/bb/Barcode6.files +45 -0
  33. data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +6 -0
  34. data/lib/extensions/barcode/ext/barcode/platform/bb/barcode6.jdp +92 -0
  35. data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj +7 -4
  36. data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile +2 -1
  37. data/lib/extensions/barcode/ext/barcode/platform/wm/src/wm_imageprovider.cpp +1 -1
  38. data/lib/extensions/digest-sha1/ext/build.bat +1 -0
  39. data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +335 -0
  40. data/lib/extensions/esri/ext/build +17 -0
  41. data/lib/extensions/esri/ext/build.bat +29 -0
  42. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.h +7 -0
  43. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.mm +58 -0
  44. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactoryRegister.mm +22 -0
  45. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.h +21 -0
  46. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.mm +32 -0
  47. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/InitESRI.c +5 -0
  48. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +143 -0
  49. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +919 -0
  50. data/lib/extensions/esri/ext/esri/platform/iphone/ESRI.xcodeproj/project.pbxproj +320 -0
  51. data/lib/extensions/esri/ext/esri/platform/iphone/ESRI_Prefix.pch +7 -0
  52. data/lib/extensions/esri/ext/esri/platform/iphone/Rakefile +76 -0
  53. data/lib/extensions/esri/ext.yml +3 -0
  54. data/lib/extensions/net-http/monitor.rb +265 -0
  55. data/lib/extensions/net-http/net/ftp.rb +981 -0
  56. data/lib/extensions/net-http/thread.rb +367 -0
  57. data/lib/extensions/rhocgi/cgi.rb +16 -0
  58. data/lib/extensions/rhospec/rhospec.rb +118 -0
  59. data/lib/framework/base64.rb +91 -0
  60. data/lib/framework/builtinME.rb +13 -10
  61. data/lib/framework/ostruct.rb +145 -0
  62. data/lib/framework/res/back_btn.wm.png +0 -0
  63. data/lib/framework/res/blue_pushpin.wm.png +0 -0
  64. data/lib/framework/res/blue_pushpin_small.wm.png +0 -0
  65. data/lib/framework/res/callout.wm.png +0 -0
  66. data/lib/framework/res/callout_link.wm.png +0 -0
  67. data/lib/framework/res/forward_btn.wm.png +0 -0
  68. data/lib/framework/res/home_btn.wm.png +0 -0
  69. data/lib/framework/res/options_btn.wm.png +0 -0
  70. data/lib/framework/res/refresh_btn.wm.png +0 -0
  71. data/lib/framework/rho/render.rb +5 -2
  72. data/lib/framework/rho/rho.rb +320 -50
  73. data/lib/framework/rho/rhoapplication.rb +48 -10
  74. data/lib/framework/rho/rhonativeviewmanager.rb +73 -0
  75. data/lib/framework/rho/rhosupport.rb +15 -1
  76. data/lib/framework/rho/rhotabbar.rb +29 -0
  77. data/lib/framework/rho/rhotoolbar.rb +17 -0
  78. data/lib/framework/rho/rhoutils.rb +22 -6
  79. data/lib/framework/rhodes.rb +1 -1
  80. data/lib/framework/rholang/rhomsg_de.rb +4 -3
  81. data/lib/framework/rholang/rhomsg_en.rb +1 -0
  82. data/lib/framework/rholang/rhomsg_es.rb +1 -0
  83. data/lib/framework/rholang/rhomsg_it.rb +1 -0
  84. data/lib/framework/rhom/rhom.rb +31 -10
  85. data/lib/framework/rhom/rhom_db_adapter.rb +33 -23
  86. data/lib/framework/rhom/rhom_object_factory.rb +465 -249
  87. data/lib/framework/rhom/rhom_source.rb +22 -7
  88. data/lib/framework/version.rb +1 -1
  89. data/lib/rhodes.rb +1 -1
  90. data/platform/android/Rhodes/AndroidManifest.xml +83 -20
  91. data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +5 -0
  92. data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +2 -0
  93. data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +9 -5
  94. data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesAppOptions.h +53 -0
  95. data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +46 -56
  96. data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +10 -0
  97. data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mapview_MapView.h +93 -0
  98. data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +38 -0
  99. data/platform/android/Rhodes/jni/include/rhodes.h +64 -8
  100. data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +6 -0
  101. data/platform/android/Rhodes/jni/src/alert.cpp +5 -11
  102. data/platform/android/Rhodes/jni/src/bluetooth.cpp +66 -29
  103. data/platform/android/Rhodes/jni/src/callbacks.cpp +24 -21
  104. data/platform/android/Rhodes/jni/src/camera.cpp +2 -6
  105. data/platform/android/Rhodes/jni/src/datetimepicker.cpp +13 -11
  106. data/platform/android/Rhodes/jni/src/event.cpp +9 -15
  107. data/platform/android/Rhodes/jni/src/fileapi.cpp +13 -27
  108. data/platform/android/Rhodes/jni/src/logconf.cpp +3 -3
  109. data/platform/android/Rhodes/jni/src/mapview.cpp +696 -16
  110. data/platform/android/Rhodes/jni/src/menu.cpp +3 -3
  111. data/platform/android/Rhodes/jni/src/nativebar.cpp +55 -4
  112. data/platform/android/Rhodes/jni/src/nativeview.cpp +33 -0
  113. data/platform/android/Rhodes/jni/src/phonebook.cpp +6 -11
  114. data/platform/android/Rhodes/jni/src/rhoconf.cpp +4 -4
  115. data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +87 -0
  116. data/platform/android/Rhodes/jni/src/rhodes.cpp +55 -34
  117. data/platform/android/Rhodes/jni/src/ringtones.cpp +2 -3
  118. data/platform/android/Rhodes/jni/src/signature.cpp +3 -5
  119. data/platform/android/Rhodes/jni/src/splashscreen.cpp +7 -0
  120. data/platform/android/Rhodes/jni/src/sslimpl.cpp +17 -20
  121. data/platform/android/Rhodes/jni/src/webview.cpp +13 -12
  122. data/platform/android/Rhodes/res/drawable/callout.png +0 -0
  123. data/platform/android/Rhodes/res/drawable/callout_link.png +0 -0
  124. data/platform/android/Rhodes/res/drawable/signature_cancel.png +0 -0
  125. data/platform/android/Rhodes/res/drawable/signature_clear.png +0 -0
  126. data/platform/android/Rhodes/res/drawable/signature_ok.png +0 -0
  127. data/platform/android/Rhodes/res/layout/datetime.xml +4 -0
  128. data/platform/android/Rhodes/res/layout/signature.xml +24 -17
  129. data/platform/android/Rhodes/res/layout/status_bar_ongoing_event_progress_bar.xml +102 -0
  130. data/platform/android/Rhodes/res/values/strings.xml +1 -1
  131. data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +6 -0
  132. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java +575 -0
  133. data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +83 -0
  134. data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +21 -3
  135. data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +23 -15
  136. data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +2 -2
  137. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +151 -0
  138. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +2 -2
  139. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +372 -0
  140. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +11 -0
  141. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +58 -0
  142. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +705 -523
  143. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +1 -1
  144. data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +167 -85
  145. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +36 -1
  146. data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +4 -2
  147. data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +33 -20
  148. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +2 -6
  149. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +2 -24
  150. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +106 -36
  151. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +15 -58
  152. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +0 -7
  153. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +6 -4
  154. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +4 -3
  155. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +91 -27
  156. data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +6 -3
  157. data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +275 -42
  158. data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +1 -1
  159. data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +1 -3
  160. data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +1 -1
  161. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +1 -0
  162. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +120 -43
  163. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +518 -28
  164. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +2 -2
  165. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +434 -0
  166. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +20 -0
  167. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +296 -336
  168. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +111 -0
  169. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +77 -0
  170. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +10 -0
  171. data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +0 -1
  172. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +5 -1
  173. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +1 -1
  174. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +1 -1
  175. data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +6 -11
  176. data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +6 -4
  177. data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +0 -7
  178. data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +9 -4
  179. data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +8 -8
  180. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +5 -1
  181. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +11 -7
  182. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +3 -5
  183. data/platform/android/build/RhodesSRC_build.files +32 -23
  184. data/platform/android/build/android.rake +28 -11
  185. data/platform/android/build/androidcommon.rb +2 -0
  186. data/platform/android/build/librhocommon_build.files +9 -5
  187. data/platform/android/build/librhodes_build.files +1 -0
  188. data/platform/android/build/libruby_build.files +1 -0
  189. data/platform/bb/Hsqldb/Hsqldb.jdp +0 -2
  190. data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +10 -2
  191. data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +37 -5
  192. data/platform/bb/Hsqldb/src/org/hsqldb/Column.java +5 -5
  193. data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -1
  194. data/platform/bb/Hsqldb/src/org/hsqldb/Function.java +73 -78
  195. data/platform/bb/Hsqldb/src/org/hsqldb/Library.java +288 -8
  196. data/platform/bb/RubyVM/RubyVM.jdp +3 -0
  197. data/platform/bb/RubyVM/src/com/rho/FilePath.java +13 -1
  198. data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -2
  199. data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +12 -0
  200. data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +18 -1
  201. data/platform/bb/RubyVM/src/com/rho/RhoConf.java +128 -108
  202. data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +9 -10
  203. data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +16 -1
  204. data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +1 -1
  205. data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +20 -0
  206. data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +5 -2
  207. data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +65 -46
  208. data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +192 -50
  209. data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +8 -114
  210. data/platform/bb/RubyVM/src/com/rho/db/DBException.java +1 -1
  211. data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +1 -1
  212. data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +5 -3
  213. data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +5 -1
  214. data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +109 -0
  215. data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +85 -0
  216. data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +12 -4
  217. data/platform/bb/RubyVM/src/com/rho/net/NetResponse.java +5 -0
  218. data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +37 -23
  219. data/platform/bb/RubyVM/src/com/rho/net/URI.java +84 -0
  220. data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +1 -1
  221. data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +119 -61
  222. data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +61 -24
  223. data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +108 -54
  224. data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +121 -163
  225. data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java +23 -0
  226. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyMutex.java +1 -1
  227. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRange.java +3 -1
  228. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRegexp.java +3 -1
  229. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java +208 -25
  230. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +3 -1
  231. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RhoSupport.java +5 -1
  232. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +12 -5
  233. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyID.java +1 -0
  234. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java +16 -0
  235. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule_Methods.java +5 -0
  236. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyValue.java +1 -1
  237. data/platform/bb/RubyVM/src/com/xruby/runtime/stdlib/RubyStringIO.java +4 -1
  238. data/platform/bb/{Hsqldb → RubyVM}/src/j2me/math/Number.java +33 -0
  239. data/platform/bb/build/RubyVM_build.files +3 -0
  240. data/platform/bb/build/bb.rake +140 -62
  241. data/platform/bb/build/hsqldb_build.files +0 -2
  242. data/platform/bb/build/rhodes_build.files +5 -0
  243. data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +43 -7
  244. data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +23 -2
  245. data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +5 -0
  246. data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +143 -0
  247. data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +269 -0
  248. data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +446 -0
  249. data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +3 -0
  250. data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +12 -2
  251. data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +2 -0
  252. data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +2 -0
  253. data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +2 -0
  254. data/platform/bb/rhodes/resources/mappin.png +0 -0
  255. data/platform/bb/rhodes/rhodes.jdp +3 -0
  256. data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +21 -18
  257. data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +150 -0
  258. data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +1 -0
  259. data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +63 -4
  260. data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +6 -5
  261. data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +242 -2
  262. data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +143 -0
  263. data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +269 -0
  264. data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +446 -0
  265. data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +1 -1
  266. data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +71 -14
  267. data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +4 -2
  268. data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +28 -12
  269. data/platform/bb/rhodes/src/com/rho/rubyext/System.java +100 -4
  270. data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +3 -2
  271. data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +1 -1
  272. data/platform/bb/rhodes/src/rhomobile/NativeBar.java +32 -0
  273. data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +9 -2
  274. data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +174 -41
  275. data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +52 -3
  276. data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +33 -1
  277. data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +2 -14
  278. data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +686 -0
  279. data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +14 -0
  280. data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +13 -0
  281. data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +174 -0
  282. data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +104 -330
  283. data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +79 -0
  284. data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +35 -12
  285. data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +2 -1
  286. data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +336 -44
  287. data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +3 -6
  288. data/platform/iphone/Classes/AppManager/AppManager.m +19 -4
  289. data/platform/iphone/Classes/DateTime.h +4 -0
  290. data/platform/iphone/Classes/DateTime.m +1 -1
  291. data/platform/iphone/Classes/DateTimePicker.m +8 -1
  292. data/platform/iphone/Classes/DateTimePickerDelegate.m +7 -1
  293. data/platform/iphone/Classes/Event/Event.m +2 -2
  294. data/platform/iphone/Classes/MapView/MapViewController.h +4 -1
  295. data/platform/iphone/Classes/MapView/MapViewController.m +6 -46
  296. data/platform/iphone/Classes/MapView/MapViewManager.h +26 -0
  297. data/platform/iphone/Classes/MapView/MapViewManager.m +172 -0
  298. data/platform/iphone/Classes/NativeBar.h +34 -0
  299. data/platform/iphone/Classes/NativeBar.m +131 -26
  300. data/platform/iphone/Classes/NativeView/NVDelegate.h +26 -0
  301. data/platform/iphone/Classes/NativeView/NVDelegate.m +40 -0
  302. data/platform/iphone/Classes/NativeView/NVViewController.h +24 -0
  303. data/platform/iphone/Classes/NativeView/NVViewController.m +90 -0
  304. data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +449 -0
  305. data/platform/iphone/Classes/{RhoNativeViewManagerOC.h → NativeView/RhoNativeViewManagerOC.h} +15 -0
  306. data/platform/iphone/Classes/RhoAlert.m +3 -3
  307. data/platform/iphone/Classes/RhoMainView.h +3 -0
  308. data/platform/iphone/Classes/Rhodes.h +6 -2
  309. data/platform/iphone/Classes/Rhodes.m +47 -79
  310. data/platform/iphone/Classes/Signature/SignatureViewController.m +1 -0
  311. data/platform/iphone/Classes/SimpleMainView.h +18 -1
  312. data/platform/iphone/Classes/SimpleMainView.m +180 -35
  313. data/platform/iphone/Classes/SplitView/LeftViewController.h +1 -1
  314. data/platform/iphone/Classes/SplitView/LeftViewController.m +13 -7
  315. data/platform/iphone/Classes/SplitView/RightViewController.h +1 -1
  316. data/platform/iphone/Classes/SplitView/RightViewController.m +26 -11
  317. data/platform/iphone/Classes/SplitView/SplittedMainView.h +1 -6
  318. data/platform/iphone/Classes/SplitView/SplittedMainView.m +14 -52
  319. data/platform/iphone/Classes/TabbedMainView.h +25 -3
  320. data/platform/iphone/Classes/TabbedMainView.m +340 -14
  321. data/platform/iphone/ESRI/BluePushpin.png +0 -0
  322. data/platform/iphone/ESRI/BluePushpin@2x.png +0 -0
  323. data/platform/iphone/ESRI/esri.png +0 -0
  324. data/platform/iphone/ESRI/esri@2x.png +0 -0
  325. data/platform/iphone/Info.plist +1 -1
  326. data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +26 -3
  327. data/platform/iphone/rbuild/iphone.rake +100 -4
  328. data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
  329. data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +116 -12
  330. data/platform/shared/SyncClient/SyncClient.cpp +29 -3
  331. data/platform/shared/SyncClient/SyncClient.h +2 -1
  332. data/platform/shared/common/IRhoClassFactory.h +3 -0
  333. data/platform/shared/common/IRhoCrypt.h +16 -0
  334. data/platform/shared/common/IRhoThreadImpl.h +1 -0
  335. data/platform/shared/common/RhoAppAdapter.h +2 -0
  336. data/platform/shared/common/RhoConf.cpp +97 -46
  337. data/platform/shared/common/RhoConf.h +14 -13
  338. data/platform/shared/common/RhoFile.cpp +10 -0
  339. data/platform/shared/common/RhoFile.h +1 -0
  340. data/platform/shared/common/RhoMath.cpp +43 -0
  341. data/platform/shared/common/RhoMath.h +27 -0
  342. data/platform/shared/common/RhoNativeViewManager.h +27 -1
  343. data/platform/shared/common/RhoPort.h +11 -0
  344. data/platform/shared/common/RhoStd.h +5 -0
  345. data/platform/shared/common/RhoThread.cpp +1 -1
  346. data/platform/shared/common/RhoThread.h +1 -1
  347. data/platform/shared/common/RhodesApp.cpp +381 -139
  348. data/platform/shared/common/RhodesApp.h +24 -10
  349. data/platform/shared/common/RhodesAppBase.cpp +72 -1
  350. data/platform/shared/common/RhodesAppBase.h +5 -1
  351. data/platform/shared/common/SplashScreen.h +4 -4
  352. data/platform/shared/common/ThreadQueue.cpp +44 -17
  353. data/platform/shared/common/ThreadQueue.h +4 -0
  354. data/platform/shared/common/app_build_configs.c +0 -1
  355. data/platform/shared/common/iphone/RhoClassfactory.h +6 -0
  356. data/platform/shared/common/iphone/RhoCryptImpl.h +47 -0
  357. data/platform/shared/common/iphone/RhoCryptImpl.mm +286 -0
  358. data/platform/shared/common/map/ESRIMapEngine.cpp +921 -0
  359. data/platform/shared/common/map/ESRIMapEngine.h +255 -0
  360. data/platform/shared/common/map/GoogleMapEngine.cpp +160 -0
  361. data/platform/shared/common/map/GoogleMapEngine.h +52 -0
  362. data/platform/shared/common/map/MapEngine.cpp +304 -0
  363. data/platform/shared/common/map/MapEngine.h +214 -0
  364. data/platform/shared/db/DBAdapter.cpp +147 -18
  365. data/platform/shared/db/DBAdapter.h +38 -12
  366. data/platform/shared/db/DBAttrManager.cpp +4 -3
  367. data/platform/shared/db/DBAttrManager.h +7 -7
  368. data/platform/shared/db/res/db/syncdb.triggers +0 -5
  369. data/platform/shared/db/res/db/syncdb_java.triggers +21 -0
  370. data/platform/shared/json/JSONIterator.cpp +11 -1
  371. data/platform/shared/json/JSONIterator.h +1 -0
  372. data/platform/shared/logging/RhoLogConf.cpp +29 -12
  373. data/platform/shared/net/CURLNetRequest.cpp +80 -25
  374. data/platform/shared/net/CURLNetRequest.h +6 -2
  375. data/platform/shared/net/HttpServer.cpp +12 -6
  376. data/platform/shared/net/HttpServer.h +2 -1
  377. data/platform/shared/net/INetRequest.h +1 -0
  378. data/platform/shared/ruby/ext/alert/alert.i +5 -0
  379. data/platform/shared/ruby/ext/alert/alert_wrap.c +439 -108
  380. data/platform/shared/ruby/ext/datetimepicker/datetimepicker.i +42 -0
  381. data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +521 -120
  382. data/platform/shared/ruby/ext/nativebar/nativebar.i +16 -0
  383. data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +623 -128
  384. data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +18 -0
  385. data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +2321 -0
  386. data/platform/shared/ruby/ext/rho/extensions.c +0 -1
  387. data/platform/shared/ruby/ext/rho/rhoruby.c +53 -0
  388. data/platform/shared/ruby/ext/rho/rhoruby.h +6 -0
  389. data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +6 -3
  390. data/platform/shared/ruby/ext/syncengine/syncengine.i +9 -1
  391. data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +61 -0
  392. data/platform/shared/ruby/ext/system/system.i +4 -0
  393. data/platform/shared/ruby/ext/system/system_wrap.c +33 -5
  394. data/platform/shared/rubyext/RhoAppAdapter.cpp +11 -1
  395. data/platform/shared/rubyext/System.cpp +9 -0
  396. data/platform/shared/rubyext/WebView.h +1 -0
  397. data/platform/shared/sqlite/crypto.c +907 -0
  398. data/platform/shared/sqlite/sqlite3.c +6 -0
  399. data/platform/shared/sync/SyncEngine.cpp +49 -19
  400. data/platform/shared/sync/SyncEngine.h +0 -1
  401. data/platform/shared/sync/SyncNotify.cpp +14 -5
  402. data/platform/shared/sync/SyncNotify.h +2 -2
  403. data/platform/shared/sync/SyncSource.cpp +79 -33
  404. data/platform/shared/sync/SyncSource.h +1 -0
  405. data/platform/shared/sync/SyncThread.cpp +26 -11
  406. data/platform/shared/xruby/src/com/xruby/compiler/codedom/StringExpression.java +4 -2
  407. data/platform/wm/RhoLib/RhoLib.vcproj +108 -72
  408. data/platform/wm/build/wm.rake +6 -0
  409. data/platform/wm/rhodes/Alert.cpp +4 -3
  410. data/platform/wm/rhodes/Alert.h +1 -1
  411. data/platform/wm/rhodes/DateTimePicker.cpp +30 -3
  412. data/platform/wm/rhodes/DateTimePicker.h +9 -1
  413. data/platform/wm/rhodes/MainWindow.cpp +121 -61
  414. data/platform/wm/rhodes/MainWindow.h +29 -4
  415. data/platform/wm/rhodes/MapView/Graphics.cpp +547 -0
  416. data/platform/wm/rhodes/MapView/Graphics.h +136 -0
  417. data/platform/wm/rhodes/MapView/MapViewManager.cpp +391 -0
  418. data/platform/wm/rhodes/MapView/MapViewManager.h +158 -0
  419. data/platform/wm/rhodes/RhoCryptImpl.cpp +248 -0
  420. data/platform/wm/rhodes/RhoCryptImpl.h +51 -0
  421. data/platform/wm/rhodes/RhoNativeViewManager.cpp +208 -0
  422. data/platform/wm/rhodes/Rhodes.cpp +94 -102
  423. data/platform/wm/rhodes/Rhodes.rc +27 -0
  424. data/platform/wm/rhodes/SyncStatusDlg.cpp +1 -0
  425. data/platform/wm/rhodes/SyncStatusDlg.h +2 -1
  426. data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +7 -4
  427. data/platform/wm/rhodes/camera/Camera.cpp +36 -15
  428. data/platform/wm/rhodes/camera/Camera.h +0 -4
  429. data/platform/wm/rhodes/resource.h +10 -2
  430. data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +7 -0
  431. data/platform/wm/rhodes/rho/common/RhoClassFactory.h +1 -0
  432. data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +10 -2
  433. data/platform/wm/rhodes/rho/net/NetRequestImpl.h +10 -0
  434. data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +513 -0
  435. data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +74 -0
  436. data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +22 -10
  437. data/platform/wm/rhodes/rho/rubyext/WebView.cpp +5 -0
  438. data/platform/wm/rhodes/rhodes.vcproj +38 -2
  439. data/platform/wm/rhodes/stdafx.h +2 -1
  440. data/platform/wm/rubylib/rubylib.vcproj +12 -0
  441. data/rakefile.rb +85 -80
  442. data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +14 -3
  443. data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
  444. data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj +2 -0
  445. data/res/build-tools/xruby-0.3.3.jar +0 -0
  446. data/res/generators/templates/application/app/application.rb +2 -2
  447. data/res/generators/templates/application/app/helpers/application_helper.rb +1 -1
  448. data/res/generators/templates/application/public/css/android.css +1 -0
  449. data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +1 -1
  450. data/res/generators/templates/application/rhoconfig.txt +66 -14
  451. data/rhodes.gemspec +3 -3
  452. data/spec/framework_spec/app/spec/core/file/expand_path_spec.rb +7 -3
  453. data/spec/framework_spec/build.yml +1 -1
  454. data/spec/phone_spec/Rakefile +1 -0
  455. data/spec/phone_spec/app/Account/account.rb +2 -0
  456. data/spec/phone_spec/app/Account_s/account_s.rb +7 -0
  457. data/spec/phone_spec/app/spec/{fixtures → array/fixtures}/classes.rb +0 -0
  458. data/spec/phone_spec/app/spec/{array_pack_spec.rb → array/pack_spec.rb} +2 -1
  459. data/spec/phone_spec/app/spec/bulksync_spec.rb +1 -0
  460. data/spec/phone_spec/app/spec/contacts_spec.rb +2 -0
  461. data/spec/phone_spec/app/spec/rho_spec.rb +34 -233
  462. data/spec/phone_spec/app/spec/rhom_object_spec.rb +396 -87
  463. data/spec/phone_spec/app/spec/string/element_set_spec.rb +251 -0
  464. data/spec/phone_spec/app/spec/string/end_with_spec.rb +49 -0
  465. data/spec/phone_spec/app/spec/string/fixtures/classes.rb +27 -0
  466. data/spec/phone_spec/app/spec/{lstrip_spec.rb → string/lstrip_spec.rb} +0 -0
  467. data/spec/phone_spec/app/spec/string/replace_spec.rb +52 -0
  468. data/spec/phone_spec/app/spec/{rstrip_spec.rb → string/rstrip_spec.rb} +0 -0
  469. data/spec/phone_spec/app/spec/string/slice_spec.rb +473 -0
  470. data/spec/phone_spec/app/spec/string/split_spec.rb +302 -0
  471. data/spec/phone_spec/app/spec/string/start_with_spec.rb +48 -0
  472. data/spec/phone_spec/app/spec/{strip_spec.rb → string/strip_spec.rb} +0 -0
  473. data/spec/phone_spec/app/spec/syncengine_spec.rb +30 -1
  474. data/spec/phone_spec/app/spec_runner.rb +15 -7
  475. data/spec/phone_spec/build.yml +2 -2
  476. metadata +154 -25
  477. data/README.textile +0 -45
  478. data/platform/android/Rhodes/AndroidManifest.full.xml +0 -62
  479. data/platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java +0 -14
  480. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java +0 -20
  481. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +0 -193
  482. data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -25
  483. data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java +0 -22
  484. data/platform/bb/RubyVM/src/com/rho/Capabilities.java +0 -6
  485. data/platform/bb/RubyVM/src/com/rho/Extensions.java +0 -11
  486. data/platform/iphone/Classes/RhoNativeViewManager.mm +0 -226
data/platform/wm/RhoLib/RhoLib.vcproj CHANGED
@@ -1,7 +1,7 @@
1
1
  <?xml version="1.0" encoding="windows-1251"?>
2
2
  <VisualStudioProject
3
3
  ProjectType="Visual C++"
4
- Version="8.00"
4
+ Version="8,00"
5
5
  Name="RhoLib"
6
6
  ProjectGUID="{F196A418-11F1-4067-9F4F-BCC7D70E6EC5}"
7
7
  RootNamespace="RhoLib"
@@ -9,26 +9,26 @@
9
9
  >
10
10
  <Platforms>
11
11
  <Platform
12
- Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
12
+ Name="Windows Mobile 6 Professional SDK (ARMV4I)"
13
13
  />
14
14
  <Platform
15
- Name="Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
15
+ Name="Win32"
16
16
  />
17
17
  <Platform
18
- Name="Windows Mobile 6 Professional SDK (ARMV4I)"
18
+ Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
19
19
  />
20
20
  <Platform
21
- Name="Windows Mobile 6 Standard SDK (ARMV4I)"
21
+ Name="Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
22
22
  />
23
23
  <Platform
24
- Name="Win32"
24
+ Name="Windows Mobile 6 Standard SDK (ARMV4I)"
25
25
  />
26
26
  </Platforms>
27
27
  <ToolFiles>
28
28
  </ToolFiles>
29
29
  <Configurations>
30
30
  <Configuration
31
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
31
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
32
32
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
33
33
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
34
34
  ConfigurationType="4"
@@ -75,7 +75,7 @@
75
75
  />
76
76
  <Tool
77
77
  Name="VCLibrarianTool"
78
- AdditionalOptions=" /subsystem:windowsce,5.01"
78
+ AdditionalOptions=" /subsystem:windowsce,5.02"
79
79
  OutputFile="$(OutDir)/RhoLib.lib"
80
80
  />
81
81
  <Tool
@@ -103,7 +103,7 @@
103
103
  />
104
104
  </Configuration>
105
105
  <Configuration
106
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
106
+ Name="Debug|Win32"
107
107
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
108
108
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
109
109
  ConfigurationType="4"
@@ -126,10 +126,9 @@
126
126
  />
127
127
  <Tool
128
128
  Name="VCCLCompilerTool"
129
- ExecutionBucket="7"
130
129
  Optimization="0"
131
130
  AdditionalIncludeDirectories="../../shared/ruby;../../shared"
132
- PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
131
+ PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS"
133
132
  MinimalRebuild="true"
134
133
  RuntimeLibrary="1"
135
134
  UsePrecompiledHeader="0"
@@ -150,7 +149,7 @@
150
149
  />
151
150
  <Tool
152
151
  Name="VCLibrarianTool"
153
- AdditionalOptions=" /subsystem:windowsce,5.01"
152
+ AdditionalOptions=" /subsystem:windowsce,5.02"
154
153
  OutputFile="$(OutDir)/RhoLib.lib"
155
154
  />
156
155
  <Tool
@@ -163,22 +162,14 @@
163
162
  Name="VCBscMakeTool"
164
163
  />
165
164
  <Tool
166
- Name="VCCodeSignTool"
165
+ Name="VCFxCopTool"
167
166
  />
168
167
  <Tool
169
168
  Name="VCPostBuildEventTool"
170
169
  />
171
- <DeploymentTool
172
- ForceDirty="-1"
173
- RemoteDirectory=""
174
- RegisterOutput="0"
175
- AdditionalFiles=""
176
- />
177
- <DebuggerTool
178
- />
179
170
  </Configuration>
180
171
  <Configuration
181
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
172
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
182
173
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
183
174
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
184
175
  ConfigurationType="4"
@@ -202,11 +193,10 @@
202
193
  <Tool
203
194
  Name="VCCLCompilerTool"
204
195
  ExecutionBucket="7"
205
- Optimization="0"
196
+ Optimization="2"
206
197
  AdditionalIncludeDirectories="../../shared/ruby;../../shared"
207
- PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
208
- MinimalRebuild="true"
209
- RuntimeLibrary="1"
198
+ PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
199
+ RuntimeLibrary="0"
210
200
  UsePrecompiledHeader="0"
211
201
  WarningLevel="3"
212
202
  DebugInformationFormat="3"
@@ -216,7 +206,7 @@
216
206
  />
217
207
  <Tool
218
208
  Name="VCResourceCompilerTool"
219
- PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
209
+ PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
220
210
  Culture="1033"
221
211
  AdditionalIncludeDirectories="$(IntDir)"
222
212
  />
@@ -253,7 +243,7 @@
253
243
  />
254
244
  </Configuration>
255
245
  <Configuration
256
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
246
+ Name="Release|Win32"
257
247
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
258
248
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
259
249
  ConfigurationType="4"
@@ -276,12 +266,10 @@
276
266
  />
277
267
  <Tool
278
268
  Name="VCCLCompilerTool"
279
- ExecutionBucket="7"
280
- Optimization="0"
269
+ Optimization="2"
281
270
  AdditionalIncludeDirectories="../../shared/ruby;../../shared"
282
- PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
283
- MinimalRebuild="true"
284
- RuntimeLibrary="1"
271
+ PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS"
272
+ RuntimeLibrary="0"
285
273
  UsePrecompiledHeader="0"
286
274
  WarningLevel="3"
287
275
  DebugInformationFormat="3"
@@ -291,7 +279,7 @@
291
279
  />
292
280
  <Tool
293
281
  Name="VCResourceCompilerTool"
294
- PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
282
+ PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
295
283
  Culture="1033"
296
284
  AdditionalIncludeDirectories="$(IntDir)"
297
285
  />
@@ -313,22 +301,14 @@
313
301
  Name="VCBscMakeTool"
314
302
  />
315
303
  <Tool
316
- Name="VCCodeSignTool"
304
+ Name="VCFxCopTool"
317
305
  />
318
306
  <Tool
319
307
  Name="VCPostBuildEventTool"
320
308
  />
321
- <DeploymentTool
322
- ForceDirty="-1"
323
- RemoteDirectory=""
324
- RegisterOutput="0"
325
- AdditionalFiles=""
326
- />
327
- <DebuggerTool
328
- />
329
309
  </Configuration>
330
310
  <Configuration
331
- Name="Debug|Win32"
311
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
332
312
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
333
313
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
334
314
  ConfigurationType="4"
@@ -351,9 +331,10 @@
351
331
  />
352
332
  <Tool
353
333
  Name="VCCLCompilerTool"
334
+ ExecutionBucket="7"
354
335
  Optimization="0"
355
336
  AdditionalIncludeDirectories="../../shared/ruby;../../shared"
356
- PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS"
337
+ PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
357
338
  MinimalRebuild="true"
358
339
  RuntimeLibrary="1"
359
340
  UsePrecompiledHeader="0"
@@ -374,7 +355,7 @@
374
355
  />
375
356
  <Tool
376
357
  Name="VCLibrarianTool"
377
- AdditionalOptions=" /subsystem:windowsce,5.02"
358
+ AdditionalOptions=" /subsystem:windowsce,5.01"
378
359
  OutputFile="$(OutDir)/RhoLib.lib"
379
360
  />
380
361
  <Tool
@@ -387,14 +368,22 @@
387
368
  Name="VCBscMakeTool"
388
369
  />
389
370
  <Tool
390
- Name="VCFxCopTool"
371
+ Name="VCCodeSignTool"
391
372
  />
392
373
  <Tool
393
374
  Name="VCPostBuildEventTool"
394
375
  />
376
+ <DeploymentTool
377
+ ForceDirty="-1"
378
+ RemoteDirectory=""
379
+ RegisterOutput="0"
380
+ AdditionalFiles=""
381
+ />
382
+ <DebuggerTool
383
+ />
395
384
  </Configuration>
396
385
  <Configuration
397
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
386
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
398
387
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
399
388
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
400
389
  ConfigurationType="4"
@@ -418,10 +407,11 @@
418
407
  <Tool
419
408
  Name="VCCLCompilerTool"
420
409
  ExecutionBucket="7"
421
- Optimization="2"
410
+ Optimization="0"
422
411
  AdditionalIncludeDirectories="../../shared/ruby;../../shared"
423
- PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
424
- RuntimeLibrary="0"
412
+ PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
413
+ MinimalRebuild="true"
414
+ RuntimeLibrary="1"
425
415
  UsePrecompiledHeader="0"
426
416
  WarningLevel="3"
427
417
  DebugInformationFormat="3"
@@ -431,7 +421,7 @@
431
421
  />
432
422
  <Tool
433
423
  Name="VCResourceCompilerTool"
434
- PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
424
+ PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
435
425
  Culture="1033"
436
426
  AdditionalIncludeDirectories="$(IntDir)"
437
427
  />
@@ -468,7 +458,7 @@
468
458
  />
469
459
  </Configuration>
470
460
  <Configuration
471
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
461
+ Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
472
462
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
473
463
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
474
464
  ConfigurationType="4"
@@ -492,10 +482,11 @@
492
482
  <Tool
493
483
  Name="VCCLCompilerTool"
494
484
  ExecutionBucket="7"
495
- Optimization="2"
485
+ Optimization="0"
496
486
  AdditionalIncludeDirectories="../../shared/ruby;../../shared"
497
- PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
498
- RuntimeLibrary="0"
487
+ PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
488
+ MinimalRebuild="true"
489
+ RuntimeLibrary="1"
499
490
  UsePrecompiledHeader="0"
500
491
  WarningLevel="3"
501
492
  DebugInformationFormat="3"
@@ -505,7 +496,7 @@
505
496
  />
506
497
  <Tool
507
498
  Name="VCResourceCompilerTool"
508
- PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
499
+ PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
509
500
  Culture="1033"
510
501
  AdditionalIncludeDirectories="$(IntDir)"
511
502
  />
@@ -514,7 +505,7 @@
514
505
  />
515
506
  <Tool
516
507
  Name="VCLibrarianTool"
517
- AdditionalOptions=" /subsystem:windowsce,5.01"
508
+ AdditionalOptions=" /subsystem:windowsce,5.02"
518
509
  OutputFile="$(OutDir)/RhoLib.lib"
519
510
  />
520
511
  <Tool
@@ -542,7 +533,7 @@
542
533
  />
543
534
  </Configuration>
544
535
  <Configuration
545
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
536
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
546
537
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
547
538
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
548
539
  ConfigurationType="4"
@@ -588,7 +579,7 @@
588
579
  />
589
580
  <Tool
590
581
  Name="VCLibrarianTool"
591
- AdditionalOptions=" /subsystem:windowsce,5.02"
582
+ AdditionalOptions=" /subsystem:windowsce,5.01"
592
583
  OutputFile="$(OutDir)/RhoLib.lib"
593
584
  />
594
585
  <Tool
@@ -616,7 +607,7 @@
616
607
  />
617
608
  </Configuration>
618
609
  <Configuration
619
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
610
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
620
611
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
621
612
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
622
613
  ConfigurationType="4"
@@ -662,7 +653,7 @@
662
653
  />
663
654
  <Tool
664
655
  Name="VCLibrarianTool"
665
- AdditionalOptions=" /subsystem:windowsce,5.02"
656
+ AdditionalOptions=" /subsystem:windowsce,5.01"
666
657
  OutputFile="$(OutDir)/RhoLib.lib"
667
658
  />
668
659
  <Tool
@@ -690,7 +681,7 @@
690
681
  />
691
682
  </Configuration>
692
683
  <Configuration
693
- Name="Release|Win32"
684
+ Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
694
685
  OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
695
686
  IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
696
687
  ConfigurationType="4"
@@ -713,9 +704,10 @@
713
704
  />
714
705
  <Tool
715
706
  Name="VCCLCompilerTool"
707
+ ExecutionBucket="7"
716
708
  Optimization="2"
717
709
  AdditionalIncludeDirectories="../../shared/ruby;../../shared"
718
- PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS"
710
+ PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
719
711
  RuntimeLibrary="0"
720
712
  UsePrecompiledHeader="0"
721
713
  WarningLevel="3"
@@ -748,11 +740,19 @@
748
740
  Name="VCBscMakeTool"
749
741
  />
750
742
  <Tool
751
- Name="VCFxCopTool"
743
+ Name="VCCodeSignTool"
752
744
  />
753
745
  <Tool
754
746
  Name="VCPostBuildEventTool"
755
747
  />
748
+ <DeploymentTool
749
+ ForceDirty="-1"
750
+ RemoteDirectory=""
751
+ RegisterOutput="0"
752
+ AdditionalFiles=""
753
+ />
754
+ <DebuggerTool
755
+ />
756
756
  </Configuration>
757
757
  </Configurations>
758
758
  <References>
@@ -761,6 +761,14 @@
761
761
  <Filter
762
762
  Name="common"
763
763
  >
764
+ <File
765
+ RelativePath="..\..\shared\common\app_build_configs.c"
766
+ >
767
+ </File>
768
+ <File
769
+ RelativePath="..\..\shared\common\app_build_configs.h"
770
+ >
771
+ </File>
764
772
  <File
765
773
  RelativePath="..\..\shared\common\AppMenu.cpp"
766
774
  >
@@ -829,6 +837,14 @@
829
837
  RelativePath="..\..\shared\common\RhoFilePath.h"
830
838
  >
831
839
  </File>
840
+ <File
841
+ RelativePath="..\..\shared\common\RhoMath.cpp"
842
+ >
843
+ </File>
844
+ <File
845
+ RelativePath="..\..\shared\common\RhoMath.h"
846
+ >
847
+ </File>
832
848
  <File
833
849
  RelativePath="..\..\shared\common\RhoMutexLock.h"
834
850
  >
@@ -893,14 +909,34 @@
893
909
  RelativePath="..\..\shared\common\Tokenizer.h"
894
910
  >
895
911
  </File>
896
- <File
897
- RelativePath="..\..\shared\common\app_build_configs.c"
912
+ <Filter
913
+ Name="map"
898
914
  >
899
- </File>
900
- <File
901
- RelativePath="..\..\shared\common\app_build_configs.h"
902
- >
903
- </File>
915
+ <File
916
+ RelativePath="..\..\shared\common\map\ESRIMapEngine.cpp"
917
+ >
918
+ </File>
919
+ <File
920
+ RelativePath="..\..\shared\common\map\ESRIMapEngine.h"
921
+ >
922
+ </File>
923
+ <File
924
+ RelativePath="..\..\shared\common\map\GoogleMapEngine.cpp"
925
+ >
926
+ </File>
927
+ <File
928
+ RelativePath="..\..\shared\common\map\GoogleMapEngine.h"
929
+ >
930
+ </File>
931
+ <File
932
+ RelativePath="..\..\shared\common\map\MapEngine.cpp"
933
+ >
934
+ </File>
935
+ <File
936
+ RelativePath="..\..\shared\common\map\MapEngine.h"
937
+ >
938
+ </File>
939
+ </Filter>
904
940
  </Filter>
905
941
  <Filter
906
942
  Name="logging"
data/platform/wm/build/wm.rake CHANGED
@@ -142,6 +142,9 @@ namespace "build" do
142
142
  mkdir_p win32rhopath
143
143
  namepath = File.join(win32rhopath,"name.txt")
144
144
  old_appname = File.read(namepath) if File.exists?(namepath)
145
+
146
+ confpath = File.join(win32rhopath,"apps/rhoconfig.txt.changes")
147
+ confpath_content = File.read(confpath) if File.exists?(confpath)
145
148
 
146
149
  rm_rf win32rhopath + 'lib'
147
150
  rm_rf win32rhopath + 'apps'
@@ -152,6 +155,7 @@ namespace "build" do
152
155
  cp_r $srcdir + '/db', win32rhopath
153
156
 
154
157
  File.open(namepath, "w") { |f| f.write($appname) }
158
+ File.open(confpath, "w") { |f| f.write(confpath_content) } if old_appname == $appname && confpath_content && confpath_content.length()>0
155
159
 
156
160
  end
157
161
  end
@@ -315,8 +319,10 @@ namespace "run" do
315
319
  win32rhopath = 'platform/wm/bin/win32/rhodes/Debug/rho/'
316
320
  win32logpath = File.join(win32rhopath,"RhoLog.txt")
317
321
  win32logpospath = File.join(win32rhopath,"RhoLog.txt_pos")
322
+ win32configpath = File.join(win32rhopath,"apps/rhoconfig.txt.changes")
318
323
  rm_rf win32logpath if File.exists?(win32logpath)
319
324
  rm_rf win32logpospath if File.exists?(win32logpospath)
325
+ rm_rf win32configpath if File.exists?(win32configpath)
320
326
 
321
327
  Jake.before_run_spec
322
328
  start = Time.now
data/platform/wm/rhodes/Alert.cpp CHANGED
@@ -364,13 +364,14 @@ void CAlert::playFile(String fileName)
364
364
 
365
365
  #endif //_WIN32_WCE
366
366
 
367
- extern "C" void alert_show_status(const char* szMessage, const char* szHide)
367
+ extern "C" void alert_show_status(const char* szTitle, const char* szMessage, const char* szHide)
368
368
  {
369
369
  String message = szMessage ? szMessage : "";
370
+ String title = szTitle ? szTitle : "";
370
371
  Vector<CAlertDialog::Params::CAlertButton> buttons;
371
372
  //buttons.addElement( CAlertDialog::Params::CAlertButton(szHide, "") );
372
373
 
373
- CAlert::showPopup(new CAlertDialog::Params(String(), message, String(), String(), buttons, CAlertDialog::Params::DLG_STATUS ));
374
+ CAlert::showPopup(new CAlertDialog::Params(title, message, String(), String(), buttons, CAlertDialog::Params::DLG_STATUS ));
374
375
  }
375
376
 
376
377
  extern "C" void alert_show_popup(rho_param *p)
@@ -455,7 +456,7 @@ extern "C" void alert_show_popup(rho_param *p)
455
456
  }//buttons
456
457
  }
457
458
 
458
- CAlert::showPopup(new CAlertDialog::Params(title, message, icon, callback, buttons));
459
+ CAlert::showPopup(new CAlertDialog::Params(title, message, icon, callback, buttons, CAlertDialog::Params::DLG_CUSTOM));
459
460
  }
460
461
  }
461
462
 
data/platform/wm/rhodes/Alert.h CHANGED
@@ -33,7 +33,7 @@ public:
33
33
  m_message = message;
34
34
  }
35
35
 
36
- Params (String &title, String &message, String &icon, String &callback, Vector<CAlertButton>& buttons, int dlgType = DLG_STATUS)
36
+ Params (String &title, String &message, String &icon, String &callback, Vector<CAlertButton>& buttons, int dlgType)
37
37
  {
38
38
  m_dlgType = dlgType;
39
39
  m_title = title;
data/platform/wm/rhodes/DateTimePicker.cpp CHANGED
@@ -31,6 +31,8 @@ CDateTimePickerDialog::CDateTimePickerDialog (const CDateTimeMessage *msg)
31
31
  m_format = msg->m_format;
32
32
  m_title = msg->m_title;
33
33
  m_initialTime = msg->m_initialTime;
34
+ m_min_time = msg->m_min_time;
35
+ m_max_time = msg->m_max_time;
34
36
  }
35
37
 
36
38
  CDateTimePickerDialog::~CDateTimePickerDialog ()
@@ -52,6 +54,22 @@ LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LP
52
54
  mbi.nToolBarId = IDR_GETURL_MENUBAR;
53
55
  mbi.hInstRes = _AtlBaseModule.GetResourceInstance();
54
56
  RHO_ASSERT(SHCreateMenuBar(&mbi));
57
+
58
+ SYSTEMTIME times[2]; // min and max times
59
+ unsigned int flags = 0;
60
+
61
+
62
+ if (m_min_time != 0) {
63
+ UnixTimeToSystemTime(m_min_time, &(times[0]));
64
+ flags = flags | GDTR_MIN;
65
+ }
66
+ if (m_max_time != 0) {
67
+ UnixTimeToSystemTime(m_max_time, &(times[1]));
68
+ flags = flags | GDTR_MAX;
69
+ }
70
+ DateTime_SetRange( GetDlgItem(IDC_DATE_CTRL), flags, times);
71
+
72
+
55
73
  GotoDlgCtrl(GetDlgItem(IDC_DATE_CTRL));
56
74
 
57
75
  #else
@@ -184,12 +202,21 @@ LRESULT CTimePickerDialog::OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndC
184
202
  return 0;
185
203
  }
186
204
 
187
- void choose_datetime(char* callback, char* title,
188
- long initial_time, int format, char* data)
205
+
206
+ void choose_datetime_with_range(char* callback, char* title,
207
+ long initial_time, int format, char* data,
208
+ long min_time, long max_time)
189
209
  {
190
210
  LOG(INFO) + __FUNCTION__ + "callback = " + callback + " title = " + title;
191
211
 
192
212
  HWND main_wnd = getMainWnd();
193
213
  ::PostMessage(main_wnd, WM_DATETIME_PICKER, 0,
194
- (LPARAM)new CDateTimeMessage(callback, title, initial_time, format, data));
214
+ (LPARAM)new CDateTimeMessage(callback, title, initial_time, format, data, min_time, max_time));
215
+ }
216
+
217
+
218
+ void choose_datetime(char* callback, char* title,
219
+ long initial_time, int format, char* data)
220
+ {
221
+ choose_datetime_with_range( callback, title, initial_time, format, data, 0, 0);
195
222
  }
data/platform/wm/rhodes/DateTimePicker.h CHANGED
@@ -15,13 +15,15 @@ public:
15
15
  FORMAT_TIME
16
16
  };
17
17
 
18
- CDateTimeMessage (const char* callback, const char* title, long initial_time, int format, const char* data)
18
+ CDateTimeMessage (const char* callback, const char* title, long initial_time, int format, const char* data, long min_time, long max_time)
19
19
  {
20
20
  m_callback = strdup (callback);
21
21
  m_title = strdup (title);
22
22
  m_initialTime = initial_time;
23
23
  m_format = format;
24
24
  m_data = strdup (data);
25
+ m_min_time = min_time;
26
+ m_max_time = max_time;
25
27
  }
26
28
 
27
29
  ~CDateTimeMessage ()
@@ -36,6 +38,8 @@ public:
36
38
  char *m_data;
37
39
  long m_initialTime;
38
40
  int m_format;
41
+ long m_min_time;
42
+ long m_max_time;
39
43
  };
40
44
 
41
45
  class CDateTimePickerDialog : public
@@ -68,6 +72,8 @@ private:
68
72
  time_t m_returnTime;
69
73
  time_t m_initialTime;
70
74
  const char *m_title;
75
+ time_t m_min_time;
76
+ time_t m_max_time;
71
77
  };
72
78
 
73
79
 
@@ -107,5 +113,7 @@ private:
107
113
 
108
114
  extern "C" void choose_datetime(char* callback, char* title,
109
115
  long initial_time, int format, char* data);
116
+ extern "C" void choose_datetime_with_range(char* callback, char* title,
117
+ long initial_time, int format, char* data, long min_time, long max_time);
110
118
 
111
119
  #endif //__DATETIMEPICKER_H__