rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/wm/rhodes/rhodes.vcproj

@@ -970,6 +970,10 @@
 				RelativePath=".\Vibrate.h"
 				>
 			</File>
+			<File
+				RelativePath=".\OkCancelModalDialog.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

data/platform/wm/tools/detool/detool.cpp

@@ -7,24 +7,37 @@
 
 #define RHOSETUP_DLL "rhosetup.dll"
 
+void checkMDEstart(HRESULT hr) 
+{
+	if (FAILED(hr)) {
+		if (hr == REGDB_E_CLASSNOTREG) {
+			printf ("Microsoft Device Emulator is too old or corrupted. Please update it.\n");
+			printf ("You could get the latest version on:\n");
+			printf ("http://www.microsoft.com/downloads/details.aspx?familyid=a6f6adaf-12e3-4b2f-a394-356e2c2fb114\n");
+		} else {
+			wprintf_s(L"Error: Unable to instantiate DeviceEmulatorManager. ErrorCode=0x%08X\n", hr);
+		}
+	}
+}
 
 DWORD WINAPI startDEM(LPVOID lpParam)
 {
 	if (SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED))) {
-        HRESULT hr;
+        HRESULT hr = 0;
 
 		CComPtr<IDeviceEmulatorManager> pDeviceEmulatorManager;
 		hr = pDeviceEmulatorManager.CoCreateInstance(__uuidof(DeviceEmulatorManager));
 		if (FAILED(hr)) {
-			wprintf_s(L"Error: Unable to instantiate DeviceEmulatorManager. ErrorCode=0x%08X\n", hr);
-			return false;
+			checkMDEstart(hr);
+			ExitProcess(EXIT_FAILURE);
+			return hr;
 		}
 		
 		pDeviceEmulatorManager->ShowManagerUI(false);
 		while (1) {
 			Sleep(600 * 1000);
 		}
-		return true;
+		return hr;
         CoUninitialize();
     }
 	return 0;

data/rakefile.rb

@@ -84,7 +84,12 @@ namespace "config" do
     extpaths << File.join($app_path, "extensions")
     extpaths << "lib/extensions"
     $app_config["extpaths"] = extpaths
-    
+
+    if $app_config["build"] and $app_config["build"] == "release"
+      $debug = false
+    else
+      $debug = true
+    end
   end
 
   out = `javac -version 2>&1`
@@ -211,6 +216,17 @@ def common_bundle_start(startdir, dest)
       end
     end
 
+    if extpath.nil?
+      begin
+        $rhodes_extensions = nil
+        require extname
+        extpath = $rhodes_extensions[0] unless $rhodes_extensions.nil?
+      rescue Exception => e
+        
+      end
+
+    end
+
     unless extpath.nil?
       add_extension(extpath, dest)
 
@@ -286,6 +302,16 @@ def common_bundle_start(startdir, dest)
   cp_r app + '/public', File.join($srcdir,'apps')
   cp   app + '/rhoconfig.txt', File.join($srcdir,'apps')
 
+
+  unless $debug
+    rm_rf $srcdir + "/apps/app/test"
+    rm_rf $srcdir + "/apps/app/SpecRunner"
+    rm_rf $srcdir + "/apps/app/mspec"
+    rm_rf $srcdir + "/apps/app/mspec.rb"
+    rm_rf $srcdir + "/apps/app/spec_runner.rb"
+  end
+
+
   copy_assets($assetfolder) if ($assetfolder and File.exists? $assetfolder)
 
   chdir File.join($srcdir,'apps')
@@ -307,14 +333,34 @@ end
 
 def create_manifest
   dir = File.join($srcdir, 'apps')
-  fname = "config.rb"
+  #fname = "config.rb"
   fappManifest = File.new( File.join(dir,'app_manifest.txt'), "w")
+  dir = File.join($srcdir, 'apps/app')
 
   Find.find(dir) do |path|
