rhodes 2.2.4.beta.1 → 2.2.5.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (188) hide show
  1. data/CHANGELOG +10 -0
  2. data/Rakefile +119 -3
  3. data/lib/build/jake.rb +15 -1
  4. data/lib/framework/dateME.rb +6 -1
  5. data/lib/framework/rho/render.rb +18 -15
  6. data/lib/framework/rho/rho.rb +105 -43
  7. data/lib/framework/rho/rhoapplication.rb +1 -1
  8. data/lib/framework/rho/rhocontact.rb +41 -13
  9. data/lib/framework/rho/rhocontroller.rb +10 -1
  10. data/lib/framework/rho/rhoevent_c.rb +6 -1
  11. data/lib/framework/rho/rhosupport.rb +1 -1
  12. data/lib/framework/rhodes.rb +1 -1
  13. data/lib/framework/rholang/rhomsg_de.rb +1 -1
  14. data/lib/framework/rholang/rhomsg_es.rb +1 -1
  15. data/lib/framework/rholang/rhomsg_it.rb +28 -0
  16. data/lib/framework/rhom/rhom.rb +6 -0
  17. data/lib/framework/rhom/rhom_model.rb +14 -7
  18. data/lib/framework/rhom/rhom_object_factory.rb +121 -56
  19. data/lib/framework/version.rb +1 -1
  20. data/lib/rhodes.rb +1 -1
  21. data/platform/android/Rhodes/AndroidManifest.full.xml +62 -0
  22. data/platform/android/Rhodes/AndroidManifest.xml +3 -34
  23. data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h +17 -2
  24. data/platform/android/Rhodes/jni/src/alert.cpp +16 -0
  25. data/platform/android/Rhodes/jni/src/callbacks.cpp +27 -3
  26. data/platform/android/Rhodes/jni/src/nativebar.cpp +3 -0
  27. data/platform/android/Rhodes/jni/src/nativeview.cpp +131 -1
  28. data/platform/android/Rhodes/jni/src/phonebook.cpp +102 -41
  29. data/platform/android/Rhodes/jni/src/rhodes.cpp +113 -32
  30. data/platform/android/Rhodes/jni/src/ringtones.cpp +1 -1
  31. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java +1 -0
  32. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +9 -8
  33. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +184 -49
  34. data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +49 -25
  35. data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +104 -57
  36. data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +36 -2
  37. data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +24 -14
  38. data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +7 -8
  39. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +185 -3
  40. data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +54 -1
  41. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +107 -14
  42. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +72 -24
  43. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +22 -21
  44. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java +91 -11
  45. data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +10 -0
  46. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +11 -0
  47. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +10 -0
  48. data/platform/android/build/android.rake +50 -9
  49. data/platform/android/build/librhocommon_build.files +1 -0
  50. data/platform/bb/Hsqldb/src/org/hsqldb/Parser.java +3 -2
  51. data/platform/bb/Hsqldb/src/org/hsqldb/SchemaManager.java +3 -1
  52. data/platform/bb/Hsqldb/src/org/hsqldb/Session.java +7 -0
  53. data/platform/bb/Hsqldb/src/org/hsqldb/Tokenizer.java +2 -2
  54. data/platform/bb/RubyVM/RubyVM.jdp +1 -0
  55. data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java +22 -0
  56. data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +5 -0
  57. data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +1 -1
  58. data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +51 -4
  59. data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +21 -10
  60. data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +82 -33
  61. data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +59 -6
  62. data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyFloat_Methods.java +5 -0
  63. data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java +19 -7
  64. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/ArrayPacker.java +1 -1
  65. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyFloat.java +5 -0
  66. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java +55 -11
  67. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +18 -2
  68. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java +8 -5
  69. data/platform/bb/RubyVM/src/j2me/lang/CharacterMe.java +1 -1
  70. data/platform/bb/RubyVM/src/j2me/util/StringParser.java +2 -0
  71. data/platform/bb/build/RubyVM_build.files +1 -0
  72. data/platform/bb/build/bb.rake +21 -2
  73. data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +3 -3
  74. data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +1 -1
  75. data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +1 -2
  76. data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +15 -16
  77. data/platform/bb/rhodes/src/com/rho/rubyext/RhoCalendar.java +4 -0
  78. data/platform/bb/rhodes/src/com/rho/rubyext/System.java +58 -0
  79. data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +90 -4
  80. data/platform/iphone/Classes/AppManager/AppManager.m +43 -5
  81. data/platform/iphone/Classes/Event/Event.h +2 -0
  82. data/platform/iphone/Classes/Event/Event.m +12 -1
  83. data/platform/iphone/Classes/GeoLocation/LocationController.m +9 -3
  84. data/platform/iphone/Classes/MapView/MapViewController.m +20 -9
  85. data/platform/iphone/Classes/NativeBar.m +27 -0
  86. data/platform/iphone/Classes/Phonebook/phonebook.m +17 -0
  87. data/platform/iphone/Classes/RhoAlert.m +61 -1
  88. data/platform/iphone/Classes/RhoMainView.h +1 -0
  89. data/platform/iphone/Classes/Rhodes.h +2 -0
  90. data/platform/iphone/Classes/Rhodes.m +108 -1
  91. data/platform/iphone/Classes/SimpleMainView.h +4 -0
  92. data/platform/iphone/Classes/SimpleMainView.m +30 -3
  93. data/platform/iphone/Classes/SplashViewController.m +3 -1
  94. data/platform/iphone/Classes/TabbedMainView.h +2 -0
  95. data/platform/iphone/Classes/TabbedMainView.m +63 -11
  96. data/platform/iphone/Classes/rho/net/NetRequestImpl.m +26 -0
  97. data/platform/iphone/Info.plist +12 -1
  98. data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +8 -0
  99. data/platform/iphone/rbuild/iphone.rake +181 -25
  100. data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +5 -5
  101. data/platform/shared/common/IRhoThreadImpl.h +1 -1
  102. data/platform/shared/common/PosixThreadImpl.cpp +5 -3
  103. data/platform/shared/common/PosixThreadImpl.h +1 -1
  104. data/platform/shared/common/RhoFilePath.h +11 -0
  105. data/platform/shared/common/RhoNativeViewManager.h +17 -0
  106. data/platform/shared/common/RhoThread.h +1 -1
  107. data/platform/shared/common/RhodesApp.cpp +29 -8
  108. data/platform/shared/common/ThreadQueue.cpp +5 -3
  109. data/platform/shared/common/ThreadQueue.h +2 -1
  110. data/platform/shared/common/app_build_configs.c +25 -0
  111. data/platform/shared/common/app_build_configs.h +11 -0
  112. data/platform/shared/net/AsyncHttp.cpp +5 -5
  113. data/platform/shared/net/CURLNetRequest.cpp +25 -7
  114. data/platform/shared/net/CURLNetRequest.h +2 -1
  115. data/platform/shared/net/HttpServer.cpp +28 -0
  116. data/platform/shared/ruby/ext/nativebar/nativebar.i +3 -0
  117. data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +26 -1
  118. data/platform/shared/ruby/ext/rho/rhoruby.c +6 -0
  119. data/platform/shared/ruby/ext/rho/rhoruby.h +1 -0
  120. data/platform/shared/ruby/ext/rho/rhosupport.c +15 -2
  121. data/platform/shared/ruby/ext/syncengine/syncengine.i +14 -2
  122. data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +97 -2
  123. data/platform/shared/ruby/ext/system/system.i +13 -0
  124. data/platform/shared/ruby/ext/system/system_wrap.c +104 -1
  125. data/platform/shared/rubyext/RhoAppAdapter.cpp +7 -0
  126. data/platform/shared/sync/SyncEngine.cpp +43 -3
  127. data/platform/shared/sync/SyncEngine.h +13 -0
  128. data/platform/shared/sync/SyncNotify.cpp +41 -23
  129. data/platform/shared/sync/SyncNotify.h +18 -4
  130. data/platform/shared/sync/SyncSource.cpp +52 -14
  131. data/platform/shared/sync/SyncSource.h +1 -0
  132. data/platform/shared/sync/SyncThread.cpp +29 -9
  133. data/platform/shared/sync/SyncThread.h +4 -2
  134. data/platform/wm/RhoLib/RhoLib.vcproj +8 -0
  135. data/platform/wm/build/build_inf.js +15 -9
  136. data/platform/wm/build/wm.rake +10 -5
  137. data/platform/wm/rhodes/Alert.cpp +10 -0
  138. data/platform/wm/rhodes/Alert.h +3 -3
  139. data/platform/wm/rhodes/MainWindow.cpp +171 -26
  140. data/platform/wm/rhodes/MainWindow.h +23 -1
  141. data/platform/wm/rhodes/MetaHandler.cpp +192 -0
  142. data/platform/wm/rhodes/MetaHandler.h +31 -0
  143. data/platform/wm/rhodes/RhoNativeViewManager.cpp +126 -0
  144. data/platform/wm/rhodes/RhoNativeViewManagerWM.h +20 -0
  145. data/platform/wm/rhodes/Rhodes.cpp +91 -2
  146. data/platform/wm/rhodes/Rhodes.rc +15 -6
  147. data/platform/wm/rhodes/SyncStatusDlg.cpp +32 -0
  148. data/platform/wm/rhodes/SyncStatusDlg.h +29 -0
  149. data/platform/wm/rhodes/resource.h +5 -2
  150. data/platform/wm/rhodes/rho/common/RhoThreadImpl.cpp +3 -1
  151. data/platform/wm/rhodes/rho/common/RhoThreadImpl.h +1 -1
  152. data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +146 -14
  153. data/platform/wm/rhodes/rhodes.vcproj +28 -0
  154. data/rakefile.rb +119 -3
  155. data/res/build-tools/iphonesim/README +58 -0
  156. data/res/build-tools/iphonesim/Source/iPhoneSimulator.h +43 -0
  157. data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +224 -0
  158. data/res/build-tools/iphonesim/Source/main.m +52 -0
  159. data/res/build-tools/iphonesim/Source/nsprintf.h +3 -0
  160. data/res/build-tools/iphonesim/Source/nsprintf.m +42 -0
  161. data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
  162. data/res/build-tools/iphonesim/iPhoneSimulatorRemoteClient/iPhoneSimulatorRemoteClient.h +124 -0
  163. data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj +261 -0
  164. data/res/build-tools/iphonesim/iphonesim_Prefix.pch +7 -0
  165. data/res/generators/rhogen.rb +5 -0
  166. data/res/generators/templates/application/app/layout.erb +7 -13
  167. data/res/generators/templates/application/app/loading.png +0 -0
  168. data/res/generators/templates/application/build.yml +3 -0
  169. data/res/generators/templates/application/icon/icon114.png +0 -0
  170. data/res/generators/templates/application/icon/icon57.png +0 -0
  171. data/res/generators/templates/application/icon/icon72.png +0 -0
  172. data/res/generators/templates/application/public/css/iphone.css +96 -0
  173. data/res/generators/templates/application/public/images/backButton.png +0 -0
  174. data/res/generators/templates/application/public/jqtouch/jqtouch.js +2 -1
  175. data/res/generators/templates/application/rhoconfig.txt +2 -0
  176. data/rhodes.gemspec +1 -1
  177. data/spec/phone_spec/app/spec/array_pack_spec.rb +108 -0
  178. data/spec/phone_spec/app/spec/bulksync_spec.rb +1 -0
  179. data/spec/phone_spec/app/spec/date_spec.rb +27 -0
  180. data/spec/phone_spec/app/spec/fixtures/classes.rb +91 -0
  181. data/spec/phone_spec/app/spec/lstrip_spec.rb +57 -0
  182. data/spec/phone_spec/app/spec/rho_spec.rb +50 -19
  183. data/spec/phone_spec/app/spec/rhom_object_spec.rb +78 -0
  184. data/spec/phone_spec/app/spec/rstrip_spec.rb +51 -0
  185. data/spec/phone_spec/app/spec/strip_spec.rb +50 -0
  186. data/spec/phone_spec/app/spec/syncengine_spec.rb +46 -3
  187. data/spec/phone_spec/app/spec_runner.rb +6 -0
  188. metadata +34 -4
