diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java index 6b439d45de..90f8540f90 100755 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java @@ -477,17 +477,26 @@ public class WAcctViewer extends Window implements EventListener forcePost.setVisible(false); // Elaine 2009/07/29 - bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png")); + if (ThemeManager.isUseFontIconForImage()) + bZoom.setIconSclass("z-icon-Zoom"); + else + bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png")); bZoom.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Zoom"))); bZoom.setVisible(tabbedPane.getSelectedIndex() == 1); bZoom.addEventListener(Events.ON_CLICK, this); // - bQuery.setImage(ThemeManager.getThemeResource("images/Refresh16.png")); + if (ThemeManager.isUseFontIconForImage()) + bQuery.setIconSclass("z-icon-Refresh"); + else + bQuery.setImage(ThemeManager.getThemeResource("images/Refresh16.png")); bQuery.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Refresh"))); bQuery.addEventListener(Events.ON_CLICK, this); - bExport.setImage(ThemeManager.getThemeResource("images/Export16.png")); + if (ThemeManager.isUseFontIconForImage()) + bExport.setIconSclass("z-icon-Export"); + else + bExport.setImage(ThemeManager.getThemeResource("images/Export16.png")); bExport.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Export"))); bExport.addEventListener(Events.ON_CLICK, this); bExport.setVisible(false); @@ -625,7 +634,10 @@ public class WAcctViewer extends Window implements EventListener m_data.fillTable(selTable); selTable.addEventListener(Events.ON_SELECT, this); - selRecord.setImage(ThemeManager.getThemeResource("images/Find16.png")); + if (ThemeManager.isUseFontIconForImage()) + selRecord.setIconSclass("z-icon-Find"); + else + selRecord.setImage(ThemeManager.getThemeResource("images/Find16.png")); selRecord.addEventListener(Events.ON_CLICK, this); selRecord.setLabel(""); @@ -638,7 +650,10 @@ public class WAcctViewer extends Window implements EventListener selAcct.setName("Account_ID"); selAcct.addEventListener(Events.ON_CLICK, this); selAcct.setLabel(""); - selAcct.setImage(ThemeManager.getThemeResource("images/Find16.png")); + if (ThemeManager.isUseFontIconForImage()) + selAcct.setIconSclass("z-icon-Find"); + else + selAcct.setImage(ThemeManager.getThemeResource("images/Find16.png")); statusLine.setValue(" " + Msg.getMsg(Env.getCtx(), "ViewerOptions")); @@ -855,7 +870,10 @@ public class WAcctViewer extends Window implements EventListener labels[selectionIndex].setVisible(true); buttons[selectionIndex].setName(columnName); // actionCommand buttons[selectionIndex].addEventListener(Events.ON_CLICK, this); - buttons[selectionIndex].setImage(ThemeManager.getThemeResource("images/Find16.png")); + if (ThemeManager.isUseFontIconForImage()) + buttons[selectionIndex].setIconSclass("z-icon-Find"); + else + buttons[selectionIndex].setImage(ThemeManager.getThemeResource("images/Find16.png")); buttons[selectionIndex].setLabel(""); buttons[selectionIndex].setVisible(true); selectionIndex++; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java index cf86fd9c24..609b545601 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java @@ -221,7 +221,12 @@ public class FeedbackRequestWindow extends Window implements EventListener public static final Button createProcessButton() { Button btnProcess = new Button(); - - btnProcess.setImage(ThemeManager.getThemeResource("images/Process24.png")); + if(ThemeManager.isUseFontIconForImage()) + btnProcess.setIconSclass("z-icon-Process"); + else + btnProcess.setImage(ThemeManager.getThemeResource("images/Process24.png")); btnProcess.setName(Msg.getMsg(Env.getCtx(), "Process")); return btnProcess; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java index 5e6122e85b..b3a23f0e97 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java @@ -781,9 +781,14 @@ public abstract class WEditor implements EventListener, PropertyChangeLis * @param popupMenu */ protected void addTextEditorMenu(WEditorPopupMenu popupMenu) { - Menuitem editor = new Menuitem(Msg.getMsg(Env.getCtx(), "Editor"), ThemeManager.getThemeResource("images/Editor16.png")); + Menuitem editor = new Menuitem(); editor.setAttribute("EVENT", WEditorPopupMenu.EDITOR_EVENT); - editor.addEventListener(Events.ON_CLICK, popupMenu); + editor.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Editor")).intern()); + if (ThemeManager.isUseFontIconForImage()) + editor.setIconSclass("z-icon-Edit"); + else + editor.setImage(ThemeManager.getThemeResource("images/Editor16.png")); + editor.addEventListener(Events.ON_CLICK, popupMenu); popupMenu.appendChild(editor); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java index 8444cb36c8..f0637cf9d8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java @@ -241,7 +241,10 @@ ContextMenuListener, IZoomableEditor searchMode = new Menuitem(); searchMode.setAttribute(WEditorPopupMenu.EVENT_ATTRIBUTE, SHORT_LIST_EVENT); searchMode.setLabel(Msg.getMsg(Env.getCtx(), "ShortListSwitchSearchMode")); - searchMode.setImage(ThemeManager.getThemeResource("images/Lock16.png")); + if(ThemeManager.isUseFontIconForImage()) + searchMode.setIconSclass("z-icon-Lock"); + else + searchMode.setImage(ThemeManager.getThemeResource("images/Lock16.png")); searchMode.addEventListener(Events.ON_CLICK, popupMenu); popupMenu.appendChild(searchMode); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java index ed22a5062a..69ac9aae1a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java @@ -363,7 +363,10 @@ public class WEMailDialog extends Window implements EventListener, ValueC LayoutUtils.addSclass("large-toolbarbutton", btn); bAddDefaultMailText = new Button(); - bAddDefaultMailText.setImage(ThemeManager.getThemeResource("images/DefaultMailText.png")); + if(ThemeManager.isUseFontIconForImage()) + bAddDefaultMailText.setIconSclass("z-icon-GetMail"); + else + bAddDefaultMailText.setImage(ThemeManager.getThemeResource("images/DefaultMailText.png")); bAddDefaultMailText.addEventListener(Events.ON_CLICK, this); bAddDefaultMailText.setTooltiptext(Msg.getMsg(Env.getCtx(), "AddDefaultMailTextContent")); if (new MUser(Env.getCtx(), Env.getAD_User_ID(Env.getCtx()), null).getR_DefaultMailText_ID() > 0) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java index 3175c7412b..f28e23a22d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java @@ -157,16 +157,25 @@ public class WMediaDialog extends Window implements EventListener bSave.setEnabled(false); - bSave.setImage(ThemeManager.getThemeResource("images/Export24.png")); + if (ThemeManager.isUseFontIconForImage()) + bSave.setIconSclass("z-icon-Export"); + else + bSave.setImage(ThemeManager.getThemeResource("images/Download24.png")); bSave.setTooltiptext(Msg.getMsg(Env.getCtx(), "AttachmentSave")); bSave.addEventListener(Events.ON_CLICK, this); - bLoad.setImage(ThemeManager.getThemeResource("images/Import24.png")); + if (ThemeManager.isUseFontIconForImage()) + bLoad.setIconSclass("z-icon-Import"); + else + bLoad.setImage(ThemeManager.getThemeResource("images/Upload24.png")); bLoad.setTooltiptext(Msg.getMsg(Env.getCtx(), "Load")); bLoad.addEventListener(Events.ON_UPLOAD, this); bLoad.setUpload(AdempiereWebUI.getUploadSetting()); - bDelete.setImage(ThemeManager.getThemeResource("images/Delete24.png")); + if (ThemeManager.isUseFontIconForImage()) + bDelete.setIconSclass("z-icon-Delete"); + else + bDelete.setImage(ThemeManager.getThemeResource("images/Delete24.png")); bDelete.setTooltiptext(Msg.getMsg(Env.getCtx(), "Delete")); bDelete.addEventListener(Events.ON_CLICK, this); @@ -187,10 +196,16 @@ public class WMediaDialog extends Window implements EventListener southPane.appendChild(confirmPanel); ZKUpdateUtil.setHeight(southPane, "30px"); - bOk.setImage(ThemeManager.getThemeResource("images/Ok24.png")); + if(ThemeManager.isUseFontIconForImage()) + bOk.setIconSclass("z-icon-Ok"); + else + bOk.setImage(ThemeManager.getThemeResource("images/Ok24.png")); bOk.addEventListener(Events.ON_CLICK, this); - bCancel.setImage(ThemeManager.getThemeResource("images/Cancel24.png")); + if(ThemeManager.isUseFontIconForImage()) + bCancel.setIconSclass("z-icon-Cancel"); + else + bCancel.setImage(ThemeManager.getThemeResource("images/Cancel24.png")); bCancel.addEventListener(Events.ON_CLICK, this); confirmPanel.appendChild(bOk); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java index 8f548fca70..8494aed321 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java @@ -351,7 +351,10 @@ public class WPAttributeDialog extends Window implements EventListener cbNewEdit.addEventListener(Events.ON_CHECK, this); row.appendChild(cbNewEdit); bSelect.setLabel(Msg.getMsg(Env.getCtx(), "SelectExisting")); - bSelect.setImage(ThemeManager.getThemeResource("images/PAttribute16.png")); + if (ThemeManager.isUseFontIconForImage()) + bSelect.setIconSclass("z-icon-PAttribute"); + else + bSelect.setImage(ThemeManager.getThemeResource("images/PAttribute16.png")); bSelect.addEventListener(Events.ON_CLICK, this); row.appendChild(bSelect); ZKUpdateUtil.setHflex(bSelect, "1"); @@ -430,6 +433,11 @@ public class WPAttributeDialog extends Window implements EventListener // Popup // fieldLot.addMouseListener(new VPAttributeDialog_mouseAdapter(this)); // popup mZoom = new Menuitem(Msg.getMsg(Env.getCtx(), "Zoom"), ThemeManager.getThemeResource("images/Zoom16.png")); + if(ThemeManager.isUseFontIconForImage()) { + mZoom.setIconSclass("z-icon-Zoom"); + mZoom.setImage(""); + } + mZoom.addEventListener(Events.ON_CLICK, this); popupMenu.appendChild(mZoom); this.appendChild(popupMenu); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java index 47f6dc9a69..c8de227888 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java @@ -152,13 +152,29 @@ public class WRecordAccessDialog extends Window implements EventListener */ private void jbInit() throws Exception { - bDelete.setImage(ThemeManager.getThemeResource("images/Delete16.png")); + //devCoffee #6142 + if(ThemeManager.isUseFontIconForImage()) + bDelete.setIconSclass("z-icon-Delete"); + else + bDelete.setImage(ThemeManager.getThemeResource("images/Delete16.png")); bDelete.setTooltiptext(Msg.getMsg(Env.getCtx(), "Delete")); - bNew.setImage(ThemeManager.getThemeResource("images/New16.png")); + //devCoffee #6142 + if(ThemeManager.isUseFontIconForImage()) + bNew.setIconSclass("z-icon-New"); + else + bNew.setImage(ThemeManager.getThemeResource("images/New16.png")); bNew.setTooltiptext(Msg.getMsg(Env.getCtx(), "New")); - bUp.setImage(ThemeManager.getThemeResource("images/Previous16.png")); + //devCoffee #6142 + if(ThemeManager.isUseFontIconForImage()) + bUp.setIconSclass("z-icon-Previous"); + else + bUp.setImage(ThemeManager.getThemeResource("images/Previous16.png")); bUp.setTooltiptext(Msg.getMsg(Env.getCtx(), "Previous")); - bDown.setImage(ThemeManager.getThemeResource("images/Next16.png")); + //devCoffee #6142 + if(ThemeManager.isUseFontIconForImage()) + bDown.setIconSclass("z-icon-Next"); + else + bDown.setImage(ThemeManager.getThemeResource("images/Next16.png")); bDown.setTooltiptext(Msg.getMsg(Env.getCtx(), "Next")); cbActive.setText(Msg.translate(Env.getCtx(), "IsActive")); diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp index 63eebc7b18..9aeacfbea1 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp @@ -291,4 +291,7 @@ } .z-icon-UnSort:before { content: "\f074"; -} \ No newline at end of file +} +.z-icon-GetMail:before { + content: "\f0e0"; +}