From 992bec31136ab9ce97a4ef915860099f55948d6d Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 3 Apr 2015 18:42:34 +0200 Subject: [PATCH] Improved the query definition providers controls panel --- java/com.sap.sailing.gwt.ui/DataMining.css | 5 +++++ .../gwt/ui/datamining/DataMiningEntryPoint.java | 12 +++++------- ...BufferingQueryDefinitionProviderWithControls.java | 9 ++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/DataMining.css b/java/com.sap.sailing.gwt.ui/DataMining.css index c975679d5dd..06a7d5b3111 100644 --- a/java/com.sap.sailing.gwt.ui/DataMining.css +++ b/java/com.sap.sailing.gwt.ui/DataMining.css @@ -214,6 +214,11 @@ input.magnifier { border-bottom: 1px solid rgba(0, 0, 0, 0.25); } +.settingsAnchor { + position: relative; + top: 9px; +} + .groupingProviderElement { margin: 2px; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java index 3ce5f6c2c68..739e07c9f41 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java @@ -11,7 +11,6 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootLayoutPanel; import com.google.gwt.user.client.ui.SplitLayoutPanel; import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint; @@ -66,17 +65,16 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint { final QueryRunner queryRunner = new SimpleQueryRunner(session, getStringMessages(), dataMiningService, this, queryDefinitionProviderWithControls, resultsPresenter); queryDefinitionProviderWithControls.addControl(queryRunner.getEntryWidget()); - Label runnerSettingsLabel = new Label(queryRunner.getLocalizedShortName() + ":"); - queryDefinitionProviderWithControls.addControl(runnerSettingsLabel); - Anchor runnerSettingsAnchor = new Anchor(AbstractImagePrototype.create(resources.settingsIcon()).getSafeHtml()); - runnerSettingsAnchor.setTitle(getStringMessages().settings()); - runnerSettingsAnchor.addClickHandler(new ClickHandler() { + Anchor settingsAnchor = new Anchor(AbstractImagePrototype.create(resources.settingsIcon()).getSafeHtml()); + settingsAnchor.addStyleName("settingsAnchor"); + settingsAnchor.setTitle(getStringMessages().settings()); + settingsAnchor.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { new SettingsDialog(queryRunner, getStringMessages()).show(); } }); - queryDefinitionProviderWithControls.addControl(runnerSettingsAnchor); + queryDefinitionProviderWithControls.addControl(settingsAnchor); } private LogoAndTitlePanel createLogoAndTitlePanel() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/BufferingQueryDefinitionProviderWithControls.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/BufferingQueryDefinitionProviderWithControls.java index c0486b347e6..18386987741 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/BufferingQueryDefinitionProviderWithControls.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/BufferingQueryDefinitionProviderWithControls.java @@ -22,9 +22,9 @@ import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; import com.sap.sailing.gwt.ui.datamining.DataMiningControls; import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionChangedListener; +import com.sap.sailing.gwt.ui.datamining.FilterSelectionProvider; import com.sap.sailing.gwt.ui.datamining.GroupingChangedListener; import com.sap.sailing.gwt.ui.datamining.SelectionChangedListener; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionProvider; import com.sap.sailing.gwt.ui.datamining.StatisticChangedListener; import com.sap.sailing.gwt.ui.datamining.StatisticProvider; import com.sap.sse.datamining.shared.DataMiningSession; @@ -34,7 +34,6 @@ import com.sap.sse.datamining.shared.dto.FunctionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryDefinitionDTOImpl; import com.sap.sse.gwt.client.ErrorReporter; -import com.sap.sse.gwt.client.panels.HorizontalFlowPanel; public class BufferingQueryDefinitionProviderWithControls extends AbstractQueryDefinitionProvider implements DataMiningControls { @@ -49,7 +48,7 @@ public class BufferingQueryDefinitionProviderWithControls extends AbstractQueryD private final Timer queryDefinitionReleaseTimer; private final DockLayoutPanel mainPanel; - private HorizontalFlowPanel controlsPanel; + private FlowPanel controlsPanel; private StatisticProvider statisticProvider; private SimpleDataRetrieverChainDefinitionProvider retrieverChainProvider; @@ -111,7 +110,7 @@ public class BufferingQueryDefinitionProviderWithControls extends AbstractQueryD }); ScrollPanel groupBySelectionScrollPanel = new ScrollPanel(groupBySelectionPanel.getEntryWidget()); - controlsPanel = new HorizontalFlowPanel(); + controlsPanel = new FlowPanel(); controlsPanel.addStyleName("definitionProviderControls"); Button clearSelectionButton = new Button(this.getStringMessages().clearSelection()); @@ -125,7 +124,7 @@ public class BufferingQueryDefinitionProviderWithControls extends AbstractQueryD SplitLayoutPanel controlsSplitPanel = new SplitLayoutPanel(15); controlsSplitPanel.addWest(new ScrollPanel(statisticAndRetrieverChainPanel), 800); - controlsSplitPanel.addEast(new ScrollPanel(controlsPanel), 300); + controlsSplitPanel.addEast(new ScrollPanel(controlsPanel), 130); controlsSplitPanel.add(groupBySelectionScrollPanel); return controlsSplitPanel; }