This is a conflict in your file. You must fix this yourself. Google for
"svn conflict". Hope this helps.
Sebastian
Sirichoke schrieb:
Please see the code below: (Notice: line start with ">>>>")
frVBL is VerticalBoxLayout (see the attached image)
var salesOrderItemDetail = this._salesOrderItemDetail = new
qx.ui.layout.GridLayout;
frVBL.add(salesOrderItemDetail);
with (salesOrderItemDetail)
{
set({ height : "2*", maxHeight : 250, right:5});
setBorder(qx.renderer.border.BorderPresets.outset);
//setBackgroundColor('black');
setPadding(8);
setColumnCount(4);
setRowCount(6);
setVerticalSpacing(4);
setHorizontalSpacing(6);
setColumnWidth(0, 5);
setColumnWidth(1, 120);
setColumnWidth(2, 120);
setColumnWidth(3, 120);
setColumnHorizontalAlignment(0, "center");
setColumnVerticalAlignment(0, "middle");
setRowHeight(0, 15);
setRowHeight(1, 25);
setRowHeight(2, 15);
setRowHeight(3, 25);
setRowHeight(4, 15);
setRowHeight(5, 80);
>>>> mergeCells(0, 0, 2, 1);
mergeCells(1, 1, 2, 1);
mergeCells(1, 4, 2, 1);
mergeCells(1, 5, 2, 1);
>>>> add(new qx.ui.embed.HtmlEmbed("<B>Product
Description</B>"), 0, 0);
add(new qx.ui.embed.HtmlEmbed("<B>CalculateType</B>"), 3, 0);
add(new qx.ui.embed.HtmlEmbed("<B>Unit Price</B>"), 1, 2);
add(new qx.ui.embed.HtmlEmbed("<B>Currency</B>"), 2, 2);
add(new qx.ui.embed.HtmlEmbed("<B>Description</B>"), 1, 4);
add(iproductID, 1, 1);
add(icalculateTypeID, 3, 1);
add(iunitPrice, 1, 3);
add(icurrencyID, 2, 3);
add(icomment, 1, 5);
}
dperez wrote:
Hi Sirichoke,
It would be better if you could us provide an example.
Sirichoke Kunnavatsuwan wrote:
If mergecell start at col 0.
The GridLayout will incorrect render.
But if merge start from col 1, that's fine...
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services,
security?
Get stuff done quickly with pre-integrated technology to make your job
easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache
Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
qooxdoo-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/qooxdoo-devel
------------------------------------------------------------------------
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
------------------------------------------------------------------------
_______________________________________________
qooxdoo-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/qooxdoo-devel
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
qooxdoo-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/qooxdoo-devel
