* Merge revision 6386 from branches/adempiere341
This commit is contained in:
parent
5b750b1abe
commit
895e58208c
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue