From 479df69cac37f291769868bf611a08271c0605b2 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 11 Jun 2013 15:29:05 +0800 Subject: [PATCH] IDEMPIERE-724 Zk: Make iDempiere theme more easily customizable. More efficient use of spaces and additional css class for sort tab. --- .../adempiere/webui/adwindow/ADSortTab.java | 35 ++++++++++-------- .../theme/default/css/theme.css.dsp | 9 ++++- .../theme/default/images/MoveDown16.png | Bin 0 -> 1077 bytes .../theme/default/images/MoveLeft16.png | Bin 0 -> 2877 bytes .../theme/default/images/MoveRight16.png | Bin 0 -> 2877 bytes .../theme/default/images/MoveUp16.png | Bin 0 -> 1005 bytes 6 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 org.adempiere.ui.zk/theme/default/images/MoveDown16.png create mode 100644 org.adempiere.ui.zk/theme/default/images/MoveLeft16.png create mode 100644 org.adempiere.ui.zk/theme/default/images/MoveRight16.png create mode 100644 org.adempiere.ui.zk/theme/default/images/MoveUp16.png diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java index 7116297aa0..d0b64c9f93 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java @@ -35,6 +35,7 @@ import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.Panel; import org.adempiere.webui.component.SimpleListModel; import org.adempiere.webui.factory.ButtonFactory; +import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.window.FDialog; import org.compiere.model.GridTab; import org.compiere.model.MRole; @@ -51,7 +52,6 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Hlayout; -import org.zkoss.zul.Vbox; import org.zkoss.zul.event.ListDataEvent; /** @@ -110,10 +110,10 @@ public class ADSortTab extends Panel implements IADTabpanel // UI variables private Label noLabel = new Label(); private Label yesLabel = new Label(); - private Button bAdd = ButtonFactory.createNamedButton("Next", false, true); - private Button bRemove = ButtonFactory.createNamedButton("Previous", false, true); - private Button bUp = ButtonFactory.createNamedButton("Parent", false, true); - private Button bDown = ButtonFactory.createNamedButton("Detail", false, true); + private Button bAdd = ButtonFactory.createButton(null, ThemeManager.getThemeResource("images/MoveLeft16.png"), null); + private Button bRemove = ButtonFactory.createButton(null, ThemeManager.getThemeResource("images/MoveRight16.png"), null); + private Button bUp = ButtonFactory.createButton(null, ThemeManager.getThemeResource("images/MoveUp16.png"), null); + private Button bDown = ButtonFactory.createButton(null, ThemeManager.getThemeResource("images/MoveDown16.png"), null); // SimpleListModel noModel = new SimpleListModel() { /** @@ -291,9 +291,11 @@ public class ADSortTab extends Panel implements IADTabpanel noModel.setMultiple(true); LayoutUtils.addSclass("btn-small", bAdd); + LayoutUtils.addSclass("btn-sorttab small-img-btn", bAdd); bAdd.addEventListener(Events.ON_CLICK, actionListener); LayoutUtils.addSclass("btn-small", bRemove); + LayoutUtils.addSclass("btn-sorttab small-img-btn", bRemove); bRemove.addEventListener(Events.ON_CLICK, actionListener); EventListener crossListMouseListener = new DragListener(); @@ -310,21 +312,33 @@ public class ADSortTab extends Panel implements IADTabpanel }; LayoutUtils.addSclass("btn-small", bUp); + LayoutUtils.addSclass("btn-sorttab small-img-btn", bUp); bUp.addEventListener(Events.ON_CLICK, actionListener2); LayoutUtils.addSclass("btn-small", bDown); + LayoutUtils.addSclass("btn-sorttab small-img-btn", bDown); bDown.addEventListener(Events.ON_CLICK, actionListener2); ListHead listHead = new ListHead(); listHead.setParent(yesList); ListHeader listHeader = new ListHeader(); listHeader.appendChild(yesLabel); + Hlayout yesButtonLayout = new Hlayout(); + yesButtonLayout.appendChild(bUp); + yesButtonLayout.appendChild(bDown); + listHeader.appendChild(yesButtonLayout); + yesButtonLayout.setStyle("display: inline-block; float: right;"); listHeader.setParent(listHead); listHead = new ListHead(); listHead.setParent(noList); listHeader = new ListHeader(); listHeader.appendChild(noLabel); + Hlayout noButtonLayout = new Hlayout(); + noButtonLayout.appendChild(bRemove); + noButtonLayout.appendChild(bAdd); + listHeader.appendChild(noButtonLayout); + noButtonLayout.setStyle("display: inline-block; float: right;"); listHeader.setParent(listHead); Hlayout hlayout = new Hlayout(); @@ -335,21 +349,10 @@ public class ADSortTab extends Panel implements IADTabpanel noList.setHflex("1"); noList.setVflex(true); hlayout.appendChild(noList); - Vbox vbox = new Vbox(); - vbox.appendChild(bAdd); - vbox.appendChild(bRemove); - vbox.setWidth("46px"); - vbox.setAlign("center"); - hlayout.appendChild(vbox); yesList.setVflex(true); yesList.setHflex("1"); hlayout.appendChild(yesList); - vbox = new Vbox(); - vbox.appendChild(bUp); - vbox.appendChild(bDown); - vbox.setWidth("46px"); - hlayout.appendChild(vbox); addEventListener(ON_ACTIVATE_EVENT, new EventListener() { @Override diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp index 547fc077c8..c0404c9b4e 100644 --- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp @@ -316,7 +316,7 @@ html,body { background-color: transparent; } -.txt-btn img { +.txt-btn img, .small-img-btn img { height: 16px; width: 16px; background-color: transparent; @@ -328,6 +328,13 @@ html,body { padding: 1px 5px; } +.btn-sorttab { + box-shadow: 0px 0px 4px #bbb; + color: #555; + border: solid 1px #bbb; + text-shadow: 0px 1px 2px #888; +} + <%-- desktop --%> div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none { background-color: white; diff --git a/org.adempiere.ui.zk/theme/default/images/MoveDown16.png b/org.adempiere.ui.zk/theme/default/images/MoveDown16.png new file mode 100644 index 0000000000000000000000000000000000000000..99d5ca4a06b5ee0b5af68b704572ad7a9849eb05 GIT binary patch literal 1077 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 b6b2XohHDj*oB=2C00000NkvXXu0mjfcZ*gS literal 0 HcmV?d00001 diff --git a/org.adempiere.ui.zk/theme/default/images/MoveRight16.png b/org.adempiere.ui.zk/theme/default/images/MoveRight16.png new file mode 100644 index 0000000000000000000000000000000000000000..5ebf86d9b121eff6b5835ed28548b36188ae248e GIT binary patch literal 2877 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 bDGV?G!59;g+9IU_00000NkvXXu0mjfzExMx literal 0 HcmV?d00001 diff --git a/org.adempiere.ui.zk/theme/default/images/MoveUp16.png b/org.adempiere.ui.zk/theme/default/images/MoveUp16.png new file mode 100644 index 0000000000000000000000000000000000000000..c0e02e5d6dc19500e0598a0698c7b20fe2a4dd0b GIT binary patch literal 1005 zcmaJ=O=#0l9FN=3FQ*+lS>F_^k0O}A!CXjapvbrCaW7g#TXY4WzlHhEd{X0x6A zh8@+5Fc>Hbp7fv>6~90a^Ws@=%D|(FS7E+%ZRf!nlDx0q@Avm9IN^rq;CHnh|*EFy#iJnVpam~xZvOTrp!`YQ--CU`d zf<>n%K`Io9fCI4sLZ|8mVkpsdU6IVAZI%Xg2(C!h@ij38pcvWtx{<_3dJ1qBACZ+qBAE{GJ35?aC%O+4KW!SPzMZqP^*Nf;X%9?LQD zD5NG()BX>2oEAF31-RqyKZOH**@J8W258AQN#W)PBU7H3^`U{0uOn1#W^tyBFbc}Z z1KC*~4A0rFg=)dEI$qO6)eW%Wnow0FnkX=~ZHW_t!U7HoXYFn~sH9mAnxBH~6&!(SBsw7Y2u}ezos+^*;|5#iQq*4BrZFzSSR| u_;F$VhSsN7kKd*C4h^jj>>0VftE->-sP?_;zIWP+E})v5Rvu-}U-<*^Aw60E literal 0 HcmV?d00001