From 23dee999a61f0b93dffdbd0c89e25aceecb3cd84 Mon Sep 17 00:00:00 2001 From: Murilo Habermann Torquato Date: Fri, 29 Nov 2019 23:16:18 -0300 Subject: [PATCH] Refs #6142 / IDEMPIERE-3535 - missing font icons --- .../org/adempiere/webui/acct/WAcctViewer.java | 18 ++++++++++++++++++ .../webui/apps/FeedbackRequestWindow.java | 5 +++++ .../adempiere/webui/apps/ProcessDialog.java | 8 ++++++++ .../webui/apps/form/WReportCustomization.java | 10 ++++++++++ .../webui/apps/form/WSQLProcess.java | 4 +++- .../org/adempiere/webui/editor/WEditor.java | 9 +++++++-- .../webui/editor/WTableDirEditor.java | 3 +++ .../adempiere/webui/window/WEMailDialog.java | 13 +++++++++++++ .../adempiere/webui/window/WMediaDialog.java | 19 +++++++++++++++++-- .../webui/window/WPAttributeDialog.java | 8 ++++++++ .../webui/window/WRecordAccessDialog.java | 19 +++++++++++++++++++ .../default/css/fragment/font-icons.css.dsp | 4 +++- 12 files changed, 114 insertions(+), 6 deletions(-) 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..af598d02e2 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,16 +477,25 @@ public class WAcctViewer extends Window implements EventListener forcePost.setVisible(false); // Elaine 2009/07/29 + 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); // + 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); + 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); @@ -625,6 +634,9 @@ public class WAcctViewer extends Window implements EventListener m_data.fillTable(selTable); selTable.addEventListener(Events.ON_SELECT, this); + 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,6 +650,9 @@ public class WAcctViewer extends Window implements EventListener selAcct.setName("Account_ID"); selAcct.addEventListener(Events.ON_CLICK, this); selAcct.setLabel(""); + if (ThemeManager.isUseFontIconForImage()) + selAcct.setIconSclass("z-icon-Find"); + else selAcct.setImage(ThemeManager.getThemeResource("images/Find16.png")); statusLine.setValue(" " + Msg.getMsg(Env.getCtx(), "ViewerOptions")); @@ -855,6 +870,9 @@ public class WAcctViewer extends Window implements EventListener labels[selectionIndex].setVisible(true); buttons[selectionIndex].setName(columnName); // actionCommand buttons[selectionIndex].addEventListener(Events.ON_CLICK, this); + 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); 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 1d914666cf..3d2ac0cda6 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 @@ -222,6 +222,11 @@ public class FeedbackRequestWindow extends Window implements EventListener public static final Button createProcessButton() { Button btnProcess = new Button(); - + if(ThemeManager.isUseFontIconForImage()) + btnProcess.setIconSclass("z-icon-Process"); + else btnProcess.setImage(ThemeManager.getThemeResource("images/Process24.png")); btnProcess.setName(Msg.getMsg(Env.getCtx(), "Process")); 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 a725ebbc15..9322bb66be 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 @@ -773,9 +773,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, this); 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 ca27170704..fce22856cf 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 @@ -240,6 +240,9 @@ ContextMenuListener, IZoomableEditor searchMode = new Menuitem(); searchMode.setAttribute(WEditorPopupMenu.EVENT_ATTRIBUTE, SHORT_LIST_EVENT); searchMode.setLabel(Msg.getMsg(Env.getCtx(), "ShortListSwitchSearchMode")); + 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..077418266b 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 @@ -309,6 +309,16 @@ public class WEMailDialog extends Window implements EventListener, ValueC row.appendChild(new Label("")); row.appendChild(isAcknowledgmentReceipt); + row = new Row(); + rows.appendChild(row); + row.appendChild(new Label("")); + row.appendChild(isAcknowledgmentReceipt); + + row = new Row(); + rows.appendChild(row); + row.appendChild(new Label("")); + row.appendChild(isAcknowledgmentReceipt); + row = new Row(); rows.appendChild(row); div = new Div(); @@ -363,6 +373,9 @@ public class WEMailDialog extends Window implements EventListener, ValueC LayoutUtils.addSclass("large-toolbarbutton", btn); bAddDefaultMailText = new Button(); + 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")); 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..a6e709860c 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,15 +157,24 @@ 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()); + 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,9 +196,15 @@ public class WMediaDialog extends Window implements EventListener southPane.appendChild(confirmPanel); ZKUpdateUtil.setHeight(southPane, "30px"); + if(ThemeManager.isUseFontIconForImage()) + bOk.setIconSclass("z-icon-Ok"); + else bOk.setImage(ThemeManager.getThemeResource("images/Ok24.png")); bOk.addEventListener(Events.ON_CLICK, this); + if(ThemeManager.isUseFontIconForImage()) + bCancel.setIconSclass("z-icon-Cancel"); + else bCancel.setImage(ThemeManager.getThemeResource("images/Cancel24.png")); bCancel.addEventListener(Events.ON_CLICK, this); 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..94ef9d767c 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,6 +351,9 @@ public class WPAttributeDialog extends Window implements EventListener cbNewEdit.addEventListener(Events.ON_CHECK, this); row.appendChild(cbNewEdit); bSelect.setLabel(Msg.getMsg(Env.getCtx(), "SelectExisting")); + 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); @@ -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..39c544759b 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 @@ -36,6 +36,7 @@ import org.compiere.util.CLogger; import org.compiere.util.DB; import org.compiere.util.Env; import org.compiere.util.Msg; +import org.zkoss.zk.ui.HtmlBasedComponent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; @@ -152,12 +153,28 @@ public class WRecordAccessDialog extends Window implements EventListener */ private void jbInit() throws Exception { + //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")); + //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")); + //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")); + //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")); @@ -186,6 +203,8 @@ public class WRecordAccessDialog extends Window implements EventListener rows.appendChild(row); row.appendChild(roleLabel); row.appendChild(roleField); + //devCoffee #6142 + ZKUpdateUtil.setHflex((HtmlBasedComponent) row.getLastChild(), "1"); row.appendChild(cbActive); row.appendChild(cbExclude); row.appendChild(cbReadOnly); 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 b16964fceb..ee6f3d7165 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 @@ -280,4 +280,6 @@ .z-icon-CSVImport:before { content: "\f0f6"; } - +.z-icon-GetMail:before { + content: "\f0e0"; +}