+
+    strDir = File.dirname(path)
+    next unless dir == File.dirname(strDir) #one level only
+    
+    if File.basename(path) == "config.rb"
+        puts "******ERROR enumerating models***********"
+        puts "Model definition has changed and doesn't use config.rb anymore: '#{path}' "
+        puts "You should replace config.rb with <model_name>.rb file as described: "
+        puts "http://wiki.rhomobile.com/index.php/Rhom#Rhom_Models_2.0"
+        puts "*****************************************"
+        exit 1
+    end
+    
+    fname = File.dirname(path)
+    fname = File.basename(fname)
+    modelname = fname.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
+    fname = modelname + ".rb"
+  
     if File.basename(path) == fname
 
       relPath = path[dir.length+1, File.dirname(path).length-1]   #relative path
-      relPath = relPath[0, relPath.length-3] #remove .rb extension
+      relPath = relPath[0, relPath.length-3] #remove .rb extension and app
+      relPath = File.join(File.dirname(relPath), modelname )
       fappManifest.puts( relPath )
 
     end

data/res/build-tools/db/syncdb.schema

@@ -23,7 +23,7 @@ CREATE TABLE sources (
  source_id BIGINT PRIMARY KEY,
  name VARCHAR(255) default NULL,
  token BIGINT default NULL,
- priority BIGINT,
+ sync_priority BIGINT,
  partition VARCHAR(255),
  sync_type VARCHAR(255),
  metadata varchar default NULL, 
@@ -36,7 +36,7 @@ CREATE TABLE sources (
  source_attribs varchar default NULL,
  schema varchar default NULL,
  schema_version varchar default NULL,
- links varchar default NULL,
+ associations varchar default NULL,
  blob_attribs varchar default NULL);
 CREATE INDEX by_src_id on object_values (source_id);
 CREATE UNIQUE INDEX by_src_object ON object_values (object, attrib, source_id);

data/res/generators/rhogen.rb

@@ -136,11 +136,11 @@ module Rhogen
     third_argument :priority, :required => false, :desc => "optional sync priority (i.e. 100)"
     fourth_argument :type, :required => false, :desc => "optional type (i.e. \"ask\" for an ask model)"
 
-    template :config do |template|
-      @model_sync_server = syncserver_exists? ? class_name : ''
-      template.source = 'config.rb'
-      template.destination = "app/#{name.camel_case}/config.rb"
-    end
+    #template :config do |template|
+    #  @model_sync_server = syncserver_exists? ? class_name : ''
+    #  template.source = 'config.rb'
+    #  template.destination = "app/#{name.camel_case}/config.rb"
+    #end
 
     template :index do |template|
       template.source = 'index.erb'
@@ -197,7 +197,7 @@ module Rhogen
     template :spec do |template|
       underscore_name = name.camel_case.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
       template.source = 'spec.rb'
-      template.destination = "app/#{name.camel_case}/#{underscore_name}_spec.rb"
+      template.destination = "app/test/#{underscore_name}_spec.rb"
     end
 
     def attributes?
@@ -238,10 +238,10 @@ module Rhogen
       directory.source = 'app/mspec'
       directory.destination = "app/mspec"
     end
-    directory :spec do |directory|
-      directory.source = 'app/spec'
-      directory.destination = "app/spec"
-    end
+    #directory :spec do |directory|
+    #  directory.source = 'app/spec'
+    #  directory.destination = "app/spec"
+    #end
     template :fileutils do |template|
       template.source = 'app/fileutils.rb'
       template.destination = "app/fileutils.rb"

data/res/generators/templates/application/app/helpers/browser_helper.rb

@@ -1,13 +1,18 @@
 module BrowserHelper
-  
+
   def placeholder(label=nil)
     "placeholder='#{label}'" if platform == 'apple'
   end
 
-  
   def platform
     System::get_property('platform').downcase
   end
-  
-  
+
+  def selected(option_value,object_value)
+    "selected=\"yes\"" if option_value == object_value
+  end
+
+  def checked(option_value,object_value)
+    "checked=\"yes\"" if option_value == object_value
+  end
 end

data/res/generators/templates/application/app/index.bb.erb

@@ -13,11 +13,11 @@
 
 
 <div id="content">
-
-    <ul>
-    	<li>Add links here...</li>
-    </ul>
-
+    <table>
+      <tr>
+        <td class="recordLabel">Add links here...</td>
+      </tr>
+    </table>
 </div>
 
 

data/res/generators/templates/application/build.yml

@@ -3,6 +3,7 @@ sdkversion: <%=Rhodes::VERSION%>
 name: <%=@app_name%>
 version: 1.0
 vendor: rhomobile
+build: debug
 bbver: 4.6
 wmsdk: "Windows Mobile 6 Professional SDK (ARMV4I)"
 applog: rholog.txt

data/res/generators/templates/application/public/css/android.css

@@ -31,7 +31,7 @@ div#toolbar {
 }
 
 div#toolbar div#leftItem,
