Minor alignments in Windows machine. Done by Nikhil.

svn path=/; revision=300

diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index eda582216d407679cdcb577e40849d1ba67fb235..8c7ad0734e53582e68d254fa4e1fd0031b51b06b 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -218,7 +218,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                super.configureShell(shell);
                updateWindowTitle();
                loadIcons(shell);
-               shell.setSize(970, 650);
+               shell.setSize(1165, 650);
                SwtUtils.center(shell);
        }
        

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index 91a61d53595021741b2eb30aa53bdb12646065b0..879cfe3346065ba09076149ff0fadf31f9df45e6 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -412,14 +412,14 @@ public class SegmentationView extends Composite {
                gd.grabExcessVerticalSpace = true;
                gd.horizontalAlignment = SWT.FILL;
                gd.verticalAlignment = SWT.FILL;
+               gd.widthHint = 900;
                view.setLayoutData(gd);
                
                // Layout term lookup toolbar
                gd = new GridData();
                gd.horizontalAlignment = SWT.FILL;
                gd.grabExcessHorizontalSpace = true;
-               gd.verticalIndent = 1;
-               gd.verticalAlignment = GridData.BEGINNING;
+               gd.heightHint = heightHint;
                termLookupBar.setLayoutData(gd);
 
                // Layout term detail Composite
@@ -435,8 +435,6 @@ public class SegmentationView extends Composite {
                gd = new GridData();
                gd.verticalAlignment = GridData.BEGINNING;
                gd.horizontalAlignment = SWT.FILL;
-               gd.verticalIndent = 2;
-               gd.widthHint = width;
                gd.grabExcessHorizontalSpace = true;
                termDetailComposite.setLayoutData(gd);
                
@@ -446,19 +444,20 @@ public class SegmentationView extends Composite {
                termDetailTable.setLayoutData(gd);
                
                // Layout term detail table                             
-               gd = new GridData(SWT.FILL,SWT.FILL,true,true);
+               gd = new GridData();
+               gd.widthHint = width/2;
                speciesCombo.setLayoutData(gd);
                
                // Layout term detail table                             
-               gd = new GridData(SWT.FILL,SWT.FILL,true,true);
+               gd = new GridData();
                curatorCombo.setLayoutData(gd);
                
                // Layout term detail table                             
-               gd = new GridData(SWT.FILL,SWT.FILL,true,true);
+               gd = new GridData();
                collectionId.setLayoutData(gd);
                
                // Layout term detail table                             
-               gd = new GridData(SWT.FILL,SWT.FILL,true,true);
+               gd = new GridData();
                comment.setLayoutData(gd);
                
                

diff --git a/Annotation/src/ie/dcu/swt/SwtUtils.java b/Annotation/src/ie/dcu/swt/SwtUtils.java
index ca119c073b893eb6ddee0fa9ff51109da047a831..13d39ee35d8c9a3ff8448b78a61a3570793cbb02 100644 (file)
--- a/Annotation/src/ie/dcu/swt/SwtUtils.java
+++ b/Annotation/src/ie/dcu/swt/SwtUtils.java
@@ -658,7 +658,7 @@ public class SwtUtils {
        public static Combo addCombo(ToolBar bar, int width, int style) {
                ToolItem item = new ToolItem(bar, SWT.SEPARATOR);
                Combo combo = new Combo(bar, style);
-               //item.setWidth(width);
+               item.setWidth(width);
                item.setControl(combo);
                return combo;
        }