diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java index d72b625..d55c931 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java @@ -123,7 +123,11 @@ public class ColumnExpressionPanel extends FramedPanel { flowButton.setPack(BoxLayoutPack.CENTER); btnApply = new TextButton("Apply"); - btnApply.setIcon(ExpressionResources.INSTANCE.apply()); + if (type == ColumnExpressionPanelType.ColumnRule) { + btnApply.setIcon(ExpressionResources.INSTANCE.apply()); + } else { + btnApply.setIcon(ExpressionResources.INSTANCE.applyFilter()); + } btnApply.setIconAlign(IconAlign.RIGHT); btnApply.setTitle("Apply rule"); btnApply.addSelectHandler(new SelectHandler() { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java index a903fe3..b478b0d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java @@ -22,7 +22,7 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; public class ColumnFilterDialog extends Window { protected String WIDTH = "650px"; - protected String HEIGHT = "426px"; + protected String HEIGHT = "334px"; protected ColumnExpressionPanel columnExpressionPanel; protected C_Expression exp = null; protected ColumnData column = null; @@ -58,9 +58,9 @@ public class ColumnFilterDialog extends Window { setHeight(HEIGHT); setBodyBorder(false); setResizable(false); - setHeadingText("New Rule"); + setHeadingText("New Filter"); setClosable(false); - getHeader().setIcon(ExpressionResources.INSTANCE.rule()); + getHeader().setIcon(ExpressionResources.INSTANCE.filter()); } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/ExpressionResources.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/ExpressionResources.java index 3d85b05..c83cc15 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/ExpressionResources.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/ExpressionResources.java @@ -38,6 +38,12 @@ public interface ExpressionResources extends ClientBundle { @Source("wrench-manage.png") ImageResource search(); + @Source("column-filter.png") + ImageResource filter(); + + @Source("column-filter-go.png") + ImageResource applyFilter(); + } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go.png b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go.png new file mode 100644 index 0000000..dcb3aa2 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go_32.png b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go_32.png new file mode 100644 index 0000000..d2e02d5 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go_32.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter.png b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter.png new file mode 100644 index 0000000..2659e30 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter_32.png b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter_32.png new file mode 100644 index 0000000..0fa2011 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter_32.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go.png b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go.png new file mode 100644 index 0000000..dcb3aa2 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go_32.png b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go_32.png new file mode 100644 index 0000000..d2e02d5 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter-go_32.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter.png b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter.png new file mode 100644 index 0000000..2659e30 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter_32.png b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter_32.png new file mode 100644 index 0000000..0fa2011 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/resource/column-filter_32.png differ