From 18560bb382862f4ef418bb151eb8f4be08be712a Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Fri, 11 Jul 2008 15:00:42 +0000
Subject: [PATCH] * Maintain tree menu selection. * Search - navigate to the
 search result menu item.

---
 .../org/adempiere/webui/editor/WImageEditor.java |  7 +++----
 .../src/org/adempiere/webui/panel/MenuPanel.java |  3 +--
 .../adempiere/webui/panel/MenuSearchPanel.java   | 16 ++++++++++++++--
 .../org/adempiere/webui/window/WImageDialog.java |  8 +++++---
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
index ced6f1f7c7..1e2cb21d53 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
@@ -1,6 +1,5 @@
 /******************************************************************************
- * Product: Posterita Ajax UI 												  *
- * Copyright (C) 2007 Posterita Ltd.  All Rights Reserved.                    *
+ * Copyright (C) 2007 Low Heng Sin  All Rights Reserved.                      *
  * 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   *
  * by the Free Software Foundation. This program is distributed in the hope   *
@@ -29,11 +28,11 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.Events;
 
 /**
- * This class is based on org.compiere.grid.ed.VButton written by Jorg Janke.
+ * This class is based on org.compiere.grid.ed.VImage written by Jorg Janke.
  * @author Jorg Janke
  * 
  * Modifications - UI Compatibility
- * @author ashley
+ * @author Low Heng Sin
  */
 public class WImageEditor extends WEditor
 {
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
index ca7faafe45..da54e71951 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
@@ -226,7 +226,6 @@ public class MenuPanel extends Panel implements EventListener
             }*/
     		
     		SessionManager.getAppDesktop().onMenuSelected(nodeId);
-    		menuTree.setSelectedItem(null);
         }
         catch (Exception e)
         {
@@ -234,7 +233,7 @@ public class MenuPanel extends Panel implements EventListener
         }		
 	}
 
-    public boolean isAsap()
+	public boolean isAsap()
     {
         return true;
     }
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
index a1362f98af..6ffa3c7a47 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
@@ -109,9 +109,21 @@ public class MenuSearchPanel extends Panel implements EventListener
             Treeitem treeItem = treeNodeItemMap.get(value);
             if (treeItem != null)
             {
-                treeItem.setSelected(true);
-                menuPanel.fireMenuSelectedEvent(treeItem);
+                select(treeItem);
+                Events.echoEvent(Events.ON_SELECT, treeItem.getTree(), null);
             }
         }
     }
+
+	private void select(Treeitem selectedItem) {
+		Treeitem parent = selectedItem.getParentItem();
+		while (parent != null) {
+			if (!parent.isOpen())
+				parent.setOpen(true);
+			
+			parent = parent.getParentItem();
+		}
+		selectedItem.getTree().setSelectedItem(selectedItem);
+		selectedItem.focus();
+	}
 }
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
index d43a5d21da..7ede84a005 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
@@ -41,10 +41,12 @@ import org.zkoss.zul.Image;
 import org.zkoss.zul.Separator;
 
 /**
- *  Image Dialog
- *
+ *  Base on the original Swing Image Dialog.
  *  @author   Jorg Janke
- *  @version  $Id: VImageDialog.java,v 1.4 2006/07/30 00:51:28 jjanke Exp $
+ *  
+ *  Zk Port
+ *  @author Low Heng Sin 
+ *  
  */
 public class WImageDialog extends Window implements EventListener
 {