In .net, changed bold, italic, underline, and wrap to TriState. Also in .net, Excel...

git-svn-id: svn://svn.code.sf.net/p/openrico/code/trunk/rico3@89 53df2df2-7ab5-4331-af62-ea79255fa4e2

diff --git a/bin/Rico.dll b/bin/Rico.dll
index 3b6d808..9324592 100644 (file)
Binary files a/bin/Rico.dll and b/bin/Rico.dll differ

diff --git a/bin/Rico.xml b/bin/Rico.xml
index 5b65d98..cbc7804 100644 (file)
--- a/bin/Rico.xml
+++ b/bin/Rico.xml
@@ -239,44 +239,49 @@ Rico
                        <item><description>P=parentheses</description></item>\r
                </list>\r
        </summary>\r
-       <remarks></remarks>\r
 </member><member name="F:Rico.Column.prefix">\r
        <summary>\r
  If column is a number, this string is prepended to the number before display.\r
  Useful for currency symbols.\r
  </summary>\r
-       <remarks></remarks>\r
 </member><member name="F:Rico.Column.suffix">\r
        <summary>\r
  If column is a number, this string is appended to the number before display.\r
  Useful for percentages and temperature values. Automatically set to % if DataType is percent.\r
  </summary>\r
-       <remarks></remarks>\r
+</member><member name="F:Rico.Column.HdgStyleID">\r
+       <summary>\r
+ Used to give the column heading a specific style.\r
+ In most cases this is not necessary, as the heading will be styled according to the theme.\r
+ </summary>\r
 </member><member name="F:Rico.Column.isNullable">\r
        <summary>\r
  Database property - set automatically by LiveGrid.GetColumnInfoFromDb()\r
  </summary>\r
-       <remarks></remarks>\r
 </member><member name="F:Rico.Column.Writeable">\r
        <summary>\r
  Database property - set automatically by LiveGrid.GetColumnInfoFromDb()\r
  </summary>\r
-       <remarks></remarks>\r
 </member><member name="F:Rico.Column.isKey">\r
        <summary>\r
  Database property - set automatically by LiveGrid.GetColumnInfoFromDb()\r
  </summary>\r
-       <remarks></remarks>\r
 </member><member name="F:Rico.Column.Length">\r
        <summary>\r
  Database property - set automatically by LiveGrid.GetColumnInfoFromDb()\r
  </summary>\r
-       <remarks></remarks>\r
 </member><member name="F:Rico.Column.TypeName">\r
        <summary>\r
  Database property - set automatically by LiveGrid.GetColumnInfoFromDb()\r
  </summary>\r
-       <remarks></remarks>\r
+</member><member name="F:Rico.Column.ColGroupIdx">\r
+       <summary>\r
+ For internal use\r
+ </summary>\r
+</member><member name="P:Rico.Column.Heading">\r
+       <summary>\r
+ Text displayed in the column heading.\r
+ </summary>\r
 </member><member name="P:Rico.Column.Width">\r
        <summary>\r
  Initial width of the column in pixels. Default is to use LiveGrid.defaultWidth.\r
@@ -395,6 +400,10 @@ Rico
        <summary>\r
  Number of frozen columns on the left (or right if direction=rtl). Default is 0.\r
  </summary>\r
+</member><member name="F:Rico.GridBase.RowLineHtEms">\r
+       <summary>\r
+ Height of one line of text in ems. Default is 1.2, which should be fine for almost all situations.\r
+ </summary>\r
 </member><member name="P:Rico.GridBase.menuEvent">\r
        <summary>\r
  Specifies when the grid's popup menu should be invoked \r
@@ -566,10 +575,12 @@ Rico
                        <item><description>jquery/1.3/jquery.min.js</description></item>\r
                        <item><description>jquery/1.4/jquery.min.js</description></item>\r
                        <item><description>jquery/1.5/jquery.min.js</description></item>\r
+                       <item><description>jquery/1.6/jquery.min.js</description></item>\r
                        <item><description>mootools/1.2/mootools-yui-compressed.js</description></item>\r
                        <item><description>mootools/1.3/mootools-yui-compressed.js</description></item>\r
                        <item><description>dojo/1.4/dojo/dojo.xd.js</description></item>\r
                        <item><description>dojo/1.5/dojo/dojo.xd.js</description></item>\r
+                       <item><description>dojo/1.6/dojo/dojo.xd.js</description></item>\r
                        <item><description>ext-core/3.0/ext-core.js</description></item>\r
                        <item><description>ext-core/3.1/ext-core.js</description></item>\r
                </list>\r

diff --git a/examples/dotnet/ex2notheme.aspx b/examples/dotnet/ex2notheme.aspx
index 922858d..32f8ed5 100644 (file)
--- a/examples/dotnet/ex2notheme.aspx
+++ b/examples/dotnet/ex2notheme.aspx
@@ -44,8 +44,8 @@ Click on a cell to see available actions.
 </div>\r
 \r
 <Rico:LiveGrid runat='server' id='ex2notheme' fmt="json" DefaultSort='OrderID' menuEvent='click' frozenColumns='1' HdgHoverStyleId="GrayText" highlightElem='cursorRow'>\r
