rhodes 1.5.5 → 2.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +5 -0
- data/Manifest.txt +214 -32
- data/Rakefile +33 -10
- data/bin/upgrade-rhodes-app +0 -1
- data/lib/build/compileERB/bb.rb +2 -2
- data/lib/build/compileERB/default.rb +7 -5
- data/lib/build/jake.rb +1 -1
- data/lib/extensions/digest-md5/ext.yml +1 -1
- data/lib/extensions/digest-md5/ext/Rakefile +35 -36
- data/lib/extensions/digest-md5/ext/build.bat +1 -0
- data/lib/extensions/digest-md5/ext/digest-md5.vcproj +203 -0
- data/lib/extensions/digest-sha1/ext.yml +1 -1
- data/lib/extensions/digest/ext.yml +1 -1
- data/lib/extensions/digest/ext/Rakefile +35 -39
- data/lib/extensions/digest/ext/build.bat +1 -2
- data/lib/extensions/digest/ext/digest.vcproj +203 -0
- data/lib/framework/rho/render.rb +79 -22
- data/lib/framework/rho/rho.rb +294 -56
- data/lib/framework/rho/rhoapplication.rb +10 -0
- data/lib/framework/rho/rhofsconnector.rb +2 -6
- data/lib/framework/rho/rhoutils.rb +56 -14
- data/lib/framework/rho/rhoviewhelpers.rb +2 -0
- data/lib/framework/rhodes.rb +2 -2
- data/lib/framework/rhom/rhom.rb +42 -15
- data/lib/framework/rhom/rhom_db_adapter.rb +165 -159
- data/lib/framework/rhom/rhom_object.rb +0 -1
- data/lib/framework/rhom/rhom_object_factory.rb +343 -166
- data/lib/framework/rhom/rhom_source.rb +28 -15
- data/lib/framework/version.rb +2 -2
- data/lib/rhodes.rb +2 -2
- data/platform/android/Rhodes/AndroidManifest.xml +2 -2
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +39 -44
- data/platform/android/Rhodes/jni/include/JNIRhodes.h +1 -1
- data/platform/android/Rhodes/jni/include/details/rhojava.inc +23 -20
- data/platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_RhoMenu.h +61 -0
- data/platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_Rhodes.h +16 -0
- data/platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_alert_Alert.h +21 -0
- data/platform/android/Rhodes/jni/include/sslimpl.h +1 -1
- data/platform/android/Rhodes/jni/src/alert.cpp +32 -5
- data/platform/android/Rhodes/jni/src/callbacks.cpp +51 -21
- data/platform/android/Rhodes/jni/src/mapview.cpp +3 -8
- data/platform/android/Rhodes/jni/src/menu.cpp +70 -0
- data/platform/android/Rhodes/jni/src/navbar.cpp +16 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +37 -0
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +3 -3
- data/platform/android/Rhodes/jni/src/webview.cpp +21 -7
- data/platform/android/Rhodes/res/drawable/alert_alert.png +0 -0
- data/platform/android/Rhodes/res/drawable/alert_info.png +0 -0
- data/platform/android/Rhodes/res/drawable/alert_question.png +0 -0
- data/platform/android/Rhodes/res/drawable/camera.png +0 -0
- data/platform/android/Rhodes/res/layout/camera.xml +18 -3
- data/platform/android/Rhodes/res/menu/options.xml +0 -10
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +5 -10
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java +12 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +105 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +157 -122
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +7 -58
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +16 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +220 -17
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +22 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +44 -25
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +10 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +3 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +10 -21
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +15 -12
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java +44 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java +47 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java +13 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java +11 -5
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java +1 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java +61 -0
- data/platform/android/build/RhodesSRC_build.files +3 -0
- data/platform/android/build/android.rake +173 -60
- data/platform/android/build/androidcommon.rb +1 -2
- data/platform/android/build/librhocommon_build.files +5 -0
- data/platform/android/build/librhodes_build.files +2 -0
- data/platform/android/build/libruby_build.files +2 -1
- data/platform/bb/Hsqldb/Hsqldb.jdp +0 -3
- data/platform/bb/Hsqldb/src/com/rho/db/FileUtilBB.java +1 -1
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +16 -1
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java +5 -0
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +25 -4
- data/platform/bb/Hsqldb/src/com/rho/db/Journal.java +1 -1
- data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -1
- data/platform/bb/Hsqldb/src/j2me/math/Number.java +6 -3
- data/platform/bb/Hsqldb/src/org/hsqldb/CompiledStatementExecutor.java +2 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -0
- data/platform/bb/Hsqldb/src/org/hsqldb/Parser.java +1 -0
- data/platform/bb/Hsqldb/src/org/hsqldb/Result.java +2 -0
- data/platform/bb/Hsqldb/src/org/hsqldb/Select.java +12 -6
- data/platform/bb/Hsqldb/src/org/hsqldb/Session.java +19 -12
- data/platform/bb/Hsqldb/src/org/hsqldb/Table.java +10 -4
- data/platform/bb/Hsqldb/src/org/hsqldb/Token.java +10 -2
- data/platform/bb/Hsqldb/src/org/hsqldb/Tokenizer.java +3 -3
- data/platform/bb/Hsqldb/src/org/hsqldb/lib/java/JavaSystem.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/persist/HsqlProperties.java +2 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/persist/ScaledRAFile.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptReaderText.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptWriterBase.java +1 -1
- data/platform/bb/RubyVM/RubyVM.jdp +9 -10
- data/platform/bb/build/RubyVM_build.files +9 -7
- data/platform/bb/build/bb.rake +13 -3
- data/platform/bb/build/hsqldb_build.files +0 -2
- data/platform/bb/build/rhodes_build.files +5 -2
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +8 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +154 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/RhoMainScreen.java +8 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +28 -0
- data/platform/bb/rhodes/rhodes.jdp +12 -7
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +331 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +28 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +10 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +4 -0
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +2 -4
- data/platform/bb/rhodes/src/com/rho/{Jsr75File.java → file/Jsr75File.java} +83 -36
- data/platform/bb/{Hsqldb → rhodes}/src/com/rho/file/Jsr75RAFileImpl.java +0 -1
- data/platform/bb/{Hsqldb → rhodes}/src/com/rho/file/PersistRAFileImpl.java +0 -2
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +8 -10
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +1 -1
- data/platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java +39 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +63 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +100 -0
- data/platform/bb/rhodes/src/rhomobile/LogScreen.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +13 -1
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +138 -492
- data/platform/bb/rhodes/src/rhomobile/SecondaryResourceFetchThread.java +11 -2
- data/platform/bb/rhodes/src/rhomobile/Utilities.java +14 -10
- data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java +5 -14
- data/platform/bb/rhodes/src/rhomobile/camera/ImageBrowserScreen.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +2 -2
- data/platform/iphone/Classes/AppManager/AppManager.m +37 -14
- data/platform/iphone/Classes/Camera/PickImageDelegate.h +15 -4
- data/platform/iphone/Classes/Camera/PickImageDelegate.m +53 -50
- data/platform/iphone/Classes/DateTimePicker.h +17 -0
- data/platform/iphone/Classes/DateTimePicker.m +35 -0
- data/platform/iphone/Classes/GeoLocation/LocationController.m +2 -3
- data/platform/iphone/Classes/LogOptionsController.m +3 -2
- data/platform/iphone/Classes/LogViewController.m +4 -2
- data/platform/iphone/Classes/MapView/GoogleGeocoder.m +12 -20
- data/platform/iphone/Classes/MapView/MapAnnotation.h +9 -13
- data/platform/iphone/Classes/MapView/MapAnnotation.m +17 -65
- data/platform/iphone/Classes/MapView/MapViewController.h +1 -7
- data/platform/iphone/Classes/MapView/MapViewController.m +51 -25
- data/platform/iphone/Classes/NativeBar.h +0 -12
- data/platform/iphone/Classes/NativeBar.m +121 -2
- data/platform/iphone/Classes/NavBar.h +16 -0
- data/platform/iphone/Classes/NavBar.m +115 -0
- data/platform/iphone/Classes/RhoAlert.h +19 -0
- data/platform/iphone/Classes/RhoAlert.m +258 -0
- data/platform/iphone/Classes/RhoDelegate.m +1 -0
- data/platform/iphone/Classes/RhoMainView.h +33 -0
- data/platform/iphone/Classes/Rhodes.h +56 -0
- data/platform/iphone/Classes/Rhodes.m +533 -0
- data/platform/iphone/Classes/RingtoneManager.h +17 -0
- data/platform/iphone/Classes/RingtoneManager.m +73 -0
- data/platform/iphone/Classes/SimpleMainView.h +30 -0
- data/platform/iphone/Classes/SimpleMainView.m +380 -0
- data/platform/iphone/Classes/TabbedMainView.h +24 -0
- data/platform/iphone/Classes/TabbedMainView.m +202 -0
- data/platform/iphone/Classes/WebView.m +123 -0
- data/platform/iphone/Classes/rho/net/NetRequestImpl.m +2 -2
- data/platform/iphone/Classes/rho/net/sslimpl.cpp +13 -1
- data/platform/iphone/Classes/rho/net/sslimpl.h +1 -1
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +44 -0
- data/platform/iphone/main.m +1 -2
- data/platform/iphone/rbuild/iphone.rake +8 -16
- data/platform/iphone/rhoextlib/dosyscall.c +1 -1
- data/platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj +6 -4
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +97 -62
- data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj +12 -0
- data/platform/osx/Rhodes Launcher/launch.rb +14 -21
- data/platform/shared/common/AppMenu.cpp +122 -0
- data/platform/shared/common/AppMenu.h +46 -0
- data/platform/shared/common/PosixThreadImpl.cpp +1 -1
- data/platform/shared/common/RhoConf.cpp +27 -2
- data/platform/shared/common/RhoConf.h +5 -0
- data/platform/shared/common/RhoFilePath.h +21 -0
- data/platform/shared/common/RhoStd.h +44 -5
- data/platform/shared/common/RhoTime.h +20 -7
- data/platform/shared/common/RhodesApp.cpp +236 -177
- data/platform/shared/common/RhodesApp.h +36 -13
- data/platform/shared/common/SplashScreen.cpp +2 -2
- data/platform/shared/common/StringConverter.h +10 -11
- data/platform/shared/common/rhoparams.c +0 -6
- data/platform/shared/curl/lib/rhossl.c +3 -2
- data/platform/shared/curl/lib/url.c +0 -5
- data/platform/shared/db/DBAdapter.cpp +304 -81
- data/platform/shared/db/DBAdapter.h +24 -7
- data/platform/shared/db/DBAttrManager.cpp +83 -30
- data/platform/shared/db/DBAttrManager.h +6 -0
- data/platform/shared/db/DBResult.h +15 -4
- data/platform/shared/json/JSONIterator.cpp +100 -3
- data/platform/shared/json/JSONIterator.h +28 -3
- data/platform/shared/net/AsyncHttp.cpp +25 -22
- data/platform/shared/net/AsyncHttp.h +10 -6
- data/platform/shared/net/CURLNetRequest.cpp +115 -36
- data/platform/shared/net/CURLNetRequest.h +6 -0
- data/platform/shared/net/HttpServer.cpp +6 -4
- data/platform/shared/net/HttpServer.h +0 -1
- data/platform/shared/net/INetRequest.h +19 -3
- data/platform/shared/net/URI.cpp +2 -2
- data/platform/shared/net/ssl.cpp +2 -2
- data/platform/shared/net/ssl.h +2 -2
- data/platform/shared/ruby/ext/alert/alert.i +14 -2
- data/platform/shared/ruby/ext/alert/alert_wrap.c +40 -20
- data/platform/shared/ruby/ext/asynchttp/asynchttp.i +8 -8
- data/platform/shared/ruby/ext/asynchttp/asynchttp_wrap.c +112 -16
- data/platform/shared/ruby/ext/geolocation/geolocation.i +16 -12
- data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c +481 -125
- data/platform/shared/ruby/ext/navbar/navbar.i +20 -0
- data/platform/shared/ruby/ext/navbar/navbar_wrap.c +1859 -0
- data/platform/shared/ruby/ext/rho/extensions.c +1 -1
- data/platform/shared/ruby/ext/rho/rhoruby.c +32 -2
- data/platform/shared/ruby/ext/rho/rhoruby.h +7 -2
- data/platform/shared/ruby/ext/rhoconf/rhoconf.i +4 -0
- data/platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c +31 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +188 -3226
- data/platform/shared/ruby/ext/syncengine/syncengine.i +14 -25
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +96 -104
- data/platform/shared/ruby/ext/system/system.i +12 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +101 -7
- data/platform/shared/ruby/ext/webview/webview.i +20 -15
- data/platform/shared/ruby/ext/webview/webview_wrap.c +42 -16
- data/platform/shared/ruby/thread_pthread.c +4 -4
- data/platform/shared/ruby/thread_win32.c +4 -4
- data/platform/shared/ruby/wince/io_wce.c +0 -1
- data/platform/shared/rubyJVM/src/com/rho/FilePath.java +18 -2
- data/platform/shared/rubyJVM/src/com/rho/IRhoRubyHelper.java +1 -0
- data/platform/shared/rubyJVM/src/com/rho/Properties.java +9 -0
- data/platform/shared/rubyJVM/src/com/rho/RhoClassFactory.java +2 -3
- data/platform/shared/rubyJVM/src/com/rho/RhoConf.java +47 -8
- data/platform/shared/rubyJVM/src/com/rho/RhoLogConf.java +1 -0
- data/platform/shared/rubyJVM/src/com/rho/RhoLogFileSink.java +1 -0
- data/platform/shared/rubyJVM/src/com/rho/RhoRuby.java +43 -5
- data/platform/shared/rubyJVM/src/com/rho/RhodesApp.java +98 -3
- data/platform/shared/rubyJVM/src/com/rho/db/DBAdapter.java +460 -175
- data/platform/shared/rubyJVM/src/com/rho/db/DBAttrManager.java +81 -33
- data/platform/shared/rubyJVM/src/com/rho/db/IDBCallback.java +3 -5
- data/platform/shared/rubyJVM/src/com/rho/db/IDBResult.java +2 -0
- data/platform/shared/rubyJVM/src/com/rho/db/IDBStorage.java +2 -0
- data/platform/shared/rubyJVM/src/com/rho/{IFile.java → file/IFile.java} +1 -1
- data/platform/shared/rubyJVM/src/com/rho/{IFileAccess.java → file/IFileAccess.java} +1 -1
- data/platform/shared/rubyJVM/src/com/rho/{IRAFile.java → file/IRAFile.java} +1 -1
- data/platform/{bb/Hsqldb/src/com/rho/db → shared/rubyJVM/src/com/rho/file}/RandomAccessFile.java +1 -2
- data/platform/shared/rubyJVM/src/com/rho/{SimpleFile.java → file/SimpleFile.java} +5 -1
- data/platform/shared/rubyJVM/src/com/rho/net/AsyncHttp.java +23 -18
- data/platform/shared/rubyJVM/src/com/rho/net/NetRequest.java +167 -250
- data/platform/shared/rubyJVM/src/com/rho/net/RhoConnection.java +100 -30
- data/platform/shared/rubyJVM/src/com/rho/net/URI.java +0 -1
- data/platform/shared/rubyJVM/src/com/rho/sync/ClientRegister.java +30 -33
- data/platform/shared/rubyJVM/src/com/rho/sync/ISyncProtocol.java +20 -0
- data/platform/shared/rubyJVM/src/com/rho/sync/JSONEntry.java +5 -0
- data/platform/shared/rubyJVM/src/com/rho/sync/JSONStructIterator.java +74 -0
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java +486 -257
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncNotify.java +89 -58
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncProtocol_3.java +79 -0
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java +634 -495
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncThread.java +74 -90
- data/platform/shared/rubyJVM/src/com/xruby/GeneratedMethods/RubySymbol_Methods.java +1 -0
- data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyThread.java +6 -0
- data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyRuntime.java +6 -2
- data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubySymbol.java +17 -1
- data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyValue.java +1 -0
- data/platform/shared/rubyJVM/src/org/json/me/JSONObject.java +3 -0
- data/platform/shared/rubyext/GeoLocation.cpp +23 -0
- data/platform/shared/rubyext/GeoLocation.h +2 -0
- data/platform/shared/rubyext/RhoRuby.cpp +31 -0
- data/platform/shared/rubyext/RhoRuby.h +32 -0
- data/platform/shared/rubyext/System.cpp +14 -3
- data/platform/shared/rubyext/WebView.h +21 -0
- data/platform/shared/sync/ClientRegister.cpp +23 -28
- data/platform/shared/sync/ClientRegister.h +6 -2
- data/platform/shared/sync/ISyncProtocol.h +29 -0
- data/platform/shared/sync/SyncEngine.cpp +450 -190
- data/platform/shared/sync/SyncEngine.h +28 -38
- data/platform/shared/sync/SyncNotify.cpp +43 -41
- data/platform/shared/sync/SyncNotify.h +7 -7
- data/platform/shared/sync/SyncProtocol_3.h +86 -0
- data/platform/shared/sync/SyncSource.cpp +535 -371
- data/platform/shared/sync/SyncSource.h +48 -55
- data/platform/shared/sync/SyncThread.cpp +59 -103
- data/platform/shared/sync/SyncThread.h +10 -23
- data/platform/shared/unzip/unzip.cpp +3 -2
- data/platform/shared/unzip/unzip.h +5 -1
- data/platform/shared/wtl80/include/atlapp.h +10 -10
- data/platform/wm/RhoLib/RhoLib.vcproj +32 -0
- data/platform/wm/build/build_inf.js +40 -3
- data/platform/wm/build/wm.rake +95 -9
- data/platform/wm/rhodes/Alert.cpp +4 -0
- data/platform/wm/rhodes/DateTimePicker.cpp +183 -0
- data/platform/wm/rhodes/DateTimePicker.h +100 -0
- data/platform/wm/rhodes/MainWindow.cpp +222 -209
- data/platform/wm/rhodes/MainWindow.h +28 -35
- data/platform/wm/rhodes/Rhodes.cpp +20 -60
- data/platform/wm/rhodes/Rhodes.rc +41 -7
- data/platform/wm/rhodes/Utils.cpp +65 -0
- data/platform/wm/rhodes/Utils.h +9 -0
- data/platform/wm/rhodes/camera/Camera.cpp +2 -2
- data/platform/wm/rhodes/menubar.cpp +2 -33
- data/platform/wm/rhodes/menubar.h +0 -14
- data/platform/wm/rhodes/resource.h +13 -11
- data/platform/wm/rhodes/rho/net/NetRequest.cpp +16 -35
- data/platform/wm/rhodes/rho/net/NetRequest.h +8 -2
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +264 -46
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +14 -4
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp +1 -1
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.h +1 -1
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +77 -4
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +63 -0
- data/platform/wm/rhodes/rhodes.vcproj +20 -66
- data/platform/wm/rhodes/stdafx.h +22 -0
- data/platform/wm/rubylib/rubylib.vcproj +4 -0
- data/platform/wm/syncengine/syncengine.vcproj +8 -0
- data/platform/wm/tools/detool.sln +66 -0
- data/platform/wm/tools/detool/DEMComInterface.tlb +0 -0
- data/platform/wm/tools/detool/ReadMe.txt +33 -0
- data/platform/wm/tools/detool/detool.cpp +559 -0
- data/platform/wm/tools/detool/detool.h +5 -0
- data/platform/wm/tools/detool/detool.vcproj +233 -0
- data/platform/wm/tools/detool/stdafx.cpp +8 -0
- data/platform/wm/tools/detool/stdafx.h +15 -0
- data/platform/wm/tools/detool/targetver.h +24 -0
- data/platform/wm/tools/rhosetup/ReadMe.txt +41 -0
- data/platform/wm/tools/rhosetup/rhosetup.cpp +52 -0
- data/platform/wm/tools/rhosetup/rhosetup.vcproj +641 -0
- data/platform/wm/tools/rhosetup/stdafx.cpp +8 -0
- data/platform/wm/tools/rhosetup/stdafx.h +59 -0
- data/rakefile.rb +33 -10
- data/res/build-tools/db/syncdb.schema +25 -23
- data/res/build-tools/db/syncdb.triggers +1 -1
- data/res/build-tools/detool.exe +0 -0
- data/res/build-tools/rhosetup.dll +0 -0
- data/res/generators/rhogen.rb +27 -22
- data/res/generators/templates/application/app/Settings/controller.rb +3 -1
- data/res/generators/templates/application/app/Settings/home.bb.erb +17 -0
- data/res/generators/templates/application/app/Settings/home.erb +21 -12
- data/res/generators/templates/application/app/Settings/index.bb.erb +32 -0
- data/res/generators/templates/application/app/Settings/index.erb +44 -15
- data/res/generators/templates/application/app/Settings/login.bb.erb +35 -0
- data/res/generators/templates/application/app/Settings/login.erb +29 -30
- data/res/generators/templates/application/app/Settings/reset.bb.erb +15 -0
- data/res/generators/templates/application/app/Settings/reset.erb +16 -13
- data/res/generators/templates/application/app/Settings/wait.bb.erb +3 -0
- data/res/generators/templates/application/app/Settings/wait.erb +4 -4
- data/res/generators/templates/application/app/application.rb +8 -0
- data/res/generators/templates/application/app/helpers/browser_helper.rb +13 -0
- data/res/generators/templates/application/app/index.bb.erb +26 -0
- data/res/generators/templates/application/app/index.erb +21 -12
- data/res/generators/templates/application/app/layout.erb +9 -11
- data/res/generators/templates/application/public/css/android.css +285 -0
- data/res/generators/templates/application/public/css/blackberry.css +85 -78
- data/res/generators/templates/application/public/css/iphone.css +286 -296
- data/res/generators/templates/application/public/css/webkit.css +34 -0
- data/res/generators/templates/application/public/css/windows_mobile.css +208 -0
- data/res/generators/templates/application/public/icons/Read me first - license.txt +14 -0
- data/res/generators/templates/application/public/icons/about.png +0 -0
- data/res/generators/templates/application/public/icons/airplane.png +0 -0
- data/res/generators/templates/application/public/icons/baby.png +0 -0
- data/res/generators/templates/application/public/icons/badge.png +0 -0
- data/res/generators/templates/application/public/icons/bandaid.png +0 -0
- data/res/generators/templates/application/public/icons/bar-chart.png +0 -0
- data/res/generators/templates/application/public/icons/battery.png +0 -0
- data/res/generators/templates/application/public/icons/beaker.png +0 -0
- data/res/generators/templates/application/public/icons/beaker2.png +0 -0
- data/res/generators/templates/application/public/icons/beermug.png +0 -0
- data/res/generators/templates/application/public/icons/bird.png +0 -0
- data/res/generators/templates/application/public/icons/book.png +0 -0
- data/res/generators/templates/application/public/icons/bookmark.png +0 -0
- data/res/generators/templates/application/public/icons/brightness.png +0 -0
- data/res/generators/templates/application/public/icons/bug.png +0 -0
- data/res/generators/templates/application/public/icons/cabinet.png +0 -0
- data/res/generators/templates/application/public/icons/calendar.png +0 -0
- data/res/generators/templates/application/public/icons/camera.png +0 -0
- data/res/generators/templates/application/public/icons/changeName.rb +22 -0
- data/res/generators/templates/application/public/icons/chat2.png +0 -0
- data/res/generators/templates/application/public/icons/chicken.png +0 -0
- data/res/generators/templates/application/public/icons/clock.png +0 -0
- data/res/generators/templates/application/public/icons/cloud.png +0 -0
- data/res/generators/templates/application/public/icons/coffee.png +0 -0
- data/res/generators/templates/application/public/icons/compass.png +0 -0
- data/res/generators/templates/application/public/icons/contrast.png +0 -0
- data/res/generators/templates/application/public/icons/dashboard.png +0 -0
- data/res/generators/templates/application/public/icons/display.png +0 -0
- data/res/generators/templates/application/public/icons/dogpaw.png +0 -0
- data/res/generators/templates/application/public/icons/download.png +0 -0
- data/res/generators/templates/application/public/icons/dumbbell.png +0 -0
- data/res/generators/templates/application/public/icons/ekg.png +0 -0
- data/res/generators/templates/application/public/icons/envelope.png +0 -0
- data/res/generators/templates/application/public/icons/equalizer.png +0 -0
- data/res/generators/templates/application/public/icons/eye.png +0 -0
- data/res/generators/templates/application/public/icons/film-roll.png +0 -0
- data/res/generators/templates/application/public/icons/flag.png +0 -0
- data/res/generators/templates/application/public/icons/fork-and-knife.png +0 -0
- data/res/generators/templates/application/public/icons/fuel.png +0 -0
- data/res/generators/templates/application/public/icons/gameplan.png +0 -0
- data/res/generators/templates/application/public/icons/gear.png +0 -0
- data/res/generators/templates/application/public/icons/gear2.png +0 -0
- data/res/generators/templates/application/public/icons/gift.png +0 -0
- data/res/generators/templates/application/public/icons/heart.png +0 -0
- data/res/generators/templates/application/public/icons/house.png +0 -0
- data/res/generators/templates/application/public/icons/inbox.png +0 -0
- data/res/generators/templates/application/public/icons/index-cards.png +0 -0
- data/res/generators/templates/application/public/icons/iphone.png +0 -0
- data/res/generators/templates/application/public/icons/ipod.png +0 -0
- data/res/generators/templates/application/public/icons/key.png +0 -0
- data/res/generators/templates/application/public/icons/lifebuoy.png +0 -0
- data/res/generators/templates/application/public/icons/lightbulb.png +0 -0
- data/res/generators/templates/application/public/icons/line-chart.png +0 -0
- data/res/generators/templates/application/public/icons/location.png +0 -0
- data/res/generators/templates/application/public/icons/lock.png +0 -0
- data/res/generators/templates/application/public/icons/loopback.png +0 -0
- data/res/generators/templates/application/public/icons/magnifying-glass.png +0 -0
- data/res/generators/templates/application/public/icons/map-marker.png +0 -0
- data/res/generators/templates/application/public/icons/map.png +0 -0
- data/res/generators/templates/application/public/icons/medical-bag.png +0 -0
- data/res/generators/templates/application/public/icons/medical.png +0 -0
- data/res/generators/templates/application/public/icons/microphone.png +0 -0
- data/res/generators/templates/application/public/icons/movie1.png +0 -0
- data/res/generators/templates/application/public/icons/movie2.png +0 -0
- data/res/generators/templates/application/public/icons/network.png +0 -0
- data/res/generators/templates/application/public/icons/note.png +0 -0
- data/res/generators/templates/application/public/icons/outlet.png +0 -0
- data/res/generators/templates/application/public/icons/palette.png +0 -0
- data/res/generators/templates/application/public/icons/paperclip.png +0 -0
- data/res/generators/templates/application/public/icons/phone.png +0 -0
- data/res/generators/templates/application/public/icons/photos.png +0 -0
- data/res/generators/templates/application/public/icons/piano.png +0 -0
- data/res/generators/templates/application/public/icons/picture-frame.png +0 -0
- data/res/generators/templates/application/public/icons/pill.png +0 -0
- data/res/generators/templates/application/public/icons/pin.png +0 -0
- data/res/generators/templates/application/public/icons/pinetree.png +0 -0
- data/res/generators/templates/application/public/icons/planet.png +0 -0
- data/res/generators/templates/application/public/icons/puzzle.png +0 -0
- data/res/generators/templates/application/public/icons/radar.png +0 -0
- data/res/generators/templates/application/public/icons/redo.png +0 -0
- data/res/generators/templates/application/public/icons/refresh.png +0 -0
- data/res/generators/templates/application/public/icons/runner.png +0 -0
- data/res/generators/templates/application/public/icons/shoebox.png +0 -0
- data/res/generators/templates/application/public/icons/shopping-bag.png +0 -0
- data/res/generators/templates/application/public/icons/shopping-cart.png +0 -0
- data/res/generators/templates/application/public/icons/shuffle.png +0 -0
- data/res/generators/templates/application/public/icons/signpost.png +0 -0
- data/res/generators/templates/application/public/icons/skull-n-crossbones.png +0 -0
- data/res/generators/templates/application/public/icons/skull.png +0 -0
- data/res/generators/templates/application/public/icons/sliders.png +0 -0
- data/res/generators/templates/application/public/icons/spraycan.png +0 -0
- data/res/generators/templates/application/public/icons/squiggle.png +0 -0
- data/res/generators/templates/application/public/icons/star.png +0 -0
- data/res/generators/templates/application/public/icons/stopwatch.png +0 -0
- data/res/generators/templates/application/public/icons/suitcase.png +0 -0
- data/res/generators/templates/application/public/icons/tag.png +0 -0
- data/res/generators/templates/application/public/icons/tags.png +0 -0
- data/res/generators/templates/application/public/icons/target.png +0 -0
- data/res/generators/templates/application/public/icons/testtube.png +0 -0
- data/res/generators/templates/application/public/icons/thermometer.png +0 -0
- data/res/generators/templates/application/public/icons/toolbox.png +0 -0
- data/res/generators/templates/application/public/icons/trophy.png +0 -0
- data/res/generators/templates/application/public/icons/tshirt.png +0 -0
- data/res/generators/templates/application/public/icons/tv.png +0 -0
- data/res/generators/templates/application/public/icons/umbrella.png +0 -0
- data/res/generators/templates/application/public/icons/walk.png +0 -0
- data/res/generators/templates/application/public/icons/weather.png +0 -0
- data/res/generators/templates/application/public/icons/widescreen.png +0 -0
- data/res/generators/templates/application/public/icons/wineglass.png +0 -0
- data/res/generators/templates/application/public/icons/zap.png +0 -0
- data/res/generators/templates/application/public/images/android/btn_check_off.png +0 -0
- data/res/generators/templates/application/public/images/android/btn_check_on.png +0 -0
- data/res/generators/templates/application/public/images/android/btn_radio_off.png +0 -0
- data/res/generators/templates/application/public/images/android/btn_radio_on.png +0 -0
- data/res/generators/templates/application/public/images/android/ic_menu_more.png +0 -0
- data/res/generators/templates/application/public/images/iphone/disclosure.png +0 -0
- data/res/generators/templates/application/public/images/iphone/disclosure_detail.png +0 -0
- data/res/generators/templates/application/public/images/iphone/radiobutton.png +0 -0
- data/res/generators/templates/application/public/images/iphone/select.png +0 -0
- data/res/generators/templates/application/public/images/iphone/switch.png +0 -0
- data/res/generators/templates/application/public/images/listArrow.png +0 -0
- data/res/generators/templates/application/public/images/listArrowDown.png +0 -0
- data/res/generators/templates/model/controller.rb +2 -0
- data/res/generators/templates/model/edit.bb.erb +24 -0
- data/res/generators/templates/model/edit.erb +21 -25
- data/res/generators/templates/model/index.bb.erb +21 -0
- data/res/generators/templates/model/index.erb +28 -14
- data/res/generators/templates/model/new.bb.erb +24 -0
- data/res/generators/templates/model/new.erb +20 -20
- data/res/generators/templates/model/show.bb.erb +21 -0
- data/res/generators/templates/model/show.erb +15 -15
- data/rhobuild.yml +37 -0
- data/rhodes.gemspec +1 -1
- data/spec/framework_spec/app/Account/config.rb +57 -1
- data/spec/framework_spec/app/Case/config.rb +1 -1
- data/spec/framework_spec/app/Customer/config.rb +1 -1
- data/spec/framework_spec/app/Product/config.rb +15 -1
- data/spec/framework_spec/app/spec/fixtures/object_values.txt +90 -90
- data/spec/framework_spec/app/spec/pagination/fixtures/object_values.txt +91 -91
- data/spec/framework_spec/app/spec/rho_spec.rb +1 -1
- data/spec/framework_spec/app/spec/rhom_object_spec.rb +47 -28
- data/spec/framework_spec/app/spec/rhom_spec.rb +8 -8
- data/spec/framework_spec/app/spec/spec_helper.rb +13 -5
- data/spec/framework_spec/app/spec_runner.rb +5 -4
- data/spec/framework_spec/public/css/base.css +0 -1
- data/spec/framework_spec/public/css/iphone.css +0 -1
- data/spec/framework_spec/rhoconfig.txt +3 -1
- metadata +220 -37
- data/platform/bb/rhodes/src/rhomobile/WebView.java +0 -90
- data/platform/iphone/Classes/BarItem.h +0 -27
- data/platform/iphone/Classes/BarItem.m +0 -32
- data/platform/iphone/Classes/JSString.h +0 -12
- data/platform/iphone/Classes/JSString.m +0 -7
- data/platform/iphone/Classes/RhoRunnerAppDelegate.h +0 -48
- data/platform/iphone/Classes/RhoRunnerAppDelegate.m +0 -617
- data/platform/iphone/Classes/Server/ServerHost.h +0 -81
- data/platform/iphone/Classes/Server/ServerHost.m +0 -597
- data/platform/iphone/Classes/Server/WebViewUrl.h +0 -13
- data/platform/iphone/Classes/Server/WebViewUrl.m +0 -8
- data/platform/iphone/Classes/TabBarDelegate.h +0 -39
- data/platform/iphone/Classes/TabBarDelegate.m +0 -151
- data/platform/iphone/Classes/Utils/unzip.cpp +0 -4328
- data/platform/iphone/Classes/Utils/unzip.h +0 -234
- data/platform/iphone/Classes/WebViewController.h +0 -59
- data/platform/iphone/Classes/WebViewController.m +0 -472
- data/platform/wm/rhodes/GetURLDialog.cpp +0 -64
- data/platform/wm/rhodes/GetURLDialog.h +0 -39
- data/res/generators/templates/application/public/css/base.css +0 -39
- data/res/generators/templates/application/public/css/rho.css +0 -3
- data/res/generators/templates/application/public/css/xhtml.css +0 -114
- data/spec/framework_spec/app/Question/config.rb +0 -3
- data/spec/generator_spec/source_generator_spec.rb +0 -27
@@ -0,0 +1,115 @@
|
|
1
|
+
//
|
2
|
+
// NavBar.m
|
3
|
+
// rhorunner
|
4
|
+
//
|
5
|
+
// Created by Dmitry Moskalchuk on 26.04.10.
|
6
|
+
// Copyright 2010 __MyCompanyName__. All rights reserved.
|
7
|
+
//
|
8
|
+
|
9
|
+
#import "NavBar.h"
|
10
|
+
#import "Rhodes.h"
|
11
|
+
|
12
|
+
#include "common/rhoparams.h"
|
13
|
+
|
14
|
+
#import "logging/RhoLog.h"
|
15
|
+
|
16
|
+
#undef DEFAULT_LOGCATEGORY
|
17
|
+
#define DEFAULT_LOGCATEGORY "NavBar"
|
18
|
+
|
19
|
+
@interface RhoNavBarCreateTask : NSObject {}
|
20
|
+
+ (void)run:(NSArray*)args;
|
21
|
+
@end
|
22
|
+
|
23
|
+
@implementation RhoNavBarCreateTask
|
24
|
+
+ (void)run:(NSArray*)args {
|
25
|
+
NSString *title = [args objectAtIndex:0];
|
26
|
+
NSArray *left = [args objectAtIndex:1];
|
27
|
+
NSArray *right = [args objectAtIndex:2];
|
28
|
+
[[[Rhodes sharedInstance] mainView] setNavBar:title left:left right:right];
|
29
|
+
}
|
30
|
+
@end
|
31
|
+
|
32
|
+
@interface RhoNavBarRemoveTask : NSObject {}
|
33
|
+
+ (void)run;
|
34
|
+
@end
|
35
|
+
|
36
|
+
@implementation RhoNavBarRemoveTask
|
37
|
+
+ (void)run {
|
38
|
+
[[[Rhodes sharedInstance] mainView] removeNavBar];
|
39
|
+
}
|
40
|
+
@end
|
41
|
+
|
42
|
+
@implementation NavBar
|
43
|
+
|
44
|
+
@end
|
45
|
+
|
46
|
+
void create_navbar(rho_param *p)
|
47
|
+
{
|
48
|
+
if (p->type != RHO_PARAM_HASH) {
|
49
|
+
RAWLOG_ERROR("Unexpected parameter type for create_navbar, should be Hash");
|
50
|
+
return;
|
51
|
+
}
|
52
|
+
|
53
|
+
NSString *title = nil;
|
54
|
+
NSMutableArray *left = [NSMutableArray arrayWithCapacity:3];
|
55
|
+
NSMutableArray *right = [NSMutableArray arrayWithCapacity:3];
|
56
|
+
|
57
|
+
int size = p->v.hash->size;
|
58
|
+
for (int i = 0; i < size; ++i) {
|
59
|
+
char *name = p->v.hash->name[i];
|
60
|
+
rho_param *value = p->v.hash->value[i];
|
61
|
+
|
62
|
+
if (strcasecmp(name, "title") == 0) {
|
63
|
+
if (value->type != RHO_PARAM_STRING) {
|
64
|
+
RAWLOG_ERROR("Unexpected type of 'title', should be String");
|
65
|
+
return;
|
66
|
+
}
|
67
|
+
title = [NSString stringWithUTF8String:value->v.string];
|
68
|
+
}
|
69
|
+
else if (strcasecmp(name, "left") == 0 || strcasecmp(name, "right") == 0) {
|
70
|
+
if (value->type != RHO_PARAM_HASH) {
|
71
|
+
RAWLOG_ERROR1("Unexpected type of '%s', should be Hash", name);
|
72
|
+
return;
|
73
|
+
}
|
74
|
+
char *label = NULL;
|
75
|
+
char *icon = NULL;
|
76
|
+
char *action = NULL;
|
77
|
+
|
78
|
+
int hashSize = value->v.hash->size;
|
79
|
+
for (int k = 0; k < hashSize; ++k) {
|
80
|
+
char *n = value->v.hash->name[k];
|
81
|
+
rho_param *v = value->v.hash->value[k];
|
82
|
+
if (v->type != RHO_PARAM_STRING) {
|
83
|
+
RAWLOG_ERROR1("Unexpected type of '%s', should be String", n);
|
84
|
+
return;
|
85
|
+
}
|
86
|
+
|
87
|
+
if (strcasecmp(n, "label") == 0)
|
88
|
+
label = v->v.string;
|
89
|
+
else if (strcasecmp(n, "icon") == 0)
|
90
|
+
icon = v->v.string;
|
91
|
+
else if (strcasecmp(n, "action") == 0)
|
92
|
+
action = v->v.string;
|
93
|
+
|
94
|
+
}
|
95
|
+
|
96
|
+
NSMutableArray *button = strcasecmp(name, "left") == 0 ? left : right;
|
97
|
+
[button addObject:[NSString stringWithUTF8String:(action ? action : "")]];
|
98
|
+
[button addObject:[NSString stringWithUTF8String:(label ? label : "")]];
|
99
|
+
[button addObject:[NSString stringWithUTF8String:(icon ? icon : "")]];
|
100
|
+
}
|
101
|
+
}
|
102
|
+
|
103
|
+
id runnable = [RhoNavBarCreateTask class];
|
104
|
+
NSMutableArray *args = [NSMutableArray arrayWithCapacity:3];
|
105
|
+
[args addObject:title];
|
106
|
+
[args addObject:left];
|
107
|
+
[args addObject:right];
|
108
|
+
[Rhodes performOnUiThread:runnable arg:args wait:YES];
|
109
|
+
}
|
110
|
+
|
111
|
+
void remove_navbar()
|
112
|
+
{
|
113
|
+
id runnable = [RhoNavBarRemoveTask class];
|
114
|
+
[Rhodes performOnUiThread:runnable wait:YES];
|
115
|
+
}
|
@@ -0,0 +1,19 @@
|
|
1
|
+
//
|
2
|
+
// Alert.h
|
3
|
+
// rhorunner
|
4
|
+
//
|
5
|
+
// Created by Dmitry Moskalchuk on 29.03.10.
|
6
|
+
// Copyright 2010 __MyCompanyName__. All rights reserved.
|
7
|
+
//
|
8
|
+
|
9
|
+
#import <Foundation/Foundation.h>
|
10
|
+
#include "common/rhoparams.h"
|
11
|
+
|
12
|
+
@interface RhoAlert : NSObject {}
|
13
|
+
|
14
|
+
+ (void)showPopup:(rho_param*)p;
|
15
|
+
+ (void)hidePopup;
|
16
|
+
+ (void)vibrate:(int)duration;
|
17
|
+
+ (void)playFile:(NSString*)file mediaType:(NSString*)type;
|
18
|
+
|
19
|
+
@end
|
@@ -0,0 +1,258 @@
|
|
1
|
+
//
|
2
|
+
// Alert.m
|
3
|
+
// rhorunner
|
4
|
+
//
|
5
|
+
// Created by Dmitry Moskalchuk on 29.03.10.
|
6
|
+
// Copyright 2010 __MyCompanyName__. All rights reserved.
|
7
|
+
//
|
8
|
+
|
9
|
+
#import <AVFoundation/AVFoundation.h>
|
10
|
+
#import <AudioToolbox/AudioToolbox.h>
|
11
|
+
#import "RhoAlert.h"
|
12
|
+
#import "Rhodes.h"
|
13
|
+
|
14
|
+
#include "common/RhodesApp.h"
|
15
|
+
#include "logging/RhoLog.h"
|
16
|
+
|
17
|
+
#undef DEFAULT_LOGCATEGORY
|
18
|
+
#define DEFAULT_LOGCATEGORY "Alert"
|
19
|
+
|
20
|
+
static UIAlertView *currentAlert = nil;
|
21
|
+
|
22
|
+
@interface RhoAlertShowPopupTask : NSObject<UIAlertViewDelegate> {
|
23
|
+
NSString *callback;
|
24
|
+
NSMutableArray *buttons;
|
25
|
+
}
|
26
|
+
|
27
|
+
@property (nonatomic,retain) NSString *callback;
|
28
|
+
@property (nonatomic,retain) NSArray *buttons;
|
29
|
+
|
30
|
+
- (id)init;
|
31
|
+
- (void)dealloc;
|
32
|
+
- (void)run:(NSValue*)v;
|
33
|
+
- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex;
|
34
|
+
|
35
|
+
@end
|
36
|
+
|
37
|
+
@implementation RhoAlertShowPopupTask
|
38
|
+
|
39
|
+
@synthesize callback, buttons;
|
40
|
+
|
41
|
+
- (id)init {
|
42
|
+
callback = nil;
|
43
|
+
buttons = nil;
|
44
|
+
return self;
|
45
|
+
}
|
46
|
+
|
47
|
+
- (void)dealloc {
|
48
|
+
self.callback = nil;
|
49
|
+
self.buttons = nil;
|
50
|
+
[super dealloc];
|
51
|
+
}
|
52
|
+
|
53
|
+
- (void)run:(NSValue*)v {
|
54
|
+
NSString *title = @"Alert";
|
55
|
+
NSString *message = nil;
|
56
|
+
|
57
|
+
self.buttons = [NSMutableArray arrayWithCapacity:1];
|
58
|
+
rho_param *p = [v pointerValue];
|
59
|
+
if (p->type == RHO_PARAM_STRING) {
|
60
|
+
message = [NSString stringWithUTF8String:p->v.string];
|
61
|
+
[buttons addObject:[NSMutableArray arrayWithObjects:@"OK", @"OK", nil]];
|
62
|
+
}
|
63
|
+
else if (p->type == RHO_PARAM_HASH) {
|
64
|
+
for (int i = 0, lim = p->v.hash->size; i < lim; ++i) {
|
65
|
+
char *name = p->v.hash->name[i];
|
66
|
+
rho_param *value = p->v.hash->value[i];
|
67
|
+
|
68
|
+
if (strcasecmp(name, "title") == 0) {
|
69
|
+
if (value->type != RHO_PARAM_STRING) {
|
70
|
+
RAWLOG_ERROR("'title' should be string");
|
71
|
+
continue;
|
72
|
+
}
|
73
|
+
title = [NSString stringWithUTF8String:value->v.string];
|
74
|
+
}
|
75
|
+
else if (strcasecmp(name, "message") == 0) {
|
76
|
+
if (value->type != RHO_PARAM_STRING) {
|
77
|
+
RAWLOG_ERROR("'message' should be string");
|
78
|
+
continue;
|
79
|
+
}
|
80
|
+
message = [NSString stringWithUTF8String:value->v.string];
|
81
|
+
}
|
82
|
+
else if (strcasecmp(name, "callback") == 0) {
|
83
|
+
if (value->type != RHO_PARAM_STRING) {
|
84
|
+
RAWLOG_ERROR("'callback' should be string");
|
85
|
+
continue;
|
86
|
+
}
|
87
|
+
self.callback = [NSString stringWithUTF8String:value->v.string];
|
88
|
+
}
|
89
|
+
else if (strcasecmp(name, "buttons") == 0) {
|
90
|
+
if (value->type != RHO_PARAM_ARRAY) {
|
91
|
+
RAWLOG_ERROR("'buttons' should be array");
|
92
|
+
continue;
|
93
|
+
}
|
94
|
+
for (int j = 0, limj = value->v.array->size; j < limj; ++j) {
|
95
|
+
rho_param *arrValue = value->v.array->value[j];
|
96
|
+
|
97
|
+
NSString *itemId = nil;
|
98
|
+
NSString *itemTitle = nil;
|
99
|
+
switch (arrValue->type) {
|
100
|
+
case RHO_PARAM_STRING:
|
101
|
+
itemId = [NSString stringWithUTF8String:arrValue->v.string];
|
102
|
+
itemTitle = [NSString stringWithUTF8String:arrValue->v.string];
|
103
|
+
break;
|
104
|
+
case RHO_PARAM_HASH:
|
105
|
+
for (int k = 0, limk = arrValue->v.hash->size; k < limk; ++k) {
|
106
|
+
char *sName = arrValue->v.hash->name[k];
|
107
|
+
rho_param *sValue = arrValue->v.hash->value[k];
|
108
|
+
if (sValue->type != RHO_PARAM_STRING) {
|
109
|
+
RAWLOG_ERROR("Illegal type of button item's value");
|
110
|
+
continue;
|
111
|
+
}
|
112
|
+
if (strcasecmp(sName, "id") == 0)
|
113
|
+
itemId = [NSString stringWithUTF8String:sValue->v.string];
|
114
|
+
else if (strcasecmp(sName, "title") == 0)
|
115
|
+
itemTitle = [NSString stringWithUTF8String:sValue->v.string];
|
116
|
+
}
|
117
|
+
break;
|
118
|
+
default:
|
119
|
+
RAWLOG_ERROR("Illegal type of button item");
|
120
|
+
continue;
|
121
|
+
}
|
122
|
+
|
123
|
+
if (!itemId || !itemTitle) {
|
124
|
+
RAWLOG_ERROR("Incomplete button item");
|
125
|
+
continue;
|
126
|
+
}
|
127
|
+
|
128
|
+
NSMutableArray *btn = [NSMutableArray arrayWithCapacity:2];
|
129
|
+
[btn addObject:itemId];
|
130
|
+
[btn addObject:itemTitle];
|
131
|
+
[buttons addObject:btn];
|
132
|
+
}
|
133
|
+
}
|
134
|
+
|
135
|
+
}
|
136
|
+
}
|
137
|
+
rho_param_free(p);
|
138
|
+
|
139
|
+
UIAlertView *alert = [[[UIAlertView alloc]
|
140
|
+
initWithTitle:title
|
141
|
+
message:message
|
142
|
+
delegate:self
|
143
|
+
cancelButtonTitle:nil
|
144
|
+
otherButtonTitles:nil] autorelease];
|
145
|
+
|
146
|
+
for (int i = 0, lim = [buttons count]; i < lim; ++i) {
|
147
|
+
NSArray *btn = [buttons objectAtIndex:i];
|
148
|
+
NSString *title = [btn objectAtIndex:1];
|
149
|
+
[alert addButtonWithTitle:title];
|
150
|
+
}
|
151
|
+
|
152
|
+
[alert show];
|
153
|
+
currentAlert = alert;
|
154
|
+
}
|
155
|
+
|
156
|
+
- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
|
157
|
+
if (!callback)
|
158
|
+
return;
|
159
|
+
|
160
|
+
if (buttonIndex < 0 || buttonIndex >= [buttons count])
|
161
|
+
return;
|
162
|
+
|
163
|
+
NSArray *btn = [buttons objectAtIndex:buttonIndex];
|
164
|
+
NSString *itemId = [[btn objectAtIndex:0] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
|
165
|
+
NSString *itemTitle = [[btn objectAtIndex:1] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
|
166
|
+
|
167
|
+
rho_rhodesapp_callPopupCallback([callback UTF8String], [itemId UTF8String], [itemTitle UTF8String]);
|
168
|
+
[self release];
|
169
|
+
currentAlert = nil;
|
170
|
+
}
|
171
|
+
|
172
|
+
@end
|
173
|
+
|
174
|
+
@interface RhoAlertHidePopupTask : NSObject {}
|
175
|
+
+ (void)run;
|
176
|
+
@end
|
177
|
+
|
178
|
+
@implementation RhoAlertHidePopupTask
|
179
|
+
+ (void)run {
|
180
|
+
if (!currentAlert)
|
181
|
+
return;
|
182
|
+
[currentAlert dismissWithClickedButtonIndex:-1 animated:NO];
|
183
|
+
currentAlert = nil;
|
184
|
+
}
|
185
|
+
@end
|
186
|
+
|
187
|
+
|
188
|
+
@interface RhoAlertVibrateTask : NSObject {}
|
189
|
+
+ (void)run;
|
190
|
+
@end
|
191
|
+
|
192
|
+
@implementation RhoAlertVibrateTask
|
193
|
+
+ (void)run {
|
194
|
+
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
|
195
|
+
}
|
196
|
+
@end
|
197
|
+
|
198
|
+
@interface RhoAlertPlayFileTask : NSObject {}
|
199
|
+
+ (void)run:(NSString*)file :(NSString*)type;
|
200
|
+
@end
|
201
|
+
|
202
|
+
@implementation RhoAlertPlayFileTask
|
203
|
+
+ (void)run:(NSString*)file :(NSString*)type {
|
204
|
+
[[Rhodes sharedInstance] playStart:file mediaType:type];
|
205
|
+
}
|
206
|
+
@end
|
207
|
+
|
208
|
+
@implementation RhoAlert
|
209
|
+
|
210
|
+
+ (void)showPopup:(rho_param*)p {
|
211
|
+
id runnable = [[RhoAlertShowPopupTask alloc] init];
|
212
|
+
NSValue *value = [NSValue valueWithPointer:rho_param_dup(p)];
|
213
|
+
[Rhodes performOnUiThread:runnable arg:value wait:NO];
|
214
|
+
}
|
215
|
+
|
216
|
+
+ (void)hidePopup {
|
217
|
+
id runnable = [RhoAlertHidePopupTask class];
|
218
|
+
[Rhodes performOnUiThread:runnable wait:NO];
|
219
|
+
}
|
220
|
+
|
221
|
+
+ (void)vibrate:(int)duration {
|
222
|
+
id runnable = [RhoAlertVibrateTask class];
|
223
|
+
[Rhodes performOnUiThread:runnable wait:NO];
|
224
|
+
}
|
225
|
+
|
226
|
+
+ (void)playFile:(NSString *)file mediaType:(NSString *)type {
|
227
|
+
id runnable = [RhoAlertPlayFileTask class];
|
228
|
+
[Rhodes performOnUiThread:runnable arg:file arg:type wait:NO];
|
229
|
+
}
|
230
|
+
|
231
|
+
@end
|
232
|
+
|
233
|
+
void alert_show_popup(rho_param *p) {
|
234
|
+
if (!p || (p->type != RHO_PARAM_STRING && p->type != RHO_PARAM_HASH)) {
|
235
|
+
RAWLOG_ERROR("Alert.show_popup - wrong arguments");
|
236
|
+
return;
|
237
|
+
}
|
238
|
+
|
239
|
+
[RhoAlert showPopup:p];
|
240
|
+
}
|
241
|
+
|
242
|
+
void alert_hide_popup() {
|
243
|
+
[RhoAlert hidePopup];
|
244
|
+
}
|
245
|
+
|
246
|
+
void alert_vibrate(int duration) {
|
247
|
+
[RhoAlert vibrate:duration];
|
248
|
+
}
|
249
|
+
|
250
|
+
void alert_play_file(char* file_name, char* media_type) {
|
251
|
+
if (!file_name) {
|
252
|
+
RAWLOG_ERROR("Alert.play_file - please specify file name to play");
|
253
|
+
return;
|
254
|
+
}
|
255
|
+
|
256
|
+
[RhoAlert playFile:[NSString stringWithUTF8String:file_name]
|
257
|
+
mediaType:media_type?[NSString stringWithUTF8String:media_type]:NULL];
|
258
|
+
}
|
@@ -0,0 +1,33 @@
|
|
1
|
+
//
|
2
|
+
// RhoMainView.h
|
3
|
+
// rhorunner
|
4
|
+
//
|
5
|
+
// Created by Dmitry Moskalchuk on 07.03.10.
|
6
|
+
// Copyright 2010 Rhomobile Inc. All rights reserved.
|
7
|
+
//
|
8
|
+
|
9
|
+
#import <UIKit/UIKit.h>
|
10
|
+
|
11
|
+
@protocol RhoMainView
|
12
|
+
|
13
|
+
- (UIView*)view;
|
14
|
+
|
15
|
+
- (void)loadHTMLString:(NSString*)data;
|
16
|
+
|
17
|
+
- (void)back:(int)index;
|
18
|
+
- (void)forward:(int)index;
|
19
|
+
- (void)navigate:(NSString*)url tab:(int)index;
|
20
|
+
- (void)navigateRedirect:(NSString*)url tab:(int)index;
|
21
|
+
- (void)reload:(int)index;
|
22
|
+
|
23
|
+
- (void)executeJs:(NSString*)js tab:(int)index;
|
24
|
+
|
25
|
+
- (NSString*)currentLocation:(int)index;
|
26
|
+
|
27
|
+
- (void)switchTab:(int)index;
|
28
|
+
- (int)activeTab;
|
29
|
+
|
30
|
+
- (void)setNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right;
|
31
|
+
- (void)removeNavBar;
|
32
|
+
|
33
|
+
@end
|