Minor changes in pages design.

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiMessages.properties b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiMessages.properties
index 09420f2..0a7abc1 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiMessages.properties
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiMessages.properties
@@ -12,10 +12,10 @@ LaunchConfigurationTab.PHPArguments.interpreter_args_box_title=Interpreter Argum
 LaunchConfigurationTab.PHPArguments.program_args_box_title=Program Arguments:
 
 LaunchConfigurationTab.PHPEntryPoint.name=File
-LaunchConfigurationTab.PHPEntryPoint.projectLabel=Project:
+LaunchConfigurationTab.PHPEntryPoint.projectLabel=&Project:
 LaunchConfigurationTab.PHPEntryPoint.projectSelectorMessage=Choose the project containing the application entry point:
 LaunchConfigurationTab.PHPEntryPoint.invalidProjectSelectionMessage=Invalid project selection.
-LaunchConfigurationTab.PHPEntryPoint.fileLabel=File:
+LaunchConfigurationTab.PHPEntryPoint.fileLabel=&File:
 LaunchConfigurationTab.PHPEntryPoint.fileSelectorMessage=Choose the PHP file that represents the application entry point:
 LaunchConfigurationTab.PHPEntryPoint.invalidFileSelectionMessage=Invalid PHP file.
 

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java
index 2368be5..ad11c41 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java
@@ -21,6 +21,7 @@ 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.Text;
 
@@ -38,9 +39,15 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
        public void createControl(Composite parent) {
                Composite composite = createPageRoot(parent);
 
-               new Label(composite, SWT.NONE).setText(PHPDebugUiMessages
+//             new Label(composite, SWT.NONE).setText(PHPDebugUiMessages
+//                             .getString("LaunchConfigurationTab.PHPArguments.working_dir"));
+//             workingDirectorySelector = new DirectorySelector(composite);
+               Group grpWorkingDir = new Group(composite, SWT.NONE);
+               grpWorkingDir.setText(PHPDebugUiMessages
                                .getString("LaunchConfigurationTab.PHPArguments.working_dir"));
-               workingDirectorySelector = new DirectorySelector(composite);
+               grpWorkingDir.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+               grpWorkingDir.setLayout(new GridLayout());
+               workingDirectorySelector = new DirectorySelector(grpWorkingDir);
                workingDirectorySelector
                                .setBrowseDialogMessage(PHPDebugUiMessages
                                                .getString("LaunchConfigurationTab.PHPArguments.working_dir_browser_message"));
@@ -52,8 +59,8 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
                        }
                });
 
-               Composite defaultWorkingDirectoryComposite = new Composite(composite,
-                               SWT.NONE);
+               Composite defaultWorkingDirectoryComposite = new Composite(
+                               grpWorkingDir, SWT.NONE);
                GridLayout layout = new GridLayout();
                layout.numColumns = 2;
                defaultWorkingDirectoryComposite.setLayout(layout);
@@ -71,18 +78,28 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
                                                .getString("LaunchConfigurationTab.PHPArguments.working_dir_use_default_message"));
                defaultWorkingDirectoryComposite.pack();
 
-               new Label(composite, SWT.NONE)
-                               .setText(PHPDebugUiMessages
-                                               .getString("LaunchConfigurationTab.PHPArguments.interpreter_args_box_title"));
-               interpreterArgsText = new Text(composite, SWT.MULTI | SWT.V_SCROLL
-                               | SWT.BORDER);
+//             new Label(composite, SWT.NONE)
+//                             .setText(PHPDebugUiMessages
+//                                             .getString("LaunchConfigurationTab.PHPArguments.interpreter_args_box_title"));
+               Group grpArgs = new Group(composite, SWT.NONE);
+               grpArgs.setText(PHPDebugUiMessages
+                               .getString("LaunchConfigurationTab.PHPArguments.interpreter_args_box_title"));
+               grpArgs.setLayoutData(new GridData(GridData.FILL_BOTH));
+               grpArgs.setLayout(new GridLayout());
+               interpreterArgsText = new Text(grpArgs, SWT.MULTI | SWT.V_SCROLL
+                               | SWT.BORDER | SWT.WRAP);
                interpreterArgsText.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-               new Label(composite, SWT.NONE)
