From 9243ec04e390254a186187de01b6be5e86c36b21 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 5 Dec 2014 11:05:19 +0000 Subject: [PATCH] Fixed Layout for GXT 3.1.1 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-table-widget@101921 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/td/tablewidget/client/normalize/DenormalizePanel.java | 3 +-- .../user/td/tablewidget/client/normalize/NormalizePanel.java | 3 +-- .../user/td/tablewidget/client/rows/DuplicatesRowsPanel.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/DenormalizePanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/DenormalizePanel.java index 7bd3e4d..5562878 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/DenormalizePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/DenormalizePanel.java @@ -31,7 +31,6 @@ 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.cell.core.client.form.ComboBoxCell.TriggerAction; -import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode; import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.data.client.loader.RpcProxy; import com.sencha.gxt.data.shared.LabelProvider; @@ -195,7 +194,7 @@ public class DenormalizePanel extends FramedPanel implements hBox.add(denormalizeButton, new BoxLayoutData(new Margins(2, 5, 2, 5))); VerticalLayoutContainer v = new VerticalLayoutContainer(); - v.setScrollMode(ScrollMode.AUTO); + //v.setScrollMode(ScrollMode.AUTO); Set in GXT 3.0.1 v.add(new FieldLabel(comboValueColumn, "Value Column"), new VerticalLayoutData(1, -1, new Margins(1))); diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/NormalizePanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/NormalizePanel.java index 7aa5d17..fbb05b7 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/NormalizePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/NormalizePanel.java @@ -30,7 +30,6 @@ 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; import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.data.client.loader.RpcProxy; import com.sencha.gxt.data.shared.ListStore; @@ -185,7 +184,7 @@ public class NormalizePanel extends FramedPanel implements hBox.add(normalizeButton, new BoxLayoutData(new Margins(2, 5, 2, 5))); VerticalLayoutContainer v = new VerticalLayoutContainer(); - v.setScrollMode(ScrollMode.AUTO); + //v.setScrollMode(ScrollMode.AUTO); Set in GXT 3.0.1 v.add(normalizedColumnNameLabel, new VerticalLayoutData(1, -1)); v.add(valueColumnNameLabel, new VerticalLayoutData(1, -1)); v.add(columnsLabel, new VerticalLayoutData(-1, -1, new Margins(2, 1, 5, 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 52f61b3..67f4aaa 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 @@ -30,7 +30,6 @@ 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; import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.data.client.loader.RpcProxy; import com.sencha.gxt.data.shared.ListStore; @@ -174,7 +173,7 @@ public class DuplicatesRowsPanel extends FramedPanel implements hBox.add(deleteButton, new BoxLayoutData(new Margins(2, 5, 2, 5))); VerticalLayoutContainer v = new VerticalLayoutContainer(); - v.setScrollMode(ScrollMode.AUTO); + //v.setScrollMode(ScrollMode.AUTO); Set In GXT 3.0.1 v.add(columnsLabel, new VerticalLayoutData(-1, -1, new Margins(2, 1, 5, 1))); v.add(grid, new VerticalLayoutData(1, -1, new Margins(0)));