From c6d2cdea7c0d480489a2c2077363a70a331fe785 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Mon, 13 Oct 2008 07:41:55 +0000
Subject: [PATCH] * [ 2158633 ] CommitWarning in ad_tab is ignore * AboutWindow
 layout not correct for 3.5.1

---
 zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java   |  4 ++--
 .../src/org/adempiere/webui/component/Messagebox.java  |  4 ++--
 .../adempiere/webui/panel/AbstractADWindowPanel.java   | 10 +++++++++-
 .../src/org/adempiere/webui/window/AboutWindow.java    | 10 +++++-----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java b/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java
index b8bf288142..2db4c11ffb 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java
@@ -917,9 +917,9 @@ public class Desktop extends AbstractUIPart implements MenuListener, Serializabl
    	public void showWindow(Window win, String pos)
 	{
    		win.setPage(page);		
-		Object objMode = win.getAttribute("mode");
+		Object objMode = win.getAttribute(Window.MODE_KEY);
 
-		String mode = "modal";
+		String mode = Window.MODE_MODAL;
 		
 		if (objMode != null)
 		{
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Messagebox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Messagebox.java
index f1d0e77a75..ab5d8e1109 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Messagebox.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Messagebox.java
@@ -224,13 +224,13 @@ public class Messagebox extends Window implements EventListener
 			this.setWidth("500px");
 			this.setPosition("center");
 			this.setClosable(true);
-			this.setAttribute("mode", "modal");
+			this.setAttribute(Window.MODE_KEY, Window.MODE_MODAL);
 			this.setSizable(true);
 		}
 		else
 		{
 			this.setTitle(title);
-			this.setAttribute("mode", "overlapped");
+			this.setAttribute(Window.MODE_KEY, Window.MODE_OVERLAPPED);
 			this.setWidth("500px");
 			this.setClosable(true);
 			this.setSizable(true);
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
index 647e105854..729b63df85 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
@@ -548,7 +548,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
 		    	if (curTab.needSave(true, true))
 				{
 					//	Automatic Save
-					if (Env.isAutoCommit(ctx, curWindowNo))
+					if (Env.isAutoCommit(ctx, curWindowNo)
+						&& (curTab.getCommitWarning() == null || curTab.getCommitWarning().trim().length() == 0))
 					{
 						if (!curTab.dataSave(true))
 						{	
@@ -922,6 +923,13 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
     	}
     	else
     	{
+    		if (curTab.getCommitWarning() != null && curTab.getCommitWarning().trim().length() > 0)
+    		{
+    			if (!FDialog.ask(curWindowNo, this.getComponent(), "SaveChanges?", curTab.getCommitWarning()))
+    			{
+    				return;
+    			}
+    		}
 	    	boolean retValue = curTab.dataSave(true);
 	        
 	        if (!retValue)
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
index e6a04296d5..e671d6659a 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
@@ -84,14 +84,14 @@ public class AboutWindow extends Window implements EventListener {
 		
 		tabbox = new Tabbox();
 		tabbox.setParent(layout);
-		tabbox.setWidth("490px");
+		tabbox.setWidth("480px");
 		tabbox.setHeight("380px");
 //		tabbox.setSclass("lite");
 		Tabs tabs = new Tabs();
 		tabs.setParent(tabbox);
 		tabPanels = new Tabpanels();
 		tabPanels.setParent(tabbox);
-		tabPanels.setWidth("490px");
+		tabPanels.setWidth("480px");
 		
 		//about
 		Tab tab = new Tab();
@@ -363,13 +363,13 @@ public class AboutWindow extends Window implements EventListener {
 		int width = Integer.parseInt(event.getWidth().substring(0, event.getWidth().length() - 2));
 		int height = Integer.parseInt(event.getHeight().substring(0, event.getHeight().length() - 2));
 		
-		tabbox.setWidth((width - 10) + "px");
+		tabbox.setWidth((width - 20) + "px");
 		tabbox.setHeight((height - 70) + "px");
 		
-		tabPanels.setWidth((width - 10) + "px");
+		tabPanels.setWidth((width - 20) + "px");
 		
 		logTable.setHeight((height - 140) + "px");
-		logTable.setWidth((width - 20) + "px");
+		logTable.setWidth((width - 30) + "px");
 	}
 	
 	private void downloadLog() {