diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/ResourceBundle.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/ResourceBundle.java index 3a677fe..84732ca 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/ResourceBundle.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/ResourceBundle.java @@ -155,4 +155,17 @@ public interface ResourceBundle extends ClientBundle { @Source("table-denormalize_32.png") ImageResource tableDenormalize32(); + @Source("table-duplicate-rows.png") + ImageResource tableDuplicateRows(); + + @Source("table-duplicate-rows_32.png") + ImageResource tableDuplicateRows32(); + + @Source("table-duplicate-rows-remove.png") + ImageResource tableDuplicateRowsRemove(); + + @Source("table-duplicate-rows-remove_32.png") + ImageResource tableDuplicateRowsRemove32(); + + } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove.png b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove.png new file mode 100644 index 0000000..163eecf Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove_32.png b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove_32.png new file mode 100644 index 0000000..b92ad8d Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove_32.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows.png b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows.png new file mode 100644 index 0000000..b79e66b Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows_32.png b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows_32.png new file mode 100644 index 0000000..304c178 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows_32.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/DuplicatesRowsPanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/DuplicatesRowsPanel.java index 0e627a6..eefc3b0 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/DuplicatesRowsPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/DuplicatesRowsPanel.java @@ -3,12 +3,14 @@ package org.gcube.portlets.user.td.tablewidget.client.rows; import java.util.ArrayList; import java.util.List; + import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession; import org.gcube.portlets.user.td.tablewidget.client.progress.DuplicatesRowsProgressDialog; import org.gcube.portlets.user.td.tablewidget.client.properties.ColumnDataProperties; +import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType; @@ -20,6 +22,7 @@ import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.rpc.AsyncCallback; 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.dom.ScrollSupport.ScrollMode; @@ -130,6 +133,10 @@ public class DuplicatesRowsPanel extends FramedPanel { // Delete Button deleteButton = new TextButton("Delete"); + deleteButton.setIcon(ResourceBundle.INSTANCE.tableDuplicateRowsRemove()); + deleteButton.setIconAlign(IconAlign.RIGHT); + deleteButton.setTitle("Delete Duplicates Rows"); + SelectHandler deleteHandler = new SelectHandler() { public void onSelect(SelectEvent event) { @@ -141,6 +148,10 @@ public class DuplicatesRowsPanel extends FramedPanel { // Validates Button validatesButton = new TextButton("Validate"); + validatesButton.setIcon(ResourceBundle.INSTANCE.tableDuplicateRows()); + validatesButton.setIconAlign(IconAlign.RIGHT); + validatesButton.setTitle("Validate Duplicates Rows"); + SelectHandler validatesHandler = new SelectHandler() { public void onSelect(SelectEvent event) { diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall.png deleted file mode 100644 index 7f342a5..0000000 Binary files a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall.png and /dev/null differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall_12.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall_12.png deleted file mode 100644 index 9bfe27b..0000000 Binary files a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall_12.png and /dev/null differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall_32.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall_32.png deleted file mode 100644 index c343fa2..0000000 Binary files a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall_32.png and /dev/null differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall_8.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall_8.png deleted file mode 100644 index e080d2e..0000000 Binary files a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/collapseall_8.png and /dev/null differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall.png deleted file mode 100644 index b318016..0000000 Binary files a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall.png and /dev/null differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall_12.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall_12.png deleted file mode 100644 index aab86ba..0000000 Binary files a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall_12.png and /dev/null differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall_32.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall_32.png deleted file mode 100644 index 55db757..0000000 Binary files a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall_32.png and /dev/null differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall_8.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall_8.png deleted file mode 100644 index db37e46..0000000 Binary files a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/expandall_8.png and /dev/null differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove.png new file mode 100644 index 0000000..163eecf Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove_32.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove_32.png new file mode 100644 index 0000000..b92ad8d Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows-remove_32.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows.png new file mode 100644 index 0000000..b79e66b Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows_32.png b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows_32.png new file mode 100644 index 0000000..304c178 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/tablewidget/client/resources/table-duplicate-rows_32.png differ