From 895e58208cddb6de38805350157183aee0b76499 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Sat, 6 Sep 2008 22:04:55 +0000 Subject: [PATCH] * Merge revision 6386 from branches/adempiere341 --- .../webui/component/Combinationbox.java | 3 +-- .../adempiere/webui/component/EditorBox.java | 3 +-- .../webui/component/Locationbox.java | 3 +-- .../adempiere/webui/component/NumberBox.java | 3 +-- .../webui/component/PAttributebox.java | 3 +-- .../adempiere/webui/component/Searchbox.java | 3 +-- .../org/adempiere/webui/component/Urlbox.java | 3 +-- .../adempiere/webui/window/AboutWindow.java | 22 +++++++++++++++++++ zkwebui/css/default.css.dsp | 11 ++++++++++ 9 files changed, 40 insertions(+), 14 deletions(-) diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Combinationbox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Combinationbox.java index 2013de2003..9db71f8597 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Combinationbox.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Combinationbox.java @@ -50,8 +50,7 @@ public class Combinationbox extends Panel { textbox = new Textbox(); button = new Button(); - button.setHeight("22px"); - button.setWidth("26px"); + button.setSclass("editor-button");; appendChild(textbox); appendChild(button); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java index 9b177e241a..05b278ea62 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java @@ -64,8 +64,7 @@ public class EditorBox extends Panel this.appendChild(txt); this.appendChild(btn); - btn.setHeight("22px"); - btn.setWidth("26px"); + btn.setSclass("editor-button"); String style = AEnv.isFirefox2() ? "display: inline" : "display: inline-block"; this.setStyle(style); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Locationbox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Locationbox.java index a3ecfd7e4b..8d07402c6b 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Locationbox.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Locationbox.java @@ -54,8 +54,7 @@ public class Locationbox extends Panel { txt = new Textbox(); btn = new Button(); - btn.setHeight("22px"); - btn.setWidth("26px"); + btn.setSclass("editor-button"); this.appendChild(txt); this.appendChild(btn); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/NumberBox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/NumberBox.java index 81e60f243e..9dc43bd762 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/NumberBox.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/NumberBox.java @@ -73,8 +73,7 @@ public class NumberBox extends Panel decimalBox.getId() + "'," + integral + ", event);"); Popup popup = getCalculatorPopup(); - btn.setHeight("22px"); - btn.setWidth("26px"); + btn.setSclass("editor-button"); btn.setPopup(popup); btn.setStyle("text-align: center"); appendChild(decimalBox); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/PAttributebox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/PAttributebox.java index 27b174db87..9a8fb887a2 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/PAttributebox.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/PAttributebox.java @@ -52,8 +52,7 @@ public class PAttributebox extends Panel { textBox = new Textbox(); button = new Button(); - button.setHeight("22px"); - button.setWidth("26px"); + button.setSclass("editor-button"); appendChild(textBox); appendChild(button); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Searchbox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Searchbox.java index c5fd97fe7f..937d7ab66f 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Searchbox.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Searchbox.java @@ -50,8 +50,7 @@ public class Searchbox extends Panel { txt = new Textbox(); btn = new Button(); - btn.setHeight("22px"); - btn.setWidth("26px"); + btn.setSclass("editor-button"); appendChild(txt); appendChild(btn); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Urlbox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Urlbox.java index 4e4a5865e0..4459bb4145 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Urlbox.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Urlbox.java @@ -53,8 +53,7 @@ public class Urlbox extends Panel { txtUrl = new Textbox(); btnUrl = new Button(); - btnUrl.setHeight("22px"); - btnUrl.setWidth("26px"); + btnUrl.setSclass("editor-button"); appendChild(txtUrl); appendChild(btnUrl); 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 355ac5884d..c80ec83cb9 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java @@ -30,6 +30,7 @@ import org.adempiere.webui.component.Tabs; import org.adempiere.webui.component.ToolBarButton; import org.adempiere.webui.component.Window; import org.compiere.Adempiere; +import org.compiere.model.MUser; import org.compiere.util.CLogErrorBuffer; import org.compiere.util.CLogMgt; import org.compiere.util.Env; @@ -60,6 +61,7 @@ public class AboutWindow extends Window implements EventListener { private Tabbox tabbox; private Tabpanels tabPanels; private Button btnDownload; + private Button btnErrorEmail; public AboutWindow() { super(); @@ -148,6 +150,9 @@ public class AboutWindow extends Window implements EventListener { btnDownload = new Button(Msg.getMsg(Env.getCtx(), "SaveFile")); btnDownload.addEventListener(Events.ON_CLICK, this); hbox.appendChild(btnDownload); + btnErrorEmail = new Button(Msg.getMsg(Env.getCtx(), "SendEMail")); + btnErrorEmail.addEventListener(Events.ON_CLICK, this); + hbox.appendChild(btnErrorEmail); vbox.appendChild(hbox); Vector columnNames = CLogErrorBuffer.get(true).getColumnNames(Env.getCtx()); @@ -346,6 +351,8 @@ public class AboutWindow extends Window implements EventListener { } else if (event.getTarget() == btnDownload) downloadLog(); + else if (event.getTarget() == btnErrorEmail) + cmd_errorEMail(); else if (event instanceof SizeEvent) doResize((SizeEvent)event); else if (Events.ON_CLICK.equals(event.getName())) @@ -370,4 +377,19 @@ public class AboutWindow extends Window implements EventListener { AMedia media = new AMedia("trace.log", null, "text/plain", log.getBytes()); Filedownload.save(media); } + + /** + * EMail Errors + */ + private void cmd_errorEMail() + { + new WEMailDialog(this, + "EMail Trace", + MUser.get(Env.getCtx()), + "", // to + "Adempiere Trace Info", + CLogErrorBuffer.get(true).getErrorInfo(Env.getCtx(), bErrorsOnly.isSelected()), + null); + + } // cmd_errorEMail } diff --git a/zkwebui/css/default.css.dsp b/zkwebui/css/default.css.dsp index 259902b73c..becc9bfb54 100644 --- a/zkwebui/css/default.css.dsp +++ b/zkwebui/css/default.css.dsp @@ -52,6 +52,17 @@ html,body { width: 80px; } +.editor-button { + height: 22px; + width: 26px; + padding: 0px; +} + +.editor-button img { + vertical-align: middle; + text-align: center; +} + div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none { background-color: white; }