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

IDEMPIERE-4561 Font Icons not used in several points (#423)

This commit is contained in:
Carlos Ruiz 2020-12-01 00:12:28 +01:00 committed by GitHub
parent 3a9b932df4
commit 42854cfb0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 56 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
View File

@ -133,14 +133,13 @@ public class WWFActivity extends ADForm implements EventListener<Event>
fAnswerList.setMold("select"); fAnswerList.setMold("select");
if (ThemeManager.isUseFontIconForImage()) if (ThemeManager.isUseFontIconForImage()) {
bZoom.setIconSclass("z-icon-Zoom"); bZoom.setIconSclass("z-icon-Zoom");
else
bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png"));
if (ThemeManager.isUseFontIconForImage())
bOK.setIconSclass("z-icon-Ok"); bOK.setIconSclass("z-icon-Ok");
else } else {
bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png"));
bOK.setImage(ThemeManager.getThemeResource("images/Ok16.png")); bOK.setImage(ThemeManager.getThemeResource("images/Ok16.png"));
}
MLookup lookup = MLookupFactory.get(Env.getCtx(), m_WindowNo, MLookup lookup = MLookupFactory.get(Env.getCtx(), m_WindowNo,
0, 10443, DisplayType.Search); 0, 10443, DisplayType.Search);

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java
View File

@ -47,6 +47,7 @@ import org.zkoss.zul.Vbox;
* Contributors: * Contributors:
* Deepak Pansheriya - showing only notes message * Deepak Pansheriya - showing only notes message
*/ */
@Deprecated // replaced with DPDocumentStatus
public class DPActivities extends DashboardPanel implements EventListener<Event> { public class DPActivities extends DashboardPanel implements EventListener<Event> {
/** /**
* *

13
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
View File

@ -50,11 +50,10 @@ import org.zkoss.zul.Toolbar;
import org.zkoss.zul.Vbox; import org.zkoss.zul.Vbox;
public class DPRunningJobs extends DashboardPanel implements EventListener<Event>, EventHandler { public class DPRunningJobs extends DashboardPanel implements EventListener<Event>, EventHandler {
/** /**
* *
*/ */
private static final long serialVersionUID = 1946438226234068194L; private static final long serialVersionUID = -8515643315156488709L;
private static final String AD_PINSTANCE_ID_ATTR = "AD_PInstance_ID"; private static final String AD_PINSTANCE_ID_ATTR = "AD_PInstance_ID";
@ -194,7 +193,10 @@ public class DPRunningJobs extends DashboardPanel implements EventListener<Event
btnJob.setAttribute(AD_PINSTANCE_ID_ATTR, String.valueOf(pi.getAD_PInstance_ID())); btnJob.setAttribute(AD_PINSTANCE_ID_ATTR, String.valueOf(pi.getAD_PInstance_ID()));
bxJobs.appendChild(btnJob); bxJobs.appendChild(btnJob);
btnJob.setLabel(label); btnJob.setLabel(label);
btnJob.setImage(ThemeManager.getThemeResource(getIconFile())); if (ThemeManager.isUseFontIconForImage())
btnJob.setIconSclass("z-icon-Window");
else
btnJob.setImage(ThemeManager.getThemeResource("images/mWindow.png"));
btnJob.addEventListener(Events.ON_CLICK, this); btnJob.addEventListener(Events.ON_CLICK, this);
btnJob.setSclass("menu-href"); btnJob.setSclass("menu-href");
ZKUpdateUtil.setHflex(btnJob, "1"); ZKUpdateUtil.setHflex(btnJob, "1");
@ -211,11 +213,6 @@ public class DPRunningJobs extends DashboardPanel implements EventListener<Event
.list(); .list();
return pis; return pis;
} }
private String getIconFile()
{
return "images/mWindow.png";
}
@Override @Override
public void refresh(ServerPushTemplate template) public void refresh(ServerPushTemplate template)

20
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java
View File

@ -167,21 +167,33 @@ public class WChosenboxSearchEditor extends WEditor implements ContextMenuListen
private void init() private void init()
{ {
columnName = this.getColumnName(); columnName = this.getColumnName();
imageUrl = ThemeManager.getThemeResource("images/PickOpen16.png"); if (ThemeManager.isUseFontIconForImage())
imageUrl = "z-icon-More";
else
imageUrl = ThemeManager.getThemeResource("images/PickOpen16.png");
if (lookup instanceof MLookup) if (lookup instanceof MLookup)
{ {
MLookup mlookup = (MLookup) lookup; MLookup mlookup = (MLookup) lookup;
if ("C_BPartner_ID".equals(mlookup.getLookupInfo().KeyColumn)) if ("C_BPartner_ID".equals(mlookup.getLookupInfo().KeyColumn))
{ {
imageUrl = ThemeManager.getThemeResource("images/BPartner16.png"); if (ThemeManager.isUseFontIconForImage())
imageUrl = "z-icon-BPartner";
else
imageUrl = ThemeManager.getThemeResource("images/BPartner16.png");
} }
else if ("M_Product_ID".equals(mlookup.getLookupInfo().KeyColumn)) else if ("M_Product_ID".equals(mlookup.getLookupInfo().KeyColumn))
{ {
imageUrl = ThemeManager.getThemeResource("images/Product16.png"); if (ThemeManager.isUseFontIconForImage())
imageUrl = "z-icon-Product";
else
imageUrl = ThemeManager.getThemeResource("images/Product16.png");
} }
} }
popupMenu = new WEditorPopupMenu(false, true, isShowPreference(), false, false, false, lookup); popupMenu = new WEditorPopupMenu(false, true, isShowPreference(), false, false, false, lookup);
getComponent().getButton().setImage(imageUrl); if (ThemeManager.isUseFontIconForImage())
getComponent().getButton().setIconSclass(imageUrl);
else
getComponent().getButton().setImage(imageUrl);
setTableAndKeyColumn(); setTableAndKeyColumn();
subModel = new InfoListSubModel(lookup, gridField, m_tableName, m_keyColumnName); subModel = new InfoListSubModel(lookup, gridField, m_tableName, m_keyColumnName);

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
View File

@ -142,12 +142,16 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
} }
}; };
bUp.setImage(ThemeManager.getThemeResource("images/Parent24.png")); if (ThemeManager.isUseFontIconForImage()) {
bUp.setIconSclass("z-icon-Parent");
bDown.setIconSclass("z-icon-Detail");
} else {
bUp.setImage(ThemeManager.getThemeResource("images/Parent24.png"));
bDown.setImage(ThemeManager.getThemeResource("images/Detail24.png"));
}
bUp.addEventListener(Events.ON_CLICK, actionListener); bUp.addEventListener(Events.ON_CLICK, actionListener);
bDown.setImage(ThemeManager.getThemeResource("images/Detail24.png"));
bDown.addEventListener(Events.ON_CLICK, actionListener); bDown.addEventListener(Events.ON_CLICK, actionListener);
Vbox vbox = new Vbox(); Vbox vbox = new Vbox();
vbox.appendChild(bUp); vbox.appendChild(bUp);
vbox.appendChild(bDown); vbox.appendChild(bDown);

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
View File

