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

IDEMPIERE-192 Zk6: Fixed alignment issue for the application menu tree panel - make consistent with application menu tree panel changes.

This commit is contained in:
Heng Sin Low 2012-03-12 12:02:55 +08:00
parent 88aadea54d
commit 3a3d13a6e3
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTreePanel.java
View File

@ -16,12 +16,15 @@ package org.adempiere.webui.panel;
import org.adempiere.webui.component.Checkbox; import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.SimpleTreeModel; import org.adempiere.webui.component.SimpleTreeModel;
import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.util.TreeUtils; import org.adempiere.webui.util.TreeUtils;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Util;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Panel; import org.zkoss.zul.Panel;
import org.zkoss.zul.Panelchildren; import org.zkoss.zul.Panelchildren;
import org.zkoss.zul.Toolbar; import org.zkoss.zul.Toolbar;
@ -38,13 +41,14 @@ public class ADTreePanel extends Panel implements EventListener
* *
*/ */
private static final long serialVersionUID = -3046550099597437942L; private static final long serialVersionUID = -3046550099597437942L;
private static final String ON_EXPAND_MENU_EVENT = "onExpandMenu";
private TreeSearchPanel pnlSearch; private TreeSearchPanel pnlSearch;
private Tree tree; private Tree tree;
private Checkbox chkExpand; // Elaine 2009/02/27 - expand tree private ToolBarButton expandToggle; // Elaine 2009/02/27 - expand tree
private int m_windowno = -1; private int m_windowno = -1;
private int m_tabno = -1; private int m_tabno = -1;
public ADTreePanel() public ADTreePanel()
{ {
init(); init();
@ -83,6 +87,7 @@ public class ADTreePanel extends Panel implements EventListener
pnlSearch = new TreeSearchPanel(tree, Events.ON_SELECT, m_windowno, m_tabno); pnlSearch = new TreeSearchPanel(tree, Events.ON_SELECT, m_windowno, m_tabno);
Toolbar toolbar = new Toolbar(); Toolbar toolbar = new Toolbar();
toolbar.setMold("panel");
toolbar.appendChild(pnlSearch); toolbar.appendChild(pnlSearch);
this.appendChild(toolbar); this.appendChild(toolbar);
@ -92,11 +97,15 @@ public class ADTreePanel extends Panel implements EventListener
// Elaine 2009/02/27 - expand tree // Elaine 2009/02/27 - expand tree
toolbar = new Toolbar(); toolbar = new Toolbar();
chkExpand = new Checkbox(); toolbar.setMold("panel");
chkExpand.setText(Msg.getMsg(Env.getCtx(), "ExpandTree")); expandToggle = new ToolBarButton();
chkExpand.addEventListener(Events.ON_CHECK, this); expandToggle.setMode("toggle");
toolbar.appendChild(chkExpand); expandToggle.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "ExpandTree")));
expandToggle.addEventListener(Events.ON_CHECK, this);
toolbar.appendChild(expandToggle);
this.appendChild(toolbar); this.appendChild(toolbar);
this.addEventListener(ON_EXPAND_MENU_EVENT, this);
} }
/** /**
@ -108,9 +117,15 @@ public class ADTreePanel extends Panel implements EventListener
String eventName = event.getName(); String eventName = event.getName();
// Elaine 2009/02/27 - expand tree // Elaine 2009/02/27 - expand tree
if (eventName.equals(Events.ON_CHECK) && event.getTarget() == chkExpand) if (eventName.equals(Events.ON_CHECK) && event.getTarget() == expandToggle)
{
Clients.showBusy(null);
Events.echoEvent(ON_EXPAND_MENU_EVENT, this, null);
}
else if (eventName.equals(ON_EXPAND_MENU_EVENT))
{ {
expandOnCheck(); expandOnCheck();
Clients.clearBusy();
} }
// //
} }
@ -128,8 +143,8 @@ public class ADTreePanel extends Panel implements EventListener
*/ */
public void expandAll() public void expandAll()
{ {
if (!chkExpand.isChecked()) if (!expandToggle.isChecked())
chkExpand.setChecked(true); expandToggle.setChecked(true);
TreeUtils.expandAll(tree); TreeUtils.expandAll(tree);
} }
@ -139,8 +154,8 @@ public class ADTreePanel extends Panel implements EventListener
*/ */
public void collapseAll() public void collapseAll()
{ {
if (chkExpand.isChecked()) if (expandToggle.isChecked())
chkExpand.setChecked(false); expandToggle.setChecked(false);
TreeUtils.collapseAll(tree); TreeUtils.collapseAll(tree);
} }
@ -150,10 +165,10 @@ public class ADTreePanel extends Panel implements EventListener
*/ */
private void expandOnCheck() private void expandOnCheck()
{ {
if (chkExpand.isChecked()) if (expandToggle.isChecked())
expandAll(); expandAll();
else else
collapseAll(); collapseAll();
} }
// //
} }