-  <Rico:Style runat='server' StyleID='DefaultHdg' BackColor="black" ForeColor="white" HorizontalAlign="center" />\r
-  <Rico:Style runat='server' StyleID='RedHdg' BackColor="red" ForeColor="white" HorizontalAlign="center" />\r
+  <Rico:Style runat='server' StyleID='DefaultHdg' BackColor="black" ForeColor="white" HorizontalAlign="center" Bold="true" />\r
+  <Rico:Style runat='server' StyleID='RedHdg' BackColor="red" ForeColor="white" HorizontalAlign="center" Bold="true" />\r
   <Rico:Style runat='server' StyleID='GrayText' ForeColor="#dddddd" />\r
   <Rico:Style runat='server' StyleID='ricoLG_oddRow' BackColor="#eeeeee" />\r
   <Rico:Style runat='server' StyleID='ricoLG_selection' BackColor="yellow" />\r

diff --git a/minsrc/ricoLiveGridForms.js b/minsrc/ricoLiveGridForms.js
index 80894f7..2559e96 100644 (file)
--- a/minsrc/ricoLiveGridForms.js
+++ b/minsrc/ricoLiveGridForms.js
@@ -54,7 +54,7 @@ Rico.TableEdit.prototype = {
     this.saveMsg=Rico.$(liveGrid.tableId+'_savemsg');
     Rico.eventBind(document,"click", Rico.eventHandle(this,'clearSaveMsg'));
     this.extraMenuItems=[];
-    this.responseHandler=function() { self.processResponse(); };
+    this.responseHandler=function(xhr) { self.processResponse(xhr); };
     Rico.log("Rico.TableEdit.initialize complete");
   },
 
@@ -663,15 +663,17 @@ Rico.TableEdit.prototype = {
 
   processResponse: function(xhr) {
     var responseText,success=true;
-    Rico.log('Processing response from form submittal');
+    Rico.log('Processing response from form submittal: '+typeof(xhr));
     this.responseDiv.innerHTML=xhr.responseText;
     var respNodes=Rico.select('.ricoFormResponse',this.responseDiv);
     if (respNodes) {
       // generate a translated response
+      Rico.log('Found ricoFormResponse');
       var phraseId=Rico.trim(respNodes[0].className).split(/\s+/)[1];
       responseText=Rico.getPhraseById(phraseId,this.options.RecordName);
     } else {
       // present the response as sent from the server (untranslated)
+      Rico.log('Processing response text');
       var ch=this.responseDiv.childNodes;
       for (var i=ch.length-1; i>=0; i--) {
         if (ch[i].nodeType==1 && ch[i].nodeName!='P' && ch[i].nodeName!='DIV' && ch[i].nodeName!='BR')

diff --git a/ricoClient/js/rico_min.js b/ricoClient/js/rico_min.js
index 63dfe8c..b02d1bf 100644 (file)
--- a/ricoClient/js/rico_min.js
+++ b/ricoClient/js/rico_min.js
@@ -4237,7 +4237,7 @@ this.createEditDiv();
 this.saveMsg=Rico.$(b.tableId+"_savemsg");
 Rico.eventBind(document,"click",Rico.eventHandle(this,"clearSaveMsg"));
 this.extraMenuItems=[];
-this.responseHandler=function(){a.processResponse()
+this.responseHandler=function(c){a.processResponse(c)
 };
 Rico.log("Rico.TableEdit.initialize complete")
 },createKeyArray:function(){this.keys=[];
@@ -4632,12 +4632,14 @@ this.responseDialog.style.top=a.top+"px";
 this.responseDialog.style.left=a.left+"px";
 this.responseDialog.style.display=""
 },processResponse:function(g){var d,f=true;
-Rico.log("Processing response from form submittal");
+Rico.log("Processing response from form submittal: "+typeof(g));
 this.responseDiv.innerHTML=g.responseText;
 var e=Rico.select(".ricoFormResponse",this.responseDiv);
-if(e){var c=Rico.trim(e[0].className).split(/\s+/)[1];
+if(e){Rico.log("Found ricoFormResponse");
+var c=Rico.trim(e[0].className).split(/\s+/)[1];
 d=Rico.getPhraseById(c,this.options.RecordName)
-}else{var b=this.responseDiv.childNodes;
+}else{Rico.log("Processing response text");
+var b=this.responseDiv.childNodes;
 for(var a=b.length-1;
 a>=0;
 a--){if(b[a].nodeType==1&&b[a].nodeName!="P"&&b[a].nodeName!="DIV"&&b[a].nodeName!="BR"){this.responseDiv.removeChild(b[a])