-div#toolbar div#centerItem, 
+div#toolbar div#centerItem,
 div#toolbar div#rightItem {
     display: table-cell;
 }
@@ -42,9 +42,9 @@ div#toolbar a {
     display: block;
 }
 
-div#toolbar .deleteButton, 
-div#toolbar .regularButton, 
-div#toolbar .blueButton, 
+div#toolbar .deleteButton,
+div#toolbar .regularButton,
+div#toolbar .blueButton,
 div#toolbar .backButton {
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, white),color-stop(0.5, #ccc), color-stop(1.0, #bdbebd));
     -webkit-border-radius: 1px;
@@ -228,7 +228,7 @@ div#content form textarea {
     box-shadow:0 -1px 3px #000000;
 }
 
-div#content form input[type="text"], 
+div#content form input[type="text"],
 div#content form input[type="password"] {
     float: right;
     height: 40px;
@@ -243,11 +243,11 @@ div#content form input[type="password"] {
     box-shadow:0 -1px 3px #000000;
 }
 
-div#content form button.standardButton {
+div#content form input.standardButton {
     height: 45px;
-    margin-top: 2px;
-    margin-bottom: 2px;
+    margin: 2px 0 2px 0;
     -webkit-border: 2px;
+    width:100%;
 }
 
 /* Settings */
@@ -278,6 +278,8 @@ div#content div.standardButton a {
 
 div#content ul#settings li.alertMessage{
     text-align: center;
+    height: 45px;
+    line-height:45px;
 }
 
 div#content ul#settings li.alertMessage span.message{

data/res/generators/templates/application/public/css/blackberry.css

@@ -3,19 +3,19 @@ body {
     margin: 0;
     font-family: Arial, Helvetica;
     font-size:16px;
-		background: white;
+	background: white;
     color: black;
     overflow-x: hidden;
 }
 
 div#pageTitle {
-		background: black;
+	background: black;
     width: auto;
 }
 
 div#pageTitle h1 {
-		margin: 0;
-		padding: 4px;
+	margin: 0;
+	padding: 4px;
     width: auto;
     font-size: 16px;
     max-height: 16px;
@@ -35,6 +35,10 @@ div#toolbar{
 	width:100%;
 }
 
+div#toolbar .noButton {
+    display:hidden;
+}
+
 /*content div styling*/
 div#content h2 {
 	font-size:15px;
@@ -59,39 +63,17 @@ div#content div.warning{
 }
 
 div#content p{
-	font-size:14px; 
-}
-
-/* bb list styles */
-div#content ul {
-	margin: 0;
-	padding: 0;
-}
-
-div#content ul li {
-	list-style-type :none;
-	border-bottom:1px solid lightgray;
-	height: 25px;
-	line-height:25px;
-	padding:0 5px 0 5px;
-}
-
-div#content ul li a {
-	text-decoration: none;
-	font-weight:bold;
-	color:black;
-	display:block;
-	overflow: hidden; 
+	font-size:14px;
 }
 
 /* bb table styles */
 
 div#content table {
-  display:block;
+    display:block;
 	border:none;
 	border-spacing:0;
-  font-size: 80%;
-	margin:4px;
+    font-size: 80%;
+    width:100%;
 }
 
 div#content table th {
@@ -100,7 +82,34 @@ div#content table th {
 	border-bottom:1px solid #BBBBBB;
 }
 
+div#content table tr {
+    width:100%;
+}
 div#content table tr td {
-	padding:5px;
 	margin:0;