@@ -0,0 +1,124 @@
1
+ #import <Cocoa/Cocoa.h>
2
+
3
+ /*
4
+ * File: /Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/iPhoneSimulatorRemoteClient.framework/Versions/A/iPhoneSimulatorRemoteClient
5
+ * Arch: Intel 80x86 (i386)
6
+ * Current version: 12.0.0, Compatibility version: 1.0.0
7
+ */
8
+
9
+ @class DTiPhoneSimulatorSession;
10
+
11
+ @protocol DTiPhoneSimulatorSessionDelegate
12
+
13
+ - (void) session: (DTiPhoneSimulatorSession *) session didEndWithError: (NSError *) error;
14
+ - (void) session: (DTiPhoneSimulatorSession *) session didStart: (BOOL) started withError: (NSError *) error;
15
+
16
+ @end
17
+
18
+ @interface DTiPhoneSimulatorApplicationSpecifier : NSObject <NSCopying>
19
+ {
20
+ NSString *_appPath;
21
+ NSString *_bundleID;
22
+ }
23
+
24
+ + (id) specifierWithApplicationPath: (NSString *) appPath;
25
+ + (id) specifierWithApplicationBundleIdentifier: (NSString *) bundleID;
26
+ - (NSString *) bundleID;
27
+ - (void) setBundleID: (NSString *) bundleId;
28
+ - (NSString *) appPath;
29
+ - (void) setAppPath: (NSString *) appPath;
30
+
31
+ @end
32
+
33
+ @interface DTiPhoneSimulatorSystemRoot : NSObject <NSCopying>
34
+ {
35
+ NSString *sdkRootPath;
36
+ NSString *sdkVersion;
37
+ NSString *sdkDisplayName;
38
+ }
39
+
40
+ + (id) defaultRoot;
41
+
42
+ + (id)rootWithSDKPath:(id)fp8;
43
+ + (id)rootWithSDKVersion:(id)fp8;
44
+ + (NSArray *) knownRoots;
45
+ - (id)initWithSDKPath:(id)fp8;
46
+ - (id)sdkDisplayName;
47
+ - (void)setSdkDisplayName:(id)fp8;
48
+ - (id)sdkVersion;
49
+ - (void)setSdkVersion:(id)fp8;
50
+ - (id)sdkRootPath;
51
+ - (void)setSdkRootPath:(id)fp8;
52
+
53
+ @end
54
+
55
+
56
+
57
+ @interface DTiPhoneSimulatorSessionConfig : NSObject <NSCopying>
58
+ {
59
+ NSString *_localizedClientName;
60
+ DTiPhoneSimulatorSystemRoot *_simulatedSystemRoot;
61
+ DTiPhoneSimulatorApplicationSpecifier *_applicationToSimulateOnStart;
62
+ NSArray *_simulatedApplicationLaunchArgs;
63
+ NSDictionary *_simulatedApplicationLaunchEnvironment;
64
+ BOOL _simulatedApplicationShouldWaitForDebugger;
65
+ NSString *_simulatedApplicationStdOutPath;
66
+ NSString *_simulatedApplicationStdErrPath;
67
+ }
68
+
69
+ - (id)simulatedApplicationStdErrPath;
70
+ - (void)setSimulatedApplicationStdErrPath:(id)fp8;
71
+ - (id)simulatedApplicationStdOutPath;
72
+ - (void)setSimulatedApplicationStdOutPath:(id)fp8;
73
+ - (id)simulatedApplicationLaunchEnvironment;
74
+ - (void)setSimulatedApplicationLaunchEnvironment:(id)fp8;
75
+ - (id)simulatedApplicationLaunchArgs;
76
+ - (void)setSimulatedApplicationLaunchArgs:(id)fp8;
77
+
78
+ - (DTiPhoneSimulatorApplicationSpecifier *) applicationToSimulateOnStart;
79
+ - (void) setApplicationToSimulateOnStart: (DTiPhoneSimulatorApplicationSpecifier *) appSpec;
80
+ - (DTiPhoneSimulatorSystemRoot *) simulatedSystemRoot;
81
+ - (void) setSimulatedSystemRoot: (DTiPhoneSimulatorSystemRoot *) simulatedSystemRoot;
82
+
83
+
84
+ - (BOOL) simulatedApplicationShouldWaitForDebugger;
85
+ - (void) setSimulatedApplicationShouldWaitForDebugger: (BOOL) waitForDebugger;
86
+
87
+ - (id)localizedClientName;
88
+ - (void)setLocalizedClientName:(id)fp8;
89
+
90
+ // Added in 3.2 to support iPad/iPhone device families
91
+ - (void)setSimulatedDeviceFamily:(NSNumber*)family;
92
+
93
+ @end
94
+
95
+
96
+ @interface DTiPhoneSimulatorSession : NSObject {
97
+ NSString *_uuid;
98
+ id <DTiPhoneSimulatorSessionDelegate> _delegate;
99
+ NSNumber *_simulatedApplicationPID;
100
+ int _sessionLifecycleProgress;
101
+ NSTimer *_timeoutTimer;
102
+ DTiPhoneSimulatorSessionConfig *_sessionConfig;
103
+ struct ProcessSerialNumber _simulatorPSN;
104
+ }
105
+
106
+ - (BOOL) requestStartWithConfig: (DTiPhoneSimulatorSessionConfig *) config timeout: (NSTimeInterval) timeout error: (NSError **) outError;
107
+ - (void) requestEndWithTimeout: (NSTimeInterval) timeout;
108
+
109
+ - (id)sessionConfig;
110
+ - (void)setSessionConfig:(id)fp8;
111
+ - (id)timeoutTimer;
112
+ - (void)setTimeoutTimer:(id)fp8;
113
+ - (int)sessionLifecycleProgress;
114
+ - (void)setSessionLifecycleProgress:(int)fp8;
115
+ - (id)simulatedApplicationPID;
116
+ - (void)setSimulatedApplicationPID:(id)fp8;
117
+
118
+ - (id<DTiPhoneSimulatorSessionDelegate>) delegate;
119
+ - (void) setDelegate: (id<DTiPhoneSimulatorSessionDelegate>) delegate;
120
+
121
+ - (id)uuid;
122
+ - (void)setUuid:(id)fp8;
123
+
124
+ @end
@@ -0,0 +1,261 @@
1
+ // !$*UTF8*$!
2
+ {
3
+ archiveVersion = 1;
4
+ classes = {
5
+ };
6
+ objectVersion = 45;
7
+ objects = {
8
+
9
+ /* Begin PBXBuildFile section */
10
+ 2481364C115A750000E3A9BA /* iPhoneSimulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 24813648115A750000E3A9BA /* iPhoneSimulator.m */; };
11
+ 2481364D115A750000E3A9BA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 24813649115A750000E3A9BA /* main.m */; };
12
+ 2481364E115A750000E3A9BA /* nsprintf.m in Sources */ = {isa = PBXBuildFile; fileRef = 2481364B115A750000E3A9BA /* nsprintf.m */; };
13
+ 8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; };
14
+ /* End PBXBuildFile section */
15
+
16
+ /* Begin PBXCopyFilesBuildPhase section */
17
+ 8DD76F9E0486AA7600D96B5E /* CopyFiles */ = {
18
+ isa = PBXCopyFilesBuildPhase;
19
+ buildActionMask = 8;
20
+ dstPath = /usr/share/man/man1/;
21
+ dstSubfolderSpec = 0;
22
+ files = (
23
+ );
24
+ runOnlyForDeploymentPostprocessing = 1;
25
+ };
26
+ /* End PBXCopyFilesBuildPhase section */
27
+
28
+ /* Begin PBXFileReference section */
29
+ 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
30
+ 24813647115A750000E3A9BA /* iPhoneSimulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iPhoneSimulator.h; path = Source/iPhoneSimulator.h; sourceTree = "<group>"; };
31
+ 24813648115A750000E3A9BA /* iPhoneSimulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iPhoneSimulator.m; path = Source/iPhoneSimulator.m; sourceTree = "<group>"; };
32
+ 24813649115A750000E3A9BA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Source/main.m; sourceTree = "<group>"; };
33
+ 2481364A115A750000E3A9BA /* nsprintf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nsprintf.h; path = Source/nsprintf.h; sourceTree = "<group>"; };
34
+ 2481364B115A750000E3A9BA /* nsprintf.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = nsprintf.m; path = Source/nsprintf.m; sourceTree = "<group>"; };
35
+ 32A70AAB03705E1F00C91783 /* iphonesim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iphonesim_Prefix.pch; sourceTree = "<group>"; };
36
+ 8DD76FA10486AA7600D96B5E /* iphonesim */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = iphonesim; sourceTree = BUILT_PRODUCTS_DIR; };
37
+ /* End PBXFileReference section */
38
+
39
+ /* Begin PBXFrameworksBuildPhase section */
40
+ 8DD76F9B0486AA7600D96B5E /* Frameworks */ = {
41
+ isa = PBXFrameworksBuildPhase;
42
+ buildActionMask = 2147483647;
43
+ files = (
44
+ 8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */,
45
+ );
46
+ runOnlyForDeploymentPostprocessing = 0;
47
+ };
48
+ /* End PBXFrameworksBuildPhase section */
49
+
50
+ /* Begin PBXGroup section */
51
+ 08FB7794FE84155DC02AAC07 /* iphonesim */ = {
52
+ isa = PBXGroup;
53
+ children = (
54
+ 08FB7795FE84155DC02AAC07 /* Source */,
55
+ 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */,
56
+ 1AB674ADFE9D54B511CA2CBB /* Products */,
57
+ );
58
+ name = iphonesim;
59
+ sourceTree = "<group>";
60
+ };
61
+ 08FB7795FE84155DC02AAC07 /* Source */ = {
62
+ isa = PBXGroup;
63
+ children = (
64
+ 24813647115A750000E3A9BA /* iPhoneSimulator.h */,
65
+ 24813648115A750000E3A9BA /* iPhoneSimulator.m */,
66
+ 24813649115A750000E3A9BA /* main.m */,
67
+ 2481364A115A750000E3A9BA /* nsprintf.h */,
68
+ 2481364B115A750000E3A9BA /* nsprintf.m */,
69
+ 32A70AAB03705E1F00C91783 /* iphonesim_Prefix.pch */,
70
+ );
71
+ name = Source;
72
+ sourceTree = "<group>";
73
+ };
74
+ 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = {
75
+ isa = PBXGroup;
76
+ children = (
77
+ 08FB779EFE84155DC02AAC07 /* Foundation.framework */,
78
+ );
79
+ name = "External Frameworks and Libraries";
80
+ sourceTree = "<group>";
81
+ };
82
+ 1AB674ADFE9D54B511CA2CBB /* Products */ = {
83
+ isa = PBXGroup;
84
+ children = (
85
+ 8DD76FA10486AA7600D96B5E /* iphonesim */,
86
+ );
87
+ name = Products;
88
+ sourceTree = "<group>";
89
+ };
90
+ /* End PBXGroup section */
91
+
92
+ /* Begin PBXNativeTarget section */
93
+ 8DD76F960486AA7600D96B5E /* iphonesim */ = {
94
+ isa = PBXNativeTarget;
95
+ buildConfigurationList = 1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "iphonesim" */;
96
+ buildPhases = (
97
+ 8DD76F990486AA7600D96B5E /* Sources */,
98
+ 8DD76F9B0486AA7600D96B5E /* Frameworks */,
99
+ 8DD76F9E0486AA7600D96B5E /* CopyFiles */,
100
+ );
101
+ buildRules = (
102
+ );
103
+ dependencies = (
104
+ );
105
+ name = iphonesim;
106
+ productInstallPath = "$(HOME)/bin";
107
+ productName = iphonesim;
108
+ productReference = 8DD76FA10486AA7600D96B5E /* iphonesim */;
109
+ productType = "com.apple.product-type.tool";
110
+ };
111
+ /* End PBXNativeTarget section */
112
+
113
+ /* Begin PBXProject section */
114
+ 08FB7793FE84155DC02AAC07 /* Project object */ = {
115
+ isa = PBXProject;
116
+ buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "iphonesim" */;
117
+ compatibilityVersion = "Xcode 3.1";
118
+ developmentRegion = English;
119
+ hasScannedForEncodings = 1;
120
+ knownRegions = (
121
+ English,
122
+ Japanese,
123
+ French,
124
+ German,
125
+ );
126
+ mainGroup = 08FB7794FE84155DC02AAC07 /* iphonesim */;
127
+ projectDirPath = "";
128
+ projectRoot = "";
129
+ targets = (
130
+ 8DD76F960486AA7600D96B5E /* iphonesim */,
131
+ );
132
+ };
133
+ /* End PBXProject section */
134
+
135
+ /* Begin PBXSourcesBuildPhase section */
136
+ 8DD76F990486AA7600D96B5E /* Sources */ = {
137
+ isa = PBXSourcesBuildPhase;
138
+ buildActionMask = 2147483647;
139
+ files = (
140
+ 2481364C115A750000E3A9BA /* iPhoneSimulator.m in Sources */,
141
+ 2481364D115A750000E3A9BA /* main.m in Sources */,
142
+ 2481364E115A750000E3A9BA /* nsprintf.m in Sources */,
143
+ );
144
+ runOnlyForDeploymentPostprocessing = 0;
145
+ };
146
+ /* End PBXSourcesBuildPhase section */
147
+
148
+ /* Begin XCBuildConfiguration section */
149
+ 1DEB927508733DD40010E9CD /* Debug */ = {
150
+ isa = XCBuildConfiguration;
151
+ buildSettings = {
152
+ ALWAYS_SEARCH_USER_PATHS = NO;
153
+ COPY_PHASE_STRIP = NO;
154
+ FRAMEWORK_SEARCH_PATHS = (
155
+ "$(inherited)",
156
+ "\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks\"",
157
+ );
158
+ GCC_DYNAMIC_NO_PIC = NO;
159
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
160
+ GCC_MODEL_TUNING = G5;
161
+ GCC_OPTIMIZATION_LEVEL = 0;
162
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
163
+ GCC_PREFIX_HEADER = iphonesim_Prefix.pch;
164
+ INSTALL_PATH = /usr/local/bin;
165
+ PRODUCT_NAME = iphonesim;
166
+ };
167
+ name = Debug;
168
+ };
169
+ 1DEB927608733DD40010E9CD /* Release */ = {
170
+ isa = XCBuildConfiguration;
171
+ buildSettings = {
172
+ ALWAYS_SEARCH_USER_PATHS = NO;
173
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
174
+ FRAMEWORK_SEARCH_PATHS = (
175
+ "$(inherited)",
176
+ "\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks\"",
177
+ );
178
+ GCC_MODEL_TUNING = G5;
179
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
180
+ GCC_PREFIX_HEADER = iphonesim_Prefix.pch;
181
+ INSTALL_PATH = /usr/local/bin;
182
+ PRODUCT_NAME = iphonesim;
183
+ };
184
+ name = Release;
185
+ };
186
+ 1DEB927908733DD40010E9CD /* Debug */ = {
187
+ isa = XCBuildConfiguration;
188
+ buildSettings = {
189
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
190
+ FRAMEWORK_SEARCH_PATHS = /Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks;
191
+ GCC_C_LANGUAGE_STANDARD = gnu99;
192
+ GCC_OPTIMIZATION_LEVEL = 0;
193
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
194
+ GCC_WARN_UNUSED_VARIABLE = YES;
195
+ HEADER_SEARCH_PATHS = .;
196
+ ONLY_ACTIVE_ARCH = NO;
197
+ OTHER_LDFLAGS = (
198
+ "-framework",
199
+ AppKit,
200
+ "-F/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
201
+ "-framework",
202
+ iPhoneSimulatorRemoteClient,
203
+ "-Wl,-rpath",
204
+ "-Wl,/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
205
+ );
206
+ PREBINDING = NO;
207
+ SDKROOT = macosx10.6;
208
+ VALID_ARCHS = "i386 x86_64";
209
+ };
210
+ name = Debug;
211
+ };
212
+ 1DEB927A08733DD40010E9CD /* Release */ = {
213
+ isa = XCBuildConfiguration;
214
+ buildSettings = {
215
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
216
+ FRAMEWORK_SEARCH_PATHS = /Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks;
217
+ GCC_C_LANGUAGE_STANDARD = gnu99;
218
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
219
+ GCC_WARN_UNUSED_VARIABLE = YES;
220
+ HEADER_SEARCH_PATHS = .;
221
+ ONLY_ACTIVE_ARCH = NO;
222
+ OTHER_LDFLAGS = (
223
+ "-framework",
224
+ AppKit,
225
+ "-F/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
226
+ "-framework",
227
+ iPhoneSimulatorRemoteClient,
228
+ "-Wl,-rpath",
229
+ "-Wl,/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
230
+ );
231
+ PREBINDING = NO;
232
+ SDKROOT = macosx10.6;
233
+ VALID_ARCHS = "i386 x86_64";
234
+ };
235
+ name = Release;
236
+ };
237
+ /* End XCBuildConfiguration section */
238
+
239
+ /* Begin XCConfigurationList section */
240
+ 1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "iphonesim" */ = {
241
+ isa = XCConfigurationList;
242
+ buildConfigurations = (
243
+ 1DEB927508733DD40010E9CD /* Debug */,
244
+ 1DEB927608733DD40010E9CD /* Release */,
245
+ );
246
+ defaultConfigurationIsVisible = 0;
247
+ defaultConfigurationName = Release;
248
+ };
249
+ 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "iphonesim" */ = {
250
+ isa = XCConfigurationList;
251
+ buildConfigurations = (
252
+ 1DEB927908733DD40010E9CD /* Debug */,
253
+ 1DEB927A08733DD40010E9CD /* Release */,
254
+ );
255
+ defaultConfigurationIsVisible = 0;
256
+ defaultConfigurationName = Release;
257
+ };
258
+ /* End XCConfigurationList section */
259
+ };
260
+ rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
261
+ }
@@ -0,0 +1,7 @@
1
+ //
2
+ // Prefix header for all source files of the 'iphonesim' target in the 'iphonesim' project.
3
+ //
4
+
5
+ #ifdef __OBJC__
6
+ #import <Foundation/Foundation.h>
7
+ #endif
@@ -81,6 +81,11 @@ module Rhogen
81
81
  template.source = 'app/loading.html'
