Revision 2368

tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java (revision 2368)
113 113
//	private TXMEditorToolBar supplementaryButtonToolbar;
114 114
	private ISelectionProvider selProvider;
115 115
	private org.eclipse.swt.widgets.Text text_text;
116
	private Label text_label;
116
//	private Label text_label;
117 117
	private TXMAutoCompleteField identifiantComboAutoCompleteField;
118 118

  
119 119
	//TODO finish editor conversion
......
299 299
	 * Previous text.
300 300
	 */
301 301
	public void previousText(boolean fromNextText) {
302
		for (EditionPanel panel : editionPanels.values())
302
		for (EditionPanel panel : editionPanels.values()) {
303 303
			panel.previousText(fromNextText);
304
		}
304 305
		updatePageLabel();
305 306
	}
306 307

  
......
308 309
	 * Next text.
309 310
	 */
310 311
	public void nextText() {
311
		for(EditionPanel panel : editionPanels.values())
312
		for( EditionPanel panel : editionPanels.values()) {
312 313
			panel.nextText();
314
		}
313 315
		updatePageLabel();
314 316
	}
315 317
	
......
317 319
	 * Previous text.
318 320
	 */
319 321
	public void firstText() {
320
		for(EditionPanel panel : editionPanels.values())
322
		for (EditionPanel panel : editionPanels.values()) {
321 323
			panel.firstText();
324
		}
322 325
		updatePageLabel();
323 326
	}
324 327

  
......
326 329
	 * Next text.
327 330
	 */
328 331
	public void lastText() {
329
		for(EditionPanel panel : editionPanels.values())
332
		for (EditionPanel panel : editionPanels.values()) {
330 333
			panel.lastText();
334
		}
331 335
		updatePageLabel();
332 336
	}
333 337

  
......
448 452
		}
449 453
		Cursor cursor = new Cursor(text_text.getDisplay(), SWT.CURSOR_SIZENS);
450 454
		text_text.setCursor(cursor);
451
		text_label = new Label(textNavigationComposite, SWT.NONE);
455
//		text_label = new Label(textNavigationComposite, SWT.NONE);
452 456
		Button nextText = new Button(textNavigationComposite, SWT.FLAT|SWT.PUSH);
453 457
		Button lastText = new Button(textNavigationComposite, SWT.FLAT|SWT.PUSH);
454 458
		textNavigationComposite.setLayoutData(new GridData(GridData.CENTER, GridData.FILL, false, false));
......
492 496

  
493 497
		// set labels
494 498
		page_label.setText(""); //$NON-NLS-1$
495
		text_label.setText(""); //$NON-NLS-1$
499
//		text_label.setText(""); //$NON-NLS-1$
496 500
		firstText.setImage(IImageKeys.getImage(IImageKeys.CTRLREWINDSTART));
497 501
		firstText.setToolTipText(EditionUIMessages.firstTextOfTheCorpus); 
498 502
		previousText.setImage(IImageKeys.getImage(IImageKeys.CTRLREWIND));
......
694 698
			page_label.setText(" / "+e.getNumPages()); //$NON-NLS-1$
695 699
			
696 700
			text_text.setText(p.getCurrentText().getName());
697
			try {
698
				text_label.setText(" / "+corpus.getCorpusTextIdsList().length);
699
			} catch (Exception e1) {
700
				// TODO Auto-generated catch block
701
				e1.printStackTrace();
702
			}
701
//			try {
702
//				text_label.setText(" / "+corpus.getCorpusTextIdsList().length);
703
//			} catch (Exception e1) {
704
//				// TODO Auto-generated catch block
705
//				e1.printStackTrace();
706
//			}
703 707

  
704 708
			controlsArea.layout();
705 709
			return;
......
883 887
		for (EditionPanel p : editionPanels.values()) {
884 888
			p.setText(text2, refresh);
885 889
		}
890
		updatePageLabel();
886 891
	}
887 892

  
888 893
	public void setFocusedWordID(String focusid) {
889 894
		for (EditionPanel p : editionPanels.values()) {
890 895
			p.setFocusedWordID(focusid);
891 896
		}
897
		updatePageLabel();
892 898
	}
893 899

  
894 900
	/**
tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/CommandLink.java (revision 2368)
17 17
	}
18 18
	
19 19
	public Object function (Object[] arguments) {
20
		if (synopticEditionEditor != null) {
21
			try { //TODO add option (or another browser command) to not force activated editor
22
				synopticEditionEditor.getSite().getPage().activate(synopticEditionEditor);
23
			} catch (Exception e) {
24
				System.out.println(e);
25
			}
26
		}
20 27
		return SynopticEditionEditor.callTXMCommand(arguments);
21 28
	}
22 29
}
tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/preferences/SynopticEditionPreferences.java (revision 2368)
41 41
		super.initializeDefaultPreferences();
42 42
		Preferences preferences = this.getDefaultPreferencesNode();
43 43
		preferences.putBoolean(FAST_HIGHLIGHT, false);
44
		preferences.putInt(BACKTOTEXT_POSITION, EModelService.RIGHT_OF);
44
		preferences.putInt(BACKTOTEXT_POSITION, EModelService.ABOVE); //TODO set to RIGHT_OF later ?
45 45
	}
46 46
}

Also available in: Unified diff