Improved pref page layout

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / PHPEclipseBasePreferencePage.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPEclipseBasePreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPEclipseBasePreferencePage.java
index 000a10e..f46d66e 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPEclipseBasePreferencePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPEclipseBasePreferencePage.java
@@ -15,6 +15,7 @@ import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Group;
@@ -98,37 +99,25 @@ public class PHPEclipseBasePreferencePage extends PreferencePage implements IWor
     Composite webSettingsComposite = new Composite(composite, SWT.NONE);
     webSettingsComposite.setLayout(new GridLayout());
     webSettingsComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    Group webSettingsGroup = new Group(webSettingsComposite, SWT.NONE);
-    webSettingsGroup.setText(PHPPreferencesMessages.getString("PHPBasePreferencePage.websettingsGroup"));
-    webSettingsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    webSettingsGroup.setLayout(new GridLayout());
-    localHostSFE =
-      new StringFieldEditor(
-        IPreferenceConstants.LOCALHOST_PREF,
-        PHPPreferencesMessages.getString("PHPBasePreferencePage.websettingsGroup.localhost"),
-        webSettingsGroup);
-    localHostSFE.setPreferencePage(this);
-    localHostSFE.setPreferenceStore(getPreferenceStore());
-    localHostSFE.load();
-    documentRootDFE =
-      new DirectoryFieldEditor(
-        IPreferenceConstants.DOCUMENTROOT_PREF,
-        PHPPreferencesMessages.getString("PHPBasePreferencePage.websettingsGroup.docroot"),
-        webSettingsGroup);
-    documentRootDFE.setPreferencePage(this);
-    documentRootDFE.setPreferenceStore(getPreferenceStore());
-    documentRootDFE.load();
-    
-    new Label(webSettingsGroup, SWT.NONE);
+
     showExternalPreviewBFE =
       new BooleanFieldEditor(
         IPreferenceConstants.SHOW_EXTERNAL_PREVIEW_PREF,
         PHPPreferencesMessages.getString("PHPBasePreferencePage.websettingsGroup.showexternalpreview"),
-        webSettingsGroup);
+        webSettingsComposite);
     showExternalPreviewBFE.setPreferencePage(this);
     showExternalPreviewBFE.setPreferenceStore(getPreferenceStore());
     showExternalPreviewBFE.load();
-    new Label(webSettingsGroup, SWT.NONE);
+
+    Group webSettingsGroup = new Group(webSettingsComposite, SWT.NONE);
+    webSettingsGroup.setText(PHPPreferencesMessages.getString("PHPBasePreferencePage.websettingsGroup"));
+    GridLayout gridLayout = new GridLayout();
+    //  gridLayout.numColumns = 3;
+    GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+    webSettingsGroup.setLayoutData(gridData);
+    webSettingsGroup.setLayout(gridLayout);
+
+    // new Label(webSettingsGroup, SWT.NONE);
     externalBrowserBFE =
       new BooleanFieldEditor(
         IPreferenceConstants.USE_EXTERNAL_BROWSER_PREF,
@@ -138,6 +127,8 @@ public class PHPEclipseBasePreferencePage extends PreferencePage implements IWor
     externalBrowserBFE.setPreferenceStore(getPreferenceStore());
     externalBrowserBFE.load();
     new Label(webSettingsGroup, SWT.NONE);
+    new Label(webSettingsGroup, SWT.NONE);
+    //  new Label(webSettingsGroup, SWT.NONE);
     externalBrowserSFE =
       new StringFieldEditor(
         IPreferenceConstants.EXTERNAL_BROWSER_PREF,
@@ -146,7 +137,26 @@ public class PHPEclipseBasePreferencePage extends PreferencePage implements IWor
     externalBrowserSFE.setPreferencePage(this);
     externalBrowserSFE.setPreferenceStore(getPreferenceStore());
     externalBrowserSFE.load();
+    new Label(webSettingsGroup, SWT.NONE);
 
+    localHostSFE =
+      new StringFieldEditor(
+        IPreferenceConstants.LOCALHOST_PREF,
+        PHPPreferencesMessages.getString("PHPBasePreferencePage.websettingsGroup.localhost"),
+        webSettingsGroup);
+    localHostSFE.setPreferencePage(this);
+    localHostSFE.setPreferenceStore(getPreferenceStore());
+    localHostSFE.load();
+    new Label(webSettingsGroup, SWT.NONE);
+
+    documentRootDFE =
+      new DirectoryFieldEditor(
+        IPreferenceConstants.DOCUMENTROOT_PREF,
+        PHPPreferencesMessages.getString("PHPBasePreferencePage.websettingsGroup.docroot"),
+        webSettingsGroup);
+    documentRootDFE.setPreferencePage(this);
+    documentRootDFE.setPreferenceStore(getPreferenceStore());
+    documentRootDFE.load();
     //Create apache
     Composite apacheSettingsComposite = new Composite(composite, SWT.NULL);
     apacheSettingsComposite.setLayout(new GridLayout());
@@ -179,7 +189,7 @@ public class PHPEclipseBasePreferencePage extends PreferencePage implements IWor
     apacheRestartSFE.setPreferencePage(this);
     apacheRestartSFE.setPreferenceStore(getPreferenceStore());
     apacheRestartSFE.load();
-    
+
     phpRunSFE =
       new StringFieldEditor(
         IPreferenceConstants.PHP_RUN_PREF,