Attachment #132816 for bug #269224

View | Details | Raw Unified | Return to bug 269224
Collapse All | Expand All




import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.SWT;
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.Control;


		fNowrapAttr = createCheckBox(formattingGroup, CSSUIMessages.PrefsLabel_WrappingWithoutAttr);
		((GridData) fNowrapAttr.getLayoutData()).horizontalSpan = 2;

		// [269224] - Place the indent controls in their own composite for proper tab ordering
		Composite radioComposite = createComposite(formattingGroup, 1);
		((GridData) radioComposite.getLayoutData()).horizontalSpan = 2;
		((GridLayout) radioComposite.getLayout()).marginWidth = 0;
		((GridLayout) radioComposite.getLayout()).marginHeight = 0;

		fIndentUsingTabs = createRadioButton(radioComposite, CSSUIMessages.Indent_using_tabs_);
		((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 1;
		fIndentUsingSpaces = createRadioButton(radioComposite, CSSUIMessages.Indent_using_spaces);
		((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 1;
		
		createLabel(formattingGroup, CSSUIMessages.Indentation_size);
		fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY | SWT.BORDER);




/*******************************************************************************
 * Copyright (c) 2001, 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

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.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;

		((GridData) fClearAllBlankLines.getLayoutData()).horizontalSpan = 2;
		fSpaceBeforeEmptyCloseTag = createCheckBox(formattingGroup, XMLUIMessages.Space_before_empty_close_tag);
		((GridData) fSpaceBeforeEmptyCloseTag.getLayoutData()).horizontalSpan = 2;
		
		fIndentUsingTabs = createRadioButton(formattingGroup, XMLUIMessages.Indent_using_tabs);
		((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 2;

		// [269224] - Place the indent controls in their own composite for proper tab ordering
		Composite indentComposite = createComposite(formattingGroup, 1);
		((GridData) indentComposite.getLayoutData()).horizontalSpan = 2;
		((GridLayout) indentComposite.getLayout()).marginWidth = 0;
		((GridLayout) indentComposite.getLayout()).marginHeight = 0;

		fIndentUsingTabs = createRadioButton(indentComposite, XMLUIMessages.Indent_using_tabs);
		((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 1;

		fIndentUsingSpaces = createRadioButton(indentComposite, XMLUIMessages.Indent_using_spaces);
		((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 1;

		createLabel(formattingGroup, XMLUIMessages.Indentation_size);
		fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY | SWT.BORDER);

Lines 1-5 Link Here

(-)src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSourcePreferencePage.java (-5 / +12 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004, 2008 IBM Corporation and others.	2	* Copyright (c) 2004, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 15-20 Link Here
15	import org.eclipse.jface.preference.IPreferenceStore;	15	import org.eclipse.jface.preference.IPreferenceStore;
16	import org.eclipse.swt.SWT;	16	import org.eclipse.swt.SWT;
17	import org.eclipse.swt.layout.GridData;	17	import org.eclipse.swt.layout.GridData;
		18	import org.eclipse.swt.layout.GridLayout;
18	import org.eclipse.swt.widgets.Button;	19	import org.eclipse.swt.widgets.Button;
19	import org.eclipse.swt.widgets.Composite;	20	import org.eclipse.swt.widgets.Composite;
20	import org.eclipse.swt.widgets.Control;	21	import org.eclipse.swt.widgets.Control;
Lines 111-121 Link Here
111	fClearAllBlankLines = createCheckBox(formattingGroup, HTMLUIMessages.Clear_all_blank_lines_UI_);	112	fClearAllBlankLines = createCheckBox(formattingGroup, HTMLUIMessages.Clear_all_blank_lines_UI_);
112	((GridData) fClearAllBlankLines.getLayoutData()).horizontalSpan = 2;	113	((GridData) fClearAllBlankLines.getLayoutData()).horizontalSpan = 2;
113		114
114	fIndentUsingTabs = createRadioButton(formattingGroup, HTMLUIMessages.Indent_using_tabs);	115	// [269224] - Place the indent controls in their own composite for proper tab ordering
115	((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 2;	116	Composite indentComposite = createComposite(formattingGroup, 1);
		117	((GridData) indentComposite.getLayoutData()).horizontalSpan = 2;
		118	((GridLayout) indentComposite.getLayout()).marginWidth = 0;
		119	((GridLayout) indentComposite.getLayout()).marginHeight = 0;
116		120
117	fIndentUsingSpaces = createRadioButton(formattingGroup, HTMLUIMessages.Indent_using_spaces);	121	fIndentUsingTabs = createRadioButton(indentComposite, HTMLUIMessages.Indent_using_tabs);
118	((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 2;	122	((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 1;
		123
		124	fIndentUsingSpaces = createRadioButton(indentComposite, HTMLUIMessages.Indent_using_spaces);
		125	((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 1;
119		126
120	createLabel(formattingGroup, HTMLUIMessages.Indentation_size);	127	createLabel(formattingGroup, HTMLUIMessages.Indentation_size);
121	fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY \| SWT.BORDER);	128	fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY \| SWT.BORDER);

Return to bug 269224

Lines 15-20 Link Here

(-)src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSourcePreferencePage.java (-5 / +12 lines)
15	import org.eclipse.jface.preference.IPreferenceStore;	15	import org.eclipse.jface.preference.IPreferenceStore;
16	import org.eclipse.swt.SWT;	16	import org.eclipse.swt.SWT;
17	import org.eclipse.swt.layout.GridData;	17	import org.eclipse.swt.layout.GridData;
		18	import org.eclipse.swt.layout.GridLayout;
18	import org.eclipse.swt.widgets.Button;	19	import org.eclipse.swt.widgets.Button;
19	import org.eclipse.swt.widgets.Composite;	20	import org.eclipse.swt.widgets.Composite;
20	import org.eclipse.swt.widgets.Control;	21	import org.eclipse.swt.widgets.Control;
Lines 130-140 Link Here
130		131
131	fNowrapAttr = createCheckBox(formattingGroup, CSSUIMessages.PrefsLabel_WrappingWithoutAttr);	132	fNowrapAttr = createCheckBox(formattingGroup, CSSUIMessages.PrefsLabel_WrappingWithoutAttr);
132	((GridData) fNowrapAttr.getLayoutData()).horizontalSpan = 2;	133	((GridData) fNowrapAttr.getLayoutData()).horizontalSpan = 2;
133		134
134	fIndentUsingTabs = createRadioButton(formattingGroup, CSSUIMessages.Indent_using_tabs_);	135	// [269224] - Place the indent controls in their own composite for proper tab ordering
135	((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 2;	136	Composite radioComposite = createComposite(formattingGroup, 1);
136	fIndentUsingSpaces = createRadioButton(formattingGroup, CSSUIMessages.Indent_using_spaces);	137	((GridData) radioComposite.getLayoutData()).horizontalSpan = 2;
137	((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 2;	138	((GridLayout) radioComposite.getLayout()).marginWidth = 0;
		139	((GridLayout) radioComposite.getLayout()).marginHeight = 0;
		140
		141	fIndentUsingTabs = createRadioButton(radioComposite, CSSUIMessages.Indent_using_tabs_);
		142	((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 1;
		143	fIndentUsingSpaces = createRadioButton(radioComposite, CSSUIMessages.Indent_using_spaces);
		144	((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 1;
138		145
139	createLabel(formattingGroup, CSSUIMessages.Indentation_size);	146	createLabel(formattingGroup, CSSUIMessages.Indentation_size);
140	fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY \| SWT.BORDER);	147	fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY \| SWT.BORDER);

Lines 1-5 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/preferences/XMLSourcePreferencePage.java (-6 / +13 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2001, 2008 IBM Corporation and others.	2	* Copyright (c) 2001, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 21-26 Link Here
21	import org.eclipse.swt.events.ModifyListener;	21	import org.eclipse.swt.events.ModifyListener;
22	import org.eclipse.swt.events.SelectionListener;	22	import org.eclipse.swt.events.SelectionListener;
23	import org.eclipse.swt.layout.GridData;	23	import org.eclipse.swt.layout.GridData;
		24	import org.eclipse.swt.layout.GridLayout;
24	import org.eclipse.swt.widgets.Button;	25	import org.eclipse.swt.widgets.Button;
25	import org.eclipse.swt.widgets.Combo;	26	import org.eclipse.swt.widgets.Combo;
26	import org.eclipse.swt.widgets.Composite;	27	import org.eclipse.swt.widgets.Composite;
Lines 126-137 Link Here
126	((GridData) fClearAllBlankLines.getLayoutData()).horizontalSpan = 2;	127	((GridData) fClearAllBlankLines.getLayoutData()).horizontalSpan = 2;
127	fSpaceBeforeEmptyCloseTag = createCheckBox(formattingGroup, XMLUIMessages.Space_before_empty_close_tag);	128	fSpaceBeforeEmptyCloseTag = createCheckBox(formattingGroup, XMLUIMessages.Space_before_empty_close_tag);
128	((GridData) fSpaceBeforeEmptyCloseTag.getLayoutData()).horizontalSpan = 2;	129	((GridData) fSpaceBeforeEmptyCloseTag.getLayoutData()).horizontalSpan = 2;
129
130	fIndentUsingTabs = createRadioButton(formattingGroup, XMLUIMessages.Indent_using_tabs);
131	((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 2;
132		130
133	fIndentUsingSpaces = createRadioButton(formattingGroup, XMLUIMessages.Indent_using_spaces);	131	// [269224] - Place the indent controls in their own composite for proper tab ordering
134	((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 2;	132	Composite indentComposite = createComposite(formattingGroup, 1);
		133	((GridData) indentComposite.getLayoutData()).horizontalSpan = 2;
		134	((GridLayout) indentComposite.getLayout()).marginWidth = 0;
		135	((GridLayout) indentComposite.getLayout()).marginHeight = 0;
		136
		137	fIndentUsingTabs = createRadioButton(indentComposite, XMLUIMessages.Indent_using_tabs);
		138	((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 1;
		139
		140	fIndentUsingSpaces = createRadioButton(indentComposite, XMLUIMessages.Indent_using_spaces);
		141	((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 1;
135		142
136	createLabel(formattingGroup, XMLUIMessages.Indentation_size);	143	createLabel(formattingGroup, XMLUIMessages.Indentation_size);
137	fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY \| SWT.BORDER);	144	fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY \| SWT.BORDER);