Révision 3152

tmp/org.txm.index.rcp/.settings/org.eclipse.core.resources.prefs (revision 3152)
1 1
eclipse.preferences.version=1
2
encoding//src/org/txm/index/rcp/messages/messages.properties=UTF-8
2 3
encoding//src/org/txm/index/rcp/messages/messages_fr.properties=UTF-8
tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java (revision 3152)
93 93
	
94 94
	/** The l fmin info. */
95 95
	protected Label lFminInfo;
96
	
97
	/** The l fmax info. */
98
	protected Label lFmaxInfo;
99
	
100
	/** The l v info. */
101
	protected Label lVInfo;
102
	
103
	/** The l t info. */
104
	protected Label lTInfo;
105
	
96
		
106 97
	// result
107 98
	/** The line table viewer. */
108 99
	protected TableViewer viewer;
......
173 164
		ComputeSelectionListener computeSelectionListener = new ComputeSelectionListener(this);
174 165
		ComputeKeyListener computeKeyListener = new ComputeKeyListener(this);
175 166
		
176
		Composite extendedParametersComposite = this.getExtendedParametersGroup();
167
		//Composite extendedParametersComposite = this.getExtendedParametersGroup();
177 168
		// paramArea.setLayout(new FormLayout());
178 169
		
179 170
		// info&navigation panel
......
214 205
		queryWidget.setLayoutData(layoutData);
215 206
		queryWidget.addKeyListener(computeKeyListener);
216 207
		
217
		
218 208
		// Word properties selector
219 209
		propertiesSelector = new PropertiesSelector<>(this.getMainParametersComposite(), SWT.NONE);
220 210
		propertiesSelector.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
......
253 243
		nLinesPerPageSpinner.setMaximum(99999);
254 244
		nLinesPerPageSpinner.setIncrement(1);
255 245
		nLinesPerPageSpinner.setPageIncrement(100);
256
		
257
		// FIXME; became useless?
258
		// nLinesPerPageSpinner.addSelectionListener(new SelectionListener() {
259
		// @Override
260
		// public void widgetSelected(SelectionEvent e) { }
261
		//
262
		// @Override
263
		// public void widgetDefaultSelected(SelectionEvent e) {
264
		// index.setTopLine(0);
265
		// index.setNLinesPerPage(nLinesPerPageSpinner.getSelection());
266
		// fillResultArea();
267
		// viewer.getTable().select(0);
268
		// viewer.getTable().showSelection();
269
		// }
270
		// });
271
		
246
				
272 247
		nLinesPerPageSpinner.addSelectionListener(computeSelectionListener);
273 248
		nLinesPerPageSpinner.addKeyListener(computeKeyListener);
274 249
		
275
		
276 250
		navigationArea = new NavigationWidget(infosArea, SWT.NONE);
277 251
		navigationArea.setLayoutData(new GridData(SWT.CENTER, SWT.FILL, true, false));
278 252
		
......
339 313
		});
340 314
		
341 315
		// Labels added after the top toolbar
342
		lTInfo = new Label(infosArea, SWT.NONE);
343
		lTInfo.setText(""); //$NON-NLS-1$
344
		// lTInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
345
		
346
		lVInfo = new Label(infosArea, SWT.NONE);
347
		lVInfo.setText(""); //$NON-NLS-1$
348
		// lVInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
349
		
350 316
		lFminInfo = new Label(infosArea, SWT.NONE);
351 317
		lFminInfo.setText(""); //$NON-NLS-1$
352
		// lFminInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
353
		
354
		lFmaxInfo = new Label(infosArea, SWT.NONE);
355
		lFmaxInfo.setText(""); //$NON-NLS-1$
356
		// lFmaxInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
357
		
318

  
358 319
		// results
359 320
		Composite resultArea = this.getResultArea();
360 321
		
......
551 512
		navigationArea.setNextEnabled(to < index.getV());
552 513
		navigationArea.setLastEnabled(to < index.getV());
553 514
		
554
		lFminInfo.setText(TXMCoreMessages.fmin + index.getFmin());
555
		lFmaxInfo.setText(TXMCoreMessages.fmax + index.getFmax());
556
		lTInfo.setText(TXMCoreMessages.common_t + index.getT());
557
		lVInfo.setText(TXMCoreMessages.v + index.getV());
515
		lFminInfo.setText(TXMCoreMessages.bind("t {0}, v {1}, fmin {2}, fmax {3}", index.getT(), index.getV(), index.getFmin(), index.getFmax()));
516
		lFminInfo.getParent().layout();
558 517
		
559
		lVInfo.getParent().layout();
560
		
561 518
		String unitColumnHeader = ""; //$NON-NLS-1$
562 519
		for (Property p : index.getProperties()) {
563 520
			unitColumnHeader += p.getName() + index.getPropertySeparator();
tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java (revision 3152)
93 93
	
94 94
	/** The l fmin info. */
95 95
	protected Label lFminInfo;
96
	
97
	/** The l fmax info. */
98
	protected Label lFmaxInfo;
99
	
100
	/** The l v info. */
101
	protected Label lVInfo;
102
	
103
	/** The l t info. */
104
	protected Label lTInfo;
105
	
96
		
106 97
	/** The line table viewer. */
107 98
	protected TableViewer viewer;
108 99
	
......
323 314
			}
324 315
		});
325 316
		
326
		// Labels added after the top toolbar
327
		lTInfo = new Label(infosArea, SWT.NONE);
328
		lTInfo.setText(""); //$NON-NLS-1$
329
		// lTInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
330 317
		
331
		lVInfo = new Label(infosArea, SWT.NONE);
332
		lVInfo.setText(""); //$NON-NLS-1$
333
		// lVInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
334
		
335 318
		lFminInfo = new Label(infosArea, SWT.NONE);
336 319
		lFminInfo.setText(""); //$NON-NLS-1$
337 320
		// lFminInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
338 321
		
339
		lFmaxInfo = new Label(infosArea, SWT.NONE);
340
		lFmaxInfo.setText(""); //$NON-NLS-1$
341
		// lFmaxInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
342
		
343 322
		// results
344 323
		Composite resultArea = this.getResultArea();
345 324
		
......
502 481
		navigationArea.setNextEnabled(to < index.getV());
503 482
		navigationArea.setLastEnabled(to < index.getV());
504 483
		
505
		lFminInfo.setText(TXMCoreMessages.fmin + index.getFmin());
506
		lFmaxInfo.setText(TXMCoreMessages.fmax + index.getFmax());
507
		lTInfo.setText(TXMCoreMessages.common_t + index.getT());
508
		lVInfo.setText(TXMCoreMessages.v + index.getV());
484
		lFminInfo.setText(TXMCoreMessages.bind("t {0}, v {1}, fmin {2}, fmax {3}", index.getT(), index.getV(), index.getFmin(), index.getFmax()));
485
		lFminInfo.getParent().layout();
509 486
		
510
		lVInfo.getParent().layout();
511
		
512 487
		String unitColumnHeader = ""; //$NON-NLS-1$
513 488
		for (Property p : index.getProperties()) {
514 489
			unitColumnHeader += p.getName() + index.getPropertySeparator();

Formats disponibles : Unified diff