diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java index 7f8b91f0a7..af5e1b108f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java @@ -52,7 +52,7 @@ public class AdempiereIdGenerator implements IdGenerator { boolean useIdSpace = true; if (Util.isEmpty(uuid)) { useIdSpace = false; - String attribute = comp.getWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME); + String attribute = comp.getClientAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME); if (!Util.isEmpty(attribute)) { String widgetName = getWidgetName(comp.getWidgetClass()); uuid = widgetName+"0"+attribute; @@ -156,7 +156,7 @@ public class AdempiereIdGenerator implements IdGenerator { } if (Util.isEmpty(id)) { - String attribute = comp.getWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME); + String attribute = comp.getClientAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME); if (attribute != null && attribute.length() > 0) { String widgetName = getWidgetName(comp.getWidgetClass()); locatorBuilder.append("@") @@ -171,7 +171,7 @@ public class AdempiereIdGenerator implements IdGenerator { Component parent = comp.getParent(); while(parent != null) { if (Util.isEmpty(id) || (parent instanceof IdSpace)) { - String parentLocator = parent.getWidgetAttribute(ZK_LOCATOR_ATTRIBUTE); + String parentLocator = parent.getClientAttribute(ZK_LOCATOR_ATTRIBUTE); if (parentLocator != null && parentLocator.trim().length() > 0) { locatorBuilder.insert(0, parentLocator+ " "); break; @@ -180,6 +180,6 @@ public class AdempiereIdGenerator implements IdGenerator { parent = parent.getParent(); } - comp.setWidgetAttribute(ZK_LOCATOR_ATTRIBUTE, locatorBuilder.toString()); + comp.setClientAttribute(ZK_LOCATOR_ATTRIBUTE, locatorBuilder.toString()); } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java index 287e284296..feee381617 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java @@ -22,6 +22,8 @@ import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.ListboxFactory; import org.adempiere.webui.component.VerticalBox; import org.adempiere.webui.component.Window; +import org.adempiere.webui.util.ZKUpdateUtil; +import org.apache.ecs.xhtml.center; import org.compiere.model.MAttachmentEntry; import org.compiere.util.CLogger; import org.zkoss.util.media.AMedia; @@ -62,7 +64,7 @@ public class FedexLabelWindow extends Window implements EventListener private void init() { this.setBorder("normal"); - this.setWidth("730px"); + ZKUpdateUtil.setWidth(this, "730px"); VerticalBox box = new VerticalBox(); this.appendChild(box); lbx = ListboxFactory.newDropdownListbox(); @@ -75,8 +77,8 @@ public class FedexLabelWindow extends Window implements EventListener box.appendChild(new Separator()); content = new Iframe(); - content.setHeight("500px"); - content.setWidth("700px"); + ZKUpdateUtil.setHeight(content, "500px"); + ZKUpdateUtil.setWidth(content, "700px"); content.setId("content"); content.setName(content.getUuid()); box.appendChild(content); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LabelAppletWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LabelAppletWindow.java index 0151d1f361..263f70461d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LabelAppletWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LabelAppletWindow.java @@ -18,6 +18,7 @@ import java.util.logging.Level; import org.adempiere.webui.component.ToolBarButton; import org.adempiere.webui.component.Window; +import org.adempiere.webui.util.ZKUpdateUtil; import org.compiere.model.MArchive; import org.compiere.util.CLogger; import org.compiere.util.Env; @@ -50,8 +51,8 @@ public class LabelAppletWindow extends Window implements EventListener Applet applet = new Applet(); applet.setCode("PrintLabelApplet.class"); applet.setArchive("labelapplet.jar"); - applet.setWidth("0"); - applet.setHeight("0"); + ZKUpdateUtil.setWidth(applet, "0"); + ZKUpdateUtil.setHeight(applet, "0"); applet.setParam("size", list.size() + ""); for(int i = 0; i < list.size(); i++) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UPSHtmlLabelWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UPSHtmlLabelWindow.java index bcf5fed0d4..7f13e4dea8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UPSHtmlLabelWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UPSHtmlLabelWindow.java @@ -27,6 +27,7 @@ import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.ListboxFactory; import org.adempiere.webui.component.VerticalBox; import org.adempiere.webui.component.Window; +import org.adempiere.webui.util.ZKUpdateUtil; import org.compiere.model.MAttachmentEntry; import org.compiere.util.CLogger; import org.zkoss.util.media.AMedia; @@ -70,7 +71,7 @@ public class UPSHtmlLabelWindow extends Window implements EventListener private void init() { this.setBorder("normal"); - this.setWidth("730px"); + ZKUpdateUtil.setWidth(this, "730px"); VerticalBox box = new VerticalBox(); this.appendChild(box); html = ListboxFactory.newDropdownListbox(); @@ -82,8 +83,8 @@ public class UPSHtmlLabelWindow extends Window implements EventListener box.appendChild(html); box.appendChild(new Separator()); content = new Iframe(); - content.setHeight("500px"); - content.setWidth("700px"); + ZKUpdateUtil.setHeight(content, "500px"); + ZKUpdateUtil.setWidth(content, "700px"); content.setId("content"); content.setName(content.getUuid()); box.appendChild(content); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java index 2abd2c52ef..13f32af59f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java @@ -34,6 +34,7 @@ import org.adempiere.webui.component.Rows; import org.adempiere.webui.component.Textbox; import org.adempiere.webui.component.Window; import org.adempiere.webui.component.ZkCssHelper; +import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.FDialog; import org.compiere.model.GridField; import org.compiere.model.MRole; @@ -311,15 +312,15 @@ public class ValuePreference extends Window implements EventListener cbInfowindow.setChecked(true); // setPanel.appendChild(setLayout); - setPanel.setHflex("1"); + ZKUpdateUtil.setHflex(setPanel, "1"); fAttribute.setReadonly(true); fValue.setReadonly(true); Vbox box = new Vbox(); - box.setWidth("100%"); - box.setHeight("100%"); + ZKUpdateUtil.setWidth(box, "100%"); + ZKUpdateUtil.setHeight(box, "100%"); box.setParent(this); - box.setHflex("1"); + ZKUpdateUtil.setHflex(box, "1"); box.appendChild(setPanel); Rows rows = new Rows(); @@ -331,7 +332,7 @@ public class ValuePreference extends Window implements EventListener div.appendChild(lAttribute); row.appendCellChild(div, 1); row.appendCellChild(fAttribute, 4); - fAttribute.setWidth("96%"); + ZKUpdateUtil.setWidth(fAttribute, "96%"); row.appendCellChild(lAttributeValue, 1); rows.appendChild(row); @@ -341,7 +342,7 @@ public class ValuePreference extends Window implements EventListener div.appendChild(lValue); row.appendCellChild(div, 1); row.appendCellChild(fValue, 4); - fValue.setWidth("96%"); + ZKUpdateUtil.setWidth(fValue, "96%"); row.appendCellChild(lValueValue, 1); rows.appendChild(row); @@ -382,7 +383,7 @@ public class ValuePreference extends Window implements EventListener // Separator separator = new Separator(); - separator.setHeight("10px"); + ZKUpdateUtil.setHeight(separator, "10px"); box.appendChild(separator); box.appendChild(confirmPanel); @@ -390,7 +391,7 @@ public class ValuePreference extends Window implements EventListener setLayout.makeNoStrip(); setLayout.setOddRowSclass("even"); - this.setWidth("500px"); + ZKUpdateUtil.setWidth(this, "500px"); this.setSizable(true); } // jbInit diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java index f9592495d3..ac3a08cde4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java @@ -22,6 +22,7 @@ import javax.servlet.ServletRequest; import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.part.AbstractUIPart; import org.adempiere.webui.theme.ThemeManager; +import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.LoginWindow; import org.zkoss.web.servlet.Servlets; import org.zkoss.zhtml.Text; @@ -76,7 +77,7 @@ public class WLogin extends AbstractUIPart div.appendChild(new Text(msg)); browserWarningWindow.appendChild(div); browserWarningWindow.setPosition("top,right"); - browserWarningWindow.setWidth("550px"); + ZKUpdateUtil.setWidth(browserWarningWindow, "550px"); browserWarningWindow.setPage(page); browserWarningWindow.doOverlapped(); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java index 2b816d8dcc..2cdd19024f 100755 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java @@ -50,6 +50,7 @@ import org.adempiere.webui.event.DialogEvents; import org.adempiere.webui.panel.InfoPanel; import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.theme.ThemeManager; +import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.FDialog; import org.compiere.model.MAcctSchema; import org.compiere.model.MAcctSchemaElement; @@ -250,11 +251,11 @@ public class WAcctViewer extends Window implements EventListener private void init() throws Exception { // Selection Panel - selectionPanel.setHflex("1"); + ZKUpdateUtil.setHflex(selectionPanel, "1"); // Accounting Schema Grid grid = new Grid(); - grid.setHflex("1"); + ZKUpdateUtil.setHflex(grid, "1"); grid.setSclass("grid-layout"); selectionPanel.appendChild(grid); @@ -262,10 +263,10 @@ public class WAcctViewer extends Window implements EventListener Columns columns = new Columns(); grid.appendChild(columns); Column column = new Column(); - column.setWidth("30%"); + ZKUpdateUtil.setWidth(column, "30%"); columns.appendChild(column); column = new Column(); - column.setWidth("60%"); + ZKUpdateUtil.setWidth(column, "60%"); columns.appendChild(column); Rows rows = grid.newRows(); @@ -277,7 +278,7 @@ public class WAcctViewer extends Window implements EventListener Row row = rows.newRow(); row.appendChild(lacctSchema); row.appendChild(selAcctSchema); - selAcctSchema.setHflex("1"); + ZKUpdateUtil.setHflex(selAcctSchema, "1"); selDocument.setLabel(Msg.getMsg(Env.getCtx(), "SelectDocument")); selDocument.addEventListener(Events.ON_CHECK, this); @@ -301,7 +302,7 @@ public class WAcctViewer extends Window implements EventListener row = rows.newRow(); row.appendChild(lpostingType); row.appendChild(selPostingType); - selPostingType.setHflex("1"); + ZKUpdateUtil.setHflex(selPostingType, "1"); // Date @@ -325,7 +326,7 @@ public class WAcctViewer extends Window implements EventListener row = rows.newRow(); row.appendChild(lOrg); row.appendChild(selOrg); - selOrg.setHflex("1"); + ZKUpdateUtil.setHflex(selOrg, "1"); // Account @@ -384,7 +385,7 @@ public class WAcctViewer extends Window implements EventListener displayQty.setLabel(Msg.getMsg(Env.getCtx(), "DisplayQty")); displayQty.addEventListener(Events.ON_CHECK, this); - displayPanel.setWidth("100%"); + ZKUpdateUtil.setWidth(displayPanel, "100%"); displayPanel.appendChild(displayDocumentInfo); displayPanel.appendChild(displaySourceAmt); displayPanel.appendChild(displayQty); @@ -392,15 +393,15 @@ public class WAcctViewer extends Window implements EventListener grid = new Grid(); grid.setSclass("grid-layout"); - grid.setHflex("1"); + ZKUpdateUtil.setHflex(grid, "1"); displayPanel.appendChild(grid); columns = new Columns(); grid.appendChild(columns); column = new Column(); - column.setWidth("70%"); + ZKUpdateUtil.setWidth(column, "70%"); columns.appendChild(column); column = new Column(); - column.setWidth("30%"); + ZKUpdateUtil.setWidth(column, "30%"); columns.appendChild(column); rows = grid.newRows(); @@ -408,35 +409,35 @@ public class WAcctViewer extends Window implements EventListener lSort.setValue(Msg.getMsg(Env.getCtx(), "SortBy")); lGroup.setValue(Msg.getMsg(Env.getCtx(), "GroupBy")); row.appendChild(lSort); - lSort.setHflex("1"); + ZKUpdateUtil.setHflex(lSort, "1"); row.appendChild(lGroup); row = rows.newRow(); sortBy1.setMold("select"); sortBy1.setRows(1); row.appendChild(sortBy1); - sortBy1.setHflex("1"); + ZKUpdateUtil.setHflex(sortBy1, "1"); row.appendChild(group1); row = rows.newRow(); sortBy2.setMold("select"); sortBy2.setRows(1); row.appendChild(sortBy2); - sortBy2.setHflex("1"); + ZKUpdateUtil.setHflex(sortBy2, "1"); row.appendChild(group2); row = rows.newRow(); sortBy3.setMold("select"); sortBy3.setRows(1); row.appendChild(sortBy3); - sortBy3.setHflex("1"); + ZKUpdateUtil.setHflex(sortBy3, "1"); row.appendChild(group3); row = rows.newRow(); sortBy4.setMold("select"); sortBy4.setRows(1); row.appendChild(sortBy4); - sortBy4.setHflex("1"); + ZKUpdateUtil.setHflex(sortBy4, "1"); row.appendChild(group4); //"images/InfoAccount16.png" @@ -452,15 +453,15 @@ public class WAcctViewer extends Window implements EventListener groupSelection.appendChild(selectionPanel); Hlayout boxQueryPanel = new Hlayout(); - boxQueryPanel.setHflex("3"); + ZKUpdateUtil.setHflex(boxQueryPanel, "3"); boxQueryPanel.appendChild(groupSelection); - groupSelection.setHflex("2"); + ZKUpdateUtil.setHflex(groupSelection, "2"); Separator separator = new Separator(); separator.setOrient("vertical"); boxQueryPanel.appendChild(separator); boxQueryPanel.appendChild(groupDisplay); - groupDisplay.setHflex("1"); + ZKUpdateUtil.setHflex(groupDisplay, "1"); // South Panel @@ -489,11 +490,11 @@ public class WAcctViewer extends Window implements EventListener bExport.addEventListener(Events.ON_CLICK, this); bExport.setVisible(false); - southPanel.setHflex("5"); + ZKUpdateUtil.setHflex(southPanel, "5"); Grid southLeftGrid = new Grid(); southLeftGrid.setSclass("grid-layout"); southPanel.appendChild(southLeftGrid); - southLeftGrid.setHflex("4"); + ZKUpdateUtil.setHflex(southLeftGrid, "4"); rows = southLeftGrid.newRows(); Row southLeft = rows.newRow(); Hlayout repostLayout = new Hlayout(); @@ -501,12 +502,12 @@ public class WAcctViewer extends Window implements EventListener repostLayout.appendChild(bRePost); repostLayout.appendChild(new Separator()); repostLayout.appendChild(forcePost); - repostLayout.setVflex("1"); + ZKUpdateUtil.setVflex(repostLayout, "1"); southLeft.appendChild(statusLine); Grid southRight = new Grid(); southRight.setSclass("grid-layout"); - southRight.setHflex("1"); + ZKUpdateUtil.setHflex(southRight, "1"); southPanel.appendChild(southRight); Panel southRightPanel = new Panel(); southRightPanel.appendChild(bZoom); // Elaine 2009/07/29 @@ -521,27 +522,27 @@ public class WAcctViewer extends Window implements EventListener resultPanel = new Borderlayout(); resultPanel.setStyle("position: absolute"); - resultPanel.setWidth("99%"); - resultPanel.setHeight("99%"); + ZKUpdateUtil.setWidth(resultPanel, "99%"); + ZKUpdateUtil.setHeight(resultPanel, "99%"); result.appendChild(resultPanel); Center resultCenter = new Center(); resultPanel.appendChild(resultCenter); - table.setHflex("1"); - table.setVflex(true); - table.setHeight("99%"); + ZKUpdateUtil.setHflex(table, "1"); + ZKUpdateUtil.setVflex(table, true); + ZKUpdateUtil.setHeight(table, "99%"); table.setStyle("position: absolute;"); resultCenter.appendChild(table); - table.setHflex("1"); - table.setVflex("1"); + ZKUpdateUtil.setHflex(table, "1"); + ZKUpdateUtil.setVflex(table, "1"); table.addEventListener(Events.ON_DOUBLE_CLICK, this); pagingPanel = new South(); resultPanel.appendChild(pagingPanel); pagingPanel.appendChild(paging); - result.setHflex("1"); - result.setHeight("100%"); + ZKUpdateUtil.setHflex(result, "1"); + ZKUpdateUtil.setHeight(result, "100%"); result.setStyle("position: relative"); paging.addEventListener("onPaging", this); @@ -550,7 +551,7 @@ public class WAcctViewer extends Window implements EventListener // Query Tab - query.setHflex("1"); + ZKUpdateUtil.setHflex(query, "1"); query.appendChild(boxQueryPanel); // Tabbox @@ -564,35 +565,35 @@ public class WAcctViewer extends Window implements EventListener tabs.appendChild(tabQuery); tabs.appendChild(tabResult); - tabpanels.setHflex("1"); + ZKUpdateUtil.setHflex(tabpanels, "1"); tabpanels.appendChild(query); tabpanels.appendChild(result); - tabbedPane.setHflex("1"); - tabbedPane.setVflex("1"); + ZKUpdateUtil.setHflex(tabbedPane, "1"); + ZKUpdateUtil.setVflex(tabbedPane, "1"); tabbedPane.appendChild(tabs); tabbedPane.appendChild(tabpanels); Borderlayout layout = new Borderlayout(); layout.setParent(this); - layout.setHeight("100%"); - layout.setWidth("100%"); + ZKUpdateUtil.setHeight(layout, "100%"); + ZKUpdateUtil.setWidth(layout, "100%"); layout.setStyle("background-color: transparent; margin: 0; position: absolute; padding: 0;"); Center center = new Center(); center.setParent(layout); center.setStyle("background-color: transparent; padding: 2px;"); tabbedPane.setParent(center); - tabbedPane.setHflex("1"); - tabbedPane.setVflex("1"); + ZKUpdateUtil.setHflex(tabbedPane, "1"); + ZKUpdateUtil.setVflex(tabbedPane, "1"); South south = new South(); south.setParent(layout); south.setStyle("background-color: transparent"); - south.setHeight("36px"); + ZKUpdateUtil.setHeight(south, "36px"); southPanel.setParent(south); - southPanel.setVflex("1"); - southPanel.setHflex("1"); + ZKUpdateUtil.setVflex(southPanel, "1"); + ZKUpdateUtil.setHflex(southPanel, "1"); this.setTitle(Msg.getMsg(Env.getCtx(), TITLE)); this.setClosable(true); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java index bd4a8ff879..6475d2c5c0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java @@ -37,6 +37,7 @@ import org.adempiere.webui.component.Panel; import org.adempiere.webui.component.SimpleListModel; import org.adempiere.webui.factory.ButtonFactory; import org.adempiere.webui.theme.ThemeManager; +import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.FDialog; import org.compiere.model.GridTab; import org.compiere.model.MRole; @@ -91,7 +92,7 @@ public class ADSortTab extends Panel implements IADTabpanel this.gridTab = gridTab; m_AD_Table_ID = gridTab.getAD_Table_ID(); - this.setVflex("true"); + ZKUpdateUtil.setVflex(this, "true"); } // ADSortTab /** Logger */ @@ -265,8 +266,8 @@ public class ADSortTab extends Panel implements IADTabpanel noLabel.setValue("No"); yesLabel.setValue("Yes"); - yesList.setVflex(true); - noList.setVflex(true); + ZKUpdateUtil.setVflex(yesList, true); + ZKUpdateUtil.setVflex(noList, true); setId(AdempiereIdGenerator.escapeId(gridTab.getName())); @@ -345,16 +346,16 @@ public class ADSortTab extends Panel implements IADTabpanel listHeader.setParent(listHead); Hlayout hlayout = new Hlayout(); - hlayout.setVflex("true"); - hlayout.setHflex("true"); + ZKUpdateUtil.setVflex(hlayout, "true"); + ZKUpdateUtil.setHflex(hlayout, "true"); hlayout.setStyle("margin: auto;"); appendChild(hlayout); - noList.setHflex("1"); - noList.setVflex(true); + ZKUpdateUtil.setHflex(noList, "1"); + ZKUpdateUtil.setVflex(noList, true); hlayout.appendChild(noList); - yesList.setVflex(true); - yesList.setHflex("1"); + ZKUpdateUtil.setVflex(yesList, true); + ZKUpdateUtil.setHflex(yesList, "1"); hlayout.appendChild(yesList); addEventListener(ON_ACTIVATE_EVENT, new EventListener() { @@ -964,7 +965,7 @@ public class ADSortTab extends Panel implements IADTabpanel @Override public void setDetailPaneMode(boolean detailMode) { this.detailPaneMode = detailMode; - this.setVflex("true"); + ZKUpdateUtil.setVflex(this, "true"); } public boolean isDetailPaneMode() { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java index 96f479bc4a..0f8cfe7bb3 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java @@ -55,6 +55,7 @@ import org.adempiere.webui.panel.HelpController; import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.util.GridTabDataBinder; import org.adempiere.webui.util.TreeUtils; +import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.FDialog; import org.compiere.model.DataStatusEvent; import org.compiere.model.DataStatusListener; @@ -236,11 +237,11 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer { LayoutUtils.addSclass("adtab-content", this); - this.setWidth("100%"); + ZKUpdateUtil.setWidth(this, "100%"); form = new Grid(); - form.setHflex("1"); - form.setHeight(null); + ZKUpdateUtil.setHflex(form, "1"); + ZKUpdateUtil.setHeight(form, null); form.setVflex(false); form.setSclass("grid-layout adwindow-form"); form.setWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME, "form"); @@ -298,7 +299,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer int maxHeight = browserHeight - topmarginpx; if (prefHeight <= maxHeight) { height = Integer.toString(prefHeight) + "px"; - formContainer.getSouth().setHeight(height); + ZKUpdateUtil.setHeight(formContainer.getSouth(), height); } } catch (Exception e) { // just ignore exception is harmless here, consequence is just not setting height so it will assume the default of theme @@ -360,7 +361,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer treePanel = new ADTreePanel(windowNo, gridTab.getTabNo()); West west = new West(); west.appendChild(treePanel); - west.setWidth("300px"); + ZKUpdateUtil.setWidth(west, "300px"); west.setCollapsible(true); west.setSplittable(true); west.setAutoscroll(true); @@ -370,8 +371,8 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer Vlayout div = new Vlayout(); div.appendChild(form); center.appendChild(div); - div.setVflex("1"); - div.setHflex("1"); + ZKUpdateUtil.setVflex(div, "1"); + ZKUpdateUtil.setHflex(div, "1"); div.setSclass("adtab-form"); div.setStyle("overflow-y: visible;"); div.setSpacing("0px"); @@ -387,8 +388,8 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer div.setSclass("adtab-form"); div.appendChild(form); div.setStyle("overflow-y: visible;"); - div.setVflex("1"); - div.setWidth("100%"); + ZKUpdateUtil.setVflex(div, "1"); + ZKUpdateUtil.setWidth(div, "100%"); div.setSpacing("0px"); Borderlayout layout = new Borderlayout(); @@ -430,7 +431,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer for (int h=0;h private void init() { setWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME, "treepanel"); - this.setWidth("100%"); - this.setHeight("100%"); + ZKUpdateUtil.setWidth(this, "100%"); + ZKUpdateUtil.setHeight(this, "100%"); tree = new Tree(); tree.setMultiple(false); - tree.setWidth("100%"); - tree.setVflex(true); + ZKUpdateUtil.setWidth(tree, "100%"); + ZKUpdateUtil.setVflex(tree, true); tree.setPageSize(-1); // Due to bug in the new paging functionality tree.setStyle("border: none"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowContent.java index f4376f8a63..8165f55ed2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowContent.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowContent.java @@ -33,6 +33,7 @@ import org.adempiere.webui.panel.IHelpContext; import org.adempiere.webui.panel.ITabOnCloseHandler; import org.adempiere.webui.part.WindowContainer; import org.adempiere.webui.session.SessionManager; +import org.adempiere.webui.util.ZKUpdateUtil; import org.compiere.model.X_AD_CtxHelp; import org.compiere.util.CLogger; import org.zkoss.zk.au.out.AuScript; @@ -90,7 +91,7 @@ public class ADWindowContent extends AbstractADWindowContent Div div = new Div(); div.setStyle("height: 100%; width: 100%"); north.appendChild(div); - north.setVflex("0"); + ZKUpdateUtil.setVflex(north, "0"); toolbar.setParent(div); toolbar.setWindowNo(getWindowNo()); breadCrumb = new BreadCrumb(getWindowNo()); @@ -143,8 +144,8 @@ public class ADWindowContent extends AbstractADWindowContent contentArea = new Div(); contentArea.setParent(layout); - contentArea.setVflex("1"); - contentArea.setHflex("1"); + ZKUpdateUtil.setVflex(contentArea, "1"); + ZKUpdateUtil.setHflex(contentArea, "1"); contentArea.setStyle("overflow: auto;"); adTabbox.createPart(contentArea); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java index d45793a28d..637da5c865 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java @@ -34,6 +34,7 @@ import org.adempiere.webui.component.ToolBarButton; import org.adempiere.webui.event.ToolbarListener; import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.theme.ThemeManager; +import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.FDialog; import org.compiere.model.GridTab; import org.compiere.model.MRole; @@ -264,7 +265,7 @@ public class ADWindowToolbar extends FToolbar implements EventListener configureKeyMap(); - setWidth("100%"); + ZKUpdateUtil.setWidth(this, "100%"); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java index bb24014a8f..ae27995543 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java @@ -70,6 +70,7 @@ import org.adempiere.webui.panel.action.ReportAction; import org.adempiere.webui.part.AbstractUIPart; import org.adempiere.webui.part.ITabOnSelectHandler; import org.adempiere.webui.session.SessionManager; +import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.CustomizeGridViewDialog; import org.adempiere.webui.window.FDialog; import org.adempiere.webui.window.FindWindow; @@ -752,8 +753,8 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements findWindow.setTitle(null); findWindow.setBorder("none"); findWindow.setStyle("position: absolute; border-bottom: 2px solid #484848; padding: 2px; background-color: #fff;"); - findWindow.setWidth("100%"); - findWindow.setHeight("60%"); + ZKUpdateUtil.setWidth(findWindow, "100%"); + ZKUpdateUtil.setHeight(findWindow, "60%"); findWindow.setZindex(1000); findWindow.setSizable(false); findWindow.setContentStyle("background-color: #fff; width: 99%; margin: auto;"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/BreadCrumb.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/BreadCrumb.java index d5fb79fa6d..a13afca44b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/BreadCrumb.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/BreadCrumb.java @@ -29,6 +29,7 @@ import org.adempiere.webui.component.ZkCssHelper; import org.adempiere.webui.event.ToolbarListener; import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.theme.ThemeManager; +import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.WRecordInfo; import org.compiere.model.DataStatusEvent; import org.compiere.model.MRole; @@ -96,7 +97,7 @@ public class BreadCrumb extends Div implements EventListener { layout.setPack("start"); layout.setAlign("center"); this.appendChild(layout); - layout.setHeight("100%"); + ZKUpdateUtil.setHeight(layout, "100%"); layout.setStyle("float: left"); this.setVisible(false); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java index bdf8bd386c..89e90d6632 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java @@ -27,6 +27,7 @@ import java.util.logging.Level; import org.adempiere.util.Callback; import org.adempiere.webui.component.ADTabListModel; import org.adempiere.webui.component.ADTabListModel.ADTabLabel; +import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.FDialog; import org.compiere.model.DataStatusEvent; import org.compiere.model.DataStatusListener; @@ -256,8 +257,8 @@ public class CompositeADTabbox extends AbstractADTabbox protected Component doCreatePart(Component parent) { layout = new Vlayout(); - layout.setHeight("100%"); - layout.setWidth("100%"); + ZKUpdateUtil.setHeight(layout, "100%"); + ZKUpdateUtil.setWidth(layout, "100%"); layout.setStyle("position: relative"); if (parent != null) { layout.setParent(parent); @@ -407,7 +408,7 @@ public class CompositeADTabbox extends AbstractADTabbox headerTab.setDetailPane(createDetailPane()); } else tabPanel.setVisible(false); - headerTab.getDetailPane().setHflex("1"); + ZKUpdateUtil.setHflex(headerTab.getDetailPane(), "1"); headerTab.getDetailPane().addADTabpanel(tabPanel, tabLabel); tabPanel.setDetailPaneMode(true); headerTab.getDetailPane().setVflex("true"); @@ -417,8 +418,8 @@ public class CompositeADTabbox extends AbstractADTabbox headerTab.getDetailPane().setVflex("true"); } HtmlBasedComponent htmlComponent = (HtmlBasedComponent) tabPanel; - htmlComponent.setVflex("1"); - htmlComponent.setWidth("100%"); + ZKUpdateUtil.setVflex(htmlComponent, "1"); + ZKUpdateUtil.setWidth(htmlComponent, "100%"); tabPanel.getGridTab().addDataStatusListener(new SyncDataStatusListener(tabPanel)); } @@ -543,7 +544,7 @@ public class CompositeADTabbox extends AbstractADTabbox } detailPane.setAttribute("detailpane.tablist", list); - detailPane.setVflex("true"); + ZKUpdateUtil.setVflex(detailPane, "true"); if (headerTab.getDetailPane() == null) { headerTab.setDetailPane(detailPane); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java index 81670707e8..06b63068ed 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java @@ -23,6 +23,7 @@ import org.adempiere.webui.component.ToolBarButton; import org.adempiere.webui.component.Window; import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.theme.ThemeManager; +import org.adempiere.webui.util.ZKUpdateUtil; import org.compiere.model.MToolBarButton; import org.compiere.util.Env; import org.compiere.util.Msg; @@ -126,7 +127,7 @@ public class DetailPane extends Panel implements EventListener, IdSpace { }); tabbox.setSclass("adwindow-detailpane-tabbox"); tabbox.setTabscroll(true); - tabbox.setWidth("100%"); + ZKUpdateUtil.setWidth(tabbox, "100%"); createPopup(); @@ -264,7 +265,7 @@ public class DetailPane extends Panel implements EventListener, IdSpace { Tabpanels tabpanels = tabbox.getTabpanels(); if (tabpanels == null) { tabpanels = new Tabpanels(); - tabpanels.setWidth("100%"); + ZKUpdateUtil.setWidth(tabpanels, "100%"); tabbox.appendChild(tabpanels); } Tabpanel tp = new Tabpanel(); @@ -396,7 +397,7 @@ public class DetailPane extends Panel implements EventListener, IdSpace { toolbar.appendChild(messageContainer); toolbar.setSclass("adwindow-detailpane-toolbar"); - toolbar.setVflex("0"); + ZKUpdateUtil.setVflex(toolbar, "0"); messageContainers.put(tabLabel.AD_Tab_ID, messageContainer); tabPanel.setAttribute("AD_Tab_ID", tabLabel.AD_Tab_ID); @@ -600,7 +601,7 @@ public class DetailPane extends Panel implements EventListener, IdSpace { private void createPopup() { msgPopupCnt = new Div(); - msgPopupCnt.setVflex("1"); + ZKUpdateUtil.setVflex(msgPopupCnt, "1"); msgPopup = new Window(); @@ -609,7 +610,7 @@ public class DetailPane extends Panel implements EventListener, IdSpace { msgPopup.setClosable(true); msgPopup.setSizable(true); msgPopup.setContentStyle("overflow: auto"); - msgPopup.setWidth("500px"); + ZKUpdateUtil.setWidth(msgPopup, "500px"); msgPopup.appendChild(msgPopupCnt); msgPopup.setPage(SessionManager.getAppDesktop().getComponent().getPage()); msgPopup.setShadow(true); @@ -638,8 +639,10 @@ public class DetailPane extends Panel implements EventListener, IdSpace { */ @Override public void setVflex(String flex) { + if (getHeight() != null) + setHeight(null); super.setVflex(flex); - tabbox.setVflex(flex); + ZKUpdateUtil.setVflex(tabbox, flex); } /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java index 76e1a38b64..395b3478ae 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java @@ -38,6 +38,7 @@ import org.adempiere.webui.event.ContextMenuListener; import org.adempiere.webui.panel.HelpController; import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.util.GridTabDataBinder; +import org.adempiere.webui.util.ZKUpdateUtil; import org.compiere.model.GridField; import org.compiere.model.GridTab; import org.compiere.util.DisplayType; @@ -513,7 +514,7 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt } } div.setStyle(divStyle); - div.setWidth("100%"); + ZKUpdateUtil.setWidth(div, "100%"); div.setAttribute("columnName", gridPanelFields[i].getColumnName()); div.addEventListener(Events.ON_CLICK, rowListener); div.addEventListener(Events.ON_DOUBLE_CLICK, rowListener); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java index 8723226617..e9148b169f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java @@ -34,6 +34,7 @@ import org.adempiere.webui.component.NumberBox; import org.adempiere.webui.component.Rows; import org.adempiere.webui.editor.WEditor; import org.adempiere.webui.util.SortComparator; +import org.adempiere.webui.util.ZKUpdateUtil; import org.compiere.model.GridField; import org.compiere.model.GridTab; import org.compiere.model.GridTable; @@ -150,10 +151,10 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi setId("gridView"); createListbox(); - this.setHflex("1"); + ZKUpdateUtil.setHflex(this, "1"); gridFooter = new Div(); - gridFooter.setVflex("0"); + ZKUpdateUtil.setVflex(gridFooter, "0"); //default paging size if (AEnv.isTablet()) @@ -175,7 +176,7 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi appendChild(listbox); appendChild(gridFooter); - this.setVflex("true"); + ZKUpdateUtil.setVflex(this, "true"); setStyle(HEADER_GRID_STYLE); gridFooter.setStyle(HEADER_GRID_STYLE); @@ -187,8 +188,8 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi protected void createListbox() { listbox = new Grid(); listbox.setSizedByContent(false); - listbox.setVflex("1"); - listbox.setHflex("1"); + ZKUpdateUtil.setVflex(listbox, "1"); + ZKUpdateUtil.setHflex(listbox, "1"); listbox.setSclass("adtab-grid"); listbox.setEmptyMessage(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Processing"))); } @@ -465,7 +466,7 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi } org.zkoss.zul.Column selection = new Column(); - selection.setWidth("22px"); + ZKUpdateUtil.setWidth(selection, "22px"); try{ selection.setSort("none"); } catch (Exception e) {} @@ -477,7 +478,7 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi columns.appendChild(selection); org.zkoss.zul.Column indicator = new Column(); - indicator.setWidth("22px"); + ZKUpdateUtil.setWidth(indicator, "22px"); try { indicator.setSort("none"); } catch (Exception e) {} @@ -509,24 +510,24 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi column.setLabel(gridField[i].getHeader()); if (columnWidthMap != null && columnWidthMap.get(gridField[i].getAD_Field_ID()) != null && !columnWidthMap.get(gridField[i].getAD_Field_ID()).equals("")) { - column.setWidth(columnWidthMap.get(gridField[i].getAD_Field_ID())); + ZKUpdateUtil.setWidth(column, columnWidthMap.get(gridField[i].getAD_Field_ID())); } else { if (gridField[i].getDisplayType()==DisplayType.YesNo) { if (i > 0) { - column.setHflex("min"); + ZKUpdateUtil.setHflex(column, "min"); } else { int estimatedWidth=60; int headerWidth = (gridField[i].getHeader().length()+2) * 8; if (headerWidth > estimatedWidth) estimatedWidth = headerWidth; - column.setWidth(estimatedWidth+"px"); + ZKUpdateUtil.setWidth(column, estimatedWidth+"px"); } } else if (DisplayType.isNumeric(gridField[i].getDisplayType()) && "Line".equals(gridField[i].getColumnName())) { //special treatment for line if (i > 0) - column.setHflex("min"); + ZKUpdateUtil.setHflex(column, "min"); else - column.setWidth("60px"); + ZKUpdateUtil.setWidth(column, "60px"); } else { int estimatedWidth = 0; if (DisplayType.isNumeric(gridField[i].getDisplayType())) @@ -548,17 +549,17 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi if (DisplayType.isLookup(gridField[i].getDisplayType())) { if (headerWidth > MIN_COMBOBOX_WIDTH) - column.setHflex("min"); + ZKUpdateUtil.setHflex(column, "min"); } else if (DisplayType.isNumeric(gridField[i].getDisplayType())) { if (headerWidth > MIN_NUMERIC_COL_WIDTH) - column.setHflex("min"); + ZKUpdateUtil.setHflex(column, "min"); } else if (!DisplayType.isText(gridField[i].getDisplayType())) { if (headerWidth > MIN_COLUMN_WIDTH) - column.setHflex("min"); + ZKUpdateUtil.setHflex(column, "min"); } } @@ -568,7 +569,7 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi estimatedWidth = MAX_COLUMN_WIDTH; else if ( estimatedWidth < MIN_COLUMN_WIDTH) estimatedWidth = MIN_COLUMN_WIDTH; - column.setWidth(Integer.toString(estimatedWidth) + "px"); + ZKUpdateUtil.setWidth(column, Integer.toString(estimatedWidth) + "px"); } } } @@ -1164,7 +1165,7 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi Component firstChild = parent.getFirstChild(); if ( gridFooter.getParent() != firstChild ) { firstChild.appendChild(gridFooter); - gridFooter.setHflex("0"); + ZKUpdateUtil.setHflex(gridFooter, "0"); gridFooter.setSclass("adwindow-detailpane-adtab-grid-south"); } break; @@ -1177,7 +1178,7 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi else { if (gridFooter.getParent() != this) { - gridFooter.setHflex("1"); + ZKUpdateUtil.setHflex(gridFooter, "1"); gridFooter.setSclass("adtab-grid-south"); appendChild(gridFooter); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java index b9d64b9dc7..af244390e7 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java @@ -6,6 +6,7 @@ package org.adempiere.webui.adwindow; import java.util.List; import org.adempiere.webui.component.Window; +import org.adempiere.webui.util.ZKUpdateUtil; import org.zkoss.zul.Button; import org.zkoss.zul.Vbox; @@ -23,11 +24,11 @@ public class ProcessButtonPopup extends Window { public void render(List