+    border-bottom:1px solid lightgray;
+	height: 25px;
+	line-height:25px;
+}
+
+div#content table tr td a {
+	text-decoration: none;
+	font-weight:bold;
+	color:black;
+	display:block;
+	overflow: hidden;
+}
+
+div#content table tr td.recordLabel {
+    width:100%;
+    padding: 5px;
+}
+
+div#content table tr td.itemLabel {
+    width:50%;
+    font-weight:bold;
 }
+
+div#content table tr td.itemValue {
+    width:50%;
+}

data/res/generators/templates/application/public/css/iphone.css

@@ -74,8 +74,8 @@ div#toolbar .backButton {
     z-index: 3;
 }
 
-div#toolbar .deleteButton, 
-div#toolbar .regularButton, 
+div#toolbar .deleteButton,
+div#toolbar .regularButton,
 div#toolbar .blueButton {
    -webkit-border-radius: 5px;
     overflow: hidden;
@@ -121,7 +121,7 @@ div#content .standardButton {
     color: #436395;
     font-size: 15px;
     font-weight: bold;
-		width:100%;
+	width:100%;
     height: 40px;
     border: 1px solid black;
     margin-top:10px;
@@ -354,7 +354,7 @@ div#content ul#settings li.alertMessage{
 div#content ul#settings li span {
 	line-height:40px;
 }
- 
+
 div#content ul#settings li.alertMessage span.message{
 		color: red;
 }

data/res/generators/templates/application/public/css/webkit.css

@@ -9,6 +9,13 @@ div#content {
     height: 100%;
 }
 
+/* Toolbar */
+
+div#toolbar .noButton {
+    display:hidden;
+}
+
+
 /* Lists */
 
 div#content ul {

data/res/generators/templates/application/public/css/windows_mobile.css

@@ -7,14 +7,14 @@ body {
 
 /* page title */
 div#pageTitle {
-    display:none;    
+    display:none;
 }
 
 /* toolbar */
 div#toolbar {
 	width:100%;
 	height: 30px;
-	background: black;  
+	background: black;
 	border-bottom:1px solid gray;
 }
 div#toolbar a {
@@ -38,6 +38,11 @@ div#toolbar div#rightItem {
     margin-right:5px;
 }
 
+div#toolbar .noButton {
+    display:hidden;
+}
+
+
 /* content */
 div#content {
 	width: 100%;
@@ -60,39 +65,38 @@ div#content h2.groupTitle{
 /* Lists */
 div#content ul {
     margin: 0;
-    padding: 0; 
+    padding: 0;
     width: 100%;
 }
 
 div#content ul li {
     list-style-type:none;
-    height: 30px;  
-    width: 100%;  
+    height: 30px;
+    width: 100%;
     border-bottom: 1px solid black;
     margin:0;
-		padding:0;
+	padding:0;
     overflow: hidden;
-		clear:both;
+	clear:both;
 }
 
-div#content ul li span.title {
-  	margin: 10px 5px 10px 5px;
-		font-size: 12px;
-		font-weight: bold;
-		line-height:30px;
+div#content ul li a span.title {
+  	margin: 0 5px 0 5px;
+    padding: 0;
+	font-size: 12px;
+	font-weight: bold;
+	line-height: 30px;
+    height: 30px;
     display:block;
 }
 
 div#content ul li a {
     text-decoration:none;
     display:block;
-    color: black; 
+    color: black;
+    height:30px;
+    line-height:30px;
 }
-div#content ul li a span.title {
-    margin: 0 5px 0 5px;
-		float: left;
-}
-
 
 div#content ul li a span.disclosure_indicator {
     display:none;
@@ -101,10 +105,10 @@ div#content ul li a span.disclosure_indicator {
 }
 
 div#content ul li div {
-  width: 45%;
-  line-height:30px;
-  margin: 0 5px;
-}	
+    width: 45%;
+    line-height:30px;
+    margin: 0 5px;
+}
 div#content ul li div.itemLabel {
     float:left;
     font-weight:bold;
@@ -126,7 +130,7 @@ div#content ul#settings li div {
 }
 
 div#content ul#settings li span.clientID {
-    font-size:60%;    
+    font-size:60%;
     float:right;
 		display:block;
 		height:20px;
