From 7d1cb5a2c5d5eb884b2792a9976eaac4582031e2 Mon Sep 17 00:00:00 2001 From: shleh Date: Sun, 25 Jul 2004 18:31:01 +0000 Subject: [PATCH 1/1] improved layout for view. --- .../phpeclipse/phpunit/PHPUnitView.java | 75 ++++++++++++++----- 1 files changed, 55 insertions(+), 20 deletions(-) diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java index bc1dd6a..1d146a3 100644 --- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java +++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java @@ -4,9 +4,14 @@ package net.sourceforge.phpeclipse.phpunit; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.part.ViewPart; @@ -67,25 +72,55 @@ public class PHPUnitView extends ViewPart { handler = new XMLReportHandler(); } + + public void createPartControl(Composite parent) { -// //viewer = new TreeViewer(parent); -// labelRuns = new Label(parent, SWT.WRAP); -// labelRuns.setText("Runs: "); -// labelRunsVal = new Label(parent, SWT.WRAP); -// labelRunsVal.setText("0 / 0"); -// -// labelFailures = new Label(parent, SWT.WRAP); -// labelFailures.setText("Failures: "); -// labelFailuresVal = new Label(parent, SWT.WRAP); -// labelFailuresVal.setText("0"); -// -// labelErrors = new Label(parent, SWT.WRAP); -// labelErrors.setText("Errors: "); -// labelErrorsVal = new Label(parent, SWT.WRAP); -// labelErrorsVal.setText("0"); - - reportArea = new Text(parent, SWT.MULTI | SWT.BORDER | + + //layout: + FillLayout fillLayout = new FillLayout(SWT.VERTICAL); + parent.setLayout(fillLayout); + + Group progressInfoComposite = new Group(parent, SWT.SHADOW_ETCHED_IN); + Group resultsInfoComposite = new Group(parent, SWT.NONE); + + + //Build the progress info Composite + progressInfoComposite.setText("Progress:"); + GridLayout gridLayout = new GridLayout(); + gridLayout.numColumns = 1; + + progressInfoComposite.setLayout(gridLayout); + + + ProgressBar progressBar = new ProgressBar(progressInfoComposite, SWT.HORIZONTAL); + progressBar.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL|GridData.FILL_HORIZONTAL)); + + Composite labelsComposite = new Composite(progressInfoComposite, SWT.NONE); + labelsComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL|GridData.FILL_HORIZONTAL)); + + labelsComposite.setLayout(new FillLayout(SWT.HORIZONTAL)); + + labelRuns = new Label(labelsComposite, SWT.NONE); + labelRuns.setText("Runs: "); + labelRunsVal = new Label(labelsComposite, SWT.NONE); + labelRunsVal.setText("0 / 0"); + + labelFailures = new Label(labelsComposite, SWT.NONE); + labelFailures.setText("Failures: "); + labelFailuresVal = new Label(labelsComposite, SWT.NONE); + labelFailuresVal.setText("0"); + + labelErrors = new Label(labelsComposite, SWT.NONE); + labelErrors.setText("Errors: "); + labelErrorsVal = new Label(labelsComposite, SWT.NONE); + labelErrorsVal.setText("0"); + + //Build the result info composite + resultsInfoComposite.setText("Results:"); + resultsInfoComposite.setLayout(fillLayout); + + reportArea = new Text(resultsInfoComposite, SWT.MULTI | SWT.BORDER | SWT.WRAP | SWT.V_SCROLL | SWT.READ_ONLY); startButton = new Button(parent, SWT.CENTER); @@ -111,8 +146,7 @@ public class PHPUnitView extends ViewPart { }); // end add action listener. - - // TODO layout! + } /* (non-Javadoc) @@ -245,7 +279,8 @@ public class PHPUnitView extends ViewPart { */ public void addTestException(String currentTestID, String exception) { - reportArea.append(" test " + currentTestID + " exception: " + exception + "\n"); + //TODO: decide how to show exceptions. don't show them for now. + //reportArea.append(" test " + currentTestID + " exception: " + exception + "\n"); } -- 1.7.1