From c4b9ec9537b24e1ef835efb2db4fdde65516e555 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 25 Jul 2014 18:04:21 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-wizard-widget@99023 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../td/wizardwidget/client/WizardWindow.java | 17 ++++++++++++--- .../client/dataresource/ResourceBundle.java | 20 ++++++++++++++++++ .../dataresource/resources/wizard-go.png | Bin 0 -> 502 bytes .../dataresource/resources/wizard-go_32.png | Bin 0 -> 656 bytes .../dataresource/resources/wizard-next.png | Bin 0 -> 474 bytes .../dataresource/resources/wizard-next_32.png | Bin 0 -> 559 bytes .../resources/wizard-previous.png | Bin 0 -> 431 bytes .../resources/wizard-previous_32.png | Bin 0 -> 573 bytes 8 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-go.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-go_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-next.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-next_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-previous.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-previous_32.png diff --git a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java index 22dfd3f..52ef501 100644 --- a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java +++ b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java @@ -6,18 +6,22 @@ package org.gcube.portlets.user.td.wizardwidget.client; import java.util.ArrayList; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; +import org.gcube.portlets.user.td.wizardwidget.client.dataresource.ResourceBundle; import org.gcube.portlets.user.td.wizardwidget.client.util.ErrorMessageBox; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.Callback; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.Widget; -import com.google.web.bindery.event.shared.SimpleEventBus; import com.google.web.bindery.event.shared.EventBus; +import com.google.web.bindery.event.shared.SimpleEventBus; +import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign; import com.sencha.gxt.core.client.resources.ThemeStyles; +import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.widget.core.client.Dialog; import com.sencha.gxt.widget.core.client.Window; import com.sencha.gxt.widget.core.client.button.TextButton; +import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData; import com.sencha.gxt.widget.core.client.container.CardLayoutContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; @@ -100,14 +104,19 @@ public class WizardWindow extends Window { toolbar.addStyleName(ThemeStyles.getStyle().borderTop()); backButton = new TextButton(BUTTONBACKLABEL); + backButton.setIcon(ResourceBundle.INSTANCE.wizardPrevious()); + backButton.setIconAlign(IconAlign.LEFT); + backButton.setEnabled(false); backButton.setTabIndex(1001); - toolbar.add(backButton); + toolbar.add(backButton,new BoxLayoutData(new Margins(1))); toolbar.add(new FillToolItem()); nextButton = new TextButton(BUTTONNEXTLABEL); + nextButton.setIcon(ResourceBundle.INSTANCE.wizardNext()); + nextButton.setIconAlign(IconAlign.RIGHT); nextButton.setTabIndex(1000); - toolbar.add(nextButton); + toolbar.add(nextButton, new BoxLayoutData(new Margins(1))); toolbar.setLayoutData(new VerticalLayoutData(1, -1)); container.add(toolbar); @@ -268,6 +277,8 @@ public class WizardWindow extends Window { */ public void setNextButtonToFinish() { nextButton.setText(BUTTONFINISHLABEL); + nextButton.setIcon(ResourceBundle.INSTANCE.wizardGo()); + nextButton.setIconAlign(IconAlign.RIGHT); nextButtonAction = new Command() { public void execute() { diff --git a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/dataresource/ResourceBundle.java b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/dataresource/ResourceBundle.java index a2f15dc..5402318 100644 --- a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/dataresource/ResourceBundle.java +++ b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/dataresource/ResourceBundle.java @@ -27,5 +27,25 @@ public interface ResourceBundle extends ClientBundle { @Source("resources/arrow-refresh_32.png") ImageResource refresh32(); + + @Source("resources/wizard-next.png") + ImageResource wizardNext(); + + @Source("resources/wizard-next_32.png") + ImageResource wizardNext32(); + + @Source("resources/wizard-previous.png") + ImageResource wizardPrevious(); + + @Source("resources/wizard-previous_32.png") + ImageResource wizardPrevious32(); + + @Source("resources/wizard-go.png") + ImageResource wizardGo(); + + @Source("resources/wizard-go_32.png") + ImageResource wizardGo32(); + + } \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-go.png b/src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-go.png new file mode 100644 index 0000000000000000000000000000000000000000..36214b34eecd6bba9066b1eb8c626df335268c46 GIT binary patch literal 502 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^x6 z5G*Wg9=FE;00DMML_t(I%f*s0P8(4WhX0whcd@bLD6#~K5Ro{94}gTCM7!nyISDvW zAQ|d3IYDv(c7cuqq)U}L5sDBp5lLVn_IvZEVAo!dizJPwnOD5|=AZcon0H9|NctJl zL5yDiC^B@(%F*35ZZ6MA^BdVg?=$R})ywzC|DWpw{1*A#1(30lUX9|&%QvMVG*=;^q2FVAbiO3|A#(LC5Pz%F&JAIuF z;weBi=&II=kDR@65m5~wK^*{Ip{n3ttt(qh0A~K9nL|1AtRP7<5A$OPaQpxu;9h=p zUKX=bG|3_=F8;!F4PEL;u7_u2LEycOsMyH-`!@smvRK^XLrPoD s+5a9=igb{m_vR?_-gWVpr#%1o1G^y2kRD*#oB#j-07*qoM6N<$f=rOqfB*mh literal 0 HcmV?d00001 diff --git a/src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-go_32.png b/src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-go_32.png new file mode 100644 index 0000000000000000000000000000000000000000..312208ff345dc8645a63f7723220be197c7782d5 GIT binary patch literal 656 zcmV;B0&o3^P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^x6 z5GyabR&cri00Iz6L_t(o!|j&8ZqrZ{hrifP966;*L?w49EUa00h6=IRf)O^DIv}3F zl@Jns0>sb>HW)$nf>57bZBQg~wtMCCJD-lvx#z&v z{&y>_^Ra2U72qlG0Jsm_1vDT4&VcX0H{hdV8{@(NOv_b(*T75Q)(S2I;4SdVu?>+6 zz_i?lz&qexdRNhQQPdhrxr!v0N#Y0*jS!*FIOu2He*iBW+xU7T0Ml}x0q@gub$5?y ztwBkW=lV>Nn33OQ)bC`kpF6hkVJ!gDavuSo0Ti`{R@af0%F6W;i!njZLxg^M_1LkE zFDn6>cl0rZk2qt*9wwV77mPk)&{ z)m@wc({c}h_LZ}aT5II)_0aDU^t|+V$FYs`MHzSkP?D5Ff&-|v1|>D_;Gfx_06c&=3JVRC(esu8v;d+oC=?*0 z*IEW}3S1v5xhPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^x6 z5DhVdhtB-~00CM_L_t(I%bk%ak0#j4hxjYzVzVG{)c@Ll`glYXbr;22{ z6!TNh`V)xwEX>jx0DzIP{R;px0KjV_V`r_r7>hH^0W2)7&Y;3`$#ij_DO?*Rfc*(0 zdr9+)aX_X}v;KzdkCz*+hc>--%K^^8&WkY!J>s*G7=)wo4bPRgq~Nlh7Xxz{B>>dz zQXm+nx#&uQsoK3Ttvzc}2Z%p(NCdzbDXJC#B7OW8es3ot06*G^Kv0|?71B|)o;M1&07*qoM6N<$f|C@(0{{R3 literal 0 HcmV?d00001 diff --git a/src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-next_32.png b/src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-next_32.png new file mode 100644 index 0000000000000000000000000000000000000000..8e2d5628743a708e062aa0e865281ccee1efe311 GIT binary patch literal 559 zcmV+~0?_@5P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^x6 z5DNr@Zmn1V00FN_L_t(o!|j(nF9bmx#(%rnb9dfug~-u}Na#c&)EbTKBqCAy0xCYh z=wy3|i0>c~#ZH1suhNi6h)6guQQXBl=SIPZ4r^~t;a|=CGnwZ%GtW~D{MTPEA=P*_ z_jkXsW=%-7ETnR41pqJ&YzwIxY6So=2%HG1dTIiY&E)}n;6O+kQ2sn-@0hrrpZto)9*b2}A zoC>K%tN|E^Y;zlpZCz%cEg{vcHGmIa)MfBHK76qtq*@VDc~$@ngyX*X0@nkW1a^f~ zEmi)T9 z`GIN8L}9QP%d~OC%TEv7TpgR%SQG~9u~YL?@yFW|_oZ{*?|mo=gPmW+w%RdE3?OdI x5=%kcm?as*STRfL31Y`AiJ#Hb|NpR>^$P6jIjCKG3002ovPDHLkV1k^-Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^x6 z5DYDjoul&r00A#aL_t(I%e|A&N&;aN#n1g_#u*YdT9~UKm$M1l^#oB`LJ-tbw4SUW zTtv^&rd8CGB(!MP6G)p1H;F`)HI=5{%y(P3(@7kI?(%TY@BV=U{AcBgZl+%oqnh)M zJ4Z~7u>dQ@iyaW%fCk(3VaCi>ZIBo=yX!(XZY0B}poO~Xped(X9# z_Qxxc&^QvH2U+qoBev0MK3;vk)G0Cm0M7OorD4W%-L~hj3jP+R{Py|r*kJ+y^8L+z Z?FT33X!HIve?b5M002ovPDHLkV1j8DwgmtH literal 0 HcmV?d00001 diff --git a/src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-previous_32.png b/src/main/resources/org/gcube/portlets/user/td/wizardwidget/client/dataresource/resources/wizard-previous_32.png new file mode 100644 index 0000000000000000000000000000000000000000..d2d6db55986ea6a45f27ac5d7f723618c5e14101 GIT binary patch literal 573 zcmV-D0>b@?P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^x6 z5DWy&FFT(A00F&8L_t(o!|m6-Y7|iv!13R#laDnqSuuo-h*1KmBffx*jm&@uR=$9R z9}h5A!aRZa3ckP$Xd_}}3K1(oiA9rm#5>H@!f{ix^MWAg`<$>O{2E@O zHa2-qeQKr@ywoL(ll&oGp*A@)KM=gH48%zu;u&s3V{VZk7zkciAWrhLSjM7SsL@;) z7+hE&PVyzZ!T8AOX%mfRW$>bRU>u_mj?^pf8;1&HX|#+B*xYGv*lvB%>-C130a+TY z;}SmXZMS^;x>}h;;WEt9XbVetvESL%TKimyL|^YfmPS8u<9Dy`XsvzJ>vo4Ha3Imk z(&!!@Kx_Sz?tZ6qHcGeSERCKVWJ7ynMQ3lfl*B;uK$b?&aRr_4o2!0owfmMBcp%Br z=shl$Ez?RSqJNd?&_}XA%XH`hf0ya;e@gDhN!~kdi909%!^7ei6r-JfGo}}L00000 LNkvXXu0mjf6Xy54 literal 0 HcmV?d00001