From e94e53d828420528caa1afcab3fb8f3f711d4ffa Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 31 Jul 2013 12:26:59 -0500 Subject: [PATCH] IDEMPIERE-234 Configure Toolbar by User / make the example work again --- .hgignore | 2 ++ .../2Pack/ExportAction/dict/PackOut.xml | 17 ++++++++++++++--- .../META-INF/2Pack.zip | Bin 1567 -> 1355 bytes .../META-INF/MANIFEST.MF | 1 + ...dempiere.ui.zk.example.action.export24.png | Bin 1214 -> 8250 bytes .../ui/zk/example/action/ExportWindow.java | 4 ++-- .../webui/adwindow/ADWindowToolbar.java | 4 ++-- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.hgignore b/.hgignore index 559269d4fa..cddda65c24 100644 --- a/.hgignore +++ b/.hgignore @@ -87,6 +87,8 @@ syntax: regexp ^org\.adempiere\.eclipse\.equinox\.servletbridge/bin/.*\.class$ ^org\.adempiere\.eclipse\.equinox\.http\.servlet/bin/.*\.class$ ^org\.adempiere\.eclipse\.equinox\.http\.servletbridge/bin/.*\.class$ +^org\.adempiere\.ui\.zk\.example/bin/.*$ +^org\.adempiere\.webstore\.resource/bin/.*$ ^org\.adempiere\.webstore\.resource/bin/.*$ ^targetPlatform/.*$ ^\.metadata/.*$ diff --git a/org.adempiere.ui.zk.example/2Pack/ExportAction/dict/PackOut.xml b/org.adempiere.ui.zk.example/2Pack/ExportAction/dict/PackOut.xml index ba04efc65d..6e6d405003 100644 --- a/org.adempiere.ui.zk.example/2Pack/ExportAction/dict/PackOut.xml +++ b/org.adempiere.ui.zk.example/2Pack/ExportAction/dict/PackOut.xml @@ -10,11 +10,11 @@ true true - Export Action + Export 0 0 09c20701-b692-44a1-9480-72a1cf8a0bf3 - Export + ExportExample org.adempiere.ui.zk.example.action.export @@ -22,11 +22,22 @@ 0 0 I - Export + Export Example U b9d8b3d7-34d7-4f18-aed9-c19f9ed8f28a org.adempiere.ui.zk.example.action.export.tooltip true + + 0 + 0 + I + Export Example + + U + 9099992f-776f-4efb-bcc6-dbffd65a8f19 + org.adempiere.ui.zk.example.action.export.label + true + diff --git a/org.adempiere.ui.zk.example/META-INF/2Pack.zip b/org.adempiere.ui.zk.example/META-INF/2Pack.zip index eb60c4edde66527a31426005d925c0e3878f965a..d0cdf6176147458d5aed0736deb53dbd703e61c7 100644 GIT binary patch delta 874 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 literal 1214 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE0z%d<2gY`4qIr=h!fr0s|r;B5V#p$(^V|`|aN*u3$@BNZp|HAsM zTNKJ#*CqGmp17p>IXUUk(Vl3NW0eaH)namW9PX;6UFKeX&X6})>4?SN3olAKcYkzC zE>kpgi<#VMH8FQ-(q+z|W8N>zxoh_>2r2lq@ksrrXLG*K`TyDa{O2b!jjmQdqMozY zAJLNM^-uNbzFvCN>rRxE?5YWMpTF(-^0R!6H$~o3*3jlecqm5d%)n8d{}=^pBQ_+ zykPTWa}7P?#4D>VM#UU^nX>LrRmAS<^UBY>#rOZbx?d=Q<;TNW+g@)gU3GEB|JT~q zI?Vpx%jE^$7yl?rSH7O^q&$6U=S+=@6+DZt_NA=7_DAU6x0?^czj>@~dfIX>)I_}d z&VI!&7doBa*K-woI&nO{a+UM(Z*I|sy5h%^6r77XPVPUp@{I5Q+1GD=4tuZ3AnH(B`Q`Kx-qQOg zh4b%}d}_XTZ}zpIXS+FAfBk&%Ws*(B!xt0v9)v6u?JWFiy7-`zl3{$FjhucBYs9Dd zm4O?pI`t*Eg!+$fjL_Lqy2VVyh%GDE%$i|iMNiPmFZRZ<6DFNz{BYyr<}+zVbF8=V zGc3O7VIfn-+?;f8_xE$Ty(*JESz4TymClR3QdzdpJc_|%dGP0CqpsBt^RiyqGE8~l z#js=f%eV&J)-VSC@USr5ldtxEOZ#JA%YPt3gQ4rtot$YQMt&wr%mO>!Jf6#J&24z~ zDqn**AF-)NvKodw2{?ZKF>)j%FT<8-9EEnz5HP->&4E~ zEgt7CyLUH&;nb!xckbwHjPO~xb|q^@(9+8<*P6}ly}mn6G{SM-CLTNaHyXQ7%`9K9 zmo7Z7c3EqPR_wA%879?t-~F^J-6HQ6AR@xz!05=}8Y%HEPQ&UqGCPo%UhX-G7 z=Ldy{w}-9H3}kFM{P54#i-J6Ck=-$R;tXn&4eNJ4^N&mD>^`fuIMeq+>v4t!*QGDK zK7H}^SMP73-Su5pk5<^sGd&!BNvL4=_XoPH+e^3TNiSxaF=IvmU*&x9yv|)c$BrEn zaS)hS@#$l2+3vS@{s+}F+U@(C&wryp`dZzr24HU2s|txINiIrFEJ@W(0TK)h6}OCy z3^rUaHMnkS#BFG@*=Xw)Bh%|<8#WjjFfce>WYv=R;3^B#nVX-InN~@x&Z-le9szYS Nc)I$ztaD0e0sz5nD<1#= diff --git a/org.adempiere.ui.zk.example/src/org/adempiere/ui/zk/example/action/ExportWindow.java b/org.adempiere.ui.zk.example/src/org/adempiere/ui/zk/example/action/ExportWindow.java index a7d44ab704..2199547319 100644 --- a/org.adempiere.ui.zk.example/src/org/adempiere/ui/zk/example/action/ExportWindow.java +++ b/org.adempiere.ui.zk.example/src/org/adempiere/ui/zk/example/action/ExportWindow.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Set; import org.adempiere.base.IGridTabExporter; -import org.adempiere.base.Service; +import org.adempiere.base.equinox.EquinoxExtensionLocator; import org.adempiere.exceptions.AdempiereException; import org.adempiere.webui.adwindow.ADWindowContent; import org.adempiere.webui.adwindow.IADTabbox; @@ -65,7 +65,7 @@ public class ExportWindow extends Window implements EventListener { exporterMap = new HashMap(); extensionMap = new HashMap(); - List exporterList = Service.locator().list(IGridTabExporter.class).getServices(); + List exporterList = EquinoxExtensionLocator.instance().list(IGridTabExporter.class).getExtensions(); for(IGridTabExporter exporter : exporterList) { String extension = exporter.getFileExtension(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java index 765ddd3ec0..dbfb0367d5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java @@ -612,9 +612,9 @@ public class ADWindowToolbar extends FToolbar implements EventListener label = mToolBarButton.getName(); } if (tooltipKey.equals(tooltiptext)) { - tooltiptext = null; + tooltipKey = null; } - ToolBarButton btn = createButton(mToolBarButton.getComponentName(), null, tooltiptext); + ToolBarButton btn = createButton(mToolBarButton.getComponentName(), null, tooltipKey); btn.removeEventListener(Events.ON_CLICK, this); btn.setId(mToolBarButton.getName()); btn.setDisabled(false);