[Qtitools-commits] SF.net SVN: qtitools:[2400] Mathqurate/trunk/mathqurate/src/main/java/org/ qtitools/mathqurate/view/SimpleChoiceWizard.java

[<lo...@us...>]

Revision: 2400
          http://qtitools.svn.sourceforge.net/qtitools/?rev=2400&view=rev
Author:   loccy
Date:     2010-03-26 11:45:31 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
MQ: Removed modal flag from simple choice quick creator window - behaves too unpredictably across platforms.

Modified Paths:
--------------
    Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SimpleChoiceWizard.java

Modified: Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SimpleChoiceWizard.java
===================================================================
--- Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SimpleChoiceWizard.java	2010-03-26 11:04:28 UTC (rev 2399)
+++ Mathqurate/trunk/mathqurate/src/main/java/org/qtitools/mathqurate/view/SimpleChoiceWizard.java	2010-03-26 11:45:31 UTC (rev 2400)
@@ -33,8 +33,6 @@
 
 package org.qtitools.mathqurate.view;
 
-
-import java.awt.KeyboardFocusManager;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.regex.Matcher;
@@ -57,12 +55,11 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.window.ApplicationWindow;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.layout.RowData;
 import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Button;
@@ -70,7 +67,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
@@ -555,9 +551,6 @@
 				hintBlurb.setToolTipText(toolTipWrap("This text is displayed if the student asked for the solution. If you don't wish to allow the student " +
 						"this option,you might wish to simply put something like \"Sorry, the solution is not available\" here."));
 				
-				GridLayoutFactory.fillDefaults().numColumns(1).margins(
-						LayoutConstants.getMargins()).generateLayout(secondParent);
-				
 				Composite scoreField = new Composite(secondParent,SWT.NONE);
 				{
 					RowLayout oddLayout = new RowLayout();
@@ -593,6 +586,11 @@
 							"be divided if they have to use the hint option. The default number 2 will half their" +
 							"final mark. Enter 1 if you don't want to deduct marks for using the hint option."));
 				}
+				
+				GridLayoutFactory.fillDefaults().numColumns(1).margins(
+						LayoutConstants.getMargins()).generateLayout(secondParent);
+				GridLayout spLayout = (GridLayout)secondParent.getLayout();
+				spLayout.verticalSpacing = 5;
 			}
 			
 			Composite graphicsButtons = new Composite(twoPanes,SWT.NONE);
@@ -848,8 +846,8 @@
 	 */
 	@Override
 	protected void initializeBounds() {		
-		getShell().setMinimumSize(750,650);
-		getShell().setSize(900, 650);
+		getShell().setMinimumSize(750,640);
+		getShell().setSize(900, 640);
 		getShell().setLocation(0, 0); 
 	}
 	
@@ -864,7 +862,7 @@
 	{
 		SimpleChoiceWizard sw = new SimpleChoiceWizard(new Shell());
 		sw.setBlockOnOpen(true);
-		sw.setShellStyle(SWT.APPLICATION_MODAL | SWT.TITLE | SWT.RESIZE);
+		//sw.setShellStyle(SWT.APPLICATION_MODAL | SWT.TITLE | SWT.RESIZE);
 		sw.open();
 		return sw.finalXml;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.