Révision 2994

tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 2994)
319 319 
	@Parameter(key = ConcordancePreferences.RIGHT_CONTEXT_SIZE)
320 320 
	private Spinner rightSizeSpinner;
321 321
322 
	private TableViewerColumn leftColumnViewer;
323
324 
	private TableViewerColumn keywordColumnViewer;
325
326 
	private TableViewerColumn rightContextColumnViewer;
327
322 328 
	// private PropertiesSelector<Property> propsArea;
323 329
324 330
......
449 455 
		viewerRight.getTable().setLinesVisible(true);
450 456 
		viewerRight.getTable().setHeaderVisible(true);
451 457
452 
		String f = concordance.getCorpus().getFont();
453 
		if (f != null && f.length() > 0) {
454 
			Font old = viewerRight.getTable().getFont();
455 
			FontData fD = old.getFontData()[0];
456 
			Font font = new Font(Display.getCurrent(), f, fD.getHeight(), fD.getStyle());
457 
			viewerRight.getTable().setFont(font);
458 
			viewerLeft.getTable().setFont(font);
459 
		}
458 
		// FIXME Mac OS X: in TXM 0.8.x releases, the table line height is not correctly adjusted to the font size
459 
		// String f = concordance.getCorpus().getFont();
460 
		// if (f != null && f.length() > 0) {
461 
		// Font old = viewerRight.getTable().getFont();
462 
		// FontData fD = old.getFontData()[0];
463 
		// Font font = new Font(Display.getCurrent(), f, fD.getHeight(), fD.getStyle());
464 
		// viewerRight.getTable().setFont(font);
465 
		// viewerLeft.getTable().setFont(font);
466 
		//
467 
		// viewerRight.getTable().addListener(SWT.MeasureItem, new Listener() {
468 
		//
469 
		// @Override
470 
		// public void handleEvent(Event event) {
471 
		// // height cannot be per row so simply set
472 
		// event.height = 67;
473 
		// }
474 
		// });
475 
		// viewerLeft.getTable().addListener(SWT.MeasureItem, new Listener() {
476 
		//
477 
		// @Override
478 
		// public void handleEvent(Event event) {
479 
		// // height cannot be per row so simply set
480 
		// event.height = 67;
481 
		// }
482 
		// });
483 
		// }
460 484
461 485 
		tableResizeListener = new Listener() {
462 486
......
504 528 
		firstColumn.setWidth(0);
505 529 
		firstColumn.setResizable(false);
506 530
507 
		TableViewerColumn leftColumnViewer = new TableViewerColumn(viewerRight, SWT.RIGHT);
531 
		leftColumnViewer = new TableViewerColumn(viewerRight, SWT.RIGHT);
508 532 
		leftContextColumn = leftColumnViewer.getColumn();
509 533 
		leftContextColumn.setText(ConcordanceUIMessages.leftContext);
510 534 
		leftContextColumn.setToolTipText(ConcordanceUIMessages.leftContext);
......
554 578 
			public void widgetDefaultSelected(SelectionEvent e) {}
555 579 
		});
556 580
557 
		TableViewerColumn keywordColumnViewer = new TableViewerColumn(viewerRight, SWT.CENTER);
581 
		keywordColumnViewer = new TableViewerColumn(viewerRight, SWT.CENTER);
558 582 
		keywordColumn = keywordColumnViewer.getColumn();
559 583 
		keywordColumn.setText(ConcordanceUIMessages.keyword);
560 584 
		keywordColumn.setToolTipText(ConcordanceUIMessages.keyword);
......
604 628 
			public void widgetDefaultSelected(SelectionEvent e) {}
605 629 
		});
606 630
607 
		TableViewerColumn rightContextColumnViewer = new TableViewerColumn(viewerRight, SWT.LEFT);
631 
		rightContextColumnViewer = new TableViewerColumn(viewerRight, SWT.LEFT);
608 632 
		rightContextColumn = rightContextColumnViewer.getColumn();
609 633 
		rightContextColumn.setText(ConcordanceUIMessages.rightContext);
610 634 
		rightContextColumn.setToolTipText(ConcordanceUIMessages.rightContext);
......
743 767
744 768 
			@Override
745 769 
			public void widgetSelected(SelectionEvent e) {
746
747 770 
				rightTable.deselectAll();
748 771 
				rightTable.select(leftTable.getSelectionIndices());
749 772 
			}

Formats disponibles : Unified diff