82
82
  template.destination = "#{name}/app/loading.html"
83
83
  end
84
+
85
+ file :loadingpng do |file|
86
+ file.source = 'app/loading.png'
87
+ file.destination = "#{name}/app/loading.png"
88
+ end
84
89
 
85
90
  directory :helpers do |directory|
86
91
  directory.source = 'app/helpers'
@@ -5,9 +5,11 @@
5
5
  <head>
6
6
 
7
7
  <title><%= class_name %></title>
8
- <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
8
+ <meta name="viewport" content="width=device-width; height=device-height; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
9
9
 
10
- <%% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' %>
10
+ <%% is_bb6 = System::get_property('platform') == 'Blackberry' && (System::get_property('os_version') =~ /^6\.0/) %>
11
+
12
+ <%% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || is_bb6 %>
11
13
  <script src="/public/jqtouch/jquery.1.3.2.min.js" type="text/javascript"></script>
12
14
  <script src="/public/jqtouch/jqtouch.js" type="text/javascript"></script>
13
15
  <link href="/public/jqtouch/jqtouch.css" type="text/css" rel="stylesheet"/>
@@ -21,18 +23,10 @@
21
23
  <link href="/public/css/iphone.css" type="text/css" rel="stylesheet"/>
22
24
  <%% elsif System::get_property('platform') == 'ANDROID' %>
