From 5f81ff3a85a8f381fcbc7dacec2a844e66cde86c Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 20 Mar 2015 10:37:18 +0000 Subject: [PATCH] Updated Ribbon git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@113671 82a268e6-3cf1-43bd-a215-b396298e98cf --- ...{ReplaceDialog.java => ReplaceAllDialog.java} | 12 ++++++------ .../{ReplacePanel.java => ReplaceAllPanel.java} | 8 ++++---- .../client/resources/ResourceBundle.java | 7 +++++++ .../client/resources/column-replace-all.png | Bin 0 -> 766 bytes .../client/resources/column-replace-all_32.png | Bin 0 -> 1286 bytes .../client/resources/column-replace-all.png | Bin 0 -> 766 bytes .../client/resources/column-replace-all_32.png | Bin 0 -> 1286 bytes 7 files changed, 17 insertions(+), 10 deletions(-) rename src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/{ReplaceDialog.java => ReplaceAllDialog.java} (80%) rename src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/{ReplacePanel.java => ReplaceAllPanel.java} (98%) create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all_32.png diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllDialog.java similarity index 80% rename from src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceDialog.java rename to src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllDialog.java index 7c54ae2..cefb840 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllDialog.java @@ -15,16 +15,16 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; * g.panichi@isti.cnr.it * */ -public class ReplaceDialog extends Window { +public class ReplaceAllDialog extends Window { protected String WIDTH = "500px"; protected String HEIGHT = "150px"; - protected ReplacePanel ReplacePanel; + protected ReplaceAllPanel ReplacePanel; protected CellData cellData; protected TRId trId; protected EventBus eventBus; - public ReplaceDialog(CellData cellData, TRId trId, EventBus eventBus) { + public ReplaceAllDialog(CellData cellData, TRId trId, EventBus eventBus) { initWindow(); this.cellData = cellData; this.trId = trId; @@ -38,9 +38,9 @@ public class ReplaceDialog extends Window { setHeight(HEIGHT); setBodyBorder(false); setResizable(false); - setHeadingText("Replace Value"); + setHeadingText("Replace All"); setClosable(true); - getHeader().setIcon(ResourceBundle.INSTANCE.replace()); + getHeader().setIcon(ResourceBundle.INSTANCE.replaceAll()); } @@ -61,7 +61,7 @@ public class ReplaceDialog extends Window { } protected void create() { - ReplacePanel replacePanel = new ReplacePanel(this, trId, cellData, + ReplaceAllPanel replacePanel = new ReplaceAllPanel(this, trId, cellData, eventBus); add(replacePanel); } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllPanel.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java rename to src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllPanel.java index 305fe96..457894a 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllPanel.java @@ -58,7 +58,7 @@ import com.sencha.gxt.widget.core.client.form.TextField; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -public class ReplacePanel extends FramedPanel implements +public class ReplaceAllPanel extends FramedPanel implements DimensionRowSelectionListener, MonitorDialogListener { private static final String REPLACEMENT = "Replacement"; private static final String CURRENT_VALUE = "Current Value"; @@ -70,7 +70,7 @@ public class ReplacePanel extends FramedPanel implements private EventBus eventBus; private TRId trId; private CellData cellData; - private ReplaceDialog parent; + private ReplaceAllDialog parent; private ColumnData column; private DimensionRow dimensionRow; @@ -87,7 +87,7 @@ public class ReplacePanel extends FramedPanel implements private TextButton btnClose; private boolean isDimension; - public ReplacePanel(ReplaceDialog parent, TRId trId, CellData cellData, + public ReplaceAllPanel(ReplaceAllDialog parent, TRId trId, CellData cellData, EventBus eventBus) { this.parent = parent; this.cellData = cellData; @@ -178,7 +178,7 @@ public class ReplacePanel extends FramedPanel implements } btnApply = new TextButton("Replace"); - btnApply.setIcon(ResourceBundle.INSTANCE.replace()); + btnApply.setIcon(ResourceBundle.INSTANCE.replaceAll()); btnApply.setIconAlign(IconAlign.RIGHT); btnApply.setTitle("Replace Value"); btnApply.addSelectHandler(new SelectHandler() { 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 4e8c94c..533c03f 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 @@ -77,6 +77,13 @@ public interface ResourceBundle extends ClientBundle { @Source("column-replace_32.png") ImageResource replace32(); + @Source("column-replace-all.png") + ImageResource replaceAll(); + + @Source("column-replace-all_32.png") + ImageResource replaceAll32(); + + @Source("column-replace-batch.png") ImageResource replaceBatch(); diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png new file mode 100644 index 0000000000000000000000000000000000000000..f17ffa6787f006e9dcd45533f2363a796cea1da2 GIT binary patch literal 766 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