* Merge revision 6386 from branches/adempiere341

This commit is contained in:
Heng Sin Low 2008-09-06 22:04:55 +00:00
parent 5b750b1abe
commit 895e58208c
9 changed files with 40 additions and 14 deletions

View File

@ -50,8 +50,7 @@ public class Combinationbox extends Panel
{ {
textbox = new Textbox(); textbox = new Textbox();
button = new Button(); button = new Button();
button.setHeight("22px"); button.setSclass("editor-button");;
button.setWidth("26px");
appendChild(textbox); appendChild(textbox);
appendChild(button); appendChild(button);

View File

@ -64,8 +64,7 @@ public class EditorBox extends Panel
this.appendChild(txt); this.appendChild(txt);
this.appendChild(btn); this.appendChild(btn);
btn.setHeight("22px"); btn.setSclass("editor-button");
btn.setWidth("26px");
String style = AEnv.isFirefox2() ? "display: inline" : "display: inline-block"; String style = AEnv.isFirefox2() ? "display: inline" : "display: inline-block";
this.setStyle(style); this.setStyle(style);

View File

@ -54,8 +54,7 @@ public class Locationbox extends Panel
{ {
txt = new Textbox(); txt = new Textbox();
btn = new Button(); btn = new Button();
btn.setHeight("22px"); btn.setSclass("editor-button");
btn.setWidth("26px");
this.appendChild(txt); this.appendChild(txt);
this.appendChild(btn); this.appendChild(btn);

View File

@ -73,8 +73,7 @@ public class NumberBox extends Panel
decimalBox.getId() + "'," + integral + ", event);"); decimalBox.getId() + "'," + integral + ", event);");
Popup popup = getCalculatorPopup(); Popup popup = getCalculatorPopup();
btn.setHeight("22px"); btn.setSclass("editor-button");
btn.setWidth("26px");
btn.setPopup(popup); btn.setPopup(popup);
btn.setStyle("text-align: center"); btn.setStyle("text-align: center");
appendChild(decimalBox); appendChild(decimalBox);

View File

@ -52,8 +52,7 @@ public class PAttributebox extends Panel
{ {
textBox = new Textbox(); textBox = new Textbox();
button = new Button(); button = new Button();
button.setHeight("22px"); button.setSclass("editor-button");
button.setWidth("26px");
appendChild(textBox); appendChild(textBox);
appendChild(button); appendChild(button);

View File

@ -50,8 +50,7 @@ public class Searchbox extends Panel
{ {
txt = new Textbox(); txt = new Textbox();
btn = new Button(); btn = new Button();
btn.setHeight("22px"); btn.setSclass("editor-button");
btn.setWidth("26px");
appendChild(txt); appendChild(txt);
appendChild(btn); appendChild(btn);

View File

@ -53,8 +53,7 @@ public class Urlbox extends Panel
{ {
txtUrl = new Textbox(); txtUrl = new Textbox();
btnUrl = new Button(); btnUrl = new Button();
btnUrl.setHeight("22px"); btnUrl.setSclass("editor-button");
btnUrl.setWidth("26px");
appendChild(txtUrl); appendChild(txtUrl);
appendChild(btnUrl); appendChild(btnUrl);

View File

@ -30,6 +30,7 @@ import org.adempiere.webui.component.Tabs;
import org.adempiere.webui.component.ToolBarButton; import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.compiere.Adempiere; import org.compiere.Adempiere;
import org.compiere.model.MUser;
import org.compiere.util.CLogErrorBuffer; import org.compiere.util.CLogErrorBuffer;
import org.compiere.util.CLogMgt; import org.compiere.util.CLogMgt;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -60,6 +61,7 @@ public class AboutWindow extends Window implements EventListener {
private Tabbox tabbox; private Tabbox tabbox;
private Tabpanels tabPanels; private Tabpanels tabPanels;
private Button btnDownload; private Button btnDownload;
private Button btnErrorEmail;
public AboutWindow() { public AboutWindow() {
super(); super();
@ -148,6 +150,9 @@ public class AboutWindow extends Window implements EventListener {
btnDownload = new Button(Msg.getMsg(Env.getCtx(), "SaveFile")); btnDownload = new Button(Msg.getMsg(Env.getCtx(), "SaveFile"));
btnDownload.addEventListener(Events.ON_CLICK, this); btnDownload.addEventListener(Events.ON_CLICK, this);
hbox.appendChild(btnDownload); hbox.appendChild(btnDownload);
btnErrorEmail = new Button(Msg.getMsg(Env.getCtx(), "SendEMail"));
btnErrorEmail.addEventListener(Events.ON_CLICK, this);
hbox.appendChild(btnErrorEmail);
vbox.appendChild(hbox); vbox.appendChild(hbox);
Vector columnNames = CLogErrorBuffer.get(true).getColumnNames(Env.getCtx()); Vector columnNames = CLogErrorBuffer.get(true).getColumnNames(Env.getCtx());
@ -346,6 +351,8 @@ public class AboutWindow extends Window implements EventListener {
} }
else if (event.getTarget() == btnDownload) else if (event.getTarget() == btnDownload)
downloadLog(); downloadLog();
else if (event.getTarget() == btnErrorEmail)
cmd_errorEMail();
else if (event instanceof SizeEvent) else if (event instanceof SizeEvent)
doResize((SizeEvent)event); doResize((SizeEvent)event);
else if (Events.ON_CLICK.equals(event.getName())) 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()); AMedia media = new AMedia("trace.log", null, "text/plain", log.getBytes());
Filedownload.save(media); 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
} }

View File

@ -52,6 +52,17 @@ html,body {
width: 80px; 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 { div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
background-color: white; background-color: white;
} }