midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4198 Icon duplicated on report dialog when using Font icon

This commit is contained in:
Carlos Ruiz 2020-03-13 15:18:44 +01:00
parent d239941666
commit aecd058f25
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
View File

@ -341,13 +341,20 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
appendRecordLogInfo(pi.getLogs(), infoResultContent);
bOK.setLabel(Msg.getMsg(Env.getCtx(), "Parameter"));
bOK.setImage(ThemeManager.getThemeResource("images/Reset16.png"));
bOK.setDisabled(false);
bCancel.setLabel(Msg.getMsg(Env.getCtx(), "Close"));
bCancel.setImage(ThemeManager.getThemeResource("images/Cancel16.png"));
bCancel.setDisabled(false);
if (ThemeManager.isUseFontIconForImage()) {
String iconSclass = "z-icon-Reset";
bOK.setIconSclass(iconSclass);
LayoutUtils.addSclass("font-icon-toolbar-button", bOK);
} else {
bOK.setImage(ThemeManager.getThemeResource("images/Reset16.png"));
bCancel.setImage(ThemeManager.getThemeResource("images/Cancel16.png"));
}
isParameterPage = false;
m_ids = pi.getIDs();
@ -458,10 +465,17 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
isParameterPage = true;
bOK.setLabel(Msg.getMsg(Env.getCtx(), "Start"));
bOK.setImage(ThemeManager.getThemeResource("images/Ok16.png"));
bCancel.setLabel(Util.cleanAmp(Msg.translate(Env.getCtx(), ConfirmPanel.A_CANCEL)));
if (ThemeManager.isUseFontIconForImage()) {
String iconSclass = "z-icon-Ok";
bOK.setIconSclass(iconSclass);
LayoutUtils.addSclass("font-icon-toolbar-button", bOK);
} else {
bOK.setImage(ThemeManager.getThemeResource("images/Ok16.png"));
bCancel.setImage(ThemeManager.getThemeResource("images/Cancel16.png"));
}
//recreate process info
ProcessInfo m_pi = new WProcessInfo(getName(), getAD_Process_ID());