23
25
  <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
26
+ <%% elsif is_bb6 %>
27
+ <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
24
28
  <%% elsif System::get_property('platform') == 'Blackberry' %>
25
- <%% if System::get_property('os_version') =~ /^6\.0/ %>
26
- <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
27
- <!-- Percentage doesnt work here? Set body height to screen height - toolbar height -->
28
- <style>
29
- body {
30
- height: <%%= System::get_property('screen_height').to_i - 62 %>px;
31
- }
32
- </style>
33
- <%% else %>
34
- <link href="/public/css/blackberry.css" type="text/css" rel="stylesheet"/>
35
- <%% end %>
29
+ <link href="/public/css/blackberry.css" type="text/css" rel="stylesheet"/>
36
30
  <%% else %>
37
31
  <link href="/public/css/windows_mobile.css" type="text/css" rel="stylesheet"/>
38
32
  <%% end %>
@@ -13,4 +13,7 @@ iphone:
13
13
  provisionprofile:
14
14
  codesignidentity:
15
15
  entitlements:
16
+ BundleIdentifier: com.rhomobile.<%=@app_name%>
17
+ BundleURLScheme: <%=@app_name%>
18
+
16
19
  extensions: ["json", "another-extension"]
@@ -408,3 +408,99 @@ h1 {
408
408
  margin: 0 8px;
409
409
  color: #565E70;
410
410
  }
