mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 15:05:36 +02:00
Code Issues Wiki Activity

fixing bug #151946 - Bad layout of Arguments tab in C/C++ Local Application

Browse source
This commit is contained in:
Norbert Pltt 2006-09-13 07:01:24 +00:00
parent be7b7d3fd0
commit 92f1d746a0
3 changed files with 41 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties
View file

@ -124,7 +124,7 @@ CEnvironmentTab.Environment=Environment
CEnvironmentTab.Existing_Environment_Variable=Existing Environment Variable CEnvironmentTab.Existing_Environment_Variable=Existing Environment Variable
CEnvironmentTab.Environment_variable_NAME_exists=Environment variable \" {0} \" exists.\nDo you want to overwrite? CEnvironmentTab.Environment_variable_NAME_exists=Environment variable \" {0} \" exists.\nDo you want to overwrite?
CArgumentsTab.C/C++_Program_Arguments=C/C++ Program Arguments: CArgumentsTab.C/C++_Program_Arguments=Program arguments:
CArgumentsTab.Arguments=Arguments CArgumentsTab.Arguments=Arguments
CArgumentsTab.Variables=Variables... CArgumentsTab.Variables=Variables...
@ -132,8 +132,9 @@ WorkingDirectoryBlock.4=Select a &workspace relative working directory:
WorkingDirectoryBlock.7=Select a working directory for the launch configuration: WorkingDirectoryBlock.7=Select a working directory for the launch configuration:
WorkingDirectoryBlock.0=W&orkspace... WorkingDirectoryBlock.0=W&orkspace...
WorkingDirectoryBlock.Working_Directory_8=Working Directory WorkingDirectoryBlock.Working_Directory_8=Working Directory
WorkingDirectoryBlock.Working_directory=Working directory:
WorkingDirectoryBlock.10=Working directory does not exist WorkingDirectoryBlock.10=Working directory does not exist
WorkingDirectoryBlock.Use_de&fault_working_directory_4=Use default wor&king directory WorkingDirectoryBlock.Use_default=Use de&fault
WorkingDirectoryBlock.17=Variabl&es... WorkingDirectoryBlock.17=Variabl&es...
WorkingDirectoryBlock.1=File S&ystem... WorkingDirectoryBlock.1=File S&ystem...
WorkingDirectoryBlock.Exception_occurred_reading_configuration___15=Exception occurred reading configuration: WorkingDirectoryBlock.Exception_occurred_reading_configuration___15=Exception occurred reading configuration:

21
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java
View file

