Révision 1861
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java (revision 1861) | ||
---|---|---|
287 | 287 |
|
288 | 288 |
// Structural units and properties combo viewers |
289 | 289 |
StructuralUnitsCombosGroup structuration = new StructuralUnitsCombosGroup(paramPanel, this, this.getResult().getStructuralUnit(), this.getResult().getStructuralUnitProperty()); |
290 |
GridData gdata = new GridData(GridData.BEGINNING, GridData.BEGINNING, true, false, 3, 1); |
|
290 |
structuration.setLayout(new GridLayout(4, false)); |
|
291 |
|
|
292 |
GridData gdata = new GridData(GridData.FILL, GridData.BEGINNING, true, false, 3, 1); |
|
291 | 293 |
structuration.setLayoutData(gdata); // the group must use the full line |
292 | 294 |
|
293 | 295 |
// Structural Unit |
... | ... | |
308 | 310 |
|
309 | 311 |
|
310 | 312 |
// Repeat same values in part markers |
311 |
repeatSameValues = new Button(paramPanel, SWT.CHECK);
|
|
313 |
repeatSameValues = new Button(structuration, SWT.CHECK);
|
|
312 | 314 |
repeatSameValues.setText(ProgressionUIMessages.repeatSameValues); |
313 | 315 |
repeatSameValues.addSelectionListener(computeSelectionListener); |
316 |
repeatSameValues.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, false, false, 4,1)); |
|
314 | 317 |
|
315 |
|
|
316 | 318 |
// Lines styles |
317 | 319 |
multipleLineStrokes = new Button(paramPanel, SWT.CHECK); |
318 | 320 |
multipleLineStrokes.setText(ChartsUIMessages.multipleLineStrokeStyles); |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/StructuralUnitsCombosGroup.java (revision 1861) | ||
---|---|---|
3 | 3 |
import org.eclipse.jface.viewers.ISelectionChangedListener; |
4 | 4 |
import org.eclipse.jface.viewers.SelectionChangedEvent; |
5 | 5 |
import org.eclipse.swt.SWT; |
6 |
import org.eclipse.swt.layout.GridData; |
|
7 |
import org.eclipse.swt.layout.GridLayout; |
|
8 |
import org.eclipse.swt.layout.RowData; |
|
6 | 9 |
import org.eclipse.swt.layout.RowLayout; |
7 | 10 |
import org.eclipse.swt.widgets.Composite; |
8 | 11 |
import org.eclipse.swt.widgets.Group; |
... | ... | |
44 | 47 |
public StructuralUnitsCombosGroup(Composite parent, int style, TXMEditor editor, boolean autoCompute, StructuralUnit selectedSU, StructuralUnitProperty selectedSUP, boolean addEmptyEntries) { |
45 | 48 |
super(parent, style); |
46 | 49 |
|
47 |
this.setLayout(new RowLayout());
|
|
50 |
this.setLayout(new GridLayout(2, false));
|
|
48 | 51 |
this.setText(TXMCoreMessages.common_structuralUnitAndProperty); |
49 | 52 |
|
50 | 53 |
// Structural Unit combo box |
51 | 54 |
this.structuralUnitsComboViewer = new StructuralUnitsComboViewer(this, editor, autoCompute, selectedSU, addEmptyEntries); |
52 |
|
|
55 |
structuralUnitsComboViewer.getCombo().setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false)); |
|
53 | 56 |
// Listener to update SUPs |
54 | 57 |
this.structuralUnitsComboViewer.addSelectionChangedListener(new ISelectionChangedListener() { |
55 | 58 |
@Override |
... | ... | |
58 | 61 |
} |
59 | 62 |
}); |
60 | 63 |
|
61 |
|
|
62 | 64 |
// Structural Unit Property combo box |
63 | 65 |
this.structuralUnitPropertiesComboViewer = new StructuralUnitPropertiesComboViewer(this, editor, autoCompute, selectedSU, selectedSUP, addEmptyEntries); |
66 |
structuralUnitPropertiesComboViewer.getCombo().setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false)); |
|
64 | 67 |
} |
65 | 68 |
|
66 | 69 |
/** |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/StructuralUnitsComboViewer.java (revision 1861) | ||
---|---|---|
31 | 31 |
* @param addBlankEntry to add an empty blank entry at start of the list to clear value. |
32 | 32 |
*/ |
33 | 33 |
public StructuralUnitsComboViewer(Composite parent, TXMEditor editor, boolean autoCompute, StructuralUnit selectedSU, boolean addBlankEntry) { |
34 |
super(parent, SWT.NONE);
|
|
34 |
super(parent, SWT.READ_ONLY);
|
|
35 | 35 |
|
36 | 36 |
this.setContentProvider(ArrayContentProvider.getInstance()); |
37 | 37 |
|
Formats disponibles : Unified diff