411
+
412
+
413
+
414
+ /* Override some styles provided by iphone.css to make them match the real iPhone more closely. */
415
+
416
+ .toolbar {
417
+ background: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgb(176,188,205)), color-stop(0.5, rgb(136,155,179)), color-stop(0.51, rgb(129,149,175)), color-stop(1, rgb(109,132,162)));
418
+ border-top: 1px solid #CDD5Df;
419
+ border-bottom: 1px solid #2D3642;
420
+ }
421
+
422
+ .toolbar a { font-weight: bold; }
423
+
424
+ .pageTitle { width: 50%; margin:0 auto; }
425
+
426
+ .pageTitle h1 {
427
+ text-shadow: rgba(0,0,0,0.6) 0px -1px 0;
428
+ width: 50%; /* Should match pageTitle's width. */
429
+ overflow: hidden;
430
+ text-overflow: ellipsis;
431
+ white-space:nowrap;
432
+ }
433
+
434
+ /* --- Controls the switcher buttons, trying to emulate the native switcher control. --- */
435
+
436
+ /* Use the following pattern in your HTML code to implement it:
437
+
438
+ <div class="switcher">
439
+ <div class="ls-button ls-pressed ls-left"><a href="#">Left Button</a></div>
440
+ <div class="ls-button ls-center"><a href="#">Center Button</a></div>
441
+ <div class="ls-button ls-right ls-disabled"><a href="#">Right Button</a></div>
442
+ </div>
443
+
444
+ */
445
+
446
+ /* Use on the div containing your button options. */
447
+ .switcher {
448
+ text-align:center;
449
+ position:relative;
450
+ position:relative;
451
+ width:250px;
452
+ margin:0 auto;
453
+ padding-top:10px;
454
+ height:30px;
455
+ }
456
+
457
+ /* All button divs must contain an <a> tag with the button's label in it. */
458
+ .switcher a {
459
+ color:#fff;
460
+ text-shadow: rgba(0,0,0,0.5) 0px -1px 0;
461
+ font-weight:bold;
462
+ font-size:smaller;
463
+ }
464
+
465
+ /* Include the .ls-button style on each button div. */
466
+ .switcher .ls-button {
467
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgb(171,185,202)), color-stop(0.5, rgb(130,151,175)), color-stop(0.51, rgb(118,139,167)), color-stop(1, rgb(120,141,169)));
468
+ width:80px; /* NOTE: If you only want to use 2 buttons, increase width to something more like 125px, and change margin to 0 -3px. */
469
+ height:15px;
470
+ display:inline-block;
471
+ padding-bottom:8px;
472
+ margin:0 -2px;
473
+ border:1px solid #000;
474
+ text-align:center;
475
+ }
476
+
477
+ /* Indicates the currently active (pressed) button. */
478
+ .switcher .ls-pressed {
479
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgb(142,164,193)), color-stop(0.5, rgb(88,119,162)), color-stop(0.51, rgb(71,105,153)), color-stop(1, rgb(74,108,152)));
480
+ }
481
+
482
+ .switcher .ls-left {
483
+ -webkit-border-top-left-radius: 4px;
484
+ -webkit-border-bottom-left-radius: 4px;
485
+ }
486
+
487
+ .switcher .ls-center {
488
+ border-right:none;
489
+ border-left:none;
490
+ }
491
+
492
+ .switcher .ls-right {
493
+ -webkit-border-top-right-radius: 4px;
494
+ -webkit-border-bottom-right-radius: 4px;
495
+ }
496
+
497
+ /* If an option should not be available, you can use the .ls-disabled class to gray it out. */
498
+ .switcher .ls-disabled {
499
+ background:-webkit-gradient(linear, left bottom, left top, color-stop(0, rgb(158,158,158)), color-stop(0.95, rgb(204,204,204)))
500
+ }
501
+
502
+ /* However, even with disabled classes you must still include an <a> tag. Just have it go href="#" */
503
+ .switcher .ls-disabled a {
504
+ color:#f0f0f0;
505
+ }
506
+
@@ -91,7 +91,8 @@
91
91
  submitSelector: '.submit',
92
92
  swapSelector: '.swap',
93
93
  useAnimations: true,
94
- useFastTouch: true // Experimental.
94
+ // useFastTouch: true // Experimental.
95
+ useFastTouch: false // Rho: default to false for this feature. May cause double-click bug.
95
96
  };
96
97
  jQTSettings = $.extend({}, defaults, options);
97
98
 
@@ -30,3 +30,5 @@ logname='<%=@app_name%>'
30
30
 
31
31
  # Hides forward button and animates back button transition
32
32
  jqtouch_mode=1
33
+
34
+ splash_screen='zoom'
data/rhodes.gemspec CHANGED
@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = %q{rhodes}
6
- s.version = '2.2.4.beta.1'
6
+ s.version = '2.2.5.beta.1'
7
7
 
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9
9
  s.authors = ["Rhomobile"]