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.
- data/CHANGELOG +20 -0
- data/README.md +46 -0
- data/Rakefile +85 -80
- data/bin/rhodes +2 -2
- data/bin/rhogen +1 -1
- data/doc/application.txt +277 -0
- data/doc/bb-css.txt +209 -0
- data/doc/build.txt +785 -0
- data/doc/configuration.txt +236 -0
- data/doc/connect-to-web-services.txt +282 -0
- data/doc/contributing.txt +64 -0
- data/doc/css-framework.txt +144 -0
- data/doc/device-caps.txt +1152 -0
- data/doc/extensions.txt +528 -0
- data/doc/files.txt +4 -0
- data/doc/generator.txt +141 -0
- data/doc/install.txt +35 -0
- data/doc/introduction.txt +88 -0
- data/doc/rhom.txt +826 -0
- data/doc/standard-css.txt +392 -0
- data/doc/synchronization.txt +542 -0
- data/doc/test-log-debug.txt +148 -0
- data/doc/tutorial.txt +136 -0
- data/doc/ui.txt +766 -0
- data/installer/EnvVarUpdate.nsh +328 -0
- data/installer/README.html +81 -0
- data/installer/RHOSYNC-LICENSE.txt +675 -0
- data/installer/icon.ico +0 -0
- data/installer/instant-rhodes.nsi +427 -0
- data/lib/build/jake.rb +15 -1
- data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/imageprovider.cpp +1 -1
- data/lib/extensions/barcode/ext/barcode/platform/bb/Barcode6.files +45 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +6 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/barcode6.jdp +92 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj +7 -4
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile +2 -1
- data/lib/extensions/barcode/ext/barcode/platform/wm/src/wm_imageprovider.cpp +1 -1
- data/lib/extensions/digest-sha1/ext/build.bat +1 -0
- data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +335 -0
- data/lib/extensions/esri/ext/build +17 -0
- data/lib/extensions/esri/ext/build.bat +29 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.h +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.mm +58 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactoryRegister.mm +22 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.h +21 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.mm +32 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/InitESRI.c +5 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +143 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +919 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI.xcodeproj/project.pbxproj +320 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI_Prefix.pch +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Rakefile +76 -0
- data/lib/extensions/esri/ext.yml +3 -0
- data/lib/extensions/net-http/monitor.rb +265 -0
- data/lib/extensions/net-http/net/ftp.rb +981 -0
- data/lib/extensions/net-http/thread.rb +367 -0
- data/lib/extensions/rhocgi/cgi.rb +16 -0
- data/lib/extensions/rhospec/rhospec.rb +118 -0
- data/lib/framework/base64.rb +91 -0
- data/lib/framework/builtinME.rb +13 -10
- data/lib/framework/ostruct.rb +145 -0
- data/lib/framework/res/back_btn.wm.png +0 -0
- data/lib/framework/res/blue_pushpin.wm.png +0 -0
- data/lib/framework/res/blue_pushpin_small.wm.png +0 -0
- data/lib/framework/res/callout.wm.png +0 -0
- data/lib/framework/res/callout_link.wm.png +0 -0
- data/lib/framework/res/forward_btn.wm.png +0 -0
- data/lib/framework/res/home_btn.wm.png +0 -0
- data/lib/framework/res/options_btn.wm.png +0 -0
- data/lib/framework/res/refresh_btn.wm.png +0 -0
- data/lib/framework/rho/render.rb +5 -2
- data/lib/framework/rho/rho.rb +320 -50
- data/lib/framework/rho/rhoapplication.rb +48 -10
- data/lib/framework/rho/rhonativeviewmanager.rb +73 -0
- data/lib/framework/rho/rhosupport.rb +15 -1
- data/lib/framework/rho/rhotabbar.rb +29 -0
- data/lib/framework/rho/rhotoolbar.rb +17 -0
- data/lib/framework/rho/rhoutils.rb +22 -6
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rholang/rhomsg_de.rb +4 -3
- data/lib/framework/rholang/rhomsg_en.rb +1 -0
- data/lib/framework/rholang/rhomsg_es.rb +1 -0
- data/lib/framework/rholang/rhomsg_it.rb +1 -0
- data/lib/framework/rhom/rhom.rb +31 -10
- data/lib/framework/rhom/rhom_db_adapter.rb +33 -23
- data/lib/framework/rhom/rhom_object_factory.rb +465 -249
- data/lib/framework/rhom/rhom_source.rb +22 -7
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +83 -20
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +5 -0
- data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +2 -0
- data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +9 -5
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesAppOptions.h +53 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +46 -56
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +10 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mapview_MapView.h +93 -0
- data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +38 -0
- data/platform/android/Rhodes/jni/include/rhodes.h +64 -8
- data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +6 -0
- data/platform/android/Rhodes/jni/src/alert.cpp +5 -11
- data/platform/android/Rhodes/jni/src/bluetooth.cpp +66 -29
- data/platform/android/Rhodes/jni/src/callbacks.cpp +24 -21
- data/platform/android/Rhodes/jni/src/camera.cpp +2 -6
- data/platform/android/Rhodes/jni/src/datetimepicker.cpp +13 -11
- data/platform/android/Rhodes/jni/src/event.cpp +9 -15
- data/platform/android/Rhodes/jni/src/fileapi.cpp +13 -27
- data/platform/android/Rhodes/jni/src/logconf.cpp +3 -3
- data/platform/android/Rhodes/jni/src/mapview.cpp +696 -16
- data/platform/android/Rhodes/jni/src/menu.cpp +3 -3
- data/platform/android/Rhodes/jni/src/nativebar.cpp +55 -4
- data/platform/android/Rhodes/jni/src/nativeview.cpp +33 -0
- data/platform/android/Rhodes/jni/src/phonebook.cpp +6 -11
- data/platform/android/Rhodes/jni/src/rhoconf.cpp +4 -4
- data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +87 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +55 -34
- data/platform/android/Rhodes/jni/src/ringtones.cpp +2 -3
- data/platform/android/Rhodes/jni/src/signature.cpp +3 -5
- data/platform/android/Rhodes/jni/src/splashscreen.cpp +7 -0
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +17 -20
- data/platform/android/Rhodes/jni/src/webview.cpp +13 -12
- data/platform/android/Rhodes/res/drawable/callout.png +0 -0
- data/platform/android/Rhodes/res/drawable/callout_link.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_cancel.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_clear.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_ok.png +0 -0
- data/platform/android/Rhodes/res/layout/datetime.xml +4 -0
- data/platform/android/Rhodes/res/layout/signature.xml +24 -17
- data/platform/android/Rhodes/res/layout/status_bar_ongoing_event_progress_bar.xml +102 -0
- data/platform/android/Rhodes/res/values/strings.xml +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java +575 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +83 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +21 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +23 -15
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +151 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +372 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +11 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +58 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +705 -523
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +167 -85
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +36 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +4 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +33 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +2 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +2 -24
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +106 -36
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +15 -58
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +4 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +91 -27
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +6 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +275 -42
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +1 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +120 -43
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +518 -28
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +434 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +20 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +296 -336
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +111 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +77 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +10 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +0 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +6 -11
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +9 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +8 -8
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +11 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +3 -5
- data/platform/android/build/RhodesSRC_build.files +32 -23
- data/platform/android/build/android.rake +28 -11
- data/platform/android/build/androidcommon.rb +2 -0
- data/platform/android/build/librhocommon_build.files +9 -5
- data/platform/android/build/librhodes_build.files +1 -0
- data/platform/android/build/libruby_build.files +1 -0
- data/platform/bb/Hsqldb/Hsqldb.jdp +0 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +10 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +37 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Column.java +5 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Function.java +73 -78
- data/platform/bb/Hsqldb/src/org/hsqldb/Library.java +288 -8
- data/platform/bb/RubyVM/RubyVM.jdp +3 -0
- data/platform/bb/RubyVM/src/com/rho/FilePath.java +13 -1
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -2
- data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +12 -0
- data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +18 -1
- data/platform/bb/RubyVM/src/com/rho/RhoConf.java +128 -108
- data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +9 -10
- data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +16 -1
- data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +20 -0
- data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +5 -2
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +65 -46
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +192 -50
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +8 -114
- data/platform/bb/RubyVM/src/com/rho/db/DBException.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +5 -3
- data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +5 -1
- data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +109 -0
- data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +85 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +12 -4
- data/platform/bb/RubyVM/src/com/rho/net/NetResponse.java +5 -0
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +37 -23
- data/platform/bb/RubyVM/src/com/rho/net/URI.java +84 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +119 -61
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +61 -24
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +108 -54
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +121 -163
- data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java +23 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyMutex.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRange.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRegexp.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java +208 -25
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RhoSupport.java +5 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +12 -5
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyID.java +1 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java +16 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule_Methods.java +5 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyValue.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/stdlib/RubyStringIO.java +4 -1
- data/platform/bb/{Hsqldb → RubyVM}/src/j2me/math/Number.java +33 -0
- data/platform/bb/build/RubyVM_build.files +3 -0
- data/platform/bb/build/bb.rake +140 -62
- data/platform/bb/build/hsqldb_build.files +0 -2
- data/platform/bb/build/rhodes_build.files +5 -0
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +43 -7
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +23 -2
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +5 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +3 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +12 -2
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +2 -0
- data/platform/bb/rhodes/resources/mappin.png +0 -0
- data/platform/bb/rhodes/rhodes.jdp +3 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +21 -18
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +150 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +1 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +63 -4
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +6 -5
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +242 -2
- data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +1 -1
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +71 -14
- data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +4 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +28 -12
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +100 -4
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +3 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/NativeBar.java +32 -0
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +9 -2
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +174 -41
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +52 -3
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +33 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +2 -14
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +686 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +14 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +13 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +174 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +104 -330
- data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +79 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +35 -12
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +2 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +336 -44
- data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +3 -6
- data/platform/iphone/Classes/AppManager/AppManager.m +19 -4
- data/platform/iphone/Classes/DateTime.h +4 -0
- data/platform/iphone/Classes/DateTime.m +1 -1
- data/platform/iphone/Classes/DateTimePicker.m +8 -1
- data/platform/iphone/Classes/DateTimePickerDelegate.m +7 -1
- data/platform/iphone/Classes/Event/Event.m +2 -2
- data/platform/iphone/Classes/MapView/MapViewController.h +4 -1
- data/platform/iphone/Classes/MapView/MapViewController.m +6 -46
- data/platform/iphone/Classes/MapView/MapViewManager.h +26 -0
- data/platform/iphone/Classes/MapView/MapViewManager.m +172 -0
- data/platform/iphone/Classes/NativeBar.h +34 -0
- data/platform/iphone/Classes/NativeBar.m +131 -26
- data/platform/iphone/Classes/NativeView/NVDelegate.h +26 -0
- data/platform/iphone/Classes/NativeView/NVDelegate.m +40 -0
- data/platform/iphone/Classes/NativeView/NVViewController.h +24 -0
- data/platform/iphone/Classes/NativeView/NVViewController.m +90 -0
- data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +449 -0
- data/platform/iphone/Classes/{RhoNativeViewManagerOC.h → NativeView/RhoNativeViewManagerOC.h} +15 -0
- data/platform/iphone/Classes/RhoAlert.m +3 -3
- data/platform/iphone/Classes/RhoMainView.h +3 -0
- data/platform/iphone/Classes/Rhodes.h +6 -2
- data/platform/iphone/Classes/Rhodes.m +47 -79
- data/platform/iphone/Classes/Signature/SignatureViewController.m +1 -0
- data/platform/iphone/Classes/SimpleMainView.h +18 -1
- data/platform/iphone/Classes/SimpleMainView.m +180 -35
- data/platform/iphone/Classes/SplitView/LeftViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/LeftViewController.m +13 -7
- data/platform/iphone/Classes/SplitView/RightViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/RightViewController.m +26 -11
- data/platform/iphone/Classes/SplitView/SplittedMainView.h +1 -6
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +14 -52
- data/platform/iphone/Classes/TabbedMainView.h +25 -3
- data/platform/iphone/Classes/TabbedMainView.m +340 -14
- data/platform/iphone/ESRI/BluePushpin.png +0 -0
- data/platform/iphone/ESRI/BluePushpin@2x.png +0 -0
- data/platform/iphone/ESRI/esri.png +0 -0
- data/platform/iphone/ESRI/esri@2x.png +0 -0
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +26 -3
- data/platform/iphone/rbuild/iphone.rake +100 -4
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +116 -12
- data/platform/shared/SyncClient/SyncClient.cpp +29 -3
- data/platform/shared/SyncClient/SyncClient.h +2 -1
- data/platform/shared/common/IRhoClassFactory.h +3 -0
- data/platform/shared/common/IRhoCrypt.h +16 -0
- data/platform/shared/common/IRhoThreadImpl.h +1 -0
- data/platform/shared/common/RhoAppAdapter.h +2 -0
- data/platform/shared/common/RhoConf.cpp +97 -46
- data/platform/shared/common/RhoConf.h +14 -13
- data/platform/shared/common/RhoFile.cpp +10 -0
- data/platform/shared/common/RhoFile.h +1 -0
- data/platform/shared/common/RhoMath.cpp +43 -0
- data/platform/shared/common/RhoMath.h +27 -0
- data/platform/shared/common/RhoNativeViewManager.h +27 -1
- data/platform/shared/common/RhoPort.h +11 -0
- data/platform/shared/common/RhoStd.h +5 -0
- data/platform/shared/common/RhoThread.cpp +1 -1
- data/platform/shared/common/RhoThread.h +1 -1
- data/platform/shared/common/RhodesApp.cpp +381 -139
- data/platform/shared/common/RhodesApp.h +24 -10
- data/platform/shared/common/RhodesAppBase.cpp +72 -1
- data/platform/shared/common/RhodesAppBase.h +5 -1
- data/platform/shared/common/SplashScreen.h +4 -4
- data/platform/shared/common/ThreadQueue.cpp +44 -17
- data/platform/shared/common/ThreadQueue.h +4 -0
- data/platform/shared/common/app_build_configs.c +0 -1
- data/platform/shared/common/iphone/RhoClassfactory.h +6 -0
- data/platform/shared/common/iphone/RhoCryptImpl.h +47 -0
- data/platform/shared/common/iphone/RhoCryptImpl.mm +286 -0
- data/platform/shared/common/map/ESRIMapEngine.cpp +921 -0
- data/platform/shared/common/map/ESRIMapEngine.h +255 -0
- data/platform/shared/common/map/GoogleMapEngine.cpp +160 -0
- data/platform/shared/common/map/GoogleMapEngine.h +52 -0
- data/platform/shared/common/map/MapEngine.cpp +304 -0
- data/platform/shared/common/map/MapEngine.h +214 -0
- data/platform/shared/db/DBAdapter.cpp +147 -18
- data/platform/shared/db/DBAdapter.h +38 -12
- data/platform/shared/db/DBAttrManager.cpp +4 -3
- data/platform/shared/db/DBAttrManager.h +7 -7
- data/platform/shared/db/res/db/syncdb.triggers +0 -5
- data/platform/shared/db/res/db/syncdb_java.triggers +21 -0
- data/platform/shared/json/JSONIterator.cpp +11 -1
- data/platform/shared/json/JSONIterator.h +1 -0
- data/platform/shared/logging/RhoLogConf.cpp +29 -12
- data/platform/shared/net/CURLNetRequest.cpp +80 -25
- data/platform/shared/net/CURLNetRequest.h +6 -2
- data/platform/shared/net/HttpServer.cpp +12 -6
- data/platform/shared/net/HttpServer.h +2 -1
- data/platform/shared/net/INetRequest.h +1 -0
- data/platform/shared/ruby/ext/alert/alert.i +5 -0
- data/platform/shared/ruby/ext/alert/alert_wrap.c +439 -108
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker.i +42 -0
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +521 -120
- data/platform/shared/ruby/ext/nativebar/nativebar.i +16 -0
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +623 -128
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +18 -0
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +2321 -0
- data/platform/shared/ruby/ext/rho/extensions.c +0 -1
- data/platform/shared/ruby/ext/rho/rhoruby.c +53 -0
- data/platform/shared/ruby/ext/rho/rhoruby.h +6 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +6 -3
- data/platform/shared/ruby/ext/syncengine/syncengine.i +9 -1
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +61 -0
- data/platform/shared/ruby/ext/system/system.i +4 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +33 -5
- data/platform/shared/rubyext/RhoAppAdapter.cpp +11 -1
- data/platform/shared/rubyext/System.cpp +9 -0
- data/platform/shared/rubyext/WebView.h +1 -0
- data/platform/shared/sqlite/crypto.c +907 -0
- data/platform/shared/sqlite/sqlite3.c +6 -0
- data/platform/shared/sync/SyncEngine.cpp +49 -19
- data/platform/shared/sync/SyncEngine.h +0 -1
- data/platform/shared/sync/SyncNotify.cpp +14 -5
- data/platform/shared/sync/SyncNotify.h +2 -2
- data/platform/shared/sync/SyncSource.cpp +79 -33
- data/platform/shared/sync/SyncSource.h +1 -0
- data/platform/shared/sync/SyncThread.cpp +26 -11
- data/platform/shared/xruby/src/com/xruby/compiler/codedom/StringExpression.java +4 -2
- data/platform/wm/RhoLib/RhoLib.vcproj +108 -72
- data/platform/wm/build/wm.rake +6 -0
- data/platform/wm/rhodes/Alert.cpp +4 -3
- data/platform/wm/rhodes/Alert.h +1 -1
- data/platform/wm/rhodes/DateTimePicker.cpp +30 -3
- data/platform/wm/rhodes/DateTimePicker.h +9 -1
- data/platform/wm/rhodes/MainWindow.cpp +121 -61
- data/platform/wm/rhodes/MainWindow.h +29 -4
- data/platform/wm/rhodes/MapView/Graphics.cpp +547 -0
- data/platform/wm/rhodes/MapView/Graphics.h +136 -0
- data/platform/wm/rhodes/MapView/MapViewManager.cpp +391 -0
- data/platform/wm/rhodes/MapView/MapViewManager.h +158 -0
- data/platform/wm/rhodes/RhoCryptImpl.cpp +248 -0
- data/platform/wm/rhodes/RhoCryptImpl.h +51 -0
- data/platform/wm/rhodes/RhoNativeViewManager.cpp +208 -0
- data/platform/wm/rhodes/Rhodes.cpp +94 -102
- data/platform/wm/rhodes/Rhodes.rc +27 -0
- data/platform/wm/rhodes/SyncStatusDlg.cpp +1 -0
- data/platform/wm/rhodes/SyncStatusDlg.h +2 -1
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +7 -4
- data/platform/wm/rhodes/camera/Camera.cpp +36 -15
- data/platform/wm/rhodes/camera/Camera.h +0 -4
- data/platform/wm/rhodes/resource.h +10 -2
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +7 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.h +1 -0
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +10 -2
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +10 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +513 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +74 -0
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +22 -10
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +5 -0
- data/platform/wm/rhodes/rhodes.vcproj +38 -2
- data/platform/wm/rhodes/stdafx.h +2 -1
- data/platform/wm/rubylib/rubylib.vcproj +12 -0
- data/rakefile.rb +85 -80
- data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +14 -3
- data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
- data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj +2 -0
- data/res/build-tools/xruby-0.3.3.jar +0 -0
- data/res/generators/templates/application/app/application.rb +2 -2
- data/res/generators/templates/application/app/helpers/application_helper.rb +1 -1
- data/res/generators/templates/application/public/css/android.css +1 -0
- data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +1 -1
- data/res/generators/templates/application/rhoconfig.txt +66 -14
- data/rhodes.gemspec +3 -3
- data/spec/framework_spec/app/spec/core/file/expand_path_spec.rb +7 -3
- data/spec/framework_spec/build.yml +1 -1
- data/spec/phone_spec/Rakefile +1 -0
- data/spec/phone_spec/app/Account/account.rb +2 -0
- data/spec/phone_spec/app/Account_s/account_s.rb +7 -0
- data/spec/phone_spec/app/spec/{fixtures → array/fixtures}/classes.rb +0 -0
- data/spec/phone_spec/app/spec/{array_pack_spec.rb → array/pack_spec.rb} +2 -1
- data/spec/phone_spec/app/spec/bulksync_spec.rb +1 -0
- data/spec/phone_spec/app/spec/contacts_spec.rb +2 -0
- data/spec/phone_spec/app/spec/rho_spec.rb +34 -233
- data/spec/phone_spec/app/spec/rhom_object_spec.rb +396 -87
- data/spec/phone_spec/app/spec/string/element_set_spec.rb +251 -0
- data/spec/phone_spec/app/spec/string/end_with_spec.rb +49 -0
- data/spec/phone_spec/app/spec/string/fixtures/classes.rb +27 -0
- data/spec/phone_spec/app/spec/{lstrip_spec.rb → string/lstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/replace_spec.rb +52 -0
- data/spec/phone_spec/app/spec/{rstrip_spec.rb → string/rstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/slice_spec.rb +473 -0
- data/spec/phone_spec/app/spec/string/split_spec.rb +302 -0
- data/spec/phone_spec/app/spec/string/start_with_spec.rb +48 -0
- data/spec/phone_spec/app/spec/{strip_spec.rb → string/strip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +30 -1
- data/spec/phone_spec/app/spec_runner.rb +15 -7
- data/spec/phone_spec/build.yml +2 -2
- metadata +154 -25
- data/README.textile +0 -45
- data/platform/android/Rhodes/AndroidManifest.full.xml +0 -62
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java +0 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java +0 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +0 -193
- data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -25
- data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java +0 -22
- data/platform/bb/RubyVM/src/com/rho/Capabilities.java +0 -6
- data/platform/bb/RubyVM/src/com/rho/Extensions.java +0 -11
- data/platform/iphone/Classes/RhoNativeViewManager.mm +0 -226
@@ -50,6 +50,16 @@ public:
|
|
50
50
|
return m_nRespCode == 401;
|
51
51
|
}
|
52
52
|
|
53
|
+
boolean isRedirect()
|
54
|
+
{
|
55
|
+
return m_nRespCode == 301 || m_nRespCode ==302;
|
56
|
+
}
|
57
|
+
|
58
|
+
virtual boolean isSuccess()
|
59
|
+
{
|
60
|
+
return m_nRespCode > 0 && m_nRespCode < 400;
|
61
|
+
}
|
62
|
+
|
53
63
|
void setCookies(String s)
|
54
64
|
{
|
55
65
|
m_cookies = s;
|
@@ -0,0 +1,513 @@
|
|
1
|
+
#include "stdafx.h"
|
2
|
+
|
3
|
+
#include "NativeToolbar.h"
|
4
|
+
#include "common/rhoparams.h"
|
5
|
+
#include "MainWindow.h"
|
6
|
+
#include "common/RhoFilePath.h"
|
7
|
+
#include "rubyext/WebView.h"
|
8
|
+
|
9
|
+
#ifndef max
|
10
|
+
#define max(a,b) (((a) > (b)) ? (a) : (b))
|
11
|
+
#endif
|
12
|
+
|
13
|
+
#define TOOLBAR_TYPE 0
|
14
|
+
#define TABBAR_TYPE 1
|
15
|
+
#define NOBAR_TYPE 2
|
16
|
+
#define VTABBAR_TYPE 3
|
17
|
+
|
18
|
+
extern CMainWindow& getAppWindow();
|
19
|
+
IMPLEMENT_LOGCLASS(CNativeToolbar,"NativeToolbar");
|
20
|
+
extern "C" int rho_wmsys_has_touchscreen();
|
21
|
+
|
22
|
+
CNativeToolbar::CNativeToolbar(void)
|
23
|
+
{
|
24
|
+
}
|
25
|
+
|
26
|
+
CNativeToolbar::~CNativeToolbar(void)
|
27
|
+
{
|
28
|
+
}
|
29
|
+
|
30
|
+
void CNativeToolbar::OnFinalMessage(HWND /*hWnd*/)
|
31
|
+
{
|
32
|
+
removeAllButtons();
|
33
|
+
}
|
34
|
+
|
35
|
+
/*static*/ CNativeToolbar& CNativeToolbar::getInstance()
|
36
|
+
{
|
37
|
+
return getAppWindow().getToolbar();
|
38
|
+
}
|
39
|
+
|
40
|
+
void CNativeToolbar::removeAllButtons()
|
41
|
+
{
|
42
|
+
if ( m_hWnd )
|
43
|
+
{
|
44
|
+
int nCount = GetButtonCount();
|
45
|
+
for( int i = 0; i < nCount; i++)
|
46
|
+
DeleteButton(0);
|
47
|
+
|
48
|
+
SetImageList(NULL);
|
49
|
+
}
|
50
|
+
|
51
|
+
m_listImages.Destroy();
|
52
|
+
m_arButtons.removeAllElements();
|
53
|
+
}
|
54
|
+
|
55
|
+
static int getColorFromString(const char* szColor)
|
56
|
+
{
|
57
|
+
if ( !szColor || !*szColor )
|
58
|
+
return RGB(0, 0, 0);
|
59
|
+
|
60
|
+
int c = atoi(szColor);
|
61
|
+
|
62
|
+
int cR = (c & 0xFF0000) >> 16;
|
63
|
+
int cG = (c & 0xFF00) >> 8;
|
64
|
+
int cB = (c & 0xFF);
|
65
|
+
|
66
|
+
return RGB(cR, cG, cB);
|
67
|
+
}
|
68
|
+
|
69
|
+
void CNativeToolbar::createToolbar(rho_param *p)
|
70
|
+
{
|
71
|
+
if (!rho_rhodesapp_check_mode() || !rho_wmsys_has_touchscreen() )
|
72
|
+
return;
|
73
|
+
|
74
|
+
int bar_type = TOOLBAR_TYPE;
|
75
|
+
m_rgbBackColor = RGB(220,220,220);
|
76
|
+
m_rgbMaskColor = RGB(255,255,255);
|
77
|
+
m_nHeight = MIN_TOOLBAR_HEIGHT;
|
78
|
+
|
79
|
+
rho_param *params = NULL;
|
80
|
+
switch (p->type)
|
81
|
+
{
|
82
|
+
case RHO_PARAM_ARRAY:
|
83
|
+
params = p;
|
84
|
+
break;
|
85
|
+
case RHO_PARAM_HASH:
|
86
|
+
{
|
87
|
+
for (int i = 0, lim = p->v.hash->size; i < lim; ++i)
|
88
|
+
{
|
89
|
+
const char *name = p->v.hash->name[i];
|
90
|
+
rho_param *value = p->v.hash->value[i];
|
91
|
+
|
92
|
+
if (strcasecmp(name, "background_color") == 0)
|
93
|
+
m_rgbBackColor = getColorFromString(value->v.string);
|
94
|
+
else if (strcasecmp(name, "mask_color") == 0)
|
95
|
+
m_rgbMaskColor = getColorFromString(value->v.string);
|
96
|
+
else if (strcasecmp(name, "view_height") == 0)
|
97
|
+
m_nHeight = atoi(value->v.string);
|
98
|
+
else if (strcasecmp(name, "buttons") == 0 || strcasecmp(name, "tabs") == 0)
|
99
|
+
params = value;
|
100
|
+
}
|
101
|
+
}
|
102
|
+
break;
|
103
|
+
default: {
|
104
|
+
LOG(ERROR) + "Unexpected parameter type for create_nativebar, should be Array or Hash";
|
105
|
+
return;
|
106
|
+
}
|
107
|
+
}
|
108
|
+
|
109
|
+
if (!params) {
|
110
|
+
LOG(ERROR) + "Wrong parameters for create_nativebar";
|
111
|
+
return;
|
112
|
+
}
|
113
|
+
|
114
|
+
int size = params->v.array->size;
|
115
|
+
if ( size == 0 )
|
116
|
+
{
|
117
|
+
removeToolbar();
|
118
|
+
return;
|
119
|
+
}
|
120
|
+
|
121
|
+
if ( m_hWnd )
|
122
|
+
{
|
123
|
+
removeAllButtons();
|
124
|
+
}else
|
125
|
+
{
|
126
|
+
RECT rcToolbar;
|
127
|
+
rcToolbar.left = 0;
|
128
|
+
rcToolbar.right = 0;
|
129
|
+
rcToolbar.top = 0;
|
130
|
+
rcToolbar.bottom = m_nHeight;
|
131
|
+
Create(getAppWindow().m_hWnd, rcToolbar, NULL, WS_CHILD|CCS_NOPARENTALIGN|CCS_NORESIZE|CCS_NOMOVEY|CCS_BOTTOM|CCS_NODIVIDER |
|
132
|
+
TBSTYLE_FLAT |TBSTYLE_LIST|TBSTYLE_TRANSPARENT ); //TBSTYLE_AUTOSIZE
|
133
|
+
|
134
|
+
SetButtonStructSize();
|
135
|
+
}
|
136
|
+
|
137
|
+
for (int i = 0; i < size; ++i)
|
138
|
+
{
|
139
|
+
rho_param *hash = params->v.array->value[i];
|
140
|
+
if (hash->type != RHO_PARAM_HASH) {
|
141
|
+
LOG(ERROR) + "Unexpected type of array item for create_nativebar, should be Hash";
|
142
|
+
return;
|
143
|
+
}
|
144
|
+
|
145
|
+
const char *label = NULL;
|
146
|
+
const char *action = NULL;
|
147
|
+
const char *icon = NULL;
|
148
|
+
const char *colored_icon = NULL;
|
149
|
+
int nItemWidth = 0;
|
150
|
+
|
151
|
+
for (int j = 0, lim = hash->v.hash->size; j < lim; ++j)
|
152
|
+
{
|
153
|
+
const char *name = hash->v.hash->name[j];
|
154
|
+
rho_param *value = hash->v.hash->value[j];
|
155
|
+
if (value->type != RHO_PARAM_STRING) {
|
156
|
+
LOG(ERROR) + "Unexpected '" + name + "' type, should be String";
|
157
|
+
return;
|
158
|
+
}
|
159
|
+
|
160
|
+
if (strcasecmp(name, "label") == 0)
|
161
|
+
label = value->v.string;
|
162
|
+
else if (strcasecmp(name, "action") == 0)
|
163
|
+
action = value->v.string;
|
164
|
+
else if (strcasecmp(name, "icon") == 0)
|
165
|
+
icon = value->v.string;
|
166
|
+
else if (strcasecmp(name, "colored_icon") == 0)
|
167
|
+
colored_icon = value->v.string;
|
168
|
+
else if (strcasecmp(name, "width") == 0)
|
169
|
+
nItemWidth = atoi(value->v.string);
|
170
|
+
}
|
171
|
+
|
172
|
+
if (label == NULL && bar_type == TOOLBAR_TYPE)
|
173
|
+
label = "";
|
174
|
+
|
175
|
+
if ( label == NULL || action == NULL) {
|
176
|
+
LOG(ERROR) + "Illegal argument for create_nativebar";
|
177
|
+
return;
|
178
|
+
}
|
179
|
+
if ( strcasecmp(action, "forward") == 0 && rho_conf_getBool("jqtouch_mode") )
|
180
|
+
continue;
|
181
|
+
|
182
|
+
m_arButtons.addElement( new CToolbarBtn(label, action, icon, nItemWidth) );
|
183
|
+
}
|
184
|
+
|
185
|
+
CSize sizeMax = getMaxImageSize();
|
186
|
+
m_nHeight = max(m_nHeight, sizeMax.cy+MIN_TOOLBAR_IDENT);
|
187
|
+
int nBtnSize = m_nHeight-MIN_TOOLBAR_IDENT;
|
188
|
+
SetButtonSize(max(nBtnSize,sizeMax.cx), max(nBtnSize,sizeMax.cy));
|
189
|
+
SetBitmapSize(sizeMax.cx, sizeMax.cy);
|
190
|
+
m_listImages.Create(sizeMax.cx, sizeMax.cy, ILC_MASK|ILC_COLOR32, m_arButtons.size(), 0);
|
191
|
+
SetImageList(m_listImages);
|
192
|
+
|
193
|
+
for ( int i = 0; i < (int)m_arButtons.size(); i++ )
|
194
|
+
addToolbarButton( *m_arButtons.elementAt(i), i );
|
195
|
+
|
196
|
+
AutoSize();
|
197
|
+
|
198
|
+
alignSeparatorWidth();
|
199
|
+
|
200
|
+
ShowWindow(SW_SHOW);
|
201
|
+
|
202
|
+
#if defined (OS_WINDOWS)
|
203
|
+
RECT rcWnd;
|
204
|
+
getAppWindow().GetWindowRect(&rcWnd);
|
205
|
+
getAppWindow().SetWindowPos( 0, 0,0,rcWnd.right-rcWnd.left-1,rcWnd.bottom-rcWnd.top, SWP_NOMOVE|SWP_NOZORDER|SWP_FRAMECHANGED);
|
206
|
+
getAppWindow().SetWindowPos( 0, 0,0,rcWnd.right-rcWnd.left,rcWnd.bottom-rcWnd.top, SWP_NOMOVE|SWP_NOZORDER|SWP_FRAMECHANGED);
|
207
|
+
#else
|
208
|
+
getAppWindow().SetWindowPos( 0, 0,0,0,0, SWP_NOMOVE|SWP_NOZORDER|SWP_NOSIZE|SWP_FRAMECHANGED);
|
209
|
+
#endif
|
210
|
+
}
|
211
|
+
|
212
|
+
void CNativeToolbar::alignSeparatorWidth()
|
213
|
+
{
|
214
|
+
int nSepPos = -1;
|
215
|
+
for ( int i = 0; i < (int)m_arButtons.size()-1; i++ )
|
216
|
+
{
|
217
|
+
if ( m_arButtons.elementAt(i)->isSeparator() )
|
218
|
+
{
|
219
|
+
if ( nSepPos == -1 )
|
220
|
+
nSepPos = i;
|
221
|
+
else
|
222
|
+
return; //if more than one separator, do anything
|
223
|
+
}
|
224
|
+
}
|
225
|
+
|
226
|
+
if ( nSepPos == -1 )
|
227
|
+
return;
|
228
|
+
|
229
|
+
//right align all buttons after single separator
|
230
|
+
CRect rcFirstBtn, rcLastBtn, rcToolbar, rcSep;
|
231
|
+
GetItemRect(0,&rcFirstBtn);
|
232
|
+
GetItemRect(m_arButtons.size()-1,&rcLastBtn);
|
233
|
+
GetItemRect(nSepPos,&rcSep);
|
234
|
+
getAppWindow().GetClientRect(&rcToolbar);
|
235
|
+
int nAdd = rcToolbar.Width() - 2*rcFirstBtn.left - rcLastBtn.right;
|
236
|
+
int nSepWidth = rcSep.Width();
|
237
|
+
nSepWidth += nAdd;
|
238
|
+
if ( nSepWidth < 0 )
|
239
|
+
nSepWidth = 0;
|
240
|
+
|
241
|
+
m_arButtons.elementAt(nSepPos)->m_nItemWidth = nSepWidth;
|
242
|
+
|
243
|
+
DeleteButton(nSepPos);
|
244
|
+
TBBUTTON btn = {0};
|
245
|
+
/*
|
246
|
+
if ( nSepWidth <= 114 ) //maximum size for empty button
|
247
|
+
{
|
248
|
+
btn.fsStyle = TBSTYLE_BUTTON;
|
249
|
+
btn.iBitmap = I_IMAGENONE;
|
250
|
+
|
251
|
+
InsertButton(nSepPos, &btn);
|
252
|
+
|
253
|
+
TBBUTTONINFO oBtnInfo = {0};
|
254
|
+
oBtnInfo.cbSize = sizeof(TBBUTTONINFO);
|
255
|
+
oBtnInfo.dwMask = TBIF_BYINDEX|TBIF_SIZE;
|
256
|
+
|
257
|
+
oBtnInfo.cx = nSepWidth;
|
258
|
+
|
259
|
+
SetButtonInfo(nSepPos, &oBtnInfo);
|
260
|
+
|
261
|
+
}else */
|
262
|
+
{
|
263
|
+
btn.fsStyle = TBSTYLE_SEP;
|
264
|
+
btn.iBitmap = nSepWidth;
|
265
|
+
|
266
|
+
InsertButton(nSepPos, &btn);
|
267
|
+
}
|
268
|
+
|
269
|
+
AutoSize();
|
270
|
+
}
|
271
|
+
|
272
|
+
void CNativeToolbar::addToolbarButton(CToolbarBtn& oButton, int nPos)
|
273
|
+
{
|
274
|
+
LOG(INFO) + "addToolbarButton: " + oButton.toString();
|
275
|
+
|
276
|
+
TBBUTTON btn = {0};
|
277
|
+
btn.iBitmap = I_IMAGENONE;
|
278
|
+
|
279
|
+
if ( oButton.isSeparator() )
|
280
|
+
{
|
281
|
+
btn.fsStyle = TBSTYLE_SEP;
|
282
|
+
if ( oButton.m_nItemWidth )
|
283
|
+
btn.iBitmap = oButton.m_nItemWidth;
|
284
|
+
else
|
285
|
+
{
|
286
|
+
CSize size;
|
287
|
+
m_listImages.GetIconSize(size);
|
288
|
+
btn.iBitmap = size.cx;
|
289
|
+
oButton.m_nItemWidth = btn.iBitmap;
|
290
|
+
}
|
291
|
+
}else
|
292
|
+
{
|
293
|
+
btn.iString = (INT_PTR)oButton.m_strLabelW.c_str();
|
294
|
+
|
295
|
+
btn.fsStyle = TBSTYLE_BUTTON|TBSTYLE_AUTOSIZE;
|
296
|
+
btn.fsState = TBSTATE_ENABLED;
|
297
|
+
btn.idCommand = ID_CUSTOM_TOOLBAR_ITEM_FIRST + nPos;
|
298
|
+
|
299
|
+
if ( oButton.m_hImage )
|
300
|
+
{
|
301
|
+
btn.iBitmap = m_listImages.Add(oButton.m_hImage, m_rgbMaskColor);
|
302
|
+
//btn.iBitmap = AddBitmap(1,oButton.m_hImage);
|
303
|
+
}
|
304
|
+
}
|
305
|
+
|
306
|
+
BOOL bRes = AddButton(&btn);
|
307
|
+
|
308
|
+
if ( !bRes )
|
309
|
+
LOG(ERROR) + "Error";
|
310
|
+
}
|
311
|
+
|
312
|
+
LRESULT CNativeToolbar::OnEraseBkgnd(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& bHandled)
|
313
|
+
{
|
314
|
+
CRect rect;
|
315
|
+
GetClientRect(rect);
|
316
|
+
|
317
|
+
CDCHandle hdc = (HDC)wParam;
|
318
|
+
hdc.FillSolidRect(rect, m_rgbBackColor );
|
319
|
+
|
320
|
+
bHandled = TRUE;
|
321
|
+
return 1;
|
322
|
+
}
|
323
|
+
|
324
|
+
CSize CNativeToolbar::getMaxImageSize()
|
325
|
+
{
|
326
|
+
CSize sizeMax(m_nHeight-MIN_TOOLBAR_IDENT, m_nHeight-MIN_TOOLBAR_IDENT);
|
327
|
+
|
328
|
+
for ( int i = 0; i < (int)m_arButtons.size(); i++ )
|
329
|
+
{
|
330
|
+
//sizeMax.cx = m_arButtons.elementAt(i)->m_sizeImage.cx > sizeMax.cx ? m_arButtons.elementAt(i)->m_sizeImage.cx : sizeMax.cx;
|
331
|
+
//sizeMax.cy = m_arButtons.elementAt(i)->m_sizeImage.cy > sizeMax.cy ? m_arButtons.elementAt(i)->m_sizeImage.cy : sizeMax.cy;
|
332
|
+
if ( m_arButtons.elementAt(i)->m_hImage )
|
333
|
+
{
|
334
|
+
sizeMax = m_arButtons.elementAt(i)->m_sizeImage;
|
335
|
+
break;
|
336
|
+
}
|
337
|
+
}
|
338
|
+
|
339
|
+
return sizeMax;
|
340
|
+
}
|
341
|
+
|
342
|
+
bool CNativeToolbar::CToolbarBtn::isSeparator()
|
343
|
+
{
|
344
|
+
return strcasecmp(m_strAction.c_str(), "separator")==0;
|
345
|
+
}
|
346
|
+
|
347
|
+
String CNativeToolbar::CToolbarBtn::getDefaultImagePath(const String& strAction)
|
348
|
+
{
|
349
|
+
String strImagePath;
|
350
|
+
if ( strcasecmp(strAction.c_str(), "options")==0 )
|
351
|
+
strImagePath = "lib/res/options_btn.png";
|
352
|
+
else if ( strcasecmp(strAction.c_str(), "home")==0 )
|
353
|
+
strImagePath = "lib/res/home_btn.png";
|
354
|
+
else if ( strcasecmp(strAction.c_str(), "refresh")==0 )
|
355
|
+
strImagePath = "lib/res/refresh_btn.png";
|
356
|
+
else if ( strcasecmp(strAction.c_str(), "back")==0 )
|
357
|
+
strImagePath = "lib/res/back_btn.png";
|
358
|
+
else if ( strcasecmp(strAction.c_str(), "forward")==0 )
|
359
|
+
strImagePath = "lib/res/forward_btn.png";
|
360
|
+
|
361
|
+
return strImagePath.length() > 0 ? CFilePath::join( RHODESAPP().getRhoRootPath(), strImagePath) : String();
|
362
|
+
}
|
363
|
+
|
364
|
+
CNativeToolbar::CToolbarBtn::CToolbarBtn( const char *label, const char *action, const char *icon, int nItemWidth )
|
365
|
+
{
|
366
|
+
m_hImage = 0;
|
367
|
+
m_sizeImage = CSize(0,0);
|
368
|
+
m_nItemWidth = nItemWidth;
|
369
|
+
|
370
|
+
if ( label )
|
371
|
+
convertToStringW( label, m_strLabelW );
|
372
|
+
|
373
|
+
m_strAction = action ? action : "";
|
374
|
+
String strImagePath;
|
375
|
+
if ( icon && *icon )
|
376
|
+
strImagePath = rho::common::CFilePath::join( RHODESAPP().getAppRootPath(), icon );
|
377
|
+
else
|
378
|
+
strImagePath = getDefaultImagePath(m_strAction);
|
379
|
+
|
380
|
+
if ( strImagePath.length() > 0 )
|
381
|
+
{
|
382
|
+
m_hImage = SHLoadImageFile( convertToStringW(strImagePath).c_str() );
|
383
|
+
if ( m_hImage )
|
384
|
+
{
|
385
|
+
BITMAP bmp;
|
386
|
+
::GetObject( m_hImage, sizeof(bmp), &bmp);
|
387
|
+
m_sizeImage.cx = bmp.bmWidth;
|
388
|
+
m_sizeImage.cy = bmp.bmHeight;
|
389
|
+
}
|
390
|
+
}
|
391
|
+
}
|
392
|
+
|
393
|
+
CNativeToolbar::CToolbarBtn::~CToolbarBtn()
|
394
|
+
{
|
395
|
+
if ( m_hImage )
|
396
|
+
DeleteObject(m_hImage);
|
397
|
+
}
|
398
|
+
|
399
|
+
String CNativeToolbar::CToolbarBtn::toString()
|
400
|
+
{
|
401
|
+
return String("Label: '") + convertToStringA(m_strLabelW) + "';Action: '" + m_strAction + "'" ;
|
402
|
+
}
|
403
|
+
|
404
|
+
void CNativeToolbar::processCommand(int nItemPos)
|
405
|
+
{
|
406
|
+
if ( nItemPos >= 0 && nItemPos < (int)m_arButtons.size() )
|
407
|
+
{
|
408
|
+
String strAction = m_arButtons.elementAt(nItemPos)->m_strAction;
|
409
|
+
if ( strcasecmp(strAction.c_str(), "forward") == 0 )
|
410
|
+
rho_webview_navigate_forward();
|
411
|
+
else
|
412
|
+
RHODESAPP().loadUrl(strAction);
|
413
|
+
}
|
414
|
+
}
|
415
|
+
|
416
|
+
void CNativeToolbar::removeToolbar()
|
417
|
+
{
|
418
|
+
if ( m_hWnd )
|
419
|
+
{
|
420
|
+
ShowWindow(SW_HIDE);
|
421
|
+
m_nHeight = 0;
|
422
|
+
|
423
|
+
#if defined (OS_WINDOWS)
|
424
|
+
RECT rcWnd;
|
425
|
+
getAppWindow().GetWindowRect(&rcWnd);
|
426
|
+
getAppWindow().SetWindowPos( 0, 0,0,rcWnd.right-rcWnd.left-1,rcWnd.bottom-rcWnd.top, SWP_NOMOVE|SWP_NOZORDER|SWP_FRAMECHANGED);
|
427
|
+
getAppWindow().SetWindowPos( 0, 0,0,rcWnd.right-rcWnd.left,rcWnd.bottom-rcWnd.top, SWP_NOMOVE|SWP_NOZORDER|SWP_FRAMECHANGED);
|
428
|
+
#else
|
429
|
+
getAppWindow().SetWindowPos( 0, 0,0,0,0, SWP_NOMOVE|SWP_NOZORDER|SWP_NOSIZE|SWP_FRAMECHANGED);
|
430
|
+
#endif
|
431
|
+
}
|
432
|
+
}
|
433
|
+
|
434
|
+
bool CNativeToolbar::isStarted()
|
435
|
+
{
|
436
|
+
return m_hWnd && IsWindowVisible();
|
437
|
+
}
|
438
|
+
|
439
|
+
extern "C"
|
440
|
+
{
|
441
|
+
void remove_native_toolbar();
|
442
|
+
void create_native_toolbar(int bar_type, rho_param *p)
|
443
|
+
{
|
444
|
+
if ( bar_type == NOBAR_TYPE )
|
445
|
+
remove_native_toolbar();
|
446
|
+
else if ( bar_type == TOOLBAR_TYPE )
|
447
|
+
{
|
448
|
+
getAppWindow().performOnUiThread(new CNativeToolbar::CCreateTask(p) );
|
449
|
+
}else
|
450
|
+
{
|
451
|
+
RAWLOGC_ERROR("NativeBar", "Only Toolbar control is supported.");
|
452
|
+
}
|
453
|
+
}
|
454
|
+
|
455
|
+
void create_nativebar(int bar_type, rho_param *p)
|
456
|
+
{
|
457
|
+
RAWLOGC_INFO("NativeBar", "NativeBar.create() is DEPRECATED. Use Rho::NativeToolbar.create() or Rho::NativeTabbar.create().");
|
458
|
+
create_native_toolbar(bar_type, p);
|
459
|
+
}
|
460
|
+
|
461
|
+
void remove_native_toolbar()
|
462
|
+
{
|
463
|
+
getAppWindow().performOnUiThread(new CNativeToolbar::CRemoveTask() );
|
464
|
+
}
|
465
|
+
|
466
|
+
void remove_nativebar()
|
467
|
+
{
|
468
|
+
RAWLOGC_INFO("NativeBar", "NativeBar.remove() is DEPRECATED API ! Please use Rho::NativeToolbar.remove() or Rho::NativeTabbar.remove().");
|
469
|
+
remove_native_toolbar();
|
470
|
+
}
|
471
|
+
|
472
|
+
VALUE nativebar_started()
|
473
|
+
{
|
474
|
+
bool bStarted = CNativeToolbar::getInstance().isStarted();
|
475
|
+
return rho_ruby_create_boolean(bStarted?1:0);
|
476
|
+
}
|
477
|
+
|
478
|
+
//Tabbar
|
479
|
+
void create_native_tabbar(int bar_type, rho_param *p) {
|
480
|
+
}
|
481
|
+
|
482
|
+
void remove_native_tabbar() {
|
483
|
+
}
|
484
|
+
|
485
|
+
void native_tabbar_switch_tab(int index) {
|
486
|
+
}
|
487
|
+
|
488
|
+
void native_tabbar_set_tab_badge(int index,char *val) {
|
489
|
+
}
|
490
|
+
|
491
|
+
void nativebar_set_tab_badge(int index,char* val)
|
492
|
+
{
|
493
|
+
}
|
494
|
+
|
495
|
+
void nativebar_switch_tab(int index) {
|
496
|
+
//TODO: Implement me!
|
497
|
+
}
|
498
|
+
|
499
|
+
//NavBar - iphone only
|
500
|
+
void create_navbar(rho_param *p)
|
501
|
+
{
|
502
|
+
}
|
503
|
+
|
504
|
+
void remove_navbar()
|
505
|
+
{
|
506
|
+
}
|
507
|
+
|
508
|
+
VALUE navbar_started()
|
509
|
+
{
|
510
|
+
return rho_ruby_create_boolean(0);
|
511
|
+
}
|
512
|
+
|
513
|
+
}
|
@@ -0,0 +1,74 @@
|
|
1
|
+
#pragma once
|
2
|
+
|
3
|
+
#include "common/IRhoThreadImpl.h"
|
4
|
+
#include "ruby/ext/rho/rhoruby.h"
|
5
|
+
|
6
|
+
class CNativeToolbar : public CWindowImpl<CNativeToolbar, CToolBarCtrl>
|
7
|
+
{
|
8
|
+
DEFINE_LOGCLASS;
|
9
|
+
|
10
|
+
static const int MIN_TOOLBAR_HEIGHT = 60;
|
11
|
+
static const int MIN_TOOLBAR_IDENT = 12;
|
12
|
+
|
13
|
+
int m_nHeight;
|
14
|
+
COLORREF m_rgbBackColor, m_rgbMaskColor;
|
15
|
+
CImageList m_listImages;
|
16
|
+
|
17
|
+
struct CToolbarBtn
|
18
|
+
{
|
19
|
+
rho::StringW m_strLabelW;
|
20
|
+
rho::String m_strAction;
|
21
|
+
HBITMAP m_hImage;
|
22
|
+
CSize m_sizeImage;
|
23
|
+
int m_nItemWidth;
|
24
|
+
|
25
|
+
CToolbarBtn( const char *label, const char *action, const char *icon, int nItemWidth );
|
26
|
+
~CToolbarBtn();
|
27
|
+
|
28
|
+
rho::String toString();
|
29
|
+
rho::String getDefaultImagePath(const rho::String& strAction);
|
30
|
+
bool isSeparator();
|
31
|
+
};
|
32
|
+
|
33
|
+
rho::VectorPtr<CToolbarBtn*> m_arButtons;
|
34
|
+
public:
|
35
|
+
class CCreateTask: public rho::common::IRhoRunnable
|
36
|
+
{
|
37
|
+
rho_param *m_param;
|
38
|
+
public:
|
39
|
+
CCreateTask(rho_param *p) : m_param(rho_param_dup(p)){ }
|
40
|
+
~CCreateTask(){ rho_param_free(m_param); }
|
41
|
+
virtual void runObject(){ CNativeToolbar::getInstance().createToolbar(m_param); }
|
42
|
+
};
|
43
|
+
class CRemoveTask: public rho::common::IRhoRunnable
|
44
|
+
{
|
45
|
+
public:
|
46
|
+
virtual void runObject(){ CNativeToolbar::getInstance().removeToolbar(); }
|
47
|
+
};
|
48
|
+
|
49
|
+
CNativeToolbar(void);
|
50
|
+
~CNativeToolbar(void);
|
51
|
+
|
52
|
+
static CNativeToolbar& getInstance();
|
53
|
+
|
54
|
+
BEGIN_MSG_MAP(CNativeToolbar)
|
55
|
+
MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd)
|
56
|
+
//MESSAGE_HANDLER(WM_PAINT, OnPaint)
|
57
|
+
END_MSG_MAP()
|
58
|
+
LRESULT OnEraseBkgnd(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
|
59
|
+
virtual void OnFinalMessage(HWND /*hWnd*/);
|
60
|
+
|
61
|
+
int getHeight(){ return m_nHeight;}
|
62
|
+
|
63
|
+
void processCommand(int nItemPos);
|
64
|
+
bool isStarted();
|
65
|
+
private:
|
66
|
+
|
67
|
+
void addToolbarButton(CToolbarBtn& oButton, int nPos);
|
68
|
+
void removeAllButtons();
|
69
|
+
CSize getMaxImageSize();
|
70
|
+
void alignSeparatorWidth();
|
71
|
+
|
72
|
+
void createToolbar(rho_param *param);
|
73
|
+
void removeToolbar();
|
74
|
+
};
|
@@ -272,6 +272,17 @@ VALUE rho_sys_get_locale()
|
|
272
272
|
return rho_ruby_create_string(convertToStringA(szLang).c_str());
|
273
273
|
}
|
274
274
|
|
275
|
+
int rho_wmsys_has_touchscreen()
|
276
|
+
{
|
277
|
+
#ifdef OS_WINDOWS
|
278
|
+
return 1;
|
279
|
+
#else
|
280
|
+
int aMouseInfo[3] = {0};
|
281
|
+
BOOL bRet = SystemParametersInfo(SPI_GETMOUSE, sizeof(aMouseInfo), aMouseInfo, 0);
|
282
|
+
return (bRet && aMouseInfo[0] != 0) ? 1 : 0;
|
283
|
+
#endif
|
284
|
+
}
|
285
|
+
|
275
286
|
int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
|
276
287
|
{
|
277
288
|
if (strcasecmp("has_camera",szPropName) == 0)
|
@@ -362,6 +373,12 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
|
|
362
373
|
return 1;
|
363
374
|
}
|
364
375
|
|
376
|
+
if (strcasecmp("has_touchscreen",szPropName) == 0)
|
377
|
+
{
|
378
|
+
*resValue = rho_ruby_create_boolean( rho_wmsys_has_touchscreen() );
|
379
|
+
return 1;
|
380
|
+
}
|
381
|
+
|
365
382
|
return 0;
|
366
383
|
}
|
367
384
|
|
@@ -461,16 +478,6 @@ void rho_sys_run_app(const char *appname, VALUE params)
|
|
461
478
|
if ( params && !rho_ruby_is_NIL(params) )
|
462
479
|
{
|
463
480
|
convertToStringW(getStringFromValue(params), strParamsW);
|
464
|
-
|
465
|
-
/*
|
466
|
-
int nPos = strParamsW.find(L"rhogallery_app");
|
467
|
-
if ( nPos >= 0 )
|
468
|
-
{
|
469
|
-
if ( nPos == 0 || (nPos > 0 && strParamsW.at(nPos-1)!= '-' ) )
|
470
|
-
strParamsW.insert(nPos, L"-");
|
471
|
-
}
|
472
|
-
*/
|
473
|
-
strParamsW.insert(0, L"-RhoStartParams:");
|
474
481
|
}
|
475
482
|
|
476
483
|
CRegKey oKey;
|
@@ -535,6 +542,11 @@ int rho_sys_is_app_installed(const char *appname)
|
|
535
542
|
return nRet;
|
536
543
|
}
|
537
544
|
|
545
|
+
void rho_sys_app_install(const char *url)
|
546
|
+
{
|
547
|
+
rho_sys_open_url(url);
|
548
|
+
}
|
549
|
+
|
538
550
|
void rho_sys_app_uninstall(const char *appname)
|
539
551
|
{
|
540
552
|
CFilePath oPath(appname);
|
@@ -38,6 +38,11 @@ void rho_webview_navigate_back()
|
|
38
38
|
::PostMessage( getMainWnd(), WM_COMMAND, IDM_NAVIGATE_BACK, (LPARAM)0 );
|
39
39
|
}
|
40
40
|
|
41
|
+
void rho_webview_navigate_forward()
|
42
|
+
{
|
43
|
+
::PostMessage( getMainWnd(), WM_COMMAND, IDM_NAVIGATE_FORWARD, (LPARAM)0 );
|
44
|
+
}
|
45
|
+
|
41
46
|
const char* rho_webview_execute_js(const char* js, int index)
|
42
47
|
{
|
43
48
|
String strJS = "javascript:";
|