-                               .setText(PHPDebugUiMessages
-                                               .getString("LaunchConfigurationTab.PHPArguments.program_args_box_title"));
-               programArgsText = new Text(composite, SWT.MULTI | SWT.V_SCROLL
-                               | SWT.BORDER);
+//             new Label(composite, SWT.NONE)
+//                             .setText(PHPDebugUiMessages
+//                                             .getString("LaunchConfigurationTab.PHPArguments.program_args_box_title"));
+               Group grpProgArgs = new Group(composite, SWT.NONE);
+               grpProgArgs.setText(PHPDebugUiMessages
+                               .getString("LaunchConfigurationTab.PHPArguments.program_args_box_title"));
+               grpProgArgs.setLayoutData(new GridData(GridData.FILL_BOTH));
+               grpProgArgs.setLayout(new GridLayout());
+               programArgsText = new Text(grpProgArgs, SWT.MULTI | SWT.V_SCROLL
+                               | SWT.BORDER | SWT.WRAP);
                programArgsText.setLayoutData(new GridData(GridData.FILL_BOTH));
        }
 
@@ -146,7 +163,7 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
        protected Composite createPageRoot(Composite parent) {
                Composite composite = new Composite(parent, SWT.NONE);
                GridLayout compositeLayout = new GridLayout();
-               compositeLayout.marginWidth = 0;
+//             compositeLayout.marginWidth = 0;
                compositeLayout.numColumns = 1;
                composite.setLayout(compositeLayout);
 

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java
index 57c3e81..3da7b18 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java
@@ -23,7 +23,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Group;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
@@ -42,10 +42,17 @@ public class PHPEntryPointTab extends AbstractLaunchConfigurationTab {
        public void createControl(Composite parent) {
                Composite composite = createPageRoot(parent);
 
-               new Label(composite, SWT.NONE)
+//             new Label(composite, SWT.NONE)
+//                             .setText(PHPDebugUiMessages
+//                                             .getString("LaunchConfigurationTab.PHPEntryPoint.projectLabel"));
+//             projectSelector = new PHPProjectSelector(composite);
+               Group grpProject = new Group(composite, SWT.NONE);
+               grpProject
                                .setText(PHPDebugUiMessages
                                                .getString("LaunchConfigurationTab.PHPEntryPoint.projectLabel"));
-               projectSelector = new PHPProjectSelector(composite);
+               grpProject.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+               grpProject.setLayout(new GridLayout());
+               projectSelector = new PHPProjectSelector(grpProject);
                projectSelector
                                .setBrowseDialogMessage(PHPDebugUiMessages
                                                .getString("LaunchConfigurationTab.PHPEntryPoint.projectSelectorMessage"));
@@ -56,9 +63,15 @@ public class PHPEntryPointTab extends AbstractLaunchConfigurationTab {
                        }
                });
 
-               new Label(composite, SWT.NONE).setText(PHPDebugUiMessages
+//             new Label(composite, SWT.NONE).setText(PHPDebugUiMessages
+//                             .getString("LaunchConfigurationTab.PHPEntryPoint.fileLabel"));
+//             fileSelector = new PHPFileSelector(composite, projectSelector);
+               Group grpFile = new Group(composite, SWT.NONE);
+               grpFile.setText(PHPDebugUiMessages
                                .getString("LaunchConfigurationTab.PHPEntryPoint.fileLabel"));
-               fileSelector = new PHPFileSelector(composite, projectSelector);
+               grpFile.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+               grpFile.setLayout(new GridLayout());
+               fileSelector = new PHPFileSelector(grpFile, projectSelector);
                fileSelector
                                .setBrowseDialogMessage(PHPDebugUiMessages
                                                .getString("LaunchConfigurationTab.PHPEntryPoint.fileSelectorMessage"));
@@ -134,7 +147,7 @@ public class PHPEntryPointTab extends AbstractLaunchConfigurationTab {
        protected Composite createPageRoot(Composite parent) {
                Composite composite = new Composite(parent, SWT.NONE);
                GridLayout layout = new GridLayout();
-               layout.marginWidth = 0;
+//             layout.marginWidth = 0;
                composite.setLayout(layout);
 
                setControl(composite);

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
index 0257ce1..877147d 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
@@ -446,8 +446,8 @@ public class PHPEnvironmentTab extends AbstractLaunchConfigurationTab {
                Composite interpreterComposite = new Composite(tabFolder, SWT.NONE);
                GridLayout layout = new GridLayout();
                layout.numColumns = 2;
-               layout.marginHeight = 0;
-               layout.marginWidth = 0;
+//             layout.marginHeight = 0;
+//             layout.marginWidth = 0;
                interpreterComposite.setLayout(layout);
                interpreterComposite.setLayoutData(new GridData(
                                GridData.FILL_HORIZONTAL));