rhodes 3.0.2 → 3.1.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +13 -2
- data/Rakefile +200 -18
- data/bin/get-rhodes-info +1 -1
- data/doc/build.txt +174 -98
- data/doc/configuration.txt +13 -2
- data/doc/device-caps.txt +184 -24
- data/doc/extensions.txt +19 -1
- data/doc/generator.txt +18 -18
- data/doc/install.txt +15 -4
- data/doc/introduction.txt +19 -20
- data/doc/nfc.txt +1617 -513
- data/doc/release.txt +85 -41
- data/doc/rhom.txt +11 -1
- data/doc/simulator.txt +15 -5
- data/doc/synchronization.txt +21 -7
- data/doc/ui.txt +4 -0
- data/installer/rhostudio.nsi +464 -0
- data/lib/build/compileERB/bb.rb +26 -0
- data/lib/build/compileERB/default.rb +26 -0
- data/lib/build/compileRB/compileRB.rb +26 -0
- data/lib/build/jake.rb +27 -2
- data/lib/build/rhodes-build.rb +26 -0
- data/lib/extensions/barcode/ext.yml +3 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/AndroidManifest.xml +27 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/Rakefile +13 -13
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable-hdpi/cancel_icon.png +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/btn_check_on.png → lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable-hdpi/ok_icon.png} +0 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable-hdpi/retake_icon.png +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/btn_radio_on.png → lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable/cancel_icon.png} +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/disclosure.png → lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable/ok_icon.png} +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/btn_radio_off.png → lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable/retake_icon.png} +0 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/layout/capture.xml +122 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/raw/beep.ogg +0 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/values/attrs.xml +20 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/values/colors.xml +42 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/values/ids.xml +31 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/ext_build.files +15 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/barcode.cpp +16 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/CaptureActivity.java +778 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/CaptureActivityHandler.java +136 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/DecodeHandler.java +99 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/DecodeThread.java +121 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/FinishListener.java +48 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/InactivityTimer.java +71 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/LocaleManager.java +97 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/PlanarYUVLuminanceSource.java +133 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/ViewfinderResultPointCallback.java +34 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/ViewfinderView.java +157 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java +51 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java +280 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/CameraManager.java +318 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/FlashlightManager.java +148 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/PreviewCallback.java +59 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/rhomobile/barcode/Barcode.java +44 -1
- data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +1 -1
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/barcode.m +4 -0
- data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode.i +5 -0
- data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode_wrap.c +138 -389
- data/lib/extensions/barcode/ext/barcode/shared/src/zbar.c +5 -0
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/README.TXT +5 -0
- data/lib/extensions/debugger/CHANGELOG +10 -0
- data/lib/extensions/debugger/LICENSE +21 -0
- data/lib/extensions/debugger/README.md +8 -0
- data/lib/extensions/debugger/debugger.rb +57 -9
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +24 -7
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +18 -17
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/Nfc.java +9 -4
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcActivity.java +1 -1
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcMessage.java +0 -1
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcMessagePack.java +0 -1
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcRecord.java +1 -1
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcTechActivity.java +0 -1
- data/lib/extensions/nfc/nfc.rb +9 -3
- data/lib/extensions/rholang/rholang/lang_cs.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_da.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_de.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_es.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_es_ar.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_ko.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_nl.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_no.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_pt_br.rb +4 -4
- data/lib/extensions/rholang/rholang/lang_se.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_sr.rb +3 -3
- data/lib/framework/builtinME.rb +31 -2
- data/lib/framework/dateME.rb +26 -0
- data/lib/framework/res/back_btn.sym.png +0 -0
- data/lib/framework/res/blue_pushpin_small.sym.png +0 -0
- data/lib/framework/res/callout.sym.png +0 -0
- data/lib/framework/res/callout_link.sym.png +0 -0
- data/lib/framework/res/esri.sym.png +0 -0
- data/lib/framework/res/forward_btn.sym.png +0 -0
- data/lib/framework/res/home_btn.sym.png +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/btn_check_off.png → lib/framework/res/options_btn.sym.png} +0 -0
- data/lib/framework/res/refresh_btn.sym.png +0 -0
- data/lib/framework/rho/mapview.rb +26 -0
- data/lib/framework/rho/render.rb +34 -2
- data/lib/framework/rho/rho.rb +28 -2
- data/lib/framework/rho/rhoapplication.rb +26 -0
- data/lib/framework/rho/rhobluetooth.rb +70 -0
- data/lib/framework/rho/rhocontact.rb +26 -0
- data/lib/framework/rho/rhocontroller.rb +26 -0
- data/lib/framework/rho/rhoerror.rb +26 -0
- data/lib/framework/rho/rhoevent.rb +26 -0
- data/lib/framework/rho/rhoevent_bb.rb +26 -0
- data/lib/framework/rho/rhoevent_c.rb +26 -0
- data/lib/framework/rho/rhofsconnector.rb +25 -0
- data/lib/framework/rho/rhomsg.rb +26 -0
- data/lib/framework/rho/rhonativeviewmanager.rb +25 -0
- data/lib/framework/rho/rhosupport.rb +32 -1
- data/lib/framework/rho/rhotabbar.rb +27 -1
- data/lib/framework/rho/rhotoolbar.rb +26 -1
- data/lib/framework/rho/rhoutils.rb +26 -0
- data/lib/framework/rho/rhoviewhelpers.rb +26 -0
- data/lib/framework/rhoappmanifest.rb +26 -0
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rhoframework.rb +77 -0
- data/lib/framework/rhom/rhom.rb +30 -19
- data/lib/framework/rhom/rhom_db_adapter.rb +26 -19
- data/lib/framework/rhom/rhom_model.rb +25 -0
- data/lib/framework/rhom/rhom_object.rb +26 -19
- data/lib/framework/rhom/rhom_object_factory.rb +73 -55
- data/lib/framework/rhom/rhom_source.rb +26 -0
- data/lib/framework/rhosystem.rb +47 -16
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +5 -4
- data/platform/android/Rhodes/default.properties +1 -1
- data/platform/android/Rhodes/jni/Android.mk +365 -0
- data/platform/android/Rhodes/jni/Application.mk +3 -0
- data/platform/android/Rhodes/jni/genconfig.h +17 -0
- data/platform/android/Rhodes/jni/include/rhodes.h +26 -0
- data/platform/android/Rhodes/jni/include/rhodes/JNIRhoRuby.h +71 -0
- data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h +47 -33
- data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +46 -1
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhoLogConf.h +11 -11
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +1 -9
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_camera_Camera.h +2 -2
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_file_RhoFileApi.h +8 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mainview_SplashScreen.h +39 -0
- data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +26 -0
- data/platform/android/Rhodes/jni/include/rhodes/sslimpl.h +26 -0
- data/platform/android/Rhodes/jni/rhocaps.inc +12 -0
- data/platform/android/Rhodes/jni/src/JNIRhoRuby.cpp +204 -0
- data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +32 -5
- data/platform/android/Rhodes/jni/src/alert.cpp +29 -5
- data/platform/android/Rhodes/jni/src/bluetooth.cpp +68 -3
- data/platform/android/Rhodes/jni/src/callbacks.cpp +40 -15
- data/platform/android/Rhodes/jni/src/camera.cpp +84 -7
- data/platform/android/Rhodes/jni/src/datetimepicker.cpp +26 -0
- data/platform/android/Rhodes/jni/src/event.cpp +27 -0
- data/platform/android/Rhodes/jni/src/fileapi.cpp +66 -2
- data/platform/android/Rhodes/jni/src/geolocation.cpp +26 -0
- data/platform/android/Rhodes/jni/src/logconf.cpp +44 -29
- data/platform/android/Rhodes/jni/src/logger.cpp +26 -0
- data/platform/android/Rhodes/jni/src/mapview.cpp +30 -0
- data/platform/android/Rhodes/jni/src/menu.cpp +26 -0
- data/platform/android/Rhodes/jni/src/nativebar.cpp +27 -8
- data/platform/android/Rhodes/jni/src/nativeview.cpp +26 -0
- data/platform/android/Rhodes/jni/src/navbar.cpp +27 -0
- data/platform/android/Rhodes/jni/src/phonebook.cpp +27 -0
- data/platform/android/Rhodes/jni/src/rhoconf.cpp +26 -0
- data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +26 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +40 -593
- data/platform/android/Rhodes/jni/src/rhodesapp.cpp +326 -0
- data/platform/android/Rhodes/jni/src/rhodessystem.cpp +186 -0
- data/platform/android/Rhodes/jni/src/ringtones.cpp +27 -0
- data/platform/android/Rhodes/jni/src/signature.cpp +26 -0
- data/platform/android/Rhodes/jni/src/socketimpl.cpp +26 -0
- data/platform/android/Rhodes/jni/src/splashscreen.cpp +30 -4
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +27 -0
- data/platform/android/Rhodes/jni/src/webview.cpp +27 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/LocalFileProvider.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeLibraries.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Push.java +27 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +29 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java +36 -30
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +81 -73
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityListener.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityStartupListeners.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +83 -38
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/PopupActivity.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/StatusNotification.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +33 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothDeviceListActivity.java +35 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +52 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +182 -56
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +41 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +60 -23
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/UUIDHelper.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +162 -27
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraNewService.java +152 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraOldService.java +49 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraSemiService.java +140 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraService.java +49 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraSettings.java +147 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +27 -21
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +124 -53
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java +39 -25
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/Event.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +75 -9
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +28 -22
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/{SplashScreen.java → mainview/SplashScreen.java} +73 -22
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +27 -21
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/ExtrasHolder.java +51 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +41 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +26 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java +28 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java +85 -30
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java +32 -30
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +29 -28
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/ExternalHttpHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/ContextFactory.java +38 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PhoneId.java +137 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/{Utils.java → util/Utils.java} +27 -17
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +27 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java +107 -0
- data/platform/android/build/RhodesSRC_build.files +11 -4
- data/platform/android/build/android.rake +79 -116
- data/platform/android/build/android_tools.rb +117 -0
- data/platform/android/build/androidcommon.rb +30 -4
- data/platform/android/build/libjson_build.files +1 -1
- data/platform/android/build/librhodes_build.files +3 -0
- data/platform/bb/Hsqldb/src/com/rho/db/FileUtilBB.java +26 -0
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +26 -0
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java +26 -0
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +26 -0
- data/platform/bb/Hsqldb/src/com/rho/db/Journal.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/math/BigDecimal.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/math/BigInteger.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/sql/Date.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/sql/Time.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/sql/Timestamp.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/DateTimeTokenizer.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/FilePath.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/IRhoLogSink.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +27 -0
- data/platform/bb/RubyVM/src/com/rho/Mutex.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/Properties.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoConf.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoCrypto.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoEmptyLogger.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoEmptyProfiler.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +52 -1
- data/platform/bb/RubyVM/src/com/rho/RhoLogFileSink.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoLogOutputSink.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +111 -2
- data/platform/bb/RubyVM/src/com/rho/RhoParamArray.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoParams.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoThread.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoTimer.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +32 -3
- data/platform/bb/RubyVM/src/com/rho/SplashScreen.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/Sprintf.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/StringScanner.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/TestProfiler.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/TestRhoLog.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/TimeInterval.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/Tokenizer.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +32 -0
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/DBException.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/IFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/IFileAccess.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/IRAFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/RandomAccessFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/SimpleFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/net/AsyncHttp.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/net/IHttpConnection.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +295 -230
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +29 -16
- data/platform/bb/RubyVM/src/com/rho/rjson/RJSONTokener.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ISyncProtocol.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ISyncStatusListener.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/JSONArrayIterator.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/JSONEntry.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/JSONStructIterator.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +26 -19
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/SyncProtocol_3.java +31 -5
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +49 -37
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +40 -18
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyDir.java +2 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyIOFileExecutor.java +7 -2
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +43 -13
- data/platform/bb/RubyVM/src/j2me/lang/ArrayMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/AssertMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/CalendarMe.java +28 -1
- data/platform/bb/RubyVM/src/j2me/lang/CharacterDataLatin1.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/CharacterMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/Convert.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/MathEx.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/PrintStreamMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/StringBufferMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/StringMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/SystemMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/TimeZoneMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/math/HugeDigit.java +26 -0
- data/platform/bb/RubyVM/src/j2me/math/HugeInt.java +26 -0
- data/platform/bb/RubyVM/src/j2me/math/HugeIntHelper.java +26 -0
- data/platform/bb/RubyVM/src/j2me/math/Number.java +26 -0
- data/platform/bb/RubyVM/src/j2me/nio/channels/FileChannel.java +26 -0
- data/platform/bb/RubyVM/src/j2me/nio/channels/Pipe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/util/WeakHashMap.java +26 -0
- data/platform/bb/RubyVM/src/j2me/util/concurrent/ConcurrentHashMap.java +26 -0
- data/platform/bb/RubyVM/src/j2me/util/concurrent/locks/ReentrantLock.java +26 -0
- data/platform/bb/build/bb.rake +45 -6
- data/platform/bb/rhodes/platform/4.2.0/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/4.2.1/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/4.2.2/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/4.2/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhodesApplicationPlatform.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +26 -0
- data/platform/bb/rhodes/src/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +26 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +26 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +26 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +26 -0
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +45 -1
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +26 -0
- data/platform/bb/rhodes/src/com/rho/Version.java +26 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +26 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +26 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +26 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +26 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75RAFileImpl.java +28 -2
- data/platform/bb/rhodes/src/com/rho/file/PersistRAFileImpl.java +29 -2
- data/platform/bb/rhodes/src/com/rho/net/BaseSocket.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/SSLSocket.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/TCPSocket.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/bb/NativeBBHttpConnection.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/RhoCalendar.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/RhoPhonebook.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +27 -1
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +59 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/LogOptionsScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/LogScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/NativeBar.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +27 -1
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/RingtoneManager.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/SecondaryResourceFetchThread.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/Utilities.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothManager.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothPort.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/camera/Camera.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/camera/CameraFilesListener.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/camera/ImageBrowserScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +736 -695
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +40 -14
- data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +39 -13
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +216 -174
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +87 -45
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapProvider.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapProvider.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +105 -79
- data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +26 -0
- data/platform/iphone/Classes/AppManager/AppLoader.h +25 -7
- data/platform/iphone/Classes/AppManager/AppLoader.m +26 -7
- data/platform/iphone/Classes/AppManager/AppManager.h +25 -7
- data/platform/iphone/Classes/AppManager/AppManager.m +26 -8
- data/platform/iphone/Classes/AppManager/AppManagerI.h +25 -8
- data/platform/iphone/Classes/Bluetooth/Bluetooth.h +39 -10
- data/platform/iphone/Classes/Bluetooth/Bluetooth.m +158 -28
- data/platform/iphone/Classes/Camera/PickImageDelegate.h +72 -9
- data/platform/iphone/Classes/Camera/PickImageDelegate.m +432 -15
- data/platform/iphone/Classes/DateTime.h +25 -7
- data/platform/iphone/Classes/DateTime.m +25 -7
- data/platform/iphone/Classes/DateTimePicker.m +25 -7
- data/platform/iphone/Classes/DateTimePickerDelegate.h +25 -7
- data/platform/iphone/Classes/DateTimePickerDelegate.m +25 -7
- data/platform/iphone/Classes/Dispatcher/Dispatcher.c +26 -8
- data/platform/iphone/Classes/Dispatcher/Dispatcher.h +25 -8
- data/platform/iphone/Classes/Event/Event.h +25 -7
- data/platform/iphone/Classes/GeoLocation/LocationController.h +25 -7
- data/platform/iphone/Classes/LogOptionsController.h +25 -7
- data/platform/iphone/Classes/LogOptionsController.m +25 -7
- data/platform/iphone/Classes/LogViewController.h +25 -7
- data/platform/iphone/Classes/LogViewController.m +27 -9
- data/platform/iphone/Classes/MapView/GoogleGeocoder.h +26 -0
- data/platform/iphone/Classes/MapView/GoogleGeocoder.m +26 -0
- data/platform/iphone/Classes/MapView/MapAnnotation.h +26 -6
- data/platform/iphone/Classes/MapView/MapAnnotation.m +25 -6
- data/platform/iphone/Classes/MapView/MapViewController.h +27 -8
- data/platform/iphone/Classes/MapView/MapViewController.m +26 -6
- data/platform/iphone/Classes/MapView/MapViewManager.h +26 -4
- data/platform/iphone/Classes/MapView/MapViewManager.m +25 -5
- data/platform/iphone/Classes/NativeBar.h +25 -7
- data/platform/iphone/Classes/NativeBar.m +54 -39
- data/platform/iphone/Classes/NativeView/NVDelegate.h +25 -7
- data/platform/iphone/Classes/NativeView/NVDelegate.m +25 -7
- data/platform/iphone/Classes/NativeView/NVViewController.h +25 -7
- data/platform/iphone/Classes/NativeView/NVViewController.m +25 -7
- data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +27 -10
- data/platform/iphone/Classes/NativeView/RhoNativeViewManagerOC.h +25 -7
- data/platform/iphone/Classes/NavBar.h +25 -7
- data/platform/iphone/Classes/NavBar.m +25 -7
- data/platform/iphone/Classes/Phonebook/phonebook.h +26 -8
- data/platform/iphone/Classes/Phonebook/phonebook.m +25 -8
- data/platform/iphone/Classes/RhoAlert.h +25 -7
- data/platform/iphone/Classes/RhoAlert.m +27 -9
- data/platform/iphone/Classes/RhoDelegate.h +25 -7
- data/platform/iphone/Classes/RhoDelegate.m +25 -7
- data/platform/iphone/Classes/RhoMainView.h +26 -8
- data/platform/iphone/Classes/RhoViewController.h +25 -7
- data/platform/iphone/Classes/RhoViewController.m +25 -7
- data/platform/iphone/Classes/Rhodes.h +25 -8
- data/platform/iphone/Classes/Rhodes.m +50 -6
- data/platform/iphone/Classes/RingtoneManager.h +25 -7
- data/platform/iphone/Classes/RingtoneManager.m +25 -7
- data/platform/iphone/Classes/Signature/SignatureDelegate.h +25 -7
- data/platform/iphone/Classes/Signature/SignatureDelegate.m +25 -7
- data/platform/iphone/Classes/Signature/SignatureView.h +25 -7
- data/platform/iphone/Classes/Signature/SignatureView.m +25 -15
- data/platform/iphone/Classes/Signature/SignatureViewController.h +25 -7
- data/platform/iphone/Classes/Signature/SignatureViewController.m +25 -7
- data/platform/iphone/Classes/SimpleMainView.h +25 -7
- data/platform/iphone/Classes/SimpleMainView.m +31 -7
- data/platform/iphone/Classes/SplashViewController.h +25 -7
- data/platform/iphone/Classes/SplashViewController.m +25 -7
- data/platform/iphone/Classes/SplitView/LeftViewController.h +25 -7
- data/platform/iphone/Classes/SplitView/LeftViewController.m +25 -7
- data/platform/iphone/Classes/SplitView/RightViewController.h +25 -7
- data/platform/iphone/Classes/SplitView/RightViewController.m +25 -7
- data/platform/iphone/Classes/SplitView/SplitViewDelegate.h +25 -7
- data/platform/iphone/Classes/SplitView/SplitViewDelegate.m +25 -7
- data/platform/iphone/Classes/SplitView/SplittedMainView.h +25 -7
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +29 -7
- data/platform/iphone/Classes/TabbedMainView.h +25 -7
- data/platform/iphone/Classes/TabbedMainView.m +42 -20
- data/platform/iphone/Classes/Utils/ParamsWrapper.h +25 -7
- data/platform/iphone/Classes/Utils/ParamsWrapper.m +25 -7
- data/platform/iphone/Classes/WebView.m +25 -7
- data/platform/iphone/Classes/rho/common/SplashScreenImpl.cpp +25 -8
- data/platform/iphone/Classes/rho/common/SplashScreenImpl.h +25 -8
- data/platform/iphone/Classes/rho/net/NetRequestImpl.m +26 -19
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/Tests/Classes/TestsAppDelegate.h +25 -7
- data/platform/iphone/Tests/Classes/TestsAppDelegate.m +25 -7
- data/platform/iphone/main.m +25 -7
- data/platform/iphone/rbuild/findRhodesGuid.rb +26 -0
- data/platform/iphone/rbuild/iphone.rake +42 -6
- data/platform/iphone/rhoextlib/dosyscall.c +26 -0
- data/platform/iphone/rhoextlib/syscall.c +26 -0
- data/platform/iphone/rhoextlib/syscall.h +26 -7
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +2 -0
- data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj +8 -8
- data/platform/linux/Rakefile +26 -0
- data/platform/linux/tasks/linux.rake +26 -0
- data/platform/osx/Rhodes Debugger/DataSource.h +26 -0
- data/platform/osx/Rhodes Debugger/DebugConnection.h +25 -4
- data/platform/osx/Rhodes Debugger/DebuggerController.h +26 -0
- data/platform/osx/Rhodes Debugger/FileSystemItem.h +26 -0
- data/platform/osx/Rhodes Debugger/GdbConnection.h +25 -7
- data/platform/osx/Rhodes Debugger/LogController.h +25 -3
- data/platform/osx/Rhodes Debugger/TcpConnection.h +25 -4
- data/platform/osx/Rhodes Launcher/RhodesController.h +25 -7
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtCore.framework/Versions/4/QtCore +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Resources/qt_menu.nib/classes.nib +59 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Resources/qt_menu.nib/info.nib +18 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Resources/qt_menu.nib/keyedobjects.nib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Versions/4/QtGui +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtNetwork.framework/Versions/4/QtNetwork +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtWebKit.framework/Versions/4/QtWebKit +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/phonon.framework/Versions/4/phonon +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist +20 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/MacOS/RhoSimulator +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PkgInfo +1 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqgif.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqico.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqjpeg.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqmng.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtiff.dylib +0 -0
- data/platform/{symbian/build/rhologpath.txt → osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/empty.lproj} +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/qt.conf +2 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/rho.icns +0 -0
- data/platform/osx/build/osx.rake +88 -0
- data/platform/shared/{SyncClient/SyncClient.cpp → RhoConnectClient/RhoConnectClient.cpp} +78 -52
- data/platform/shared/RhoConnectClient/RhoConnectClient.h +121 -0
- data/platform/shared/RhoConnectClient/RhoError.h +55 -0
- data/platform/shared/common/AppMenu.cpp +26 -0
- data/platform/shared/common/AppMenu.h +26 -0
- data/platform/shared/common/AutoPointer.h +26 -0
- data/platform/shared/common/IRhoBrowser.h +26 -0
- data/platform/shared/common/IRhoClassFactory.h +26 -0
- data/platform/shared/common/IRhoCrypt.h +26 -0
- data/platform/shared/common/IRhoThreadImpl.h +26 -0
- data/platform/shared/common/InputStream.h +26 -0
- data/platform/shared/common/PosixThreadImpl.cpp +31 -0
- data/platform/shared/common/PosixThreadImpl.h +26 -0
- data/platform/shared/common/RhoAppAdapter.h +26 -0
- data/platform/shared/common/RhoConf.cpp +28 -2
- data/platform/shared/common/RhoConf.h +32 -1
- data/platform/shared/common/RhoDefs.h +32 -0
- data/platform/shared/common/RhoFatalError.h +27 -1
- data/platform/shared/common/RhoFile.cpp +30 -4
- data/platform/shared/common/RhoFile.h +26 -0
- data/platform/shared/common/RhoFilePath.h +26 -0
- data/platform/shared/common/RhoMath.cpp +26 -0
- data/platform/shared/common/RhoMath.h +26 -0
- data/platform/shared/common/RhoMutexLock.h +39 -3
- data/platform/shared/common/RhoNativeViewManager.h +26 -0
- data/platform/shared/common/RhoPort.h +55 -17
- data/platform/shared/common/RhoSimConf.cpp +58 -0
- data/platform/shared/common/RhoSimConf.h +62 -0
- data/platform/shared/common/RhoStd.h +26 -0
- data/platform/shared/common/RhoSystem.h +28 -2
- data/platform/shared/common/RhoThread.cpp +26 -0
- data/platform/shared/common/RhoThread.h +26 -0
- data/platform/shared/common/RhoTime.cpp +26 -0
- data/platform/shared/common/RhoTime.h +33 -4
- data/platform/shared/common/RhodesApp.cpp +170 -68
- data/platform/shared/common/RhodesApp.h +34 -6
- data/platform/shared/common/RhodesAppBase.cpp +77 -8
- data/platform/shared/common/RhodesAppBase.h +31 -4
- data/platform/shared/common/SplashScreen.cpp +29 -0
- data/platform/shared/common/SplashScreen.h +26 -0
- data/platform/shared/common/StringConverter.h +26 -0
- data/platform/shared/common/ThreadQueue.cpp +26 -0
- data/platform/shared/common/ThreadQueue.h +26 -0
- data/platform/shared/common/Tokenizer.cpp +26 -0
- data/platform/shared/common/Tokenizer.h +26 -0
- data/platform/shared/common/iphone/RhoClassFactory.cpp +26 -0
- data/platform/shared/common/iphone/RhoClassfactory.h +44 -4
- data/platform/shared/common/iphone/RhoCryptImpl.h +26 -0
- data/platform/shared/common/iphone/RhoCryptImpl.mm +26 -0
- data/platform/shared/common/iphone/RhoFileImpl.m +26 -7
- data/platform/shared/common/iphone/RhoThreadImpl.m +26 -7
- data/platform/shared/common/map/ESRIMapEngine.cpp +26 -0
- data/platform/shared/common/map/ESRIMapEngine.h +26 -0
- data/platform/shared/common/map/GoogleMapEngine.cpp +26 -0
- data/platform/shared/common/map/GoogleMapEngine.h +26 -0
- data/platform/shared/common/map/MapEngine.cpp +28 -2
- data/platform/shared/common/map/MapEngine.h +26 -0
- data/platform/shared/common/rhoparams.cpp +26 -0
- data/platform/shared/common/rhoparams.h +26 -0
- data/platform/shared/common/stat.h +26 -0
- data/platform/shared/curl/lib/config-symbian.h +824 -0
- data/platform/shared/curl/lib/hostip.c +7 -0
- data/platform/shared/curl/lib/http.c +6 -0
- data/platform/shared/curl/lib/setup_once.h +4 -0
- data/platform/shared/db/DBAdapter.cpp +34 -2
- data/platform/shared/db/DBAdapter.h +26 -0
- data/platform/shared/db/DBAttrManager.cpp +26 -0
- data/platform/shared/db/DBAttrManager.h +26 -0
- data/platform/shared/db/DBResult.cpp +26 -0
- data/platform/shared/db/DBResult.h +26 -0
- data/platform/shared/json/JSONIterator.cpp +26 -0
- data/platform/shared/json/JSONIterator.h +26 -0
- data/platform/shared/json/RJSONTokener.c +3 -3
- data/platform/shared/json/json.h +1 -1
- data/platform/shared/json/{debug.c → json_debug.c} +2 -2
- data/platform/shared/json/{debug.h → json_debug.h} +1 -1
- data/platform/shared/json/json_object.c +1 -1
- data/platform/shared/json/json_tokener.c +1 -1
- data/platform/shared/json/json_util.c +1 -1
- data/platform/shared/json/printbuf.c +1 -1
- data/platform/shared/logging/RhoATLTrace.h +26 -0
- data/platform/shared/logging/RhoLog.cpp +90 -0
- data/platform/shared/logging/RhoLog.h +29 -1
- data/platform/shared/logging/RhoLogCat.h +26 -0
- data/platform/shared/logging/RhoLogConf.cpp +72 -10
- data/platform/shared/logging/RhoLogConf.h +39 -5
- data/platform/shared/logging/RhoLogSink.cpp +26 -0
- data/platform/shared/logging/RhoLogSink.h +26 -0
- data/platform/shared/logging/RhoPlainLog.cpp +36 -8
- data/platform/shared/logging/test/TestLog.cpp +26 -0
- data/platform/shared/logging/test/TestPlainLog.c +26 -0
- data/platform/shared/logging/test/main.cpp +26 -0
- data/platform/shared/net/AsyncHttp.cpp +27 -0
- data/platform/shared/net/AsyncHttp.h +28 -1
- data/platform/shared/net/CURLNetRequest.cpp +81 -11
- data/platform/shared/net/CURLNetRequest.h +30 -0
- data/platform/shared/net/CompatWince.cpp +26 -0
- data/platform/shared/net/CompatWince.h +26 -0
- data/platform/shared/net/HttpServer.cpp +82 -23
- data/platform/shared/net/HttpServer.h +27 -1
- data/platform/shared/net/INetRequest.cpp +26 -0
- data/platform/shared/net/INetRequest.h +26 -0
- data/platform/shared/net/RawSocket.cpp +38 -12
- data/platform/shared/net/RawSocket.h +28 -2
- data/platform/shared/net/URI.cpp +26 -6
- data/platform/shared/net/URI.h +26 -2
- data/platform/shared/net/iphone/sslimpl.cpp +39 -10
- data/platform/shared/net/iphone/sslimpl.h +25 -8
- data/platform/shared/net/ssl.cpp +26 -0
- data/platform/shared/net/ssl.h +26 -0
- data/platform/shared/qt/RhoSimulator.pro +7 -0
- data/platform/shared/qt/curl/curl.pro +181 -0
- data/platform/shared/qt/pbxproj2pro.pl +21 -0
- data/platform/shared/qt/pro_vcproj_diff.pl +59 -0
- data/platform/shared/qt/rhodes/DateTimeDialog.cpp +91 -0
- data/platform/shared/qt/rhodes/DateTimeDialog.h +54 -0
- data/platform/shared/qt/rhodes/DateTimeDialog.ui +68 -0
- data/platform/shared/qt/rhodes/ExternalWebView.cpp +46 -0
- data/platform/shared/qt/rhodes/ExternalWebView.h +49 -0
- data/platform/{wm/rhodes/emulator → shared/qt/rhodes}/ExternalWebView.ui +0 -0
- data/platform/shared/qt/rhodes/MainWindowCallback.h +51 -0
- data/platform/shared/qt/rhodes/QtMainWindow.cpp +819 -0
- data/platform/shared/qt/rhodes/QtMainWindow.h +148 -0
- data/platform/{wm/rhodes/emulator → shared/qt/rhodes}/QtMainWindow.ui +13 -1
- data/platform/shared/qt/rhodes/QtNativeTabBar.cpp +112 -0
- data/platform/shared/qt/rhodes/QtNativeTabBar.h +37 -0
- data/platform/shared/qt/rhodes/QtWebInspector.cpp +71 -0
- data/platform/shared/qt/rhodes/QtWebInspector.h +53 -0
- data/platform/shared/qt/rhodes/QtWebInspector.ui +41 -0
- data/platform/shared/qt/rhodes/impl/AlertImpl.cpp +153 -0
- data/platform/shared/qt/rhodes/impl/AlertImpl.h +65 -0
- data/platform/shared/qt/rhodes/impl/BluetoothImpl.cpp +109 -0
- data/platform/shared/qt/rhodes/impl/CalendarImpl.cpp +52 -0
- data/platform/shared/qt/rhodes/impl/CameraImpl.cpp +54 -0
- data/platform/shared/qt/rhodes/impl/DateTimePickerImpl.cpp +61 -0
- data/platform/shared/qt/rhodes/impl/DateTimePickerImpl.h +70 -0
- data/platform/shared/qt/rhodes/impl/GeoLocationImpl.cpp +65 -0
- data/platform/shared/qt/rhodes/impl/MainWindowImpl.cpp +727 -0
- data/platform/shared/qt/rhodes/impl/MainWindowImpl.h +160 -0
- data/platform/shared/qt/rhodes/impl/MapViewImpl.cpp +60 -0
- data/platform/shared/qt/rhodes/impl/NativeTabbarImpl.cpp +131 -0
- data/platform/shared/qt/rhodes/impl/NativeTabbarImpl.h +96 -0
- data/platform/shared/qt/rhodes/impl/NativeToolbarImpl.cpp +124 -0
- data/platform/shared/qt/rhodes/impl/NativeToolbarImpl.h +71 -0
- data/platform/shared/qt/rhodes/impl/PhonebookImpl.cpp +103 -0
- data/platform/shared/qt/rhodes/impl/RhoClassFactoryImpl.cpp +56 -0
- data/platform/shared/qt/rhodes/impl/RhoClassFactoryImpl.h +82 -0
- data/platform/shared/qt/rhodes/impl/RhoFileImpl.cpp +63 -0
- data/platform/shared/qt/rhodes/impl/RhoNativeViewManagerImpl.cpp +86 -0
- data/platform/shared/qt/rhodes/impl/RhoThreadImpl.cpp +114 -0
- data/platform/shared/qt/rhodes/impl/RhoThreadImpl.h +72 -0
- data/platform/shared/qt/rhodes/impl/RhodesImpl.cpp +193 -0
- data/platform/shared/qt/rhodes/impl/RingtoneManagerImpl.cpp +51 -0
- data/platform/shared/qt/rhodes/impl/SignatureImpl.cpp +43 -0
- data/platform/shared/qt/rhodes/impl/SystemImpl.cpp +229 -0
- data/platform/shared/qt/rhodes/impl/WebViewImpl.cpp +114 -0
- data/platform/shared/qt/rhodes/main.cpp +208 -0
- data/platform/shared/qt/rhodes/resources/rho.icns +0 -0
- data/platform/shared/qt/rhodes/resources/rho.ico +0 -0
- data/platform/shared/qt/rhodes/rhodes.pro +133 -0
- data/platform/shared/qt/rholib/rholib.pro +138 -0
- data/platform/shared/qt/rubylib/rubylib.pro +183 -0
- data/platform/shared/qt/sqlite3/sqlite3.pro +40 -0
- data/platform/shared/qt/syncengine/syncengine.pro +82 -0
- data/platform/shared/ruby/ext/alert/alert.i +13 -5
- data/platform/shared/ruby/ext/alert/alert_wrap.c +100 -11
- data/platform/shared/ruby/ext/asynchttp/asynchttp_wrap.c +391 -111
- data/platform/shared/ruby/ext/bluetooth/bluetooth.i +28 -14
- data/platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c +311 -424
- data/platform/shared/ruby/ext/calendar/calendar_wrap.c +2278 -2278
- data/platform/shared/ruby/ext/calendar/event_wrap.c +2152 -2151
- data/platform/shared/ruby/ext/camera/camera.i +22 -2
- data/platform/shared/ruby/ext/camera/camera_wrap.c +448 -115
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +404 -126
- data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c +17 -14
- data/platform/shared/ruby/ext/mapview/mapview_wrap.c +384 -104
- data/platform/shared/ruby/ext/nativebar/nativebar.i +0 -3
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +0 -35
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +5 -5
- data/platform/shared/ruby/ext/navbar/navbar_wrap.c +384 -104
- data/platform/shared/ruby/ext/phonebook/phonebook.h +26 -0
- data/platform/shared/ruby/ext/phonebook/phonebook_wrap.c +422 -144
- data/platform/shared/ruby/ext/rho/rhoruby.c +56 -13
- data/platform/shared/ruby/ext/rho/rhoruby.h +30 -10
- data/platform/shared/ruby/ext/rho/rhosupport.c +106 -33
- data/platform/shared/ruby/ext/rhoconf/rhoconf.i +6 -2
- data/platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c +24 -8
- data/platform/shared/ruby/ext/ringtones/ringtones_wrap.c +389 -109
- data/platform/shared/ruby/ext/signature/signature.i +1 -1
- data/platform/shared/ruby/ext/signature/signature_wrap.c +5 -5
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +26 -0
- data/platform/shared/ruby/ext/syncengine/syncengine.i +4 -0
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +25 -5
- data/platform/shared/ruby/ext/system/system_wrap.c +3 -3
- data/platform/shared/ruby/ext/webview/webview.i +4 -0
- data/platform/shared/ruby/ext/webview/webview_wrap.c +428 -134
- data/platform/shared/ruby/gc.c +4 -0
- data/platform/shared/ruby/hash.c +3 -0
- data/platform/shared/ruby/include/ruby/defines.h +20 -1
- data/platform/shared/ruby/include/ruby/intern.h +2 -0
- data/platform/shared/ruby/include/ruby/ruby.h +7 -4
- data/platform/shared/ruby/io.c +2 -1
- data/platform/shared/ruby/iphone/ruby/config.h +2 -0
- data/platform/shared/ruby/missing/dup2.c +1 -0
- data/platform/shared/ruby/signal.c +5 -5
- data/platform/shared/ruby/symbian/assert.h +2 -2
- data/platform/shared/ruby/symbian/ruby/config.h +13 -3
- data/platform/shared/ruby/symbian/symbian.h +2 -2
- data/platform/shared/ruby/thread_pthread.c +1 -1
- data/platform/shared/ruby/win32/assert.h +27 -1
- data/platform/shared/rubyext/GeoLocation.cpp +26 -0
- data/platform/shared/rubyext/GeoLocation.h +26 -0
- data/platform/shared/rubyext/NativeToolbarExt.h +35 -0
- data/platform/shared/rubyext/RhoAppAdapter.cpp +26 -0
- data/platform/shared/rubyext/System.cpp +54 -1
- data/platform/shared/rubyext/WebView.h +26 -0
- data/platform/shared/sqlite/crypto.c +26 -0
- data/platform/shared/sqlite/sqlite3.c +9706 -4596
- data/platform/shared/sqlite/sqlite3.h +521 -119
- data/platform/shared/statistic/RhoProfiler.cpp +26 -0
- data/platform/shared/statistic/RhoProfiler.h +26 -0
- data/platform/shared/statistic/test/TestProfiling.cpp +26 -0
- data/platform/shared/sync/ClientRegister.cpp +29 -1
- data/platform/shared/sync/ClientRegister.h +26 -0
- data/platform/shared/sync/ISyncProtocol.h +27 -1
- data/platform/shared/sync/SyncEngine.cpp +26 -0
- data/platform/shared/sync/SyncEngine.h +27 -1
- data/platform/shared/sync/SyncNotify.cpp +28 -1
- data/platform/shared/sync/SyncNotify.h +26 -0
- data/platform/shared/sync/SyncProtocol_3.h +34 -6
- data/platform/shared/sync/SyncSource.cpp +52 -17
- data/platform/shared/sync/SyncSource.h +26 -0
- data/platform/shared/sync/SyncThread.cpp +41 -0
- data/platform/shared/sync/SyncThread.h +27 -2
- data/platform/shared/sync/Test/NetDataStub.h +26 -0
- data/platform/shared/sync/Test/SyncEngine_test.cpp +26 -0
- data/platform/shared/sync/Test/SyncSource_test.cpp +26 -0
- data/platform/shared/tcmalloc/rhomem.h +1 -1
- data/platform/shared/test/Tests.cpp +28 -2
- data/platform/shared/test/test_helper.cpp +26 -0
- data/platform/shared/test/test_helper.h +26 -0
- data/platform/shared/unzip/unzip.cpp +10 -4
- data/platform/shared/unzip/unzip.h +8 -0
- data/platform/shared/xruby/src/com/xruby/compiler/parser/RubyParser.java +97 -97
- data/platform/symbian/build/symbian.rake +202 -0
- data/platform/symbian/curl/curl.pro +179 -0
- data/platform/symbian/qtscroller/include/QtScrollEvent +5 -0
- data/platform/symbian/qtscroller/include/QtScrollPrepareEvent +5 -0
- data/platform/symbian/qtscroller/include/QtScroller +5 -0
- data/platform/symbian/qtscroller/include/QtScrollerProperties +5 -0
- data/platform/symbian/qtscroller/qtscroller.pri +13 -0
- data/platform/symbian/qtscroller/qtscroller.pro +3 -0
- data/platform/symbian/qtscroller/src/qtflickgesture.cpp +696 -0
- data/platform/symbian/qtscroller/src/qtflickgesture_p.h +107 -0
- data/platform/symbian/qtscroller/src/qtscroller.cpp +2081 -0
- data/platform/symbian/qtscroller/src/qtscroller.h +138 -0
- data/platform/symbian/qtscroller/src/qtscroller_p.h +206 -0
- data/platform/symbian/qtscroller/src/qtscrollerfilter.cpp +351 -0
- data/platform/symbian/qtscroller/src/qtscrollerfilter_p.h +111 -0
- data/platform/symbian/qtscroller/src/qtscrollerproperties.cpp +413 -0
- data/platform/symbian/qtscroller/src/qtscrollerproperties.h +135 -0
- data/platform/symbian/qtscroller/src/qtscrollerproperties_p.h +91 -0
- data/platform/symbian/qtscroller/src/qtscrollevent.cpp +191 -0
- data/platform/symbian/qtscroller/src/qtscrollevent.h +100 -0
- data/platform/symbian/qtscroller/src/qtscrollevent_p.h +33 -0
- data/platform/symbian/qtscroller/src/src.pro +24 -0
- data/platform/symbian/rhodes.pro +4 -0
- data/platform/symbian/rhodes.sln +72 -0
- data/platform/symbian/rhodes/deployment.pri +115 -0
- data/platform/symbian/rhodes/rhodes.pro +141 -0
- data/platform/symbian/rhodes/rhodes.vcproj +385 -0
- data/platform/symbian/rhodes/{inc → src}/ContactsConstants.h +0 -0
- data/platform/symbian/rhodes/src/RhoThreadImpl.cpp +19 -0
- data/platform/symbian/rhodes/src/phonebook/Phonebook.cpp +19 -19
- data/platform/symbian/rhodes/{inc → src}/phonebook/Phonebook.h +1 -1
- data/platform/symbian/rhodes/src/qkineticscroller.cpp +1245 -0
- data/platform/symbian/rhodes/src/qkineticscroller.h +165 -0
- data/platform/symbian/rhodes/src/qkineticscroller_p.h +168 -0
- data/platform/symbian/rhodes/src/qwebviewkineticscroller.cpp +347 -0
- data/platform/symbian/rhodes/src/qwebviewkineticscroller.h +89 -0
- data/platform/symbian/rhodes/src/qwebviewselectionsuppressor.h +113 -0
- data/platform/symbian/rhodes_win32.pro +4 -0
- data/platform/symbian/rholib/rholib.pro +108 -0
- data/platform/symbian/rholib/rholib.vcproj +1466 -0
- data/platform/symbian/rubylib/rubylib.pro +163 -0
- data/platform/symbian/rubylib/rubylib.vcproj +1166 -0
- data/platform/symbian/rubylib/src/symbian_stubs.c +45 -3
- data/platform/symbian/sqlite3/sqlite3.pro +38 -0
- data/platform/symbian/sqlite3/sqlite3.vcproj +254 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/mutex.cpp +0 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/os_symbian.cpp +0 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/os_symbian.h +0 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/sqlite3.c +1 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/sqlite3.h +0 -0
- data/platform/symbian/syncengine/syncengine.pro +64 -0
- data/platform/symbian/syncengine/syncengine.vcproj +842 -0
- data/platform/win32/RhoSimulator/RhoSimulator.exe +0 -0
- data/platform/win32/replaceicon/replaceicon.cpp +25 -2
- data/platform/win32/replaceicon/stdafx.cpp +25 -3
- data/platform/win32/replaceicon/stdafx.h +25 -4
- data/platform/win32/updateresstring/stdafx.cpp +25 -3
- data/platform/win32/updateresstring/stdafx.h +25 -4
- data/platform/win32/updateresstring/updateresstring.cpp +25 -2
- data/platform/wm/RhoLib/RhoLib.vcproj +38 -8
- data/platform/wm/build/wm.rake +92 -76
- data/platform/wm/rhodes.sln +139 -139
- data/platform/wm/rhodes/Alert.cpp +31 -5
- data/platform/wm/rhodes/Alert.h +27 -1
- data/platform/wm/rhodes/AppManager.cpp +26 -0
- data/platform/wm/rhodes/AppManager.h +26 -0
- data/platform/wm/rhodes/DateTimePicker.cpp +26 -0
- data/platform/wm/rhodes/DateTimePicker.h +30 -0
- data/platform/wm/rhodes/LogOptionsDlg.cpp +26 -0
- data/platform/wm/rhodes/LogOptionsDlg.h +26 -0
- data/platform/wm/rhodes/LogView.cpp +26 -2
- data/platform/wm/rhodes/LogView.h +25 -1
- data/platform/wm/rhodes/Macros.h +25 -1
- data/platform/wm/rhodes/MainWindow.cpp +37 -2
- data/platform/wm/rhodes/MainWindow.h +29 -2
- data/platform/wm/rhodes/MapView/Graphics.cpp +25 -1
- data/platform/wm/rhodes/MapView/Graphics.h +26 -0
- data/platform/wm/rhodes/MapView/MapViewManager.cpp +26 -0
- data/platform/wm/rhodes/MapView/MapViewManager.h +25 -0
- data/platform/wm/rhodes/MetaHandler.cpp +26 -0
- data/platform/wm/rhodes/MetaHandler.h +26 -0
- data/platform/wm/rhodes/OkCancelModalDialog.h +26 -0
- data/platform/wm/rhodes/OutlookApp.cpp +26 -0
- data/platform/wm/rhodes/OutlookApp.h +26 -0
- data/platform/wm/rhodes/RhoNativeViewManager.cpp +26 -0
- data/platform/wm/rhodes/RhoNativeViewManagerWM.h +25 -8
- data/platform/wm/rhodes/Rhodes.cpp +127 -24
- data/platform/wm/rhodes/RingtoneManager.cpp +26 -0
- data/platform/wm/rhodes/RingtoneManager.h +26 -0
- data/platform/wm/rhodes/SyncStatusDlg.cpp +26 -0
- data/platform/wm/rhodes/SyncStatusDlg.h +26 -0
- data/platform/wm/rhodes/Utils.cpp +26 -0
- data/platform/wm/rhodes/Utils.h +26 -0
- data/platform/wm/rhodes/Vibrate.cpp +30 -9
- data/platform/wm/rhodes/Vibrate.h +27 -2
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +63 -4
- data/platform/wm/rhodes/bluetooth/Bluetooth.h +32 -1
- data/platform/wm/rhodes/camera/Camera.cpp +40 -6
- data/platform/wm/rhodes/camera/Camera.h +32 -1
- data/platform/wm/rhodes/memory_helper.cpp +26 -0
- data/platform/wm/rhodes/menubar.cpp +26 -0
- data/platform/wm/rhodes/menubar.h +26 -0
- data/platform/wm/rhodes/phonebook/NativeAddressBook.cpp +26 -0
- data/platform/wm/rhodes/phonebook/NativeAddressBook.h +26 -0
- data/platform/wm/rhodes/phonebook/phonebook.cpp +26 -8
- data/platform/wm/rhodes/phonebook/phonebook.h +26 -8
- data/platform/wm/rhodes/resource.h +1 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +26 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.h +26 -0
- data/platform/wm/rhodes/rho/common/RhoCryptImpl.cpp +26 -0
- data/platform/wm/rhodes/rho/common/RhoCryptImpl.h +26 -0
- data/platform/wm/rhodes/rho/common/RhoThreadImpl.cpp +26 -0
- data/platform/wm/rhodes/rho/common/RhoThreadImpl.h +26 -0
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +30 -1
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +29 -0
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp +26 -0
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.h +26 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +27 -1
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +26 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbarExt.cpp +71 -7
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +36 -4
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +48 -2
- data/platform/wm/rhodes/rho/rubyext/calendar.cpp +26 -0
- data/platform/wm/rhodes/rhodes.vcproj +2491 -579
- data/platform/wm/rhodes/signature/Signature.cpp +26 -0
- data/platform/wm/rhodes/signature/Signature.h +26 -0
- data/platform/wm/rhodes/simulator/MainWindowQt.cpp +852 -0
- data/platform/wm/rhodes/{emulator → simulator}/MainWindowQt.h +76 -11
- data/platform/wm/rhodes/simulator/NativeTabbarQt.cpp +91 -0
- data/platform/wm/rhodes/simulator/NativeTabbarQt.h +102 -0
- data/platform/wm/rhodes/simulator/NativeToolbarQt.cpp +82 -0
- data/platform/wm/rhodes/simulator/NativeToolbarQt.h +78 -0
- data/platform/wm/rhodes/stdafx.cpp +25 -16
- data/platform/wm/rhodes/stdafx.h +26 -4
- data/platform/wm/rubylib/rubylib.vcproj +94 -78
- data/platform/wm/sqlite3/sqlite3.vcproj +8 -8
- data/platform/wm/syncengine/syncengine.vcproj +33 -11
- data/platform/wm/tools/detool/LogServer.cpp +33 -3
- data/platform/wm/tools/detool/LogServer.h +29 -1
- data/platform/wm/tools/detool/detool.cpp +105 -14
- data/platform/wm/tools/detool/detool.h +26 -0
- data/platform/wm/tools/detool/detool.vcproj +243 -242
- data/platform/wm/tools/detool/stdafx.cpp +25 -3
- data/platform/wm/tools/detool/stdafx.h +26 -0
- data/platform/wm/tools/detool/targetver.h +26 -0
- data/platform/wm/tools/rhosetup/rhosetup.cpp +25 -2
- data/platform/wm/tools/rhosetup/stdafx.cpp +25 -3
- data/platform/wm/tools/rhosetup/stdafx.h +25 -4
- data/platform/wp7/IronRuby/bin/Silverlight3Release/IronRuby.Libraries.dll +0 -0
- data/platform/wp7/IronRuby/bin/Silverlight3Release/IronRuby.dll +0 -0
- data/platform/wp7/RhoAppRunner/Program.cs +27 -1
- data/platform/wp7/RhoLogServer/Program.cs +27 -1
- data/platform/wp7/RhoLogServer/SocketServer.cs +27 -1
- data/platform/wp7/RhoRubyExtGen/RhoAsyncHttp.cs +27 -1
- data/platform/wp7/RhoRubyExtGen/RhoConfig.cs +84 -0
- data/platform/wp7/RhoRubyExtGen/RhoDatabase.cs +27 -1
- data/platform/wp7/RhoRubyExtGen/RhoJSON.cs +26 -0
- data/platform/wp7/RhoRubyExtGen/RhoNativeBar.cs +35 -3
- data/platform/wp7/RhoRubyExtGen/RhoRubyExtGen.csproj +2 -0
- data/platform/wp7/RhoRubyExtGen/RhoSyncEngine.cs +34 -2
- data/platform/wp7/RhoRubyExtGen/RhoSystem.cs +144 -0
- data/platform/wp7/RhoRubyExtGen/RhoWebView.cs +33 -2
- data/platform/wp7/RhoRubyLib/Initializers.Generated.cs +149 -5
- data/platform/wp7/RhoRubyLib/RhoAppAdapter.cs +27 -1
- data/platform/wp7/RhoRubyLib/RhoRuby.cs +27 -1
- data/platform/wp7/RhoRubyLib/RhoRubyLib.csproj +24 -1
- data/platform/wp7/RhoRubyLib/WP_PlatformAdaptationLayer.cs +26 -15
- data/platform/wp7/RhoRubyLib/common/IInputStream.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/Mutex.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoConf.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoEmptyProfiler.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoFile.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoFilePath.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoParamArray.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoParams.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoProfiler.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoResourceMap.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoStd.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoThread.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhodesApp.cs +232 -16
- data/platform/wp7/RhoRubyLib/common/ThreadQueue.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/TimeInterval.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/Tokenizer.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/DBAdapter.cs +33 -1
- data/platform/wp7/RhoRubyLib/db/DBAttrManager.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/DBCommand.cs +428 -0
- data/platform/wp7/RhoRubyLib/db/DBException.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/IDBCallback.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/IDBResult.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/IDBStorage.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/SqliteCopyResult.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/SqliteResult.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/SqliteStorage.cs +27 -1
- data/platform/wp7/RhoRubyLib/json/JSONArrayIterator.cs +27 -1
- data/platform/wp7/RhoRubyLib/json/JSONEntry.cs +27 -1
- data/platform/wp7/RhoRubyLib/json/JSONStructIterator.cs +27 -1
- data/platform/wp7/RhoRubyLib/json/JsonParser.cs +26 -0
- data/platform/wp7/RhoRubyLib/json/RJSONTokener.cs +26 -0
- data/platform/wp7/RhoRubyLib/logging/IRhoLogSink.cs +27 -1
- data/platform/wp7/RhoRubyLib/logging/RhoEmptyLogger.cs +26 -0
- data/platform/wp7/RhoRubyLib/logging/RhoLogConf.cs +27 -1
- data/platform/wp7/RhoRubyLib/logging/RhoLogFileSink.cs +27 -1
- data/platform/wp7/RhoRubyLib/logging/RhoLogServerSink.cs +27 -1
- data/platform/wp7/RhoRubyLib/logging/RhoLogger.cs +27 -1
- data/platform/wp7/RhoRubyLib/net/AsyncHttp.cs +27 -1
- data/platform/wp7/RhoRubyLib/net/HttpServer.cs +28 -2
- data/platform/wp7/RhoRubyLib/net/NetRequest.cs +28 -2
- data/platform/wp7/RhoRubyLib/net/NetResponse.cs +27 -1
- data/platform/wp7/RhoRubyLib/net/URI.cs +27 -1
- data/platform/wp7/RhoRubyLib/rubyext/RhoAsyncHttp.cs +27 -1
- data/platform/wp7/RhoRubyLib/rubyext/RhoConfig.cs +188 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoDatabase.cs +27 -1
- data/platform/wp7/RhoRubyLib/rubyext/RhoJSON.cs +26 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoKernelOps.cs +27 -1
- data/platform/wp7/RhoRubyLib/rubyext/RhoNativeBar.cs +130 -6
- data/platform/wp7/RhoRubyLib/rubyext/RhoSyncEngine.cs +42 -2
- data/platform/wp7/RhoRubyLib/rubyext/RhoSystem.cs +153 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoWebView.cs +49 -4
- data/platform/wp7/RhoRubyLib/sync/SyncSource.cs +17 -17
- data/platform/wp7/RhoRubyLib/views/RhoTabHeader.xaml +18 -0
- data/platform/wp7/RhoRubyLib/views/RhoTabHeader.xaml.cs +56 -0
- data/platform/wp7/RhoRubyLib/views/RhoView.xaml +16 -0
- data/platform/wp7/RhoRubyLib/views/RhoView.xaml.cs +153 -0
- data/platform/wp7/build/wp.rake +31 -0
- data/platform/wp7/rhodes/App.xaml.cs +28 -2
- data/platform/wp7/rhodes/MainPage.xaml +4 -3
- data/platform/wp7/rhodes/MainPage.xaml.cs +50 -11
- data/platform/wp7/sqlite3/SQLiteClient.cs +27 -1
- data/rakefile.rb +200 -18
- data/res/build-tools/detool.exe +0 -0
- data/res/generators/rhogen.rb +2 -1
- data/res/generators/templates/application/app/Settings/home.bb.erb +14 -13
- data/res/generators/templates/application/app/Settings/home.erb +16 -17
- data/res/generators/templates/application/app/Settings/index.bb.erb +26 -27
- data/res/generators/templates/application/app/Settings/index.erb +28 -27
- data/res/generators/templates/application/app/Settings/login.bb.erb +25 -31
- data/res/generators/templates/application/app/Settings/login.erb +20 -22
- data/res/generators/templates/application/app/Settings/reset.bb.erb +12 -11
- data/res/generators/templates/application/app/Settings/reset.erb +10 -13
- data/res/generators/templates/application/app/Settings/wait.bb.erb +9 -2
- data/res/generators/templates/application/app/Settings/wait.erb +9 -4
- data/res/generators/templates/application/app/index.erb +17 -24
- data/res/generators/templates/application/app/layout.erb +51 -21
- data/res/generators/templates/application/build.yml +3 -1
- data/res/generators/templates/application/icon/icon.svg +5334 -0
- data/res/generators/templates/application/public/css/android.css +6 -1
- data/res/generators/templates/application/public/css/blackberry.css +6 -1
- data/res/generators/templates/application/public/css/iphone.css +4 -0
- data/res/generators/templates/application/public/jqmobile/images/ajax-loader.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icon-search-black.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-18-black.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-18-white.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-36-black.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-36-white.png +0 -0
- data/res/generators/templates/application/public/jqmobile/jquery.mobile-1.0b1.css +1661 -0
- data/res/generators/templates/application/public/jqmobile/jquery.mobile-1.0b1.js +5626 -0
- data/res/generators/templates/application/public/jqmobile/jquery.mobile-1.0b1.min.css +8 -0
- data/res/generators/templates/application/public/jqmobile/jquery.mobile-1.0b1.min.js +146 -0
- data/res/generators/templates/application/public/{jqtouch/jqtouch-iphone.css → jqmobile/jquery.mobile.iphone.css} +1 -1
- data/res/generators/templates/application/public/jquery/jquery-1.6.2.js +8981 -0
- data/res/generators/templates/application/public/jquery/jquery-1.6.2.min.js +18 -0
- data/res/generators/templates/application/public/js/jqmobile-patch.js +231 -0
- data/res/generators/templates/model/controller.rb +3 -2
- data/res/generators/templates/model/edit.bb.erb +17 -17
- data/res/generators/templates/model/edit.erb +15 -20
- data/res/generators/templates/model/index.bb.erb +19 -19
- data/res/generators/templates/model/index.erb +23 -26
- data/res/generators/templates/model/new.bb.erb +18 -19
- data/res/generators/templates/model/new.erb +17 -19
- data/res/generators/templates/model/show.bb.erb +10 -11
- data/res/generators/templates/model/show.erb +16 -19
- data/rhobuild.yml.example +2 -1
- data/rhodes.gemspec +4 -3
- data/rhomobile-debug.gemspec +22 -0
- data/spec/framework_spec/app/layout.erb +1 -1
- data/spec/perfomance_spec/app/layout.erb +1 -1
- data/spec/phone_spec/app/spec/asynchttp_spec.rb +1 -1
- data/spec/phone_spec/app/spec/mapview_spec.rb +43 -0
- data/spec/phone_spec/app/spec/rho_spec.rb +23 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +49 -8
- metadata +244 -344
- data/Manifest.txt +0 -6409
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/COPYING +0 -27
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/README +0 -95
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar.h +0 -1415
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Decoder.h +0 -201
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Exception.h +0 -187
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Image.h +0 -321
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ImageScanner.h +0 -130
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Processor.h +0 -223
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/QZBar.h +0 -169
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/QZBarImage.h +0 -72
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Scanner.h +0 -162
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Symbol.h +0 -529
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Video.h +0 -170
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Window.h +0 -136
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarCaptureReader.h +0 -99
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarImage.h +0 -69
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarImageScanner.h +0 -50
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarReaderController.h +0 -142
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarReaderView.h +0 -119
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarReaderViewController.h +0 -99
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarSymbol.h +0 -67
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/zbargtk.h +0 -205
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/config.c +0 -157
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/convert.c +0 -1172
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/debug.h +0 -87
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder.c +0 -409
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder.h +0 -219
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/code128.c +0 -528
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/code128.h +0 -49
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/code39.c +0 -335
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/code39.h +0 -50
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/ean.c +0 -660
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/ean.h +0 -86
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/i25.c +0 -243
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/i25.h +0 -50
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/pdf417.c +0 -223
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/pdf417.h +0 -49
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/pdf417_hash.h +0 -545
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/qr_finder.c +0 -102
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/qr_finder.h +0 -23
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/error.c +0 -183
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/error.h +0 -240
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/event.h +0 -62
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/image.c +0 -358
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/image.h +0 -142
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/img_scanner.c +0 -819
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/img_scanner.h +0 -38
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/jpeg.c +0 -241
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/mutex.h +0 -160
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor.c +0 -700
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor.h +0 -126
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/lock.c +0 -227
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/null.c +0 -62
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/posix.c +0 -337
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/posix.h +0 -138
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/win.c +0 -335
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/x.c +0 -269
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode.h +0 -66
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/bch15_5.c +0 -184
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/bch15_5.h +0 -20
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/binarize.c +0 -639
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/binarize.h +0 -17
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/isaac.c +0 -139
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/isaac.h +0 -41
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/qrdec.c +0 -3957
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/qrdec.h +0 -168
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/qrdectxt.c +0 -405
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/rs.c +0 -799
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/rs.h +0 -66
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/util.c +0 -140
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/util.h +0 -48
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/refcnt.c +0 -48
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/refcnt.h +0 -96
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/scanner.c +0 -317
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/svg.c +0 -184
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/svg.h +0 -65
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/symbol.c +0 -325
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/symbol.h +0 -93
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/thread.h +0 -127
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/timer.h +0 -151
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/unistd.h +0 -1
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video.c +0 -384
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video.h +0 -160
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video/null.c +0 -37
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video/v4l1.c +0 -435
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video/v4l2.c +0 -509
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video/vfw.c +0 -494
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window.c +0 -318
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window.h +0 -144
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/dib.c +0 -75
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/null.c +0 -103
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/vfw.c +0 -104
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/win.c +0 -334
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/win.h +0 -46
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/x.c +0 -356
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/x.h +0 -74
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/ximage.c +0 -219
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/xv.c +0 -273
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +0 -39
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java +0 -222
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java +0 -185
- data/platform/shared/SyncClient/RhoError.h +0 -29
- data/platform/shared/SyncClient/SyncClient.h +0 -95
- data/platform/symbian/RhoLib/group/RhoLib.mmp +0 -41
- data/platform/symbian/RhoLib/group/bld.inf +0 -15
- data/platform/symbian/SQLite60/group/SQLite60.mmp +0 -21
- data/platform/symbian/SQLite60/group/bld.inf +0 -7
- data/platform/symbian/build/build.properties +0 -80
- data/platform/symbian/build/build.xml +0 -649
- data/platform/symbian/build/insertRhoBundle2pkg.rb +0 -26
- data/platform/symbian/build/lib/stlport.zip +0 -0
- data/platform/symbian/build/logfile.template +0 -1
- data/platform/symbian/build/release.properties +0 -7
- data/platform/symbian/lib/pips_nokia_1_3_ss.sis +0 -0
- data/platform/symbian/rhodes/data/loading.html +0 -11
- data/platform/symbian/rhodes/data/rhodes.rls +0 -91
- data/platform/symbian/rhodes/data/rhodes.rss +0 -537
- data/platform/symbian/rhodes/data/rhodes_reg.rss +0 -40
- data/platform/symbian/rhodes/gfx/qgn_menu_rhodes.svg +0 -55
- data/platform/symbian/rhodes/group/Icons_scalable_dc.mk +0 -50
- data/platform/symbian/rhodes/group/bld.inf +0 -10
- data/platform/symbian/rhodes/group/rhodes.mmp +0 -180
- data/platform/symbian/rhodes/help/Custom.xml +0 -18
- data/platform/symbian/rhodes/help/build_help.mk +0 -45
- data/platform/symbian/rhodes/help/rhodes.cshlp +0 -19
- data/platform/symbian/rhodes/help/rhodes.xml +0 -13
- data/platform/symbian/rhodes/inc/AppManager.h +0 -89
- data/platform/symbian/rhodes/inc/AppSoftkeysObserver.h +0 -95
- data/platform/symbian/rhodes/inc/ConnectionManager.h +0 -115
- data/platform/symbian/rhodes/inc/GeoLocationService.h +0 -89
- data/platform/symbian/rhodes/inc/HttpClient.h +0 -161
- data/platform/symbian/rhodes/inc/HttpConstants.h +0 -72
- data/platform/symbian/rhodes/inc/HttpEventHandler.h +0 -130
- data/platform/symbian/rhodes/inc/HttpFileManager.h +0 -116
- data/platform/symbian/rhodes/inc/HttpServer.h +0 -119
- data/platform/symbian/rhodes/inc/LogOptionsDialog.h +0 -59
- data/platform/symbian/rhodes/inc/RhoCamera.h +0 -321
- data/platform/symbian/rhodes/inc/SpecialLoadObserver.h +0 -115
- data/platform/symbian/rhodes/inc/SyncEngineWrap.h +0 -107
- data/platform/symbian/rhodes/inc/geolocation/GeoLocation.h +0 -91
- data/platform/symbian/rhodes/inc/ports_mngt.h +0 -23
- data/platform/symbian/rhodes/inc/posix_http_client.h +0 -37
- data/platform/symbian/rhodes/inc/rhodes.hrh +0 -106
- data/platform/symbian/rhodes/inc/rhodes.pan +0 -42
- data/platform/symbian/rhodes/inc/rhodesAppUi.h +0 -153
- data/platform/symbian/rhodes/inc/rhodesAppView.h +0 -242
- data/platform/symbian/rhodes/inc/rhodesApplication.h +0 -69
- data/platform/symbian/rhodes/inc/rhodesDocument.h +0 -103
- data/platform/symbian/rhodes/sis/backup_registration.xml +0 -5
- data/platform/symbian/rhodes/sis/cert/rhodes_cert.cer +0 -27
- data/platform/symbian/rhodes/sis/cert/rhodes_pid.key +0 -23
- data/platform/symbian/rhodes/sis/rhodes.pkg +0 -42
- data/platform/symbian/rhodes/src/AppManager.cpp +0 -153
- data/platform/symbian/rhodes/src/AppSoftkeysObserver.cpp +0 -88
- data/platform/symbian/rhodes/src/ConnectionManager.cpp +0 -337
- data/platform/symbian/rhodes/src/GeoLocationService.cpp +0 -151
- data/platform/symbian/rhodes/src/HttpClient.cpp +0 -489
- data/platform/symbian/rhodes/src/HttpConstants.cpp +0 -35
- data/platform/symbian/rhodes/src/HttpEventHandler.cpp +0 -587
- data/platform/symbian/rhodes/src/HttpFileManager.cpp +0 -282
- data/platform/symbian/rhodes/src/HttpServer.cpp +0 -275
- data/platform/symbian/rhodes/src/LogOptionsDialog.cpp +0 -179
- data/platform/symbian/rhodes/src/RhoCamera.cpp +0 -675
- data/platform/symbian/rhodes/src/SpecialLoadObserver.cpp +0 -95
- data/platform/symbian/rhodes/src/SyncEngineWrap.cpp +0 -400
- data/platform/symbian/rhodes/src/camera/camera.cpp +0 -23
- data/platform/symbian/rhodes/src/geolocation/GeoLocation.cpp +0 -110
- data/platform/symbian/rhodes/src/geolocation/ruby_geolocation.cpp +0 -38
- data/platform/symbian/rhodes/src/notification.cpp +0 -117
- data/platform/symbian/rhodes/src/ports_mngt.c +0 -103
- data/platform/symbian/rhodes/src/posix_http_client.c +0 -460
- data/platform/symbian/rhodes/src/rhodes.cpp +0 -43
- data/platform/symbian/rhodes/src/rhodesAppUi.cpp +0 -436
- data/platform/symbian/rhodes/src/rhodesAppView.cpp +0 -851
- data/platform/symbian/rhodes/src/rhodesApplication.cpp +0 -51
- data/platform/symbian/rhodes/src/rhodesDocument.cpp +0 -97
- data/platform/symbian/rhodes/src/rsyncengine.c +0 -11
- data/platform/symbian/rhodes/src/webview/webview.cpp +0 -44
- data/platform/symbian/rubylib/group/bld.inf +0 -7
- data/platform/symbian/rubylib/group/rubylib.mmp +0 -143
- data/platform/symbian/shttpd/group/bld.inf +0 -5
- data/platform/symbian/shttpd/group/shttpd.mmp +0 -24
- data/platform/symbian/tcmalloc/group/bld.inf +0 -15
- data/platform/symbian/tcmalloc/group/tcmalloc.mmp +0 -31
- data/platform/wm/rhodes/emulator/ExternalWebView.cpp +0 -20
- data/platform/wm/rhodes/emulator/ExternalWebView.h +0 -23
- data/platform/wm/rhodes/emulator/MainWindowCallback.h +0 -19
- data/platform/wm/rhodes/emulator/MainWindowProxy.cpp +0 -270
- data/platform/wm/rhodes/emulator/MainWindowProxy.h +0 -34
- data/platform/wm/rhodes/emulator/MainWindowQt.cpp +0 -356
- data/platform/wm/rhodes/emulator/NativeToolbarQt.cpp +0 -57
- data/platform/wm/rhodes/emulator/NativeToolbarQt.h +0 -52
- data/platform/wm/rhodes/emulator/QtMainWindow.cpp +0 -252
- data/platform/wm/rhodes/emulator/QtMainWindow.h +0 -62
- data/platform/wm/rhodes/rho/rubyext/NativeToolbarExt.h +0 -6
- data/platform/wp7/WPApplication.sln +0 -50
- data/platform/wp7/WPApplication/App.xaml +0 -19
- data/platform/wp7/WPApplication/App.xaml.cs +0 -211
- data/platform/wp7/WPApplication/ApplicationIcon.png +0 -0
- data/platform/wp7/WPApplication/Background.png +0 -0
- data/platform/wp7/WPApplication/MainPage.xaml +0 -44
- data/platform/wp7/WPApplication/MainPage.xaml.cs +0 -132
- data/platform/wp7/WPApplication/Properties/AppManifest.xml +0 -6
- data/platform/wp7/WPApplication/Properties/AssemblyInfo.cs +0 -35
- data/platform/wp7/WPApplication/Properties/WMAppManifest.xml +0 -32
- data/platform/wp7/WPApplication/SplashScreenImage.jpg +0 -0
- data/platform/wp7/WPApplication/WPApplication.csproj +0 -201
- data/platform/wp7/WPApplication/WP_PlatformAdaptationLayer.cs +0 -88
- data/platform/wp7/WPApplication/app_manifest.txt +0 -1
- data/platform/wp7/WPApplication/readme.htm +0 -40
- data/platform/wp7/WPApplication/readme2.htm +0 -37
- data/platform/wp7/WPApplication/rho/apps/app/Model1/edit.bb.erb +0 -29
- data/platform/wp7/WPApplication/rho/apps/app/Model1/edit.erb +0 -32
- data/platform/wp7/WPApplication/rho/apps/app/Model1/index.bb.erb +0 -21
- data/platform/wp7/WPApplication/rho/apps/app/Model1/index.erb +0 -26
- data/platform/wp7/WPApplication/rho/apps/app/Model1/model1.rb +0 -10
- data/platform/wp7/WPApplication/rho/apps/app/Model1/model1_controller.rb +0 -58
- data/platform/wp7/WPApplication/rho/apps/app/Model1/new.bb.erb +0 -29
- data/platform/wp7/WPApplication/rho/apps/app/Model1/new.erb +0 -31
- data/platform/wp7/WPApplication/rho/apps/app/Model1/show.bb.erb +0 -26
- data/platform/wp7/WPApplication/rho/apps/app/Model1/show.erb +0 -28
- data/platform/wp7/WPApplication/rho/apps/app/Settings/controller.rb +0 -75
- data/platform/wp7/WPApplication/rho/apps/app/Settings/home.bb.erb +0 -17
- data/platform/wp7/WPApplication/rho/apps/app/Settings/home.erb +0 -20
- data/platform/wp7/WPApplication/rho/apps/app/Settings/index.bb.erb +0 -32
- data/platform/wp7/WPApplication/rho/apps/app/Settings/index.erb +0 -30
- data/platform/wp7/WPApplication/rho/apps/app/Settings/login.bb.erb +0 -35
- data/platform/wp7/WPApplication/rho/apps/app/Settings/login.erb +0 -27
- data/platform/wp7/WPApplication/rho/apps/app/Settings/reset.bb.erb +0 -15
- data/platform/wp7/WPApplication/rho/apps/app/Settings/reset.erb +0 -17
- data/platform/wp7/WPApplication/rho/apps/app/Settings/wait.bb.erb +0 -3
- data/platform/wp7/WPApplication/rho/apps/app/Settings/wait.erb +0 -5
- data/platform/wp7/WPApplication/rho/apps/app/application.rb +0 -16
- data/platform/wp7/WPApplication/rho/apps/app/helpers/application_helper.rb +0 -126
- data/platform/wp7/WPApplication/rho/apps/app/helpers/browser_helper.rb +0 -18
- data/platform/wp7/WPApplication/rho/apps/app/index.bb.erb +0 -26
- data/platform/wp7/WPApplication/rho/apps/app/index.erb +0 -26
- data/platform/wp7/WPApplication/rho/apps/app/layout.erb +0 -47
- data/platform/wp7/WPApplication/rho/apps/app/loading.html +0 -11
- data/platform/wp7/WPApplication/rho/apps/app_manifest.txt +0 -1
- data/platform/wp7/WPApplication/rho/apps/public/css/android.css +0 -330
- data/platform/wp7/WPApplication/rho/apps/public/css/blackberry.css +0 -115
- data/platform/wp7/WPApplication/rho/apps/public/css/iphone.css +0 -410
- data/platform/wp7/WPApplication/rho/apps/public/css/windows_mobile.css +0 -222
- data/platform/wp7/WPApplication/rho/apps/public/images/IUI_LICENSE.txt +0 -21
- data/platform/wp7/WPApplication/rho/apps/public/images/android/ic_menu_more.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/backButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/blueButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/cancel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/grayButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/disclosure.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/disclosure_detail.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/backButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/blueButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/cancel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/chevron.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/grayButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/listArrowSel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/listGroup.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/loading.gif +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/on_off.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/pinstripes.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/selection.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/thumb.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toggle.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toggleOn.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toolButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toolbar.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/whiteButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/radiobutton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/select.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/switch.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iui-logo-touch-icon.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listArrow.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listArrowDown.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listArrowSel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listGroup.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/loading.gif +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/pinstripes.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/right_button.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/selection.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/thumb.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toggle.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toggleOn.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toolButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toolButton_new.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toolbar.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/whiteButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch-iphone.css +0 -9
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch.css +0 -374
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch.js +0 -742
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch.transitions.js +0 -60
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jquery.1.3.2.min.js +0 -19
- data/platform/wp7/WPApplication/rho/apps/public/js/application.js +0 -1
- data/platform/wp7/WPApplication/rho/apps/public/js/rho.js +0 -4
- data/platform/wp7/WPApplication/rho/apps/public/js/rhogeolocation-wm.js +0 -59
- data/platform/wp7/WPApplication/rho/apps/public/js/rhogeolocation.js +0 -11
- data/platform/wp7/WPApplication/rho/apps/rhoconfig.txt +0 -32
- data/platform/wp7/WPApplication/rhoconfig.txt +0 -32
- data/platform/wp7/WPApplication/windows_mobile.css +0 -222
- data/res/generators/templates/application/public/jqtouch/changes.txt +0 -20
- data/res/generators/templates/application/public/jqtouch/jqtouch.css +0 -374
- data/res/generators/templates/application/public/jqtouch/jqtouch.js +0 -771
- data/res/generators/templates/application/public/jqtouch/jqtouch.transitions.js +0 -60
- data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +0 -19
- data/res/generators/templates/application/public/js/wp7.js +0 -7
File without changes
|
@@ -0,0 +1,19 @@
|
|
1
|
+
#include "common/RhoPort.h"
|
2
|
+
#include <e32std.h>
|
3
|
+
#include <e32base.h>
|
4
|
+
extern "C" {
|
5
|
+
void* rho_nativethread_start()
|
6
|
+
{
|
7
|
+
CActiveScheduler* Scheduler = new ( ELeave ) CActiveScheduler;
|
8
|
+
CleanupStack::PushL( Scheduler );
|
9
|
+
CActiveScheduler::Install( Scheduler );
|
10
|
+
return Scheduler;
|
11
|
+
}
|
12
|
+
|
13
|
+
void rho_nativethread_end(void* pData)
|
14
|
+
{
|
15
|
+
if(pData)
|
16
|
+
CleanupStack::PopAndDestroy(pData);
|
17
|
+
}
|
18
|
+
|
19
|
+
} //extern "C"
|
@@ -40,7 +40,7 @@
|
|
40
40
|
#include <stdlib.h>
|
41
41
|
#include <string.h>
|
42
42
|
|
43
|
-
|
43
|
+
//#include <rhodes.rsg>
|
44
44
|
|
45
45
|
//IMPLEMENT_LOGCLASS(CPhonebook,"Phonebook");
|
46
46
|
|
@@ -76,20 +76,20 @@ CPhonebook* CPhonebook::NewL()
|
|
76
76
|
void CPhonebook::ConstructL()
|
77
77
|
{
|
78
78
|
// Read name of the default database
|
79
|
-
|
79
|
+
//_LIT( KOrgContactFile,"" );
|
80
80
|
|
81
|
-
|
82
|
-
|
83
|
-
|
81
|
+
//TBuf<KMaxDatabasePathAndNameLength> orgContactFile( KOrgContactFile );
|
82
|
+
//CContactDatabase::GetDefaultNameL( orgContactFile );
|
83
|
+
//orgContactFile.LowerCase();
|
84
84
|
|
85
|
-
|
85
|
+
TRAPD(err, iContactDb = CContactDatabase::OpenL( ););//orgContactFile ););
|
86
86
|
// Check if database already exist
|
87
87
|
if ( err == KErrNotFound )
|
88
88
|
{
|
89
|
-
|
89
|
+
/*HBufC* text = StringLoader::LoadLC( R_CONTACTS_DB_NOT_FOUND );
|
90
90
|
CAknInformationNote* informationNote = new (ELeave) CAknInformationNote;
|
91
91
|
informationNote->ExecuteLD( *text );
|
92
|
-
|
92
|
+
CleanupStack::PopAndDestroy( text );*/
|
93
93
|
iContactDb = NULL;
|
94
94
|
}
|
95
95
|
}
|
@@ -125,7 +125,7 @@ void CPhonebook::add2hash(VALUE* hash, const char* key, TPtrC& aValue )
|
|
125
125
|
if ( key && value )
|
126
126
|
{
|
127
127
|
//LOG(INFO) + "Adding field [" + key + ":" + value + "]";
|
128
|
-
|
128
|
+
addStrToHash(*hash, key, value);
|
129
129
|
}
|
130
130
|
|
131
131
|
if ( value )
|
@@ -134,11 +134,11 @@ void CPhonebook::add2hash(VALUE* hash, const char* key, TPtrC& aValue )
|
|
134
134
|
|
135
135
|
VALUE CPhonebook::getFields(CContactItemFieldSet& fieldSet, char* id)
|
136
136
|
{
|
137
|
-
|
137
|
+
VALUE hash = rho_ruby_createHash();
|
138
138
|
|
139
139
|
// Get field ID
|
140
140
|
//LOG(INFO) + "Adding field [id:" + id + "]";
|
141
|
-
|
141
|
+
addStrToHash(hash, RUBY_PB_ID, id);
|
142
142
|
|
143
143
|
// Get first name
|
144
144
|
TInt findpos( fieldSet.Find( KUidContactFieldGivenName ) );
|
@@ -153,7 +153,7 @@ VALUE CPhonebook::getFields(CContactItemFieldSet& fieldSet, char* id)
|
|
153
153
|
}
|
154
154
|
else
|
155
155
|
{
|
156
|
-
|
156
|
+
addStrToHash(hash, RUBY_PB_FIRST_NAME, "");
|
157
157
|
}
|
158
158
|
|
159
159
|
// Get last name
|
@@ -169,7 +169,7 @@ VALUE CPhonebook::getFields(CContactItemFieldSet& fieldSet, char* id)
|
|
169
169
|
}
|
170
170
|
else
|
171
171
|
{
|
172
|
-
|
172
|
+
addStrToHash(hash, RUBY_PB_LAST_NAME, "");
|
173
173
|
}
|
174
174
|
|
175
175
|
// Get home phone
|
@@ -187,9 +187,9 @@ VALUE CPhonebook::getFields(CContactItemFieldSet& fieldSet, char* id)
|
|
187
187
|
}
|
188
188
|
else
|
189
189
|
{
|
190
|
-
|
191
|
-
|
192
|
-
|
190
|
+
addStrToHash(hash, RUBY_PB_HOME_NUMBER, "");
|
191
|
+
addStrToHash(hash, RUBY_PB_MOBILE_NUMBER, "");
|
192
|
+
addStrToHash(hash, RUBY_PB_BUSINESS_NUMBER, "");
|
193
193
|
}
|
194
194
|
|
195
195
|
// Get email
|
@@ -205,7 +205,7 @@ VALUE CPhonebook::getFields(CContactItemFieldSet& fieldSet, char* id)
|
|
205
205
|
}
|
206
206
|
else
|
207
207
|
{
|
208
|
-
|
208
|
+
addStrToHash(hash, RUBY_PB_EMAIL_ADDRESS, "");
|
209
209
|
}
|
210
210
|
|
211
211
|
// Get company
|
@@ -221,7 +221,7 @@ VALUE CPhonebook::getFields(CContactItemFieldSet& fieldSet, char* id)
|
|
221
221
|
}
|
222
222
|
else
|
223
223
|
{
|
224
|
-
|
224
|
+
addStrToHash(hash, RUBY_PB_COMPANY_NAME, "");
|
225
225
|
}
|
226
226
|
|
227
227
|
return hash;
|
@@ -229,7 +229,7 @@ VALUE CPhonebook::getFields(CContactItemFieldSet& fieldSet, char* id)
|
|
229
229
|
|
230
230
|
VALUE CPhonebook::getallPhonebookRecords()
|
231
231
|
{
|
232
|
-
|
232
|
+
VALUE hash = rho_ruby_createHash(); //retval
|
233
233
|
|
234
234
|
iContactDb->SetDbViewContactType( KUidContactCard );
|
235
235
|
|
@@ -0,0 +1,1245 @@
|
|
1
|
+
/****************************************************************************
|
2
|
+
**
|
3
|
+
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
4
|
+
** All rights reserved.
|
5
|
+
** Contact: Nokia Corporation (qt-info@nokia.com)
|
6
|
+
**
|
7
|
+
** This file is part of the QtGui module of the Qt Toolkit.
|
8
|
+
**
|
9
|
+
** $QT_BEGIN_LICENSE:LGPL$
|
10
|
+
** No Commercial Usage
|
11
|
+
** This file contains pre-release code and may not be distributed.
|
12
|
+
** You may use this file in accordance with the terms and conditions
|
13
|
+
** contained in the Technology Preview License Agreement accompanying
|
14
|
+
** this package.
|
15
|
+
**
|
16
|
+
** GNU Lesser General Public License Usage
|
17
|
+
** Alternatively, this file may be used under the terms of the GNU Lesser
|
18
|
+
** General Public License version 2.1 as published by the Free Software
|
19
|
+
** Foundation and appearing in the file LICENSE.LGPL included in the
|
20
|
+
** packaging of this file. Please review the following information to
|
21
|
+
** ensure the GNU Lesser General Public License version 2.1 requirements
|
22
|
+
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
23
|
+
**
|
24
|
+
** In addition, as a special exception, Nokia gives you certain additional
|
25
|
+
** rights. These rights are described in the Nokia Qt LGPL Exception
|
26
|
+
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
27
|
+
**
|
28
|
+
** If you have questions regarding the use of this file, please contact
|
29
|
+
** Nokia at qt-info@nokia.com.
|
30
|
+
**
|
31
|
+
**
|
32
|
+
**
|
33
|
+
**
|
34
|
+
**
|
35
|
+
**
|
36
|
+
**
|
37
|
+
**
|
38
|
+
** $QT_END_LICENSE$
|
39
|
+
**
|
40
|
+
****************************************************************************/
|
41
|
+
#include <qkineticscroller.h>
|
42
|
+
#include <qkineticscroller_p.h>
|
43
|
+
#include <QMap>
|
44
|
+
#include <QApplication>
|
45
|
+
#include <QDesktopWidget>
|
46
|
+
#include <QtCore/qmath.h>
|
47
|
+
|
48
|
+
#include <QtDebug>
|
49
|
+
|
50
|
+
QT_BEGIN_NAMESPACE
|
51
|
+
|
52
|
+
#define KINETIC_SCROLLER_DEBUG
|
53
|
+
|
54
|
+
#ifdef KINETIC_SCROLLER_DEBUG
|
55
|
+
# define qKSDebug qDebug
|
56
|
+
#else
|
57
|
+
# define qKSDebug while (false) qDebug
|
58
|
+
#endif
|
59
|
+
|
60
|
+
|
61
|
+
inline bool operator<=(const QPointF &p, qreal f)
|
62
|
+
{
|
63
|
+
return (qAbs(p.x()) <= f) && (qAbs(p.y()) <= f);
|
64
|
+
}
|
65
|
+
inline bool operator<(const QPointF &p, qreal f)
|
66
|
+
{
|
67
|
+
return (qAbs(p.x()) < f) && (qAbs(p.y()) < f);
|
68
|
+
}
|
69
|
+
|
70
|
+
inline bool operator>=(const QPointF &p, qreal f)
|
71
|
+
{
|
72
|
+
return (qAbs(p.x()) >= f) || (qAbs(p.y()) >= f);
|
73
|
+
}
|
74
|
+
inline bool operator>(const QPointF &p, qreal f)
|
75
|
+
{
|
76
|
+
return (qAbs(p.x()) > f) || (qAbs(p.y()) > f);
|
77
|
+
}
|
78
|
+
|
79
|
+
inline QPointF qAbs(const QPointF &p)
|
80
|
+
{
|
81
|
+
return QPointF(qAbs(p.x()), qAbs(p.y()));
|
82
|
+
}
|
83
|
+
|
84
|
+
inline int qSign(qreal r)
|
85
|
+
{
|
86
|
+
return (r < 0) ? -1 : ((r > 0) ? 1 : 0);
|
87
|
+
}
|
88
|
+
|
89
|
+
|
90
|
+
/*!
|
91
|
+
\class QKineticScroller
|
92
|
+
\brief The QKineticScroller class enables kinetic scrolling for any scrolling widget or graphics item.
|
93
|
+
\ingroup qtmaemo5
|
94
|
+
\since 4.6
|
95
|
+
\preliminary
|
96
|
+
|
97
|
+
With kinetic scrolling, the user can push the widget in a given
|
98
|
+
direction and it will continue to scroll in this direction until it is
|
99
|
+
stopped either by the user or by friction. Aspects of inertia, friction
|
100
|
+
and other physical concepts can be changed in order to fine-tune an
|
101
|
+
intuitive user experience.
|
102
|
+
|
103
|
+
To enable kinetic scrolling for a widget or graphics item, you need to
|
104
|
+
derive from this class and implement at least all the pure-virtual
|
105
|
+
functions.
|
106
|
+
|
107
|
+
Qt for Maemo 5 already comes with two implementations for
|
108
|
+
QScrollArea and QWebView, and those kinetic scrollers are
|
109
|
+
automatically instantiated and attached to these widgets on creation.
|
110
|
+
In the QScrollArea case, the kinetic scroller is initially
|
111
|
+
disabled. However, for QItemView and QScrollArea derived classes
|
112
|
+
it is enabled by default. You can obtain these automatically created
|
113
|
+
objects via a dynamic property:
|
114
|
+
|
115
|
+
\code
|
116
|
+
// disable the kinetic scroller on scrollArea
|
117
|
+
QKineticScroller *scroller = scrollArea->property("kineticScroller")
|
118
|
+
.value<QKineticScroller *>();
|
119
|
+
if (scroller)
|
120
|
+
scroller->setEnabled(false);
|
121
|
+
\endcode
|
122
|
+
|
123
|
+
In addition there is also an example on how you would add kinetic
|
124
|
+
scrolling to a QGraphicsView based application in \c maemobrowser
|
125
|
+
examples in the \c maemo5 examples directory.
|
126
|
+
|
127
|
+
The kinetic scroller installs an event filter on the widget to handle mouse
|
128
|
+
presses and moves on the widget \mdash presses and moves on a device's touch screen
|
129
|
+
are also handled by this mechanism. These events will be interpreted as scroll actions
|
130
|
+
depending on the current state() of the scroller.
|
131
|
+
|
132
|
+
Even though this kinetic scroller has a huge number of settings, we
|
133
|
+
recommend that you leave them all at their default values. In case you
|
134
|
+
really want to change them you can try out the \c kineticscroller
|
135
|
+
example in the \c maemo5 examples directory.
|
136
|
+
|
137
|
+
\sa QWidget
|
138
|
+
*/
|
139
|
+
|
140
|
+
|
141
|
+
/*!
|
142
|
+
Constructs a new kinetic scroller.
|
143
|
+
*/
|
144
|
+
QKineticScroller::QKineticScroller()
|
145
|
+
: d_ptr(new QKineticScrollerPrivate())
|
146
|
+
{
|
147
|
+
Q_D(QKineticScroller);
|
148
|
+
d->q_ptr = this;
|
149
|
+
d->init();
|
150
|
+
}
|
151
|
+
|
152
|
+
/*! \internal
|
153
|
+
*/
|
154
|
+
QKineticScroller::QKineticScroller(QKineticScrollerPrivate &dd)
|
155
|
+
: d_ptr(&dd)
|
156
|
+
{
|
157
|
+
Q_D(QKineticScroller);
|
158
|
+
d->q_ptr = this;
|
159
|
+
d->init();
|
160
|
+
}
|
161
|
+
|
162
|
+
/*!
|
163
|
+
Destroys the scroller.
|
164
|
+
*/
|
165
|
+
QKineticScroller::~QKineticScroller()
|
166
|
+
{
|
167
|
+
}
|
168
|
+
|
169
|
+
/*!
|
170
|
+
\enum QKineticScroller::State
|
171
|
+
|
172
|
+
This enum describes the possible states the kinetic scroller can be in.
|
173
|
+
|
174
|
+
\value Inactive The scroller is inactive. It may also have been disabled.
|
175
|
+
\value Pressed The user has pressed the mouse button (or pressed the
|
176
|
+
the touch screen).
|
177
|
+
\value Dragging The user is dragging the mouse cursor (or other input
|
178
|
+
point) over the scroll area.
|
179
|
+
\value Scrolling Scrolling is occurring without direct user input.
|
180
|
+
*/
|
181
|
+
|
182
|
+
QKineticScrollerPrivate::QKineticScrollerPrivate()
|
183
|
+
: enabled(true)
|
184
|
+
, state(QKineticScroller::StateInactive)
|
185
|
+
, hOvershootPolicy(QKineticScroller::OvershootWhenScrollable)
|
186
|
+
, vOvershootPolicy(QKineticScroller::OvershootWhenScrollable)
|
187
|
+
, pressTimestamp(0)
|
188
|
+
, lastTimestamp(0)
|
189
|
+
, scrollToX(false)
|
190
|
+
, scrollToY(false)
|
191
|
+
, overshootX(false)
|
192
|
+
, overshootY(false)
|
193
|
+
, cancelPress(false)
|
194
|
+
, debugHook(0)
|
195
|
+
, debugHookUser(0)
|
196
|
+
{ }
|
197
|
+
|
198
|
+
QKineticScrollerPrivate::~QKineticScrollerPrivate()
|
199
|
+
{ }
|
200
|
+
|
201
|
+
void QKineticScrollerPrivate::init()
|
202
|
+
{
|
203
|
+
Q_Q(QKineticScroller);
|
204
|
+
q->setDpiFromWidget(0);
|
205
|
+
q->resetScrollMetrics();
|
206
|
+
}
|
207
|
+
|
208
|
+
void QKineticScroller::registerDebugHook(void (*callback)(void *user, const QPointF &releaseVelocity, const QPointF &position, const QPointF &overshootPosition), void *user)
|
209
|
+
{
|
210
|
+
Q_D(QKineticScroller);
|
211
|
+
d->debugHook = callback;
|
212
|
+
d->debugHookUser = user;
|
213
|
+
}
|
214
|
+
|
215
|
+
void QKineticScroller::resetScrollMetrics()
|
216
|
+
{
|
217
|
+
static QMap<ScrollMetric, QVariant> metrics;
|
218
|
+
|
219
|
+
#ifdef Q_WS_MAEMO_5
|
220
|
+
metrics.insert(DragVelocitySmoothingFactor, qreal(0.15));
|
221
|
+
metrics.insert(ExponentialDecelerationBase, qreal(0.38)); // 0.85^20
|
222
|
+
metrics.insert(LinearDecelerationFactor, qreal(0));
|
223
|
+
metrics.insert(OvershootSpringConstant, qreal(80.56));
|
224
|
+
metrics.insert(OvershootDragResistanceFactor, qreal(1));
|
225
|
+
metrics.insert(OvershootMaximumDistance, QPointF(qreal(15.0 / 1000), qreal(15.0 / 1000)));
|
226
|
+
metrics.insert(DragStartDistance, qreal(2.5 / 1000));
|
227
|
+
metrics.insert(DragStartDirectionErrorMargin, qreal(1.0 / 1000));
|
228
|
+
metrics.insert(MaximumVelocity, qreal(6.84));
|
229
|
+
metrics.insert(MinimumVelocity, qreal(0.0195));
|
230
|
+
metrics.insert(MaximumNonAcceleratedVelocity, qreal(5.6));
|
231
|
+
metrics.insert(MaximumClickThroughVelocity, qreal(0.0684));
|
232
|
+
metrics.insert(AxisLockThreshold, qreal(0));
|
233
|
+
metrics.insert(FastSwipeBaseVelocity, qreal(5.6 * 27));
|
234
|
+
metrics.insert(FastSwipeMinimumVelocity, qreal(0.078));
|
235
|
+
metrics.insert(FastSwipeMaximumTime, qreal(0.125));
|
236
|
+
metrics.insert(FramesPerSecond, qreal(20));
|
237
|
+
#else
|
238
|
+
metrics.insert(DragVelocitySmoothingFactor, qreal(0.02));
|
239
|
+
metrics.insert(ExponentialDecelerationBase, qreal(1));
|
240
|
+
metrics.insert(LinearDecelerationFactor, qreal(0.38));
|
241
|
+
metrics.insert(OvershootSpringConstant, qreal(15.0));
|
242
|
+
metrics.insert(OvershootDragResistanceFactor, qreal(0.5));
|
243
|
+
metrics.insert(OvershootMaximumDistance, QPointF(0,0)); // QPointF(qreal(14.25 / 1000), qreal(14.25 / 1000)));
|
244
|
+
metrics.insert(DragStartDistance, qreal(2.5 / 1000));
|
245
|
+
metrics.insert(DragStartDirectionErrorMargin, qreal(1.0 / 1000));
|
246
|
+
metrics.insert(MaximumVelocity, qreal(6650.0 / 1000));
|
247
|
+
metrics.insert(MinimumVelocity, qreal(30.0 / 1000));
|
248
|
+
metrics.insert(MaximumNonAcceleratedVelocity, qreal(532.0 / 1000));
|
249
|
+
metrics.insert(MaximumClickThroughVelocity, qreal(66.5 / 1000));
|
250
|
+
metrics.insert(AxisLockThreshold, qreal(0));
|
251
|
+
metrics.insert(FastSwipeBaseVelocity, qreal(51.3 / 1000));
|
252
|
+
metrics.insert(FastSwipeMinimumVelocity, qreal(76.0 / 1000));
|
253
|
+
metrics.insert(FastSwipeMaximumTime, qreal(0.125));
|
254
|
+
metrics.insert(FramesPerSecond, qreal(60));
|
255
|
+
#endif
|
256
|
+
|
257
|
+
if (!metrics.isEmpty()) {
|
258
|
+
for (QMap<ScrollMetric, QVariant>::const_iterator it = metrics.constBegin(); it != metrics.constEnd(); ++it)
|
259
|
+
setScrollMetric(it.key(), it.value());
|
260
|
+
if (metrics.count() != ScrollMetricCount)
|
261
|
+
qWarning("QKineticScroller::resetAllMetrics(): scroll metrics parameter set did not contain all metrics.");
|
262
|
+
} else {
|
263
|
+
qWarning("QKineticScroller::resetAllMetrics(): no platform default parameter set available.");
|
264
|
+
}
|
265
|
+
}
|
266
|
+
|
267
|
+
|
268
|
+
const char *QKineticScrollerPrivate::stateName(QKineticScroller::State state)
|
269
|
+
{
|
270
|
+
switch (state) {
|
271
|
+
case QKineticScroller::StateInactive: return "inactive";
|
272
|
+
case QKineticScroller::StatePressed: return "pressed";
|
273
|
+
case QKineticScroller::StateDragging: return "dragging";
|
274
|
+
case QKineticScroller::StateScrolling: return "scrolling";
|
275
|
+
default: return "(invalid)";
|
276
|
+
}
|
277
|
+
}
|
278
|
+
|
279
|
+
const char *QKineticScrollerPrivate::inputName(QKineticScroller::Input input)
|
280
|
+
{
|
281
|
+
switch (input) {
|
282
|
+
case QKineticScroller::InputPress: return "press";
|
283
|
+
case QKineticScroller::InputMove: return "move";
|
284
|
+
case QKineticScroller::InputRelease: return "release";
|
285
|
+
default: return "(invalid)";
|
286
|
+
}
|
287
|
+
}
|
288
|
+
|
289
|
+
|
290
|
+
|
291
|
+
|
292
|
+
void QKineticScrollerPrivate::timerEvent(QTimerEvent *e)
|
293
|
+
{
|
294
|
+
if (e->timerId() != timerId) {
|
295
|
+
QObject::timerEvent(e);
|
296
|
+
return;
|
297
|
+
}
|
298
|
+
|
299
|
+
struct timerevent {
|
300
|
+
QKineticScroller::State state;
|
301
|
+
typedef void (QKineticScrollerPrivate::*timerhandler_t)();
|
302
|
+
timerhandler_t handler;
|
303
|
+
};
|
304
|
+
|
305
|
+
timerevent timerevents[] = {
|
306
|
+
{ QKineticScroller::StateDragging, &QKineticScrollerPrivate::timerEventWhileDragging },
|
307
|
+
{ QKineticScroller::StateScrolling, &QKineticScrollerPrivate::timerEventWhileScrolling },
|
308
|
+
};
|
309
|
+
|
310
|
+
for (int i = 0; i < int(sizeof(timerevents) / sizeof(*timerevents)); ++i) {
|
311
|
+
timerevent *te = timerevents + i;
|
312
|
+
|
313
|
+
if (state == te->state) {
|
314
|
+
(this->*te->handler)();
|
315
|
+
return;
|
316
|
+
}
|
317
|
+
}
|
318
|
+
|
319
|
+
if (timerId) {
|
320
|
+
qWarning() << "Unhandled timer event, while in state " << stateName(state);
|
321
|
+
killTimer(timerId);
|
322
|
+
timerId = 0;
|
323
|
+
}
|
324
|
+
// otherwise this is a timer event that was already queued when the
|
325
|
+
// timer was killed, so just ignore it
|
326
|
+
}
|
327
|
+
|
328
|
+
bool QKineticScroller::handleInput(Input input, const QPointF &position, qint64 timestamp)
|
329
|
+
{
|
330
|
+
Q_D(QKineticScroller);
|
331
|
+
|
332
|
+
|
333
|
+
qKSDebug() << "QKS::handleInput(" << input << ", " << position << ", " << timestamp << ")";
|
334
|
+
struct statechange {
|
335
|
+
State state;
|
336
|
+
Input input;
|
337
|
+
typedef bool (QKineticScrollerPrivate::*inputhandler_t)(Input input, const QPointF &position, qint64 timestamp);
|
338
|
+
inputhandler_t handler;
|
339
|
+
};
|
340
|
+
|
341
|
+
statechange statechanges[] = {
|
342
|
+
{ StateInactive, InputPress, &QKineticScrollerPrivate::pressWhileInactive },
|
343
|
+
{ StatePressed, InputMove, &QKineticScrollerPrivate::moveWhilePressed },
|
344
|
+
{ StatePressed, InputRelease, &QKineticScrollerPrivate::releaseWhilePressed },
|
345
|
+
{ StateDragging, InputMove, &QKineticScrollerPrivate::moveWhileDragging },
|
346
|
+
{ StateDragging, InputRelease, &QKineticScrollerPrivate::releaseWhileDragging },
|
347
|
+
{ StateScrolling, InputPress, &QKineticScrollerPrivate::pressWhileScrolling }
|
348
|
+
};
|
349
|
+
|
350
|
+
for (int i = 0; i < int(sizeof(statechanges) / sizeof(*statechanges)); ++i) {
|
351
|
+
statechange *sc = statechanges + i;
|
352
|
+
|
353
|
+
if (d->state == sc->state && input == sc->input)
|
354
|
+
return (d->*sc->handler)(input, position, timestamp);
|
355
|
+
}
|
356
|
+
|
357
|
+
qWarning() << "Unhandled input: got input " << d->inputName(input) << " while in state " << d->stateName(d->state);
|
358
|
+
return false;
|
359
|
+
}
|
360
|
+
|
361
|
+
bool QKineticScroller::isEnabled() const
|
362
|
+
{
|
363
|
+
Q_D(const QKineticScroller);
|
364
|
+
return d->enabled;
|
365
|
+
}
|
366
|
+
|
367
|
+
void QKineticScroller::setEnabled(bool b)
|
368
|
+
{
|
369
|
+
Q_D(QKineticScroller);
|
370
|
+
d->enabled = b;
|
371
|
+
}
|
372
|
+
|
373
|
+
QKineticScroller::State QKineticScroller::state() const
|
374
|
+
{
|
375
|
+
Q_D(const QKineticScroller);
|
376
|
+
return d->state;
|
377
|
+
}
|
378
|
+
|
379
|
+
/*!
|
380
|
+
Resets the internal state of the kinetic scroller. This function is not
|
381
|
+
needed for normal use. This function only needs to be called if the
|
382
|
+
kinetic scroller is being re-attached to a different widget.
|
383
|
+
*/
|
384
|
+
void QKineticScroller::reset()
|
385
|
+
{
|
386
|
+
Q_D(QKineticScroller);
|
387
|
+
|
388
|
+
d->setState(StateInactive);
|
389
|
+
}
|
390
|
+
|
391
|
+
QKineticScroller::OvershootPolicy QKineticScroller::horizontalOvershootPolicy() const
|
392
|
+
{
|
393
|
+
Q_D(const QKineticScroller);
|
394
|
+
return d->hOvershootPolicy;
|
395
|
+
}
|
396
|
+
|
397
|
+
void QKineticScroller::setHorizontalOvershootPolicy(QKineticScroller::OvershootPolicy policy)
|
398
|
+
{
|
399
|
+
Q_D(QKineticScroller);
|
400
|
+
d->hOvershootPolicy = policy;
|
401
|
+
}
|
402
|
+
|
403
|
+
QKineticScroller::OvershootPolicy QKineticScroller::verticalOvershootPolicy() const
|
404
|
+
{
|
405
|
+
Q_D(const QKineticScroller);
|
406
|
+
return d->vOvershootPolicy;
|
407
|
+
}
|
408
|
+
|
409
|
+
void QKineticScroller::setVerticalOvershootPolicy(QKineticScroller::OvershootPolicy policy)
|
410
|
+
{
|
411
|
+
Q_D(QKineticScroller);
|
412
|
+
d->vOvershootPolicy = policy;
|
413
|
+
}
|
414
|
+
|
415
|
+
QVariant QKineticScroller::scrollMetric(ScrollMetric metric) const
|
416
|
+
{
|
417
|
+
Q_D(const QKineticScroller);
|
418
|
+
|
419
|
+
switch (metric) {
|
420
|
+
case DragVelocitySmoothingFactor: return d->dragVelocitySmoothingFactor;
|
421
|
+
case LinearDecelerationFactor: return d->linearDecelerationFactor;
|
422
|
+
case ExponentialDecelerationBase: return d->exponentialDecelerationBase;
|
423
|
+
case OvershootSpringConstant: return d->overshootSpringConstantRoot * d->overshootSpringConstantRoot;
|
424
|
+
case OvershootDragResistanceFactor: return d->overshootDragResistanceFactor;
|
425
|
+
case OvershootMaximumDistance: return d->overshootMaximumDistance;
|
426
|
+
case DragStartDistance: return d->dragStartDistance;
|
427
|
+
case DragStartDirectionErrorMargin: return d->dragStartDirectionErrorMargin;
|
428
|
+
case MinimumVelocity: return d->minimumVelocity;
|
429
|
+
case MaximumVelocity: return d->maximumVelocity;
|
430
|
+
case MaximumNonAcceleratedVelocity: return d->maximumNonAcceleratedVelocity;
|
431
|
+
case MaximumClickThroughVelocity: return d->maximumClickThroughVelocity;
|
432
|
+
case AxisLockThreshold: return d->axisLockThreshold;
|
433
|
+
case FramesPerSecond: return d->framesPerSecond;
|
434
|
+
case FastSwipeMaximumTime: return d->fastSwipeMaximumTime;
|
435
|
+
case FastSwipeMinimumVelocity: return d->fastSwipeMinimumVelocity;
|
436
|
+
case FastSwipeBaseVelocity: return d->fastSwipeBaseVelocity;
|
437
|
+
case ScrollMetricCount: break;
|
438
|
+
}
|
439
|
+
return QVariant();
|
440
|
+
}
|
441
|
+
|
442
|
+
|
443
|
+
void QKineticScroller::setScrollMetric(ScrollMetric metric, const QVariant &value)
|
444
|
+
{
|
445
|
+
Q_D(QKineticScroller);
|
446
|
+
|
447
|
+
switch (metric) {
|
448
|
+
case DragVelocitySmoothingFactor: d->dragVelocitySmoothingFactor = qBound(qreal(0), value.toReal(), qreal(1)); break;
|
449
|
+
case LinearDecelerationFactor: d->linearDecelerationFactor = qBound(qreal(0), value.toReal(), qreal(1)); break;
|
450
|
+
case ExponentialDecelerationBase: d->exponentialDecelerationBase = qBound(qreal(0), value.toReal(), qreal(1)); break;
|
451
|
+
case OvershootSpringConstant: d->overshootSpringConstantRoot = qSqrt(value.toReal()); break;
|
452
|
+
case OvershootDragResistanceFactor: d->overshootDragResistanceFactor = value.toReal(); break;
|
453
|
+
case OvershootMaximumDistance: d->overshootMaximumDistance = value.toPointF(); break;
|
454
|
+
case DragStartDistance: d->dragStartDistance = value.toReal(); break;
|
455
|
+
case DragStartDirectionErrorMargin: d->dragStartDirectionErrorMargin = value.toReal(); break;
|
456
|
+
case MinimumVelocity: d->minimumVelocity = value.toReal(); break;
|
457
|
+
case MaximumVelocity: d->maximumVelocity = value.toReal(); break;
|
458
|
+
case MaximumNonAcceleratedVelocity: d->maximumNonAcceleratedVelocity = value.toReal(); break;
|
459
|
+
case MaximumClickThroughVelocity: d->maximumClickThroughVelocity = value.toReal(); break;
|
460
|
+
case AxisLockThreshold: d->axisLockThreshold = qBound(qreal(0), value.toReal(), qreal(1)); break;
|
461
|
+
case FramesPerSecond: d->framesPerSecond = qBound(1, value.toInt(), 100); break;
|
462
|
+
case FastSwipeMaximumTime: d->fastSwipeMaximumTime = value.toReal(); break;
|
463
|
+
case FastSwipeMinimumVelocity: d->fastSwipeMinimumVelocity = value.toReal(); break;
|
464
|
+
case FastSwipeBaseVelocity: d->fastSwipeBaseVelocity = value.toReal(); break;
|
465
|
+
case ScrollMetricCount: break;
|
466
|
+
}
|
467
|
+
}
|
468
|
+
|
469
|
+
qreal QKineticScroller::dpi() const
|
470
|
+
{
|
471
|
+
Q_D(const QKineticScroller);
|
472
|
+
return d->pixelPerMeter / qreal(39.3700787);
|
473
|
+
}
|
474
|
+
|
475
|
+
|
476
|
+
void QKineticScroller::setDpi(qreal dpi)
|
477
|
+
{
|
478
|
+
Q_D(QKineticScroller);
|
479
|
+
d->pixelPerMeter = dpi * qreal(39.3700787);
|
480
|
+
}
|
481
|
+
|
482
|
+
void QKineticScroller::setDpiFromWidget(QWidget *widget)
|
483
|
+
{
|
484
|
+
Q_D(QKineticScroller);
|
485
|
+
|
486
|
+
QDesktopWidget *dw = QApplication::desktop();
|
487
|
+
QPointF dpi = d->realDpi(widget ? dw->screenNumber(widget) : dw->primaryScreen());
|
488
|
+
setDpi((dpi.x() + dpi.y()) / qreal(2));
|
489
|
+
}
|
490
|
+
|
491
|
+
#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAC)
|
492
|
+
|
493
|
+
QPointF QKineticScrollerPrivate::realDpi(int screen)
|
494
|
+
{
|
495
|
+
QWidget *w = QApplication::desktop()->screen(screen);
|
496
|
+
return QPointF(w->physicalDpiX(), w->physicalDpiY());
|
497
|
+
}
|
498
|
+
|
499
|
+
#endif
|
500
|
+
|
501
|
+
|
502
|
+
void QKineticScrollerPrivate::updateVelocity(const QPointF &deltaPixelRaw, qint64 deltaTime)
|
503
|
+
{
|
504
|
+
qKSDebug() << "QKS::updateVelocity(" << deltaPixelRaw << " [delta pix], " << deltaTime << " [delta ms])";
|
505
|
+
|
506
|
+
QPointF deltaPixel = deltaPixelRaw;
|
507
|
+
|
508
|
+
// faster than 2.5mm/ms seems bogus (that would be a screen height in ~20 ms)
|
509
|
+
if (((deltaPixelRaw / qreal(deltaTime)).manhattanLength() / pixelPerMeter * 1000) > qreal(2.5))
|
510
|
+
deltaPixel = deltaPixelRaw * qreal(2.5) * pixelPerMeter / 1000 / (deltaPixelRaw / qreal(deltaTime)).manhattanLength();
|
511
|
+
|
512
|
+
qreal inversSmoothingFactor = ((qreal(1) - dragVelocitySmoothingFactor) * qreal(deltaTime) / qreal(1000));
|
513
|
+
QPointF newv = -deltaPixel / qreal(deltaTime) * qreal(1000) / pixelPerMeter;
|
514
|
+
newv = newv * (qreal(1) - inversSmoothingFactor) + releaseVelocity * inversSmoothingFactor;
|
515
|
+
|
516
|
+
// newv = newv * dragVelocitySmoothingFactor + velocity * (qreal(1) - dragVelocitySmoothingFactor);
|
517
|
+
|
518
|
+
if (deltaPixel.x())
|
519
|
+
releaseVelocity.setX(qBound(-maximumVelocity, newv.x(), maximumVelocity));
|
520
|
+
if (deltaPixel.y())
|
521
|
+
releaseVelocity.setY(qBound(-maximumVelocity, newv.y(), maximumVelocity));
|
522
|
+
|
523
|
+
qKSDebug() << " --> new velocity:" << releaseVelocity;
|
524
|
+
}
|
525
|
+
|
526
|
+
qreal QKineticScrollerPrivate::decelerate(qreal v, qreal t)
|
527
|
+
{
|
528
|
+
qreal result = v * qPow(exponentialDecelerationBase, t);
|
529
|
+
qreal linear = linearDecelerationFactor * t;
|
530
|
+
if (qAbs(result) > linear)
|
531
|
+
return result + (result < 0 ? linear : -linear);
|
532
|
+
else
|
533
|
+
return 0;
|
534
|
+
}
|
535
|
+
|
536
|
+
/*! Calculates the current velocity during scrolling
|
537
|
+
*/
|
538
|
+
QPointF QKineticScrollerPrivate::calculateVelocity(qreal time)
|
539
|
+
{
|
540
|
+
QPointF velocity;
|
541
|
+
|
542
|
+
// -- x coordinate
|
543
|
+
if (overshootX) {
|
544
|
+
if (overshootSpringConstantRoot * (time-overshootStartTimeX) < M_PI) // prevent swinging around
|
545
|
+
velocity.setX(overshootVelocity.x() * qCos(overshootSpringConstantRoot * (time - overshootStartTimeX)));
|
546
|
+
else
|
547
|
+
velocity.setX(-overshootVelocity.x());
|
548
|
+
|
549
|
+
} else {
|
550
|
+
qreal newVelocity = decelerate(releaseVelocity.x(), time);
|
551
|
+
|
552
|
+
if (scrollToX) {
|
553
|
+
if (qAbs(newVelocity) < qreal(30.0 / 1000) /* 30mm/s */)
|
554
|
+
newVelocity = qreal(30.0 / 1000) * qSign(releaseVelocity.x());
|
555
|
+
|
556
|
+
} else {
|
557
|
+
if (qAbs(newVelocity) < qreal(0.5) * qreal(framesPerSecond) / pixelPerMeter /* 0.5 [pix/frame] */)
|
558
|
+
newVelocity = 0;
|
559
|
+
}
|
560
|
+
|
561
|
+
velocity.setX(newVelocity);
|
562
|
+
}
|
563
|
+
|
564
|
+
// -- y coordinate
|
565
|
+
if (overshootY) {
|
566
|
+
if (overshootSpringConstantRoot * (time-overshootStartTimeY) < M_PI) // prevent swinging around
|
567
|
+
velocity.setY(overshootVelocity.y() * qCos(overshootSpringConstantRoot * (time - overshootStartTimeY)));
|
568
|
+
else
|
569
|
+
velocity.setY(-overshootVelocity.y());
|
570
|
+
|
571
|
+
} else {
|
572
|
+
qreal newVelocity = decelerate(releaseVelocity.y(), time);
|
573
|
+
|
574
|
+
if (scrollToY) {
|
575
|
+
if (qAbs(newVelocity) < qreal(30.0 / 1000) /* 30mm/s */)
|
576
|
+
newVelocity = qreal(30.0 / 1000) * qSign(releaseVelocity.y());
|
577
|
+
|
578
|
+
} else {
|
579
|
+
if (qAbs(newVelocity) < qreal(0.5) * qreal(framesPerSecond) / pixelPerMeter /* 0.5 [pix/frame] */)
|
580
|
+
newVelocity = 0;
|
581
|
+
}
|
582
|
+
|
583
|
+
velocity.setY(newVelocity);
|
584
|
+
}
|
585
|
+
|
586
|
+
return velocity;
|
587
|
+
}
|
588
|
+
|
589
|
+
|
590
|
+
void QKineticScrollerPrivate::handleDrag(const QPointF &position, qint64 timestamp)
|
591
|
+
{
|
592
|
+
Q_Q(QKineticScroller);
|
593
|
+
|
594
|
+
QPointF deltaPixel = position - lastPosition;
|
595
|
+
qint64 deltaTime = timestamp - lastTimestamp;
|
596
|
+
|
597
|
+
if (axisLockThreshold) {
|
598
|
+
int dx = qAbs(deltaPixel.x());
|
599
|
+
int dy = qAbs(deltaPixel.y());
|
600
|
+
if (dx || dy) {
|
601
|
+
bool vertical = (dy > dx);
|
602
|
+
qreal alpha = qreal(vertical ? dx : dy) / qreal(vertical ? dy : dx);
|
603
|
+
//qKSDebug() << "QKS::handleDrag() -- axis lock:" << alpha << " / " << axisLockThreshold << "- isvertical:" << vertical << "- dx:" << dx << "- dy:" << dy;
|
604
|
+
if (alpha <= axisLockThreshold) {
|
605
|
+
if (vertical)
|
606
|
+
deltaPixel.setX(0);
|
607
|
+
else
|
608
|
+
deltaPixel.setY(0);
|
609
|
+
}
|
610
|
+
}
|
611
|
+
}
|
612
|
+
|
613
|
+
// calculate velocity (if the user would release the mouse NOW)
|
614
|
+
updateVelocity(deltaPixel, deltaTime);
|
615
|
+
|
616
|
+
// restrict velocity, if content is not scrollable
|
617
|
+
QPointF maxPos = q->maximumContentPosition();
|
618
|
+
bool canScrollX = maxPos.x() || (hOvershootPolicy == QKineticScroller::OvershootAlwaysOn);
|
619
|
+
bool canScrollY = maxPos.y() || (vOvershootPolicy == QKineticScroller::OvershootAlwaysOn);
|
620
|
+
|
621
|
+
if (!canScrollX) {
|
622
|
+
deltaPixel.setX(0);
|
623
|
+
releaseVelocity.setX(0);
|
624
|
+
}
|
625
|
+
if (!canScrollY) {
|
626
|
+
deltaPixel.setY(0);
|
627
|
+
releaseVelocity.setY(0);
|
628
|
+
}
|
629
|
+
|
630
|
+
// if (firstDrag) {
|
631
|
+
// // Do not delay the first drag
|
632
|
+
// setContentPositionHelper(q->contentPosition() - overshootDistance - deltaPixel);
|
633
|
+
// dragDistance = QPointF(0, 0);
|
634
|
+
// } else {
|
635
|
+
dragDistance += deltaPixel;
|
636
|
+
// }
|
637
|
+
|
638
|
+
if (canScrollX)
|
639
|
+
lastPosition.setX(position.x());
|
640
|
+
if (canScrollY)
|
641
|
+
lastPosition.setY(position.y());
|
642
|
+
lastTimestamp = timestamp;
|
643
|
+
}
|
644
|
+
|
645
|
+
|
646
|
+
|
647
|
+
bool QKineticScrollerPrivate::pressWhileInactive(QKineticScroller::Input, const QPointF &position, qint64 timestamp)
|
648
|
+
{
|
649
|
+
Q_Q(QKineticScroller);
|
650
|
+
|
651
|
+
if ((q->maximumContentPosition() > qreal(0)) ||
|
652
|
+
(hOvershootPolicy == QKineticScroller::OvershootAlwaysOn) ||
|
653
|
+
(vOvershootPolicy == QKineticScroller::OvershootAlwaysOn)) {
|
654
|
+
if (q->canStartScrollingAt(position)) {
|
655
|
+
lastPosition = pressPosition = position;
|
656
|
+
lastTimestamp = pressTimestamp = timestamp;
|
657
|
+
cancelPress = true;
|
658
|
+
setState(QKineticScroller::StatePressed);
|
659
|
+
}
|
660
|
+
}
|
661
|
+
return false;
|
662
|
+
}
|
663
|
+
|
664
|
+
bool QKineticScrollerPrivate::releaseWhilePressed(QKineticScroller::Input, const QPointF &, qint64)
|
665
|
+
{
|
666
|
+
if (overshootX || overshootY)
|
667
|
+
setState(QKineticScroller::StateScrolling);
|
668
|
+
else
|
669
|
+
setState(QKineticScroller::StateInactive);
|
670
|
+
return false;
|
671
|
+
}
|
672
|
+
|
673
|
+
bool QKineticScrollerPrivate::moveWhilePressed(QKineticScroller::Input, const QPointF &position, qint64 timestamp)
|
674
|
+
{
|
675
|
+
Q_Q(QKineticScroller);
|
676
|
+
|
677
|
+
QPointF deltaPixel = position - pressPosition;
|
678
|
+
|
679
|
+
bool moveStarted = ((deltaPixel.manhattanLength() / pixelPerMeter) > dragStartDistance);
|
680
|
+
|
681
|
+
if (moveStarted) {
|
682
|
+
qreal deltaXtoY = qAbs(pressPosition.x() - position.x()) - qAbs(pressPosition.y() - position.y());
|
683
|
+
deltaXtoY /= pixelPerMeter;
|
684
|
+
|
685
|
+
QPointF maxPos = q->maximumContentPosition();
|
686
|
+
bool canScrollX = (maxPos.x() > 0);
|
687
|
+
bool canScrollY = (maxPos.y() > 0);
|
688
|
+
|
689
|
+
if (hOvershootPolicy == QKineticScroller::OvershootAlwaysOn)
|
690
|
+
canScrollX = true;
|
691
|
+
if (vOvershootPolicy == QKineticScroller::OvershootAlwaysOn)
|
692
|
+
canScrollY = true;
|
693
|
+
|
694
|
+
if (deltaXtoY < 0) {
|
695
|
+
if (!canScrollY && (!canScrollX || (-deltaXtoY >= dragStartDirectionErrorMargin)))
|
696
|
+
moveStarted = false;
|
697
|
+
} else {
|
698
|
+
if (!canScrollX && (!canScrollY || (deltaXtoY >= dragStartDirectionErrorMargin)))
|
699
|
+
moveStarted = false;
|
700
|
+
}
|
701
|
+
}
|
702
|
+
|
703
|
+
if (moveStarted) {
|
704
|
+
if (cancelPress)
|
705
|
+
q->cancelPress(pressPosition);
|
706
|
+
setState(QKineticScroller::StateDragging);
|
707
|
+
|
708
|
+
// subtract the dragStartDistance
|
709
|
+
deltaPixel = deltaPixel - deltaPixel * (dragStartDistance / deltaPixel.manhattanLength());
|
710
|
+
|
711
|
+
if (!deltaPixel.isNull()) {
|
712
|
+
// handleDrag updates lastPosition, lastTimestamp and velocity
|
713
|
+
handleDrag(pressPosition + deltaPixel, timestamp);
|
714
|
+
}
|
715
|
+
}
|
716
|
+
return moveStarted;
|
717
|
+
}
|
718
|
+
|
719
|
+
bool QKineticScrollerPrivate::moveWhileDragging(QKineticScroller::Input, const QPointF &position, qint64 timestamp)
|
720
|
+
{
|
721
|
+
// handleDrag updates lastPosition, lastTimestamp and velocity
|
722
|
+
handleDrag(position, timestamp);
|
723
|
+
return true;
|
724
|
+
}
|
725
|
+
|
726
|
+
void QKineticScrollerPrivate::timerEventWhileDragging()
|
727
|
+
{
|
728
|
+
if (!dragDistance.isNull()) {
|
729
|
+
qKSDebug() << "QKS::timerEventWhileDragging() -- dragDistance:" << dragDistance;
|
730
|
+
|
731
|
+
setContentPositionHelper(-dragDistance);
|
732
|
+
dragDistance = QPointF(0, 0);
|
733
|
+
}
|
734
|
+
}
|
735
|
+
|
736
|
+
bool QKineticScrollerPrivate::releaseWhileDragging(QKineticScroller::Input, const QPointF &, qint64 timestamp)
|
737
|
+
{
|
738
|
+
Q_Q(QKineticScroller);
|
739
|
+
|
740
|
+
// calculate the fastSwipe velocity
|
741
|
+
QPointF maxPos = q->maximumContentPosition();
|
742
|
+
QPointF fastSwipeVelocity = QPoint(0, 0);
|
743
|
+
QSizeF size = q->viewportSize();
|
744
|
+
if (size.width())
|
745
|
+
fastSwipeVelocity.setX(qMin(maximumVelocity, maxPos.x() / size.width() * fastSwipeBaseVelocity));
|
746
|
+
if (size.height())
|
747
|
+
fastSwipeVelocity.setY(qMin(maximumVelocity, maxPos.y() / size.height() * fastSwipeBaseVelocity));
|
748
|
+
|
749
|
+
if (fastSwipeMaximumTime &&
|
750
|
+
((timestamp - pressTimestamp) < qint64(fastSwipeMaximumTime * 1000)) &&
|
751
|
+
(oldVelocity > fastSwipeMinimumVelocity)) {
|
752
|
+
|
753
|
+
// more than one fast swipe in a row: add fastSwipeVelocity
|
754
|
+
int signX = 0, signY = 0;
|
755
|
+
if (releaseVelocity.x())
|
756
|
+
signX = (releaseVelocity.x() > 0) == (oldVelocity.x() > 0) ? 1 : -1;
|
757
|
+
if (releaseVelocity.y())
|
758
|
+
signY = (releaseVelocity.y() > 0) == (oldVelocity.y() > 0) ? 1 : -1;
|
759
|
+
|
760
|
+
releaseVelocity.setX(signX * (oldVelocity.x() + (oldVelocity.x() > 0 ? fastSwipeVelocity.x() : -fastSwipeVelocity.x())));
|
761
|
+
releaseVelocity.setY(signY * (oldVelocity.y() + (oldVelocity.y() > 0 ? fastSwipeVelocity.y() : -fastSwipeVelocity.y())));
|
762
|
+
|
763
|
+
} else if (releaseVelocity >= minimumVelocity) {
|
764
|
+
|
765
|
+
// if we have a fast swipe, accelerate it to the fastSwipe velocity
|
766
|
+
if ((qAbs(releaseVelocity.x()) > maximumNonAcceleratedVelocity) &&
|
767
|
+
(fastSwipeVelocity.x() > maximumNonAcceleratedVelocity)) {
|
768
|
+
releaseVelocity.setX(releaseVelocity.x() > 0 ? fastSwipeVelocity.x() : -fastSwipeVelocity.x());
|
769
|
+
}
|
770
|
+
if ((qAbs(releaseVelocity.y()) > maximumNonAcceleratedVelocity) &&
|
771
|
+
(fastSwipeVelocity.y() > maximumNonAcceleratedVelocity)) {
|
772
|
+
releaseVelocity.setY(releaseVelocity.y() > 0 ? fastSwipeVelocity.y() : -fastSwipeVelocity.y());
|
773
|
+
}
|
774
|
+
|
775
|
+
}
|
776
|
+
|
777
|
+
qKSDebug() << "QKS::releaseWhileDragging() -- velocity:" << releaseVelocity << "-- minimum velocity:" << minimumVelocity;
|
778
|
+
if (overshootX || overshootY)
|
779
|
+
setState(QKineticScroller::StateScrolling);
|
780
|
+
else if (releaseVelocity >= minimumVelocity)
|
781
|
+
setState(QKineticScroller::StateScrolling);
|
782
|
+
else
|
783
|
+
setState(QKineticScroller::StateInactive);
|
784
|
+
|
785
|
+
return true;
|
786
|
+
}
|
787
|
+
|
788
|
+
void QKineticScrollerPrivate::timerEventWhileScrolling()
|
789
|
+
{
|
790
|
+
qreal deltaTime = qreal(scrollRelativeTimer.restart()) / 1000;
|
791
|
+
qreal time = qreal(scrollAbsoluteTimer.elapsed()) / 1000;
|
792
|
+
|
793
|
+
// calculate the velocity for the passed interval deltatime.
|
794
|
+
// using the midpoint of the interval gives a better precision than using just time.
|
795
|
+
QPointF newVelocity = calculateVelocity(time - deltaTime / 2);
|
796
|
+
QPointF deltaPos = newVelocity * deltaTime * pixelPerMeter;
|
797
|
+
|
798
|
+
// -- move (convert from [m/s] to [pix/frame]
|
799
|
+
if (!deltaPos.isNull())
|
800
|
+
setContentPositionHelper(deltaPos);
|
801
|
+
|
802
|
+
qKSDebug() << "QKS::timerEventWhileScrolling() -- DeltaPos:" << deltaPos << "- NewVel:" << newVelocity << "- Time:" << time;
|
803
|
+
|
804
|
+
if (newVelocity.isNull() ||
|
805
|
+
(releaseVelocity.isNull() && !scrollToX && !scrollToY && !overshootX && !overshootY))
|
806
|
+
// if (newVelocity.isNull())
|
807
|
+
setState(QKineticScroller::StateInactive);
|
808
|
+
}
|
809
|
+
|
810
|
+
bool QKineticScrollerPrivate::pressWhileScrolling(QKineticScroller::Input, const QPointF &position, qint64 timestamp)
|
811
|
+
{
|
812
|
+
lastPosition = pressPosition = position;
|
813
|
+
lastTimestamp = pressTimestamp = timestamp;
|
814
|
+
cancelPress = false;
|
815
|
+
setState(QKineticScroller::StatePressed);
|
816
|
+
return true;
|
817
|
+
}
|
818
|
+
|
819
|
+
void QKineticScrollerPrivate::setState(QKineticScroller::State newstate)
|
820
|
+
{
|
821
|
+
Q_Q(QKineticScroller);
|
822
|
+
|
823
|
+
if (state == newstate)
|
824
|
+
return;
|
825
|
+
|
826
|
+
qKSDebug() << "QKS::setState(" << stateName(newstate) << ")";
|
827
|
+
|
828
|
+
switch (newstate) {
|
829
|
+
case QKineticScroller::StateInactive:
|
830
|
+
if (state == QKineticScroller::StateScrolling) {
|
831
|
+
if (timerId) {
|
832
|
+
killTimer(timerId);
|
833
|
+
timerId = 0;
|
834
|
+
} else {
|
835
|
+
qKSDebug() << " --> state change from " << stateName(state) << " to " << stateName(newstate) << ", but timer is not active.";
|
836
|
+
}
|
837
|
+
}
|
838
|
+
releaseVelocity = QPointF(0, 0);
|
839
|
+
break;
|
840
|
+
|
841
|
+
case QKineticScroller::StatePressed:
|
842
|
+
if (timerId) {
|
843
|
+
killTimer(timerId);
|
844
|
+
timerId = 0;
|
845
|
+
}
|
846
|
+
scrollToX = false;
|
847
|
+
scrollToY = false;
|
848
|
+
oldVelocity = releaseVelocity;
|
849
|
+
// releaseVelocity = QPointF(0, 0);
|
850
|
+
break;
|
851
|
+
|
852
|
+
case QKineticScroller::StateDragging:
|
853
|
+
|
854
|
+
dragDistance = QPointF(0, 0);
|
855
|
+
if (state == QKineticScroller::StatePressed) {
|
856
|
+
if (!timerId) {
|
857
|
+
timerId = startTimer(1000 / framesPerSecond);
|
858
|
+
} else {
|
859
|
+
qKSDebug() << " --> state change from " << stateName(state) << " to " << stateName(newstate) << ", but timer is already active.";
|
860
|
+
}
|
861
|
+
}
|
862
|
+
|
863
|
+
break;
|
864
|
+
|
865
|
+
case QKineticScroller::StateScrolling:
|
866
|
+
if (!timerId) {
|
867
|
+
timerId = startTimer(1000 / framesPerSecond);
|
868
|
+
}
|
869
|
+
scrollRelativeTimer.start();
|
870
|
+
scrollAbsoluteTimer.start();
|
871
|
+
|
872
|
+
if (state == QKineticScroller::StateDragging) {
|
873
|
+
// TODO: better calculate StartTime using the current releaseVelocity
|
874
|
+
overshootStartTimeX = overshootStartTimeY = qreal(scrollAbsoluteTimer.elapsed()) / 1000 - M_PI / (overshootSpringConstantRoot * 2);
|
875
|
+
overshootVelocity = overshootPosition / pixelPerMeter * overshootSpringConstantRoot;
|
876
|
+
}
|
877
|
+
|
878
|
+
break;
|
879
|
+
}
|
880
|
+
|
881
|
+
qSwap(state, newstate);
|
882
|
+
q->stateChanged(newstate);
|
883
|
+
}
|
884
|
+
|
885
|
+
/*!
|
886
|
+
Starts scrolling the widget so that the point \a pos is visible inside
|
887
|
+
the viewport.
|
888
|
+
|
889
|
+
If the specified point cannot be reached, the contents are scrolled to the
|
890
|
+
nearest valid position (in this case the scroller might or might not overshoot).
|
891
|
+
|
892
|
+
The scrolling speed will be calculated so that the given position will
|
893
|
+
be reached after a platform-defined time span (1 second for Maemo 5).
|
894
|
+
The final speed at the end position is not guaranteed to be zero.
|
895
|
+
|
896
|
+
\sa ensureVisible(), maximumContentPosition()
|
897
|
+
*/
|
898
|
+
void QKineticScroller::scrollTo(const QPointF &pos, int scrollTime)
|
899
|
+
{
|
900
|
+
Q_D(QKineticScroller);
|
901
|
+
|
902
|
+
if (scrollTime <= 0)
|
903
|
+
scrollTime = 1;
|
904
|
+
|
905
|
+
qKSDebug() << "QKS::scrollTo(" << pos << " [pix], " << scrollTime << " [ms])";
|
906
|
+
|
907
|
+
qreal time = qreal(scrollTime) / 1000;
|
908
|
+
|
909
|
+
if ((pos == contentPosition()) ||
|
910
|
+
(d->state == QKineticScroller::StatePressed) ||
|
911
|
+
(d->state == QKineticScroller::StateDragging)) {
|
912
|
+
return;
|
913
|
+
}
|
914
|
+
|
915
|
+
// estimate the minimal start velocity
|
916
|
+
// if the start velocity is below that then the scrolling would stop before scrollTime.
|
917
|
+
//qreal vMin = d->linearDecelerationFactor * time / qPow(d->exponentialDecelerationBase, time);
|
918
|
+
|
919
|
+
/*
|
920
|
+
// estimate of the distance passed within the vMin time during scrollTime
|
921
|
+
qreal distMin = qreal(scrollTime) * vMin / 2.0;
|
922
|
+
|
923
|
+
QPointF v = QPointF((pos.x()-contentPosition().x()) / distMin * vMin,
|
924
|
+
(pos.y()-contentPosition().y()) / distMin * vMin);
|
925
|
+
|
926
|
+
*/
|
927
|
+
|
928
|
+
// v(t) = vstart * exponentialDecelerationBase ^ t - linearDecelerationFactor * t
|
929
|
+
// pos(t) = integrate(v(t) * dt)
|
930
|
+
// pos(t) = vstart * (eDB ^ t / ln(eDB) + C) - lDF / 2 * t ^ 2
|
931
|
+
//
|
932
|
+
// pos(time) = pos - contentsPos()
|
933
|
+
// vstart = ((lDF / 2) * time ^ 2 + (pos - contentPos())) / (eDB ^ time / ln(eDB) + C)
|
934
|
+
// (for C = -1/ln(eDB) )
|
935
|
+
|
936
|
+
QPointF scrollDir(qSign(pos.x() - contentPosition().x()),
|
937
|
+
qSign(pos.y() - contentPosition().y()));
|
938
|
+
|
939
|
+
QPointF v = (scrollDir * (d->linearDecelerationFactor / qreal(2)) * qreal(time) * qreal(time) + (pos - contentPosition()) / d->pixelPerMeter);
|
940
|
+
if (d->exponentialDecelerationBase != qreal(1))
|
941
|
+
v /= (qPow(d->exponentialDecelerationBase, time) - 1) / qLn(d->exponentialDecelerationBase);
|
942
|
+
else
|
943
|
+
v /= time;
|
944
|
+
|
945
|
+
d->scrollToPosition = pos;
|
946
|
+
d->scrollToX = true;
|
947
|
+
d->scrollToY = true;
|
948
|
+
d->releaseVelocity = v;
|
949
|
+
d->scrollRelativeTimer.restart();
|
950
|
+
d->scrollAbsoluteTimer.restart();
|
951
|
+
d->setState(QKineticScroller::StateScrolling);
|
952
|
+
}
|
953
|
+
|
954
|
+
/*!
|
955
|
+
Starts scrolling the widget so that the point \a pos is visible inside the
|
956
|
+
viewport with margins specified in pixels by \a xmargin and \a ymargin.
|
957
|
+
|
958
|
+
If the specified point cannot be reached, the contents are scrolled to the
|
959
|
+
nearest valid position. The default value for both margins is 50 pixels.
|
960
|
+
|
961
|
+
This function performs the actual scrolling by calling scrollTo().
|
962
|
+
|
963
|
+
\sa maximumContentPosition()
|
964
|
+
*/
|
965
|
+
void QKineticScroller::ensureVisible(const QPointF &pos, int xmargin, int ymargin, int scrollTime)
|
966
|
+
{
|
967
|
+
QSizeF visible = viewportSize();
|
968
|
+
QPointF currentPos = contentPosition();
|
969
|
+
|
970
|
+
qKSDebug() << "QKS::ensureVisible(" << pos << " [pix], " << xmargin << " [pix], " << ymargin << " [pix], " << scrollTime << "[ms])";
|
971
|
+
qKSDebug() << " --> content position:" << contentPosition();
|
972
|
+
|
973
|
+
QRectF posRect(pos.x() - xmargin, pos.y() - ymargin, 2 * xmargin, 2 * ymargin);
|
974
|
+
QRectF visibleRect(currentPos, visible);
|
975
|
+
|
976
|
+
if (visibleRect.contains(posRect))
|
977
|
+
return;
|
978
|
+
|
979
|
+
QPointF newPos = currentPos;
|
980
|
+
if (posRect.top() < visibleRect.top())
|
981
|
+
newPos.setY(posRect.top());
|
982
|
+
else if (posRect.bottom() > visibleRect.bottom())
|
983
|
+
newPos.setY(posRect.bottom() - visible.height());
|
984
|
+
if (posRect.left() < visibleRect.left())
|
985
|
+
newPos.setX(posRect.left());
|
986
|
+
else if (posRect.right() > visibleRect.right())
|
987
|
+
newPos.setY(posRect.right() - visible.width());
|
988
|
+
|
989
|
+
scrollTo(newPos, scrollTime);
|
990
|
+
}
|
991
|
+
|
992
|
+
|
993
|
+
/*! \internal
|
994
|
+
Helps when setting the content position.
|
995
|
+
It will try to move the content by the requested delta but stop in case
|
996
|
+
when we are coming back from an overshoot or a scrollTo.
|
997
|
+
It will also indicate a new overshooting condition by the overshootX and oversthootY flags.
|
998
|
+
|
999
|
+
In this cases it will reset the velocity variables and other flags.
|
1000
|
+
|
1001
|
+
Also keeps track of the current over-shooting value in overshootPosition.
|
1002
|
+
|
1003
|
+
\deltaPos is the amout of pixels the current content position should be moved
|
1004
|
+
*/
|
1005
|
+
void QKineticScrollerPrivate::setContentPositionHelper(const QPointF &deltaPos)
|
1006
|
+
{
|
1007
|
+
Q_Q(QKineticScroller);
|
1008
|
+
|
1009
|
+
if (state == QKineticScroller::StateDragging && overshootDragResistanceFactor)
|
1010
|
+
overshootPosition /= overshootDragResistanceFactor;
|
1011
|
+
|
1012
|
+
QPointF oldPos = q->contentPosition() + overshootPosition;
|
1013
|
+
QPointF newPos = oldPos + deltaPos;
|
1014
|
+
QPointF maxPos = q->maximumContentPosition();
|
1015
|
+
|
1016
|
+
QPointF oldScrollToDist = scrollToPosition - oldPos;
|
1017
|
+
QPointF newScrollToDist = scrollToPosition - newPos;
|
1018
|
+
|
1019
|
+
qKSDebug() << "QKS::setContentPositionHelper(" << deltaPos << " [pix])";
|
1020
|
+
qKSDebug() << " --> overshoot:" << overshootPosition << "- old pos:" << oldPos << "- new pos:" << newPos;
|
1021
|
+
|
1022
|
+
QPointF oldClampedPos;
|
1023
|
+
oldClampedPos.setX(qBound(qreal(0), oldPos.x(), maxPos.x()));
|
1024
|
+
oldClampedPos.setY(qBound(qreal(0), oldPos.y(), maxPos.y()));
|
1025
|
+
|
1026
|
+
QPointF newClampedPos;
|
1027
|
+
newClampedPos.setX(qBound(qreal(0), newPos.x(), maxPos.x()));
|
1028
|
+
newClampedPos.setY(qBound(qreal(0), newPos.y(), maxPos.y()));
|
1029
|
+
|
1030
|
+
// --- handle overshooting and stop if the coordinate is going back inside the normal area
|
1031
|
+
bool alwaysOvershootX = (hOvershootPolicy == QKineticScroller::OvershootAlwaysOn);
|
1032
|
+
bool alwaysOvershootY = (vOvershootPolicy == QKineticScroller::OvershootAlwaysOn);
|
1033
|
+
bool noOvershootX = (hOvershootPolicy == QKineticScroller::OvershootAlwaysOff) ||
|
1034
|
+
((state == QKineticScroller::StateDragging) && !overshootDragResistanceFactor);
|
1035
|
+
bool noOvershootY = (vOvershootPolicy == QKineticScroller::OvershootAlwaysOff) ||
|
1036
|
+
((state == QKineticScroller::StateDragging) && !overshootDragResistanceFactor);
|
1037
|
+
bool canOvershootX = !noOvershootX && (alwaysOvershootX || maxPos.x());
|
1038
|
+
bool canOvershootY = !noOvershootY && (alwaysOvershootY || maxPos.y());
|
1039
|
+
|
1040
|
+
qreal oldOvershootX = (canOvershootX) ? oldPos.x() - oldClampedPos.x() : 0;
|
1041
|
+
qreal oldOvershootY = (canOvershootY) ? oldPos.y() - oldClampedPos.y() : 0;
|
1042
|
+
|
1043
|
+
qreal newOvershootX = (canOvershootX) ? newPos.x() - newClampedPos.x() : 0;
|
1044
|
+
qreal newOvershootY = (canOvershootY) ? newPos.y() - newClampedPos.y() : 0;
|
1045
|
+
|
1046
|
+
if (state == QKineticScroller::StateDragging && overshootDragResistanceFactor) {
|
1047
|
+
oldOvershootX *= overshootDragResistanceFactor;
|
1048
|
+
oldOvershootY *= overshootDragResistanceFactor;
|
1049
|
+
newOvershootX *= overshootDragResistanceFactor;
|
1050
|
+
newOvershootY *= overshootDragResistanceFactor;
|
1051
|
+
}
|
1052
|
+
|
1053
|
+
// -- stop at the maximum overshoot distance (if set)
|
1054
|
+
if (!overshootMaximumDistance.isNull()) {
|
1055
|
+
newOvershootX = qBound(-overshootMaximumDistance.x() * pixelPerMeter, newOvershootX, overshootMaximumDistance.x() * pixelPerMeter);
|
1056
|
+
|
1057
|
+
newOvershootY = qBound(-overshootMaximumDistance.y() * pixelPerMeter, newOvershootY, overshootMaximumDistance.y() * pixelPerMeter);
|
1058
|
+
}
|
1059
|
+
|
1060
|
+
// --- sanity check for scrollTo in case we can't even scroll that direction
|
1061
|
+
if (!(maxPos.x() || alwaysOvershootX))
|
1062
|
+
scrollToX = false;
|
1063
|
+
if (!(maxPos.y() || alwaysOvershootY))
|
1064
|
+
scrollToY = false;
|
1065
|
+
|
1066
|
+
// --- handle crossing over borders (scrollTo and overshoot)
|
1067
|
+
qKSDebug() << " --> old overshoot Y:" << oldOvershootY << "- new overshoot Y:" << newOvershootY;
|
1068
|
+
// -- x axis
|
1069
|
+
if (scrollToX && qSign(oldScrollToDist.x()) != qSign(newScrollToDist.x())) {
|
1070
|
+
newClampedPos.setX(scrollToPosition.x());
|
1071
|
+
newOvershootX = 0;
|
1072
|
+
releaseVelocity.setX(0);
|
1073
|
+
scrollToX = false;
|
1074
|
+
|
1075
|
+
} else if (oldOvershootX && (qSign(oldOvershootX) != qSign(newOvershootX))) {
|
1076
|
+
newClampedPos.setX((oldOvershootX < 0) ? 0 : maxPos.x());
|
1077
|
+
newOvershootX = 0;
|
1078
|
+
releaseVelocity.setX(0);
|
1079
|
+
overshootVelocity.setX(0);
|
1080
|
+
overshootX = false;
|
1081
|
+
|
1082
|
+
} else if (!oldOvershootX && newOvershootX) {
|
1083
|
+
overshootStartTimeX = qreal(scrollAbsoluteTimer.elapsed()) / 1000;
|
1084
|
+
overshootVelocity.setX(calculateVelocity(overshootStartTimeX).x());
|
1085
|
+
|
1086
|
+
// restrict the overshoot to overshootMaximumDistance
|
1087
|
+
qreal maxOvershootVelocity = overshootMaximumDistance.x() * overshootSpringConstantRoot;
|
1088
|
+
if (overshootMaximumDistance.x() && qAbs(overshootVelocity.x()) > maxOvershootVelocity)
|
1089
|
+
overshootVelocity.setX(maxOvershootVelocity * qSign(newOvershootX));
|
1090
|
+
|
1091
|
+
// -- prevent going into overshoot too far
|
1092
|
+
if (state != QKineticScroller::StateDragging)
|
1093
|
+
newOvershootX = qSign(newOvershootX) * qreal(0.0001);
|
1094
|
+
|
1095
|
+
scrollToX = false;
|
1096
|
+
overshootX = true;
|
1097
|
+
}
|
1098
|
+
|
1099
|
+
// -- y axis
|
1100
|
+
if (scrollToY && qSign(oldScrollToDist.y()) != qSign(newScrollToDist.y())) {
|
1101
|
+
newClampedPos.setY(scrollToPosition.y());
|
1102
|
+
newOvershootY = 0;
|
1103
|
+
releaseVelocity.setY(0);
|
1104
|
+
scrollToY = false;
|
1105
|
+
|
1106
|
+
} else if (oldOvershootY && (qSign(oldOvershootY) != qSign(newOvershootY))) {
|
1107
|
+
newClampedPos.setY((oldOvershootY < 0) ? 0 : maxPos.y());
|
1108
|
+
newOvershootY = 0;
|
1109
|
+
releaseVelocity.setY(0);
|
1110
|
+
overshootVelocity.setY(0);
|
1111
|
+
overshootY = false;
|
1112
|
+
|
1113
|
+
} else if (!oldOvershootY && newOvershootY) {
|
1114
|
+
overshootStartTimeY = qreal(scrollAbsoluteTimer.elapsed()) / 1000;
|
1115
|
+
overshootVelocity.setY(calculateVelocity(overshootStartTimeY).y());
|
1116
|
+
|
1117
|
+
// -- restrict the overshoot to overshootMaximumDistance
|
1118
|
+
qreal maxOvershootVelocity = overshootMaximumDistance.y() * overshootSpringConstantRoot;
|
1119
|
+
if (overshootMaximumDistance.y() && (qAbs(overshootVelocity.y()) > maxOvershootVelocity))
|
1120
|
+
overshootVelocity.setY(maxOvershootVelocity * qSign(newOvershootY));
|
1121
|
+
|
1122
|
+
// -- prevent going into overshoot too far
|
1123
|
+
if (state != QKineticScroller::StateDragging)
|
1124
|
+
newOvershootY = qSign(newOvershootY) * qreal(0.0001);
|
1125
|
+
|
1126
|
+
scrollToY = false;
|
1127
|
+
overshootY = true;
|
1128
|
+
}
|
1129
|
+
|
1130
|
+
overshootPosition.setX(newOvershootX);
|
1131
|
+
overshootPosition.setY(newOvershootY);
|
1132
|
+
|
1133
|
+
q->setContentPosition(newClampedPos, overshootPosition);
|
1134
|
+
|
1135
|
+
if (debugHook)
|
1136
|
+
debugHook(debugHookUser, calculateVelocity(qreal(scrollAbsoluteTimer.elapsed()) / 1000), newClampedPos, overshootPosition);
|
1137
|
+
|
1138
|
+
qKSDebug() << " --> new position:" << newClampedPos << "- new overshoot:" << overshootPosition <<
|
1139
|
+
"- overshoot x/y?:" << overshootX << "/" << overshootY << "- scrollto x/y?:" << scrollToX << "/" << scrollToY;
|
1140
|
+
}
|
1141
|
+
|
1142
|
+
|
1143
|
+
/*!
|
1144
|
+
\enum QKineticScroller::OvershootPolicy
|
1145
|
+
|
1146
|
+
This enum describes the various modes of overshooting.
|
1147
|
+
|
1148
|
+
\value OvershootWhenScrollable Overshooting is when the content is scrollable. This is the default.
|
1149
|
+
|
1150
|
+
\value OvershootAlwaysOff Overshooting is never enabled (even when the content is scrollable).
|
1151
|
+
|
1152
|
+
\value OvershootAlwaysOn Overshooting is always enabled (even when the content is not scrollable).
|
1153
|
+
*/
|
1154
|
+
|
1155
|
+
|
1156
|
+
/*!
|
1157
|
+
If kinetic scrolling can be started at the given content's \a position,
|
1158
|
+
this function needs to return true; otherwise it needs to return false.
|
1159
|
+
|
1160
|
+
The default value is true, regardless of \a position.
|
1161
|
+
*/
|
1162
|
+
bool QKineticScroller::canStartScrollingAt(const QPointF &position) const
|
1163
|
+
{
|
1164
|
+
Q_UNUSED(position);
|
1165
|
+
return true;
|
1166
|
+
}
|
1167
|
+
|
1168
|
+
/*!
|
1169
|
+
Since a mouse press is always delivered normally when the scroller is in
|
1170
|
+
the StateInactive state, we may need to cancel it as soon as the user
|
1171
|
+
has moved the mouse far enough to actually start a kinetic scroll
|
1172
|
+
operation.
|
1173
|
+
|
1174
|
+
The \a pressPosition parameter can be used to find out which widget (or
|
1175
|
+
graphics item) received the mouse press in the first place.
|
1176
|
+
|
1177
|
+
Subclasses may choose to simulate a fake mouse release event for that
|
1178
|
+
widget (or graphics item), preferably \bold not within its boundaries.
|
1179
|
+
The default implementation does nothing.
|
1180
|
+
*/
|
1181
|
+
void QKineticScroller::cancelPress(const QPointF &pressPosition)
|
1182
|
+
{
|
1183
|
+
Q_UNUSED(pressPosition);
|
1184
|
+
}
|
1185
|
+
|
1186
|
+
|
1187
|
+
/*!
|
1188
|
+
This function get called whenever the state of the kinetic scroller changes.
|
1189
|
+
The old state is supplied as \a oldState, while the new state is returned by
|
1190
|
+
calling state().
|
1191
|
+
|
1192
|
+
The default implementation does nothing.
|
1193
|
+
|
1194
|
+
\sa state()
|
1195
|
+
*/
|
1196
|
+
void QKineticScroller::stateChanged(State oldState)
|
1197
|
+
{
|
1198
|
+
Q_UNUSED(oldState);
|
1199
|
+
}
|
1200
|
+
|
1201
|
+
/*!
|
1202
|
+
\fn QPointF QKineticScroller::maximumContentPosition() const
|
1203
|
+
|
1204
|
+
Returns the maximum valid content position. The minimum is always \c
|
1205
|
+
(0,0).
|
1206
|
+
|
1207
|
+
\sa scrollTo()
|
1208
|
+
*/
|
1209
|
+
|
1210
|
+
/*!
|
1211
|
+
\fn QSizeF QKineticScroller::viewportSize() const
|
1212
|
+
|
1213
|
+
Returns the size of the currently visible content positions. In the
|
1214
|
+
case where an QAbstractScrollArea is used, this is equivalent to the
|
1215
|
+
viewport() size.
|
1216
|
+
|
1217
|
+
\sa scrollTo()
|
1218
|
+
*/
|
1219
|
+
|
1220
|
+
/*!
|
1221
|
+
\fn QPointF QKineticScroller::contentPosition() const
|
1222
|
+
|
1223
|
+
\brief Returns the current position of the content.
|
1224
|
+
|
1225
|
+
Note that overshooting is not considered to be "real" scrolling so the
|
1226
|
+
position might be (0,0) even if the user is currently dragging the
|
1227
|
+
widget outside the "normal" maximumContentPosition().
|
1228
|
+
|
1229
|
+
\sa maximumContentPosition()
|
1230
|
+
*/
|
1231
|
+
|
1232
|
+
|
1233
|
+
/*!
|
1234
|
+
\fn void QKineticScroller::setContentPosition(const QPointF &position, const QPointF &overshoot)
|
1235
|
+
|
1236
|
+
Set the content's \a position. This parameter will always be in the
|
1237
|
+
valid range QPointF(0, 0) and maximumContentPosition().
|
1238
|
+
|
1239
|
+
In the case where overshooting is required, the \a overshoot parameter
|
1240
|
+
will give the direction and the absolute distance to overshoot.
|
1241
|
+
|
1242
|
+
\sa maximumContentPosition()
|
1243
|
+
*/
|
1244
|
+
|
1245
|
+
QT_END_NAMESPACE
|