@ -112,10 +112,14 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements EventListener
yesList.setSeltype("multiple"); yesList.setSeltype("multiple");
noList.setSeltype("multiple"); noList.setSeltype("multiple");
bAdd.setImage(ThemeManager.getThemeResource("images/Next24.png")); if (ThemeManager.isUseFontIconForImage()) {
bAdd.setIconSclass("z-icon-Next");
bRemove.setIconSclass("z-icon-Previous");
} else {
bAdd.setImage(ThemeManager.getThemeResource("images/Next24.png"));
bRemove.setImage(ThemeManager.getThemeResource("images/Previous24.png"));
}
bAdd.addEventListener(Events.ON_CLICK, actionListener); bAdd.addEventListener(Events.ON_CLICK, actionListener);
bRemove.setImage(ThemeManager.getThemeResource("images/Previous24.png"));
bRemove.addEventListener(Events.ON_CLICK, actionListener); bRemove.addEventListener(Events.ON_CLICK, actionListener);
EventListener<Event> crossListMouseListener = new DragListener(); EventListener<Event> crossListMouseListener = new DragListener();
@ -160,11 +164,15 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements EventListener
migrateValueWithinYesList(event); migrateValueWithinYesList(event);
} }
}; };
bUp.setImage(ThemeManager.getThemeResource("images/Parent24.png"));
bUp.addEventListener(Events.ON_CLICK, actionListener2);
bDown.setImage(ThemeManager.getThemeResource("images/Detail24.png")); if (ThemeManager.isUseFontIconForImage()) {
bUp.setIconSclass("z-icon-Parent");
bDown.setIconSclass("z-icon-Detail");
} else {
bUp.setImage(ThemeManager.getThemeResource("images/Parent24.png"));
bDown.setImage(ThemeManager.getThemeResource("images/Detail24.png"));
}
bUp.addEventListener(Events.ON_CLICK, actionListener2);
bDown.addEventListener(Events.ON_CLICK, actionListener2); bDown.addEventListener(Events.ON_CLICK, actionListener2);
vbox = new Vbox(); vbox = new Vbox();

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WGadgets.java
View File

@ -155,10 +155,14 @@ public class WGadgets extends Window implements EventListener<Event>{
yesList.setSeltype("multiple"); yesList.setSeltype("multiple");
noList.setSeltype("multiple"); noList.setSeltype("multiple");
bAdd.setImage(ThemeManager.getThemeResource("images/Next24.png")); if (ThemeManager.isUseFontIconForImage()) {
bAdd.setIconSclass("z-icon-Next");
bRemove.setIconSclass("z-icon-Previous");
} else {
bAdd.setImage(ThemeManager.getThemeResource("images/Next24.png"));
bRemove.setImage(ThemeManager.getThemeResource("images/Previous24.png"));
}
bAdd.addEventListener(Events.ON_CLICK, actionListener); bAdd.addEventListener(Events.ON_CLICK, actionListener);
bRemove.setImage(ThemeManager.getThemeResource("images/Previous24.png"));
bRemove.addEventListener(Events.ON_CLICK, actionListener); bRemove.addEventListener(Events.ON_CLICK, actionListener);
final EventListener<Event> moveListener = new MoveListener(); final EventListener<Event> moveListener = new MoveListener();