Layout Modifications. Done by Nikhil.

svn path=/; revision=240

diff --git a/Annotation/.classpath b/Annotation/.classpath
index 22412b6c9a2c02f608af7c008e1447f0c9cabf62..61c9bd15a41fc425ceb98dd42ebd3e345b58f214 100644 (file)
--- a/Annotation/.classpath
+++ b/Annotation/.classpath
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry excluding="src/" kind="src" path=""/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/commons-lang3-3.1.jar"/>
-       <classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/jface.jar"/>
-       <classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/json.jar"/>
-       <classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/swt-gtk-64.jar"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="src" path="src"/>\r
+       <classpathentry excluding="src/" kind="src" path=""/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/Annotation/library/commons-lang3-3.1.jar"/>\r
+       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/Annotation/library/jface.jar"/>\r
+       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/Annotation/library/json.jar"/>\r
+       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/image_annotation/lib/swt-win.jar"/>\r
+       <classpathentry kind="output" path="bin"/>\r
+</classpath>\r

diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index 30e33153cb3a293039e588b9f255913186dba1ab..70f8668840dcf0cf51d00c17252867408a74198b 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -256,7 +256,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
        protected Control createContents(Composite parent) {
                content = new Composite(parent, SWT.NONE);
 
-               content.setLayout(LayoutFactory.createGridLayout(0, 0, 2, false));
+               content.setLayout(LayoutFactory.createGridLayout(0, 0, 3, false));
 
                view = createView(content);
                view.setLayoutData(LayoutFactory.createGridData());

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index 62e0ac0223104c00e5182945de3349e5153f9e45..8d750b929ab75db8286cc5197308978b5b2f13ba 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -287,12 +287,21 @@ public class SegmentationView extends Composite {
                // Layout view
                gd = new GridData();
                gd.verticalIndent = 2;
-               gd.horizontalSpan = 3;
+               gd.horizontalSpan = 2;
                gd.grabExcessHorizontalSpace = true;
                gd.grabExcessVerticalSpace = true;
                gd.horizontalAlignment = SWT.FILL;
                gd.verticalAlignment = SWT.FILL;
                view.setLayoutData(gd);
+               
+               // Layout toolbar 3
+               gd = new GridData();
+               gd.horizontalAlignment = SWT.FILL;
+               gd.verticalAlignment = GridData.BEGINNING;
+               gd.verticalIndent = 1;
+               gd.verticalSpan = 2;
+               bar3.setLayoutData(gd);
+               
        }