From 849f3005bbd76f73ccb241691af48cbf7c9c8594 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 19 Mar 2014 15:48:15 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@93329 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/batch/BatchReplaceDialog.java | 2 +- .../client/batch/BatchReplacePanel.java | 67 +++++++++++++++--- .../client/resources/ResourceBundle.java | 15 ++++ .../client/resources/close-red.png | Bin 0 -> 693 bytes .../client/resources/close-red_32.png | Bin 0 -> 1610 bytes .../td/columnwidget/client/resources/disk.png | Bin 0 -> 482 bytes .../columnwidget/client/resources/disk_32.png | Bin 0 -> 886 bytes .../client/resources/close-red.png | Bin 0 -> 693 bytes .../client/resources/close-red_32.png | Bin 0 -> 1610 bytes .../td/columnwidget/client/resources/disk.png | Bin 0 -> 482 bytes .../columnwidget/client/resources/disk_32.png | Bin 0 -> 886 bytes 11 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/close-red.png create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/close-red_32.png create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/disk.png create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/disk_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/close-red.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/close-red_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/disk.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/disk_32.png diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/BatchReplaceDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/BatchReplaceDialog.java index b0d4f20..14dd1b7 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/BatchReplaceDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/BatchReplaceDialog.java @@ -28,7 +28,7 @@ public class BatchReplaceDialog extends Window { this.columnName=columnName; initWindow(); - BatchReplacePanel batchRepalcePanel= new BatchReplacePanel(trId,columnName,eventBus); + BatchReplacePanel batchRepalcePanel= new BatchReplacePanel(this, trId,columnName,eventBus); add(batchRepalcePanel); } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/BatchReplacePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/BatchReplacePanel.java index 28b0165..eb3c1a3 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/BatchReplacePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/BatchReplacePanel.java @@ -22,6 +22,7 @@ import com.google.gwt.safecss.shared.SafeStylesBuilder; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.HTML; import com.google.web.bindery.event.shared.EventBus; +import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign; import com.sencha.gxt.core.client.IdentityValueProvider; import com.sencha.gxt.core.client.Style.SelectionMode; import com.sencha.gxt.core.client.resources.ThemeStyles; @@ -37,6 +38,11 @@ import com.sencha.gxt.data.shared.loader.ListLoadResultBean; import com.sencha.gxt.data.shared.loader.ListLoader; import com.sencha.gxt.data.shared.loader.LoadResultListStoreBinding; import com.sencha.gxt.widget.core.client.FramedPanel; +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.BoxLayoutContainer.BoxLayoutPack; +import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer; +import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer.HBoxLayoutAlign; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; import com.sencha.gxt.widget.core.client.event.SelectEvent; @@ -64,16 +70,21 @@ public class BatchReplacePanel extends FramedPanel { protected TRId trId; protected String columnName; protected ColumnData column; - + protected BatchReplaceDialog batchReplaceDialog; + protected static final String DON_T_REPLACE = "Don't replace"; + private TextButton btnApply; + private TextButton btnClose; + protected ListLoader> loader; protected Grid grid; protected ListStore store; protected HTML info; - public BatchReplacePanel(TRId trId, String columnName, EventBus eventBus) { + public BatchReplacePanel(BatchReplaceDialog batchReplaceDialog, TRId trId, String columnName, EventBus eventBus) { + this.batchReplaceDialog=batchReplaceDialog; Log.debug("BatchReplacePanel:["+trId+", columnName:"+columnName+"]"); setWidth(WIDTH); setHeight(HEIGHT); @@ -157,12 +168,6 @@ public class BatchReplacePanel extends FramedPanel { }); - - - - - - RpcProxy> proxy = new RpcProxy>() { @@ -198,7 +203,7 @@ public class BatchReplacePanel extends FramedPanel { number.initPlugin(grid); // grid.getView().setAutoExpandColumn(labelCol); // grid.setHeight(360); - grid.setHeight("454px"); + grid.setHeight("418px"); grid.getView().setStripeRows(true); grid.getView().setColumnLines(true); grid.getView().setAutoFill(true); @@ -215,10 +220,46 @@ public class BatchReplacePanel extends FramedPanel { toolBar.addStyleName(ThemeStyles.getStyle().borderTop()); toolBar.getElement().getStyle().setProperty("borderBottom", "none"); + btnApply = new TextButton("Save"); + btnApply.setIcon(ResourceBundle.INSTANCE.save()); + btnApply.setIconAlign(IconAlign.RIGHT); + btnApply.setTitle("Apply Filter"); + btnApply.addSelectHandler(new SelectHandler() { + + public void onSelect(SelectEvent event) { + Log.debug("Pressed Apply"); + save(); + + } + }); + + btnClose = new TextButton("Close"); + btnClose.setIcon(ResourceBundle.INSTANCE.close()); + btnClose.setIconAlign(IconAlign.RIGHT); + btnClose.setTitle("Cancel filter"); + btnClose.addSelectHandler(new SelectHandler() { + + public void onSelect(SelectEvent event) { + Log.debug("Pressed Close"); + close(); + } + }); + + HBoxLayoutContainer flowButton = new HBoxLayoutContainer(); + flowButton.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE); + flowButton.setPack(BoxLayoutPack.CENTER); + + flowButton + .add(btnApply, new BoxLayoutData(new Margins(2, 4, 2, 4))); + flowButton + .add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4))); + + VerticalLayoutContainer v = new VerticalLayoutContainer(); v.add(grid, new VerticalLayoutData(-1, -1, new Margins(0))); v.add(toolBar,new VerticalLayoutData(1, 25, new Margins(0))); - + v.add(flowButton, new VerticalLayoutData(-1, 36, new Margins( + 5, 2, 5, 2))); add(v); @@ -330,7 +371,13 @@ public class BatchReplacePanel extends FramedPanel { return data; } + protected void save(){ + + } + protected void close(){ + batchReplaceDialog.close(); + } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/ResourceBundle.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/ResourceBundle.java index ccecdd4..d793995 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/ResourceBundle.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/ResourceBundle.java @@ -39,5 +39,20 @@ public interface ResourceBundle extends ClientBundle { @Source("column-values_32.png") ImageResource replace32(); + + @Source("close-red.png") + ImageResource close(); + + @Source("close-red_32.png") + ImageResource close32(); + + @Source("disk.png") + ImageResource save(); + + @Source("disk_32.png") + ImageResource save32(); + + + } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/close-red.png b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/close-red.png new file mode 100644 index 0000000000000000000000000000000000000000..978f945b8468139d545f89624e17f62f2f20629c GIT binary patch literal 693 zcmV;m0!safP)U<^{h;=59XSA+U1e>a-noAIA@jsc5i;D&|qOGH8Ru+6e~sqTM*vw>j|} zjnjjf+fSMTtC@7t_*Sm_@cxeIriU$pluJ+z1&F%P-i7Z((5VqBZ{F3EZAMa=yPgHG zy`?X<^!Ii|f;zScYWf1!nadD~LDWUfUc)*+hrO|mQ}u}U_jH=Ne+j?=5Mw6YL>E?R z1u@$pdS43b+!aIw)xQTR_#ofL{d5rcy)x@Z7{M zd_wIW#!k;eYdg}}jbE)HT7PH~pv}@&{_~;e;BF%8WmLT9H@4B(>3LLlAF3;XpBiE_ z{~3%~Y{r;7doqb~a(%~+bhx!uoWLN(0#f!u?ACTvR|4a-&=?x$+w)g7-#8-^*=!i& z=%c5lpwXD|Uc8ceTLK-66DS1|-Vi&2NewfObznTc%H+wscpPfeaw77K0r zhCAB^Q#kR?&|#&<=E@f~KISVT%uYO6+WE>&k*VVeA#w@D6v9}T0n5Omg?=!x_{{rz b=fCO)OBE^E@HZAAg2s45|fh^mx` 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 b=fCO)OBE^E@HZAAg2s45|fh^mx` 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