Révision 789
| tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java (revision 789) | ||
|---|---|---|
| 265 | 265 |
//result |
| 266 | 266 |
|
| 267 | 267 |
Composite resultArea = getResultArea(); |
| 268 |
resultArea.setLayout(new GridLayout(1, false)); |
|
| 269 | 268 |
|
| 270 | 269 |
viewer = new TableViewer(resultArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER); |
| 271 | 270 |
viewer.getTable().addKeyListener(new TableKeyListener(viewer)); |
| tmp/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TIGERSearchEditor.java (revision 789) | ||
|---|---|---|
| 156 | 156 |
}); |
| 157 | 157 |
|
| 158 | 158 |
Composite mainPanel = this.getResultArea(); |
| 159 |
mainPanel.setLayout(new GridLayout(1, false)); |
|
| 160 | 159 |
svgPanel = new SVGComposite(mainPanel, SWT.EMBEDDED | SWT.NO_BACKGROUND); |
| 161 | 160 |
svgPanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); |
| 162 | 161 |
|
| tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java (revision 789) | ||
|---|---|---|
| 174 | 174 |
final GLComposite infosArea = this.getBottomToolbar().installGLComposite("Infos", 1, false);
|
| 175 | 175 |
infosArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false)); |
| 176 | 176 |
infosArea.getLayout().numColumns = 5; // nav panel + labels |
| 177 |
Composite resultArea = this.getResultArea(); |
|
| 178 |
|
|
| 177 |
|
|
| 179 | 178 |
// on créé une Query, ici le pivot de la concordance est "[]" |
| 180 | 179 |
// Query Area: query itself + view properties |
| 181 | 180 |
Composite queryArea = new Composite(paramArea, SWT.NONE); |
| ... | ... | |
| 384 | 383 |
// lFmaxInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); |
| 385 | 384 |
|
| 386 | 385 |
// results |
| 387 |
FormLayout resultLayout = new FormLayout(); |
|
| 388 |
resultArea.setLayout(resultLayout); |
|
| 386 |
Composite resultArea = this.getResultArea(); |
|
| 389 | 387 |
|
| 390 | 388 |
viewer = new TableViewer(resultArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER); |
| 391 | 389 |
this.getSite().setSelectionProvider(viewer); |
| ... | ... | |
| 403 | 401 |
viewer.getTable().setFont(font); |
| 404 | 402 |
} |
| 405 | 403 |
|
| 406 |
FormData tableLayoutData = new FormData(); |
|
| 407 |
tableLayoutData.top = new FormAttachment(0); |
|
| 408 |
tableLayoutData.bottom = new FormAttachment(100); |
|
| 409 |
tableLayoutData.left = new FormAttachment(0); |
|
| 410 |
tableLayoutData.right = new FormAttachment(100); |
|
| 411 |
viewer.getTable().setLayoutData(tableLayoutData); |
|
| 404 |
viewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH)); |
|
| 412 | 405 |
|
| 413 | 406 |
viewer.setLabelProvider(new LineLabelProvider()); |
| 414 | 407 |
viewer.setContentProvider(new LineContentProvider()); |
| tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java (revision 789) | ||
|---|---|---|
| 368 | 368 |
// resultLayoutData.bottom = new FormAttachment(100); |
| 369 | 369 |
// resultArea.setLayoutData(resultLayoutData); |
| 370 | 370 |
|
| 371 |
FormLayout resultLayout = new FormLayout(); |
|
| 372 |
resultArea.setLayout(resultLayout); |
|
| 373 |
|
|
| 374 | 371 |
viewer = new TableViewer(resultArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER); |
| 375 | 372 |
viewer.getTable().addKeyListener(new TableKeyListener(viewer)); |
| 376 | 373 |
viewer.getTable().setLinesVisible(true); |
| ... | ... | |
| 406 | 403 |
// } |
| 407 | 404 |
// }); |
| 408 | 405 |
|
| 409 |
FormData tableLayoutData = new FormData(); |
|
| 410 |
tableLayoutData.top = new FormAttachment(0); |
|
| 411 |
tableLayoutData.bottom = new FormAttachment(100); |
|
| 412 |
tableLayoutData.left = new FormAttachment(0); |
|
| 413 |
tableLayoutData.right = new FormAttachment(100); |
|
| 414 |
viewer.getTable().setLayoutData(tableLayoutData); |
|
| 406 |
viewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH)); |
|
| 415 | 407 |
|
| 416 | 408 |
viewer.setLabelProvider(new LineLabelProvider()); |
| 417 | 409 |
viewer.setContentProvider(new LineContentProvider()); |
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 789) | ||
|---|---|---|
| 11 | 11 |
import org.eclipse.core.runtime.Platform; |
| 12 | 12 |
import org.eclipse.swt.SWT; |
| 13 | 13 |
import org.eclipse.swt.layout.GridData; |
| 14 |
import org.eclipse.swt.layout.GridLayout; |
|
| 14 | 15 |
import org.eclipse.swt.widgets.Composite; |
| 15 | 16 |
import org.eclipse.swt.widgets.Group; |
| 16 | 17 |
import org.eclipse.ui.IPartListener; |
| ... | ... | |
| 129 | 130 |
|
| 130 | 131 |
// Remove parent composites |
| 131 | 132 |
//TODO MD: hack ? |
| 132 |
this.resultArea.dispose(); |
|
| 133 |
//this.resultArea.dispose();
|
|
| 133 | 134 |
|
| 134 | 135 |
// Chart composite |
| 135 |
this.chartComposite = SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()).createComposite(this, parent);
|
|
| 136 |
this.chartComposite = SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()).createComposite(this, getResultArea());
|
|
| 136 | 137 |
|
| 137 | 138 |
GridData gd = new GridData(GridData.FILL_BOTH); |
| 138 | 139 |
// gd.grabExcessVerticalSpace = true; |
| tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 789) | ||
|---|---|---|
| 353 | 353 |
|
| 354 | 354 |
try {
|
| 355 | 355 |
composeControlArea(controlArea); |
| 356 |
composeDisplayArea(getResultArea()); |
|
| 356 |
Composite d = new Composite(getResultArea(), SWT.NONE); |
|
| 357 |
composeDisplayArea(d); |
|
| 358 |
d.setLayoutData(new GridData(GridData.FILL_BOTH)); |
|
| 357 | 359 |
composeExtraAreas(controlArea, getResultArea()); |
| 358 | 360 |
// finally set the sorter to fill the tables |
| 359 | 361 |
if (complexsorter != null) {
|
| ... | ... | |
| 2011 | 2013 |
|
| 2012 | 2014 |
((FormData) sash.getLayoutData()).left = new FormAttachment(0, 25+(int) (refMax*W)); |
| 2013 | 2015 |
referenceColumn.setWidth(2*(int) (refMax*W)); |
| 2014 |
resultArea.layout(true, true);
|
|
| 2016 |
getResultArea().layout(true, true);
|
|
| 2015 | 2017 |
} |
| 2016 | 2018 |
|
| 2017 | 2019 |
/* |
| tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java (revision 789) | ||
|---|---|---|
| 125 | 125 |
|
| 126 | 126 |
|
| 127 | 127 |
// result area |
| 128 |
Composite resultArea = this.getResultArea(); |
|
| 129 |
|
|
| 130 |
GridLayout layout = new GridLayout(2, false); |
|
| 131 |
layout.marginWidth = layout.marginHeight = layout.horizontalSpacing = 0; |
|
| 132 |
resultArea.setLayout(layout); |
|
| 128 |
GLComposite resultArea = this.getResultArea(); |
|
| 129 |
resultArea.getLayout().numColumns = 2; |
|
| 133 | 130 |
|
| 134 | 131 |
// create table viewer |
| 135 | 132 |
viewer = new TableViewer(resultArea, SWT.VIRTUAL | SWT.MULTI | SWT.FULL_SELECTION); |
| tmp/org.txm.information.rcp/src/org/txm/information/rcp/editors/InformationEditor.java (revision 789) | ||
|---|---|---|
| 60 | 60 |
|
| 61 | 61 |
// browser |
| 62 | 62 |
Composite displayArea = this.getResultArea(); |
| 63 |
displayArea.setLayout(new GridLayout(1, true)); |
|
| 64 | 63 |
this.browser = new Browser(displayArea, SWT.NONE); |
| 65 | 64 |
this.browser.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true)); |
| 66 | 65 |
} |
| tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java (revision 789) | ||
|---|---|---|
| 348 | 348 |
//gd.horizontalSpan = 2; |
| 349 | 349 |
resultArea.setLayoutData(gd); |
| 350 | 350 |
|
| 351 |
FormLayout resultLayout = new FormLayout(); |
|
| 352 |
resultArea.setLayout(resultLayout); |
|
| 353 |
|
|
| 354 | 351 |
viewer = new TableViewer(resultArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL); |
| 355 | 352 |
viewer.getTable().addKeyListener(new TableKeyListener(viewer)); |
| 356 | 353 |
viewer.getTable().setLinesVisible(true); |
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 789) | ||
|---|---|---|
| 25 | 25 |
import org.eclipse.swt.layout.RowLayout; |
| 26 | 26 |
import org.eclipse.swt.widgets.Button; |
| 27 | 27 |
import org.eclipse.swt.widgets.Composite; |
| 28 |
import org.eclipse.swt.widgets.Group; |
|
| 28 | 29 |
import org.eclipse.swt.widgets.Menu; |
| 29 | 30 |
import org.eclipse.swt.widgets.Spinner; |
| 30 | 31 |
import org.eclipse.swt.widgets.TableColumn; |
| ... | ... | |
| 39 | 40 |
import org.eclipse.ui.PlatformUI; |
| 40 | 41 |
import org.eclipse.ui.menus.IMenuService; |
| 41 | 42 |
import org.eclipse.ui.part.EditorPart; |
| 42 |
import org.txm.core.preferences.TXMPreferences; |
|
| 43 | 43 |
import org.txm.core.results.Parameter; |
| 44 | 44 |
import org.txm.core.results.TXMResult; |
| 45 | 45 |
import org.txm.rcp.JobsTimer; |
| ... | ... | |
| 87 | 87 |
/** |
| 88 | 88 |
* The main panel containing the displayed result |
| 89 | 89 |
*/ |
| 90 |
protected Composite resultArea;
|
|
| 90 |
private GLComposite resultArea;
|
|
| 91 | 91 |
|
| 92 | 92 |
/** |
| 93 | 93 |
* The editor bottom tool bar, positioned at the bottom of the editor. |
| ... | ... | |
| 95 | 95 |
protected TXMEditorToolBar bottomToolBar; |
| 96 | 96 |
|
| 97 | 97 |
/** |
| 98 |
* the parameters groups are added to this composite. contains the sub widgets of the default Top toolbar
|
|
| 98 |
* The parameters groups are added to this composite. contains the sub widgets of the default Top toolbar
|
|
| 99 | 99 |
*/ |
| 100 | 100 |
private GLComposite extendedParametersGroupsComposite; |
| 101 | 101 |
|
| 102 |
|
|
| 103 | 102 |
/** |
| 104 | 103 |
* Command main parameters that are always visible in the toolbar. |
| 105 | 104 |
*/ |
| ... | ... | |
| 109 | 108 |
/** |
| 110 | 109 |
* Command extended parameters composite that can be hidden. |
| 111 | 110 |
*/ |
| 112 |
protected Composite extendedParametersComposite;
|
|
| 111 |
protected Group extendedParametersComposite;
|
|
| 113 | 112 |
|
| 114 | 113 |
/** |
| 115 | 114 |
* |
| ... | ... | |
| 216 | 215 |
|
| 217 | 216 |
|
| 218 | 217 |
// display main area |
| 219 |
this.resultArea = new Composite(parent, SWT.NONE); |
|
| 218 |
this.resultArea = new GLComposite(parent, SWT.NONE);
|
|
| 220 | 219 |
this.resultArea.setLayoutData(new GridData(GridData.FILL_BOTH)); |
| 221 | 220 |
|
| 222 | 221 |
// create the bottom tool bar |
| ... | ... | |
| 306 | 305 |
* The user must configure its layout |
| 307 | 306 |
* @return |
| 308 | 307 |
*/ |
| 309 |
public Composite getResultArea() {
|
|
| 308 |
public GLComposite getResultArea() {
|
|
| 310 | 309 |
return resultArea; |
| 311 | 310 |
} |
| 312 | 311 |
|
| ... | ... | |
| 336 | 335 |
/** |
| 337 | 336 |
* @return the commandParametersComposite. Put here you main parameter widgets |
| 338 | 337 |
*/ |
| 339 |
public Composite getExtendedParametersComposite() {
|
|
| 338 |
public Group getExtendedParametersComposite() {
|
|
| 340 | 339 |
return this.extendedParametersComposite; |
| 341 | 340 |
} |
| 342 | 341 |
|
| tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java (revision 789) | ||
|---|---|---|
| 107 | 107 |
parametersArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false)); |
| 108 | 108 |
|
| 109 | 109 |
Composite resultPanel = getResultArea(); |
| 110 |
resultPanel.setLayout(new GridLayout(1,true)); |
|
| 111 | 110 |
|
| 112 | 111 |
// Structural unit selector |
| 113 | 112 |
Label structComboLabel = new Label(parametersArea, SWT.NONE); |
Formats disponibles : Unified diff