@ -38,6 +38,7 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.dialogs.ContainerSelectionDialog; import org.eclipse.ui.dialogs.ContainerSelectionDialog;
@ -94,33 +95,35 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab {
public void createControl(Composite parent) { public void createControl(Composite parent) {
Font font = parent.getFont(); Font font = parent.getFont();
Composite comp = new Composite(parent, SWT.NONE); Group group = new Group(parent, SWT.NONE);
// WorkbenchHelp.setHelp(group, // WorkbenchHelp.setHelp(group,
// IJavaDebugHelpContextIds.WORKING_DIRECTORY_BLOCK); // IJavaDebugHelpContextIds.WORKING_DIRECTORY_BLOCK);
GridLayout workingDirLayout = new GridLayout(); GridLayout workingDirLayout = new GridLayout();
workingDirLayout.numColumns = 2; workingDirLayout.numColumns = 2;
workingDirLayout.makeColumnsEqualWidth = false; workingDirLayout.makeColumnsEqualWidth = false;
comp.setLayout(workingDirLayout); group.setLayout(workingDirLayout);
GridData gd = new GridData(GridData.FILL_HORIZONTAL); GridData gd = new GridData(GridData.FILL_HORIZONTAL);
comp.setLayoutData(gd); group.setLayoutData(gd);
comp.setFont(font); group.setFont(font);
setControl(comp); setControl(group);
fWorkingDirText = new Text(comp, SWT.SINGLE | SWT.BORDER); group.setText(LaunchMessages.getString("WorkingDirectoryBlock.Working_directory"));
fWorkingDirText = new Text(group, SWT.SINGLE | SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL); gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2; gd.horizontalSpan = 2;
fWorkingDirText.setLayoutData(gd); fWorkingDirText.setLayoutData(gd);
fWorkingDirText.setFont(font); fWorkingDirText.setFont(font);
fWorkingDirText.addModifyListener(fListener); fWorkingDirText.addModifyListener(fListener);
fUseDefaultWorkingDirButton = new Button(comp, SWT.CHECK); fUseDefaultWorkingDirButton = new Button(group, SWT.CHECK);
fUseDefaultWorkingDirButton.setText(LaunchMessages.getString("WorkingDirectoryBlock.Use_de&fault_working_directory_4")); //$NON-NLS-1$ fUseDefaultWorkingDirButton.setText(LaunchMessages.getString("WorkingDirectoryBlock.Use_default")); //$NON-NLS-1$
gd = new GridData(GridData.FILL_HORIZONTAL); gd = new GridData(GridData.FILL_HORIZONTAL);
fUseDefaultWorkingDirButton.setLayoutData(gd); fUseDefaultWorkingDirButton.setLayoutData(gd);
fUseDefaultWorkingDirButton.setFont(font); fUseDefaultWorkingDirButton.setFont(font);
fUseDefaultWorkingDirButton.addSelectionListener(fListener); fUseDefaultWorkingDirButton.addSelectionListener(fListener);
Composite buttonComp = new Composite(comp, SWT.NONE); Composite buttonComp = new Composite(group, SWT.NONE);
GridLayout layout = new GridLayout(3, false); GridLayout layout = new GridLayout(3, false);
layout.marginHeight = 0; layout.marginHeight = 0;
layout.marginWidth = 0; layout.marginWidth = 0;

50
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java
View file

@ -27,12 +27,14 @@ import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
@ -58,45 +60,45 @@ public class CArgumentsTab extends CLaunchConfigurationTab {
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/ */
public void createControl(Composite parent) { public void createControl(Composite parent) {
Font font = parent.getFont();
Composite comp = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(1, true);
comp.setLayout(layout);
comp.setFont(font);
Composite comp = new Composite(parent, SWT.NONE); GridData gd = new GridData(GridData.FILL_BOTH);
setControl(comp); comp.setLayoutData(gd);
setControl(comp);
LaunchUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_ARGUMNETS_TAB); LaunchUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_ARGUMNETS_TAB);
GridLayout topLayout = new GridLayout();
comp.setLayout(topLayout);
createVerticalSpacer(comp, 1);
createArgumentComponent(comp, 1); createArgumentComponent(comp, 1);
createVerticalSpacer(comp, 1);
fWorkingDirectoryBlock.createControl(comp); fWorkingDirectoryBlock.createControl(comp);
} }
protected void createArgumentComponent(Composite comp, int i) { protected void createArgumentComponent(Composite comp, int horizontalSpan) {
Composite argsComp = new Composite(comp, SWT.NONE); Font font = comp.getFont();
GridLayout projLayout = new GridLayout(); Group group = new Group(comp, SWT.NONE);
projLayout.numColumns = 1; group.setFont(font);
projLayout.marginHeight = 0; group.setLayout(new GridLayout());
projLayout.marginWidth = 0; GridData gd = new GridData(GridData.FILL_BOTH);
argsComp.setLayout(projLayout); gd.horizontalSpan = horizontalSpan;
GridData gd = new GridData(GridData.FILL_HORIZONTAL); group.setLayoutData(gd);
gd.horizontalSpan = i;
argsComp.setLayoutData(gd); group.setText(LaunchMessages.getString("CArgumentsTab.C/C++_Program_Arguments")); //$NON-NLS-1$
fPrgmArgumentsText = new Text(group, SWT.MULTI | SWT.WRAP | SWT.BORDER | SWT.V_SCROLL);
fPrgmArgumentsLabel = new Label(argsComp, SWT.NONE); gd = new GridData(GridData.FILL_BOTH);
fPrgmArgumentsLabel.setText(LaunchMessages.getString("CArgumentsTab.C/C++_Program_Arguments")); //$NON-NLS-1$
fPrgmArgumentsText = new Text(argsComp, SWT.MULTI | SWT.WRAP | SWT.BORDER | SWT.V_SCROLL);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 40; gd.heightHint = 40;
gd.widthHint = 100;
fPrgmArgumentsText.setLayoutData(gd); fPrgmArgumentsText.setLayoutData(gd);
fPrgmArgumentsText.setFont(font);
fPrgmArgumentsText.addModifyListener(new ModifyListener() { fPrgmArgumentsText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent evt) { public void modifyText(ModifyEvent evt) {
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
} }
}); });
fArgumentVariablesButton= createPushButton(argsComp, LaunchMessages.getString("CArgumentsTab.Variables"), null); //$NON-NLS-1$ fArgumentVariablesButton= createPushButton(group, LaunchMessages.getString("CArgumentsTab.Variables"), null); //$NON-NLS-1$
gd = new GridData(GridData.HORIZONTAL_ALIGN_END); gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
fArgumentVariablesButton.setLayoutData(gd); fArgumentVariablesButton.setLayoutData(gd);
fArgumentVariablesButton.addSelectionListener(new SelectionAdapter() { fArgumentVariablesButton.addSelectionListener(new SelectionAdapter() {