@@ -149,7 +153,7 @@ div#content div#reset  {
 
 /* forms */
 div#content form {
-    margin: 0;  
+    margin: 0;
     padding:0;
 }
 
@@ -157,18 +161,18 @@ div#content form h4 {
     background-color:black;
     color:white;
     display:block;
-    padding: 5px;   
+    padding: 5px;
     margin:0;
 }
 
 
 div#content form ul {
-    margin: 0;  
+    margin: 0;
     padding:0;
 }
 
 div#content form ul li {
-    height: 40px; 
+    height: 40px;
 }
 div#content form ul li.textarea {
 		height:110px;

data/res/generators/templates/application/rhoconfig.txt

@@ -18,6 +18,6 @@ ExcludeLogCategories =
 KeepTrackOfLastVisitedPage = 0 
 LastVisitedPage = ''
 
-# Sync server url.  This must be the full path to your sources.  
-# For example: http://rhomobile.rhohub.com/apps/SugarCRM/sources/
+# Sync server url. Typically this will look like 'http://<hostname>:<port>/application'
+# For example: 'http://localhost:9292/application'
 syncserver = '<%=syncserver%>'

data/res/generators/templates/model/edit.bb.erb

@@ -14,8 +14,8 @@
             <table>
         		<% attributes.each do |attribute| %>
                     <tr>
-            			<td width="125" class="fieldLabel"><%= humanize(attribute) %>: </td>
-              			<td><input type="text" name="<%= name.downcase %>[<%= attribute %>]" value="<%%= @<%= name.downcase %>.<%= attribute %> %>"/></td>
+            			<td class="itemLabel"><%= humanize(attribute) %>: </td>
+              			<td class="itemValue"><input type="text" name="<%= name.downcase %>[<%= attribute %>]" value="<%%= @<%= name.downcase %>.<%= attribute %> %>"/></td>
           		    </tr>
         		<% end %>
             </table>

data/res/generators/templates/model/index.bb.erb

@@ -9,13 +9,15 @@
 </div>
 
 <div id="content">
-    <ul>
+  <table>
+    <tr>
     <%% @<%= name.downcase.pluralize %>.each do |obj| %>
     	<% if self.attributes? %>
-    	    <li><%%= link_to "#{obj.<%= attributes[0] %>}", :action => :show, :id => obj.object %></li>
+    	    <td class="recordLabel"><%%= link_to "#{obj.<%= attributes[0] %>}", :action => :show, :id => obj.object %></td>
     	<% else %>
-    	    <li>Some list entry...</li>
+    	    <td class="recordLabel">Some list entry...</td>
     	<% end %>
     <%% end %>
-    </ul>
+    </tr>
+  </table>
 </div>

data/res/generators/templates/model/model.rb

@@ -1,6 +1,7 @@
 # The model has already been created by the framework, and extends Rhom::RhomObject
 # You can add more methods here
-
 class <%= class_name %>
+  include Rhom::PropertyBag
+  
   #add model specifc code here
 end

data/res/generators/templates/model/new.bb.erb

@@ -14,8 +14,8 @@
         <table>
     		<% attributes.each do |attribute| %>
     		  <tr>
-    			  <td width="125"><%= humanize(attribute) %>: </td>
-    			  <td><input type="text" name="<%= name.downcase %>[<%= attribute %>]"/></td>
+    			  <td class="itemLabel"><%= humanize(attribute) %>: </td>
+    			  <td class="itemValue"><input type="text" name="<%= name.downcase %>[<%= attribute %>]"/></td>
     		  </tr>
     		<% end %>
         </table>

data/res/generators/templates/model/show.bb.erb

@@ -13,8 +13,8 @@
     <table>
       <% attributes.each do |attribute| %>
       <tr>
-    	<td><%= attribute.camelize %></td>
-        <td><%%= @<%= name.downcase %>.<%= attribute %>%></td>
+    	<td class="itemLabel"><%= attribute.camelize %></td>
+        <td class="itemValue"><%%= @<%= name.downcase %>.<%= attribute %>%></td>
       </tr>
       <% end %>
     </table>