diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ChartsToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ChartsToolBar.java index aec17e8..d7900f1 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ChartsToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ChartsToolBar.java @@ -55,15 +55,16 @@ public class ChartsToolBar { toolBar = new ToolBar(); toolBar.setSpacing(1); - - ButtonGroup basicGroup = new ButtonGroup(); - basicGroup.setId("Charts"); - basicGroup.setStyleName("ribbon"); - basicGroup.setHeadingText("Charts"); - toolBar.add(basicGroup); + //Charts Group + ButtonGroup chartsGroup = new ButtonGroup(); + chartsGroup.setId("Charts"); + chartsGroup.setStyleName("ribbon"); + chartsGroup.setHeadingText("Charts"); + chartsGroup.disable(); + toolBar.add(chartsGroup); FlexTable basicLayout = new FlexTable(); - basicGroup.add(basicLayout); + chartsGroup.add(basicLayout); pieButton = new TextButton("Pie", TabularDataResources.INSTANCE.chartPie32()); pieButton.setScale(ButtonScale.LARGE); @@ -140,6 +141,7 @@ public class ChartsToolBar { externalToolGroup.setId("ExternalTools"); externalToolGroup.setStyleName("ribbon"); externalToolGroup.setHeadingText("External Tools"); + externalToolGroup.disable(); toolBar.add(externalToolGroup); FlexTable externalToolLayout = new FlexTable(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java index 4f88bc7..a1a809f 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java @@ -72,15 +72,15 @@ public class FileToolBar { toolBar.setSpacing(1); //File - ButtonGroup dataGroup = new ButtonGroup(); - dataGroup.setId("File"); - dataGroup.setStyleName("ribbon"); - dataGroup.setHeadingText("File"); - toolBar.add(dataGroup); + ButtonGroup fileGroup = new ButtonGroup(); + fileGroup.setId("File"); + fileGroup.setStyleName("ribbon"); + fileGroup.setHeadingText("File"); + toolBar.add(fileGroup); FlexTable dataLayout = new FlexTable(); dataLayout.setStyleName("ribbon"); - dataGroup.add(dataLayout); + fileGroup.add(dataLayout); openButton = new TextButton("Open", TabularDataResources.INSTANCE.open32()); openButton.setId("oepnButton"); @@ -192,6 +192,7 @@ public class FileToolBar { importLayout.setWidget(0, 2, importCSVButton); importJSONButton = new TextButton("JSON", TabularDataResources.INSTANCE.json()); + importJSONButton.disable(); importJSONButton.setToolTip("Import table from JSON source"); importJSONButton.addSelectHandler(new SelectHandler() { @@ -212,7 +213,6 @@ public class FileToolBar { exportGroup.setStyleName("ribbon"); exportGroup.setHeadingText("Export"); exportGroup.disable(); - toolBar.add(exportGroup); FlexTable exportLayout = new FlexTable(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FormulasToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FormulasToolBar.java index 51567d7..b87ddf7 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FormulasToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FormulasToolBar.java @@ -64,15 +64,16 @@ public class FormulasToolBar { toolBar.setSpacing(1); - //Basic - ButtonGroup basicGroup = new ButtonGroup(); - basicGroup.setId("Table"); - basicGroup.setStyleName("ribbon"); - basicGroup.setHeadingText("Table"); - toolBar.add(basicGroup); + //Table Group + ButtonGroup tableGroup = new ButtonGroup(); + tableGroup.setId("Table"); + tableGroup.setStyleName("ribbon"); + tableGroup.setHeadingText("Table"); + tableGroup.disable(); + toolBar.add(tableGroup); - FlexTable basicLayout = new FlexTable(); - basicGroup.add(basicLayout); + FlexTable tableLayout = new FlexTable(); + tableGroup.add(tableLayout); filterButton = new TextButton("Filter", TabularDataResources.INSTANCE.filter32()); filterButton.setScale(ButtonScale.LARGE); @@ -87,8 +88,8 @@ public class FormulasToolBar { } }); - basicLayout.setWidget(0, 0, filterButton); - basicLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); + tableLayout.setWidget(0, 0, filterButton); + tableLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); unionButton = new TextButton("Union", TabularDataResources.INSTANCE.union32()); unionButton.setScale(ButtonScale.LARGE); @@ -103,8 +104,8 @@ public class FormulasToolBar { } }); - basicLayout.setWidget(0, 1, unionButton); - basicLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); + tableLayout.setWidget(0, 1, unionButton); + tableLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); denormalizeButton = new TextButton("Denormalize", TabularDataResources.INSTANCE.denormalize32()); @@ -120,28 +121,11 @@ public class FormulasToolBar { } }); - basicLayout.setWidget(0, 2, denormalizeButton); - basicLayout.getFlexCellFormatter().setRowSpan(0, 2, 2); + tableLayout.setWidget(0, 2, denormalizeButton); + tableLayout.getFlexCellFormatter().setRowSpan(0, 2, 2); - /* - groupButton = new TextButton("Group", TabularDataResources.INSTANCE.group32()); - groupButton.setScale(ButtonScale.LARGE); - groupButton.setIconAlign(IconAlign.TOP); - groupButton.setToolTip("Group the open TS"); - groupButton.setArrowAlign(ButtonArrowAlign.BOTTOM); - groupButton.addSelectHandler(new SelectHandler() { - - @Override - public void onSelect(SelectEvent event) { - //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); - } - }); - - basicLayout.setWidget(0, 2, groupButton); - basicLayout.getFlexCellFormatter().setRowSpan(0, 2, 2); - cleanCells(basicLayout.getElement()); - */ + aggregateButton = new TextButton("Aggregate", TabularDataResources.INSTANCE.aggregate32()); aggregateButton.setScale(ButtonScale.LARGE); aggregateButton.setIconAlign(IconAlign.TOP); @@ -155,12 +139,12 @@ public class FormulasToolBar { } }); - basicLayout.setWidget(0, 3, aggregateButton); - basicLayout.getFlexCellFormatter().setRowSpan(0, 3, 2); - cleanCells(basicLayout.getElement()); + tableLayout.setWidget(0, 3, aggregateButton); + tableLayout.getFlexCellFormatter().setRowSpan(0, 3, 2); + cleanCells(tableLayout.getElement()); - //Column + //Column Group ButtonGroup columnGroup = new ButtonGroup(); columnGroup.setId("Column"); columnGroup.setStyleName("ribbon"); @@ -223,11 +207,12 @@ public class FormulasToolBar { cleanCells(columnLayout.getElement()); - //History + //History Group ButtonGroup historyGroup = new ButtonGroup(); historyGroup.setId("History"); historyGroup.setStyleName("ribbon"); historyGroup.setHeadingText("History"); + historyGroup.disable(); toolBar.add(historyGroup); FlexTable historyLayout = new FlexTable(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ReviewToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ReviewToolBar.java index 24c2265..3d4478f 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ReviewToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ReviewToolBar.java @@ -53,6 +53,7 @@ public class ReviewToolBar { validationGroup.setId("Validation"); validationGroup.setStyleName("ribbon"); validationGroup.setHeadingText("Validation"); + validationGroup.disable(); toolBar.add(validationGroup); FlexTable validationLayout = new FlexTable(); @@ -120,6 +121,7 @@ public class ReviewToolBar { operationsGroup.setId("Operations"); operationsGroup.setStyleName("ribbon"); operationsGroup.setHeadingText("Operations"); + operationsGroup.disable(); toolBar.add(operationsGroup); FlexTable operationsLayout = new FlexTable(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java index 5faf2e8..bd9495a 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java @@ -5,14 +5,16 @@ package org.gcube.portlets.user.td.client.ribbon; import com.allen_sauer.gwt.log.client.Log; import com.google.web.bindery.event.shared.EventBus; -import com.sencha.gxt.widget.core.client.PlainTabPanel; import com.sencha.gxt.widget.core.client.TabPanel; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; + /** - * @author "Federico De Faveri defaveri@isti.cnr.it" * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * */ public class TabularDataRibbon {