midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-369 Master Detail layout improvements. Refactoring and fixed saving of detail and header together.

This commit is contained in:
Heng Sin Low 2012-10-09 20:56:26 +08:00
parent d21fc00b60
commit 89b02ce27d
4 changed files with 201 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* Product: Posterita Ajax UI * f * Product: Posterita Ajax UI *
* Copyright (C) 2007 Posterita Ltd. All Rights Reserved. * * Copyright (C) 2007 Posterita Ltd. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published * * under the terms version 2 of the GNU General Public License as published *
@ -169,7 +169,6 @@ DataStatusListener, IADTabpanel
form.setHeight(null); form.setHeight(null);
form.setVflex(false); form.setVflex(false);
form.setSclass("grid-layout"); form.setSclass("grid-layout");
form.addEventListener(Events.ON_FOCUS, this);
listPanel = new GridView(); listPanel = new GridView();
listPanel.getListbox().addEventListener(Events.ON_DOUBLE_CLICK, this); listPanel.getListbox().addEventListener(Events.ON_DOUBLE_CLICK, this);
@ -788,8 +787,6 @@ DataStatusListener, IADTabpanel
if (gridTab.getRecord_ID() > 0 && gridTab.isTreeTab() && treePanel != null) { if (gridTab.getRecord_ID() > 0 && gridTab.isTreeTab() && treePanel != null) {
setSelectedNode(gridTab.getRecord_ID()); setSelectedNode(gridTab.getRecord_ID());
} }
} else {
System.out.println(event.getName() + " " + event.getTarget());
} }
} }

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowContent.java
View File

@ -122,7 +122,7 @@ public class ADWindowContent extends AbstractADWindowContent
contentArea = new Center(); contentArea = new Center();
contentArea.setParent(layout); contentArea.setParent(layout);
contentArea.setAutoscroll(true); contentArea.setAutoscroll(true);
adTab.createPart(contentArea); adTabbox.createPart(contentArea);
if (parent instanceof Tabpanel) { if (parent instanceof Tabpanel) {
TabOnCloseHanlder handler = new TabOnCloseHanlder(); TabOnCloseHanlder handler = new TabOnCloseHanlder();
@ -172,7 +172,7 @@ public class ADWindowContent extends AbstractADWindowContent
@Override @Override
public boolean initPanel(int adWindowId, MQuery query) { public boolean initPanel(int adWindowId, MQuery query) {
boolean retValue = super.initPanel(adWindowId, query); boolean retValue = super.initPanel(adWindowId, query);
if (adTab.getTabCount() == 1) { if (adTabbox.getTabCount() == 1) {
if (west != null) if (west != null)
west.setVisible(false); west.setVisible(false);
else if (east != null) else if (east != null)
@ -191,7 +191,7 @@ public class ADWindowContent extends AbstractADWindowContent
KeyEvent keyEvent = (KeyEvent) event; KeyEvent keyEvent = (KeyEvent) event;
//enter == 13 //enter == 13
if (keyEvent.getKeyCode() == 13 && this.getComponent().getParent().isVisible()) { if (keyEvent.getKeyCode() == 13 && this.getComponent().getParent().isVisible()) {
IADTabpanel panel = adTab.getSelectedTabpanel(); IADTabpanel panel = adTabbox.getSelectedTabpanel();
if (panel != null) { if (panel != null) {
if (panel.onEnterKey()) { if (panel.onEnterKey()) {
keyEvent.stopPropagation(); keyEvent.stopPropagation();

386
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
View File

File diff suppressed because it is too large Load Diff

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java
View File

@ -40,7 +40,6 @@ import org.compiere.model.GridTab;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.NamePair; import org.compiere.util.NamePair;
import org.zkoss.xml.XMLs;
import org.zkoss.zk.au.out.AuFocus; import org.zkoss.zk.au.out.AuFocus;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.HtmlBasedComponent; import org.zkoss.zk.ui.HtmlBasedComponent;