Révision 839

tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 839)
1241 1241

  
1242 1242
		//if (true)// concordance==null || concordance.getQuery()!=query)
1243 1243
		try {
1244
			
1245
			//FIXME: usless? called by TXMEditor
1246
			CorporaView.refresh();
1247
			CorporaView.expand(concordance.getCorpus());
1248
			
1249
			
1244
						
1250 1245
			QueriesView.refresh();
1251 1246

  
1252 1247
			fillDisplayArea();
1253
			
1254
			//FIXME: usless? called by TXMEditor	
1255
			setPartName(concordance.getName());
1256
			
1248

  
1257 1249
			queryWidget.memorize();
1258 1250

  
1259 1251
			resetColumnWidths();
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 839)
114 114
	public final void _createPartControl() {
115 115
		
116 116
		// Toolbar
117
		this.chartToolBar = new ChartEditorToolBar(this, this.getTopToolbarContainer(), this.getParametersGroupsComposite(), SWT.FLAT | SWT.RIGHT);
117
		this.chartToolBar = new ChartEditorToolBar(this, this.getFirstLineComposite(), this.getParametersGroupsComposite(), SWT.FLAT | SWT.RIGHT);
118
		this.getFirstLineComposite().getLayout().numColumns += 1;
118 119
		//this.chartToolBar.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_RED));
119 120

  
120 121
		// Advanced tool bar
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorToolBar.java (revision 839)
56 56
	 * the parent layout must be a GridLayout
57 57
	 * 
58 58
	 * @param parent where the Toolbar will be located
59
	 * @param subWidgetComposite where the installed Widgets will be installed
59
	 * @param subWidgetComposite OPTIONAL: where the installed Widgets (Groups) will be installed
60 60
	 * @param style
61 61
	 * @param toolbarId
62 62
	 * @param editor
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 839)
119 119
	 */
120 120
	private Composite parent;
121 121

  
122
	private Composite topToolBarsContainer;
123

  
124 122
	/**
125 123
	 * contains the default bottom toolbars widget
126 124
	 */
......
138 136
	private GLComposite bottomSubWidgetsComposite;
139 137
	private GLComposite firstLineComposite;
140 138
	private boolean createPartControlDoneSucessfully = true; // for now... muahahaha
141
	private GLComposite betweenTopToolbarsAndResultComposite;
142 139

  
143

  
140
	/**
141
	 * the composite containing the main parameteres, the top toolbar and eventually other top toolbars
142
	 * @return
143
	 */
144
	public GLComposite getFirstLineComposite() {
145
		return firstLineComposite;
146
	}
147
	
144 148
	public Shell getShell() {
145 149
		if (parent !=null && !parent.isDisposed()) {
146 150
			return parent.getShell();
......
188 192
			this.mainParametersComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
189 193
			this.mainParametersComposite.getLayout().horizontalSpacing = 5;
190 194

  
191
			// create the top tool bar
192
			this.topToolBarsContainer = new Composite(firstLineComposite, SWT.NONE);
193
			this.topToolBarsContainer.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
194
			RowLayout rl = new RowLayout(SWT.HORIZONTAL);
195
			rl = new RowLayout(SWT.HORIZONTAL);
196
			rl.marginTop = rl.marginHeight = rl.marginWidth = rl.marginBottom = 0;
197
			rl.center = true;
198
			rl.spacing = 0;
199
			this.topToolBarsContainer.setLayout(rl);
200

  
201
			betweenTopToolbarsAndResultComposite = new GLComposite(parent, SWT.NONE, "Between Top toolbar and result area");
202
			this.betweenTopToolbarsAndResultComposite.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
203

  
204
			
205
			this.extendedParametersGroupsComposite = new GLComposite(betweenTopToolbarsAndResultComposite, SWT.NONE, "Extended parameters area");
195
			this.extendedParametersGroupsComposite = new GLComposite(parent, SWT.NONE, "Extended parameters area");
206 196
			this.extendedParametersGroupsComposite.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
207 197

  
208
			this.topToolBar = new TXMEditorToolBar(this, this.topToolBarsContainer, this.extendedParametersGroupsComposite, SWT.FLAT | SWT.RIGHT, TOP_TOOLBAR_ID);
198
			this.topToolBar = new TXMEditorToolBar(this, this.firstLineComposite, this.extendedParametersGroupsComposite, SWT.FLAT | SWT.RIGHT, TOP_TOOLBAR_ID);
209 199
			// FIXME: debug tests for see why there is an empty area at bottom of the toolbar
210 200
			//this.topToolBar.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_RED));
211 201

  
......
234 224
			// create the bottom tool bar
235 225
			this.bottomToolBarContainer = new Composite(parent, SWT.NONE);
236 226
			this.bottomToolBarContainer.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
237
			rl = new RowLayout(SWT.HORIZONTAL);
227
			RowLayout rl = new RowLayout(SWT.HORIZONTAL);
238 228
			rl.marginTop = rl.marginHeight = rl.marginWidth = rl.marginBottom = 0;
239 229
			//rl.center = true;
240 230
			//rl.justify = true;
......
284 274
	public abstract void _createPartControl();
285 275

  
286 276
	/**
287
	 * Use this method to add widget next to the default Top toolbar
288
	 * 
289
	 * @return the composite that contains the default Top toolbar. 
290
	 */
291
	public Composite getTopToolbarContainer() {
292
		return topToolBarsContainer;
293
	}
294

  
295
	/**
296
	 * Use this composite if you need to insert widget between the toptoolbars container and the result area
297
	 * @return
298
	 */
299
	public GLComposite getBetweenTopToolbarsAndResultComposite() {
300
		return betweenTopToolbarsAndResultComposite;
301
	}
302
	
303
	/**
304 277
	 * Use this method to add widget next to the default Bottom toolbar
305 278
	 * 
306 279
	 * @return the composite that contains the default Bottom toolbar. 
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editor/AnnotationArea.java (revision 839)
9 9
 * A widget to show in a to annotate a Result within a TXMEditor
10 10
 * 
11 11
 * @author mdecorde
12
 *
12
 * 
13 13
 */
14 14
public abstract class AnnotationArea extends GLComposite {
15 15

  
tmp/org.txm.analec.rcp/src/org/txm/analec/toolbar/UnitToolbar.java (revision 839)
122 122
		this.analecCorpus = analecCorpus;
123 123
		analecCorpus.addEventListener(this);
124 124
		this.vue = vue;
125
		this.setLayout(new GridLayout(10, false));
125
		this.getLayout().numColumns = 10;
126 126
		this.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
127 127

  
128 128
		l = new Label(this, SWT.NONE);
tmp/org.txm.analec.rcp/src/org/txm/analec/toolbar/SchemaToolbar.java (revision 839)
108 108
		this.analecCorpus = analecCorpus;
109 109
		analecCorpus.addEventListener(this);
110 110
		this.vue = vue;
111
		this.setLayout(new GridLayout(7, false));
111
		this.getLayout().numColumns = 7;
112 112
		this.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
113 113

  
114 114
		l = new Label(this, SWT.NONE);

Formats disponibles : Unified diff