Sync git svn branch with SVN repository r33249.

[simantics/platform.git] / bundles / org.simantics.charts / src / org / simantics / charts / ui / CSVExportPage.java

diff --git a/bundles/org.simantics.charts/src/org/simantics/charts/ui/CSVExportPage.java b/bundles/org.simantics.charts/src/org/simantics/charts/ui/CSVExportPage.java
index b5a177e7ed2a42872a099cd27d5f2be95209c866..0f5a1751d585aab615839a7dbd771d6709745e30 100644 (file)
--- a/bundles/org.simantics.charts/src/org/simantics/charts/ui/CSVExportPage.java
+++ b/bundles/org.simantics.charts/src/org/simantics/charts/ui/CSVExportPage.java
@@ -27,6 +27,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.wizard.WizardPage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.custom.CCombo;\r
+import org.eclipse.swt.custom.ScrolledComposite;\r
 import org.eclipse.swt.events.ModifyListener;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.swt.events.SelectionEvent;\r
@@ -113,7 +114,12 @@ public class CSVExportPage extends WizardPage {
 \r
     @Override\r
     public void createControl(Composite parent) {\r
-        Composite container = new Composite(parent, SWT.NONE);\r
+        ScrolledComposite scroller = new ScrolledComposite(parent, SWT.V_SCROLL);\r
+        scroller.setExpandHorizontal(true);\r
+        scroller.setExpandVertical(true);\r
+\r
+        Composite container = new Composite(scroller, SWT.NONE);\r
+        scroller.setContent(container);\r
         GridLayoutFactory.swtDefaults().spacing(20, 10).numColumns(3).applyTo(container);\r
         new Label(container, SWT.NONE).setText("Select a model:");\r
         model = new CCombo(container, SWT.BORDER);\r
@@ -128,7 +134,7 @@ public class CSVExportPage extends WizardPage {
         item = new Table(container, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION | SWT.CHECK);\r
         {\r
             item.setToolTipText("Selects the Subscription Items");\r
-            GridDataFactory.fillDefaults().grab(true, false).span(2, 1).hint(SWT.DEFAULT, 105).applyTo(item);\r
+            GridDataFactory.fillDefaults().grab(true, true).span(2, 1).hint(SWT.DEFAULT, 105).applyTo(item);\r
         }\r
         item.addSelectionListener(new SelectionAdapter() {\r
             @Override\r
@@ -292,7 +298,9 @@ public class CSVExportPage extends WizardPage {
 \r
         model.addSelectionListener(s);\r
 \r
-        setControl(container);\r
+        scroller.setMinSize(container.computeSize(SWT.DEFAULT, SWT.DEFAULT));\r
+\r
+        setControl(scroller);\r
         validatePage();\r
         \r
     }\r