Revision 772

tmp/org.txm.jodconverter.core/src/main/java/org/artofsolving/jodconverter/cli/Convert.java (revision 772)
80 80
                    + "or [options] -o output-format input-file [input-file...]";
81 81
            HelpFormatter helpFormatter = new HelpFormatter();
82 82
            helpFormatter.printHelp(syntax, OPTIONS);
83
            System.exit(STATUS_INVALID_ARGUMENTS);
83
//            System.exit(STATUS_INVALID_ARGUMENTS);
84 84
        }
85 85

  
86 86
        DocumentFormatRegistry registry;
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java (revision 772)
245 245

  
246 246
		queryArea.setLayout(new GridLayout(3, false));
247 247

  
248
		Label queryLabel = new Label(queryArea, SWT.NONE);
248
		getMinimalParametersComposite().getLayout().numColumns = 3;
249
		getMinimalParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
250
		
251
		Label queryLabel = new Label(getMinimalParametersComposite(), SWT.NONE);
249 252
		queryLabel.setText(TXMCoreMessages.common_query);
250 253
		queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true));
251 254

  
252 255
		// [ (v)]
253
		queryWidget = new AssistedQueryWidget(queryArea, SWT.DROP_DOWN, this.cooc.getCorpus());
256
		queryWidget = new AssistedQueryWidget(getMinimalParametersComposite(), SWT.DROP_DOWN, this.cooc.getCorpus());
254 257
		GridData layoutData = new GridData(GridData.VERTICAL_ALIGN_CENTER);
255 258
		layoutData.horizontalAlignment = GridData.FILL;
256 259
		layoutData.grabExcessHorizontalSpace = true;
tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java (revision 772)
46 46
import org.eclipse.swt.widgets.Button;
47 47
import org.eclipse.swt.widgets.Composite;
48 48
import org.eclipse.swt.widgets.Display;
49
import org.eclipse.swt.widgets.Label;
49 50
import org.eclipse.swt.widgets.TableColumn;
50 51
import org.txm.core.messages.TXMCoreMessages;
51 52
import org.txm.core.results.Parameter;
......
153 154
		Composite paramArea = getCommandParametersGroup();
154 155
		paramArea.setLayout(new GridLayout(3, false));
155 156
		
156
		querywidget = new QueryWidget(paramArea, SWT.None);
157
		getMinimalParametersComposite().getLayout().numColumns = 3;
158
		getMinimalParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
159
		
160
		Label queryLabel = new Label(getMinimalParametersComposite(), SWT.NONE);
161
		queryLabel.setText(TXMUIMessages.CreateSubcorpusDialog_10);
162
		queryLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
163
		
164
		querywidget = new QueryWidget(getMinimalParametersComposite(), SWT.None);
157 165
		querywidget.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
158 166
		querywidget.addKeyListener(computeKeyListener);
159 167

  
160 168
		// [Edit]
161
		propertiesSelector = new PropertiesSelector<Property>(paramArea, SWT.NONE);
169
		propertiesSelector = new PropertiesSelector<Property>(getMinimalParametersComposite(), SWT.NONE);
162 170
		propertiesSelector.setMaxPropertyNumber(1);
163 171
		propertiesSelector.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
164 172
				false, false));
......
166 174
		propertiesSelector.addSelectionListener(computeSelectionListener);
167 175
		
168 176
		// [Search]
169
		Button go = new Button(paramArea, SWT.PUSH);
170
		go.setText(TXMUIMessages.SEARCH);
171
		go.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
172
				false, false));
173
		Font f = go.getFont();
174
		FontData defaultFont = f.getFontData()[0];
175
		defaultFont.setStyle(SWT.BOLD);
176
		Font newf = new Font(go.getDisplay(), defaultFont);
177
		go.setFont(newf);
177
//		Button go = new Button(paramArea, SWT.PUSH);
178
//		go.setText(TXMUIMessages.SEARCH);
179
//		go.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
180
//				false, false));
181
//		Font f = go.getFont();
182
//		FontData defaultFont = f.getFontData()[0];
183
//		defaultFont.setStyle(SWT.BOLD);
184
//		Font newf = new Font(go.getDisplay(), defaultFont);
185
//		go.setFont(newf);
186
//
187
//		go.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
188
//		go.addSelectionListener(computeSelectionListener);
178 189

  
179
		go.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
180
		go.addSelectionListener(computeSelectionListener);
181

  
182 190
		// [pattern : ... ]
183 191
		patternArea = new PropertiesSelector<StructuralUnitProperty>(paramArea, SWT.NONE);
184 192
		patternArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false,3,1));
185 193
		patternArea.setLayout(new GridLayout(3, false));
186 194
		patternArea.setTitle(ReferencerUIMessages.ReferencerEditor_6);
187 195
		patternArea.addSelectionListener(computeSelectionListener);
188

  
189 196
		
190 197
		
191 198
		//pagination
192 199
		GLComposite navigationComposite = getBottomToolbar().installGLComposite("navigation", 1, false);
193
		navigationArea = new NavigationWidget(navigationComposite, SWT.None);
194
		navigationArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL,	false, false));
200
		navigationComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL,	true, false));
201
		
202
		navigationArea = new NavigationWidget(navigationComposite, SWT.BORDER);
203
		navigationArea.setLayoutData(new GridData(GridData.CENTER, GridData.FILL,	true, false));
195 204

  
196 205
		navigationArea.addFirstListener(new SelectionListener() {
197 206
			@Override
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java (revision 772)
359 359
				return IImageKeys.getImage(IImageKeys.CORPUS);
360 360
			else if (element instanceof Partition)
361 361
				return IImageKeys.getImage(IImageKeys.PARTITION);
362
			else if (element instanceof Lexicon)
363
				return IImageKeys.getImage(IImageKeys.ACTION_FREQUENCY_LIST);
364
			else if (element instanceof Index)
365
				return IImageKeys.getImage(IImageKeys.ACTION_INDEX);
366
			else if (element instanceof Specificities)
367
				return IImageKeys.getImage(IImageKeys.ACTION_SPECIFICITIES);
368
			else if (element instanceof Concordance)
369
				return IImageKeys.getImage(IImageKeys.ACTION_CONCORDANCES);
370
			else if (element instanceof Cooccurrence)
371
				return IImageKeys.getImage(IImageKeys.ACTION_COOCCURRENCE);
372
			else if (element instanceof LexicalTable)
373
				return IImageKeys.getImage(IImageKeys.LEXICALTABLE);
374
			else if (element instanceof CA)
375
				return IImageKeys.getImage(IImageKeys.ACTION_CORRESPONDANCE_ANALYSIS);
376
			else if (element instanceof AHC)
377
				return IImageKeys.getImage(IImageKeys.ACTION_CAH);
378
			else if (element instanceof Referencer)
379
				return IImageKeys.getImage(IImageKeys.ACTION_REFERENCER);
380
			else if (element instanceof Progression)
381
				return IImageKeys.getImage(IImageKeys.ACTION_PROGRESSION);
362
//			else if (element instanceof Lexicon)
363
//				return IImageKeys.getImage(IImageKeys.ACTION_FREQUENCY_LIST);
364
//			else if (element instanceof Index)
365
//				return IImageKeys.getImage(IImageKeys.ACTION_INDEX);
366
//			else if (element instanceof Specificities)
367
//				return IImageKeys.getImage(IImageKeys.ACTION_SPECIFICITIES);
368
//			else if (element instanceof Concordance)
369
//				return IImageKeys.getImage(IImageKeys.ACTION_CONCORDANCES);
370
//			else if (element instanceof Cooccurrence)
371
//				return IImageKeys.getImage(IImageKeys.ACTION_COOCCURRENCE);
372
//			else if (element instanceof LexicalTable)
373
//				return IImageKeys.getImage(IImageKeys.LEXICALTABLE);
374
//			else if (element instanceof CA)
375
//				return IImageKeys.getImage(IImageKeys.ACTION_CORRESPONDANCE_ANALYSIS);
376
//			else if (element instanceof AHC)
377
//				return IImageKeys.getImage(IImageKeys.ACTION_CAH);
378
//			else if (element instanceof Referencer)
379
//				return IImageKeys.getImage(IImageKeys.ACTION_REFERENCER);
380
//			else if (element instanceof Progression)
381
//				return IImageKeys.getImage(IImageKeys.ACTION_PROGRESSION);
382
			
382 383
			return null;
383 384
		}
384 385
	}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/IImageKeys.java (revision 772)
46 46
	/** The images. */
47 47
	private static HashMap<String, Image> images = new HashMap<String, Image>();
48 48
	
49
	/** The Constant ACTION_REFERENCER. */
50
	public static final String ACTION_REFERENCER = "icons/functions/Referencer.png"; //$NON-NLS-1$
51
	
52 49
	/** The Constant ACTION_CONCORDANCES. */
53 50
	public static final String ACTION_CONCORDANCES = "icons/functions/Concordances.png"; //$NON-NLS-1$
54 51
	public static final String CONCORDANCE_DELETE = "icons/functions/Concordances_delete_line.png"; //$NON-NLS-1$
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/ImportFormEditorInput.java (revision 772)
61 61
	@Override
62 62
	public ImageDescriptor getImageDescriptor() {
63 63
		return AbstractUIPlugin.imageDescriptorFromPlugin(
64
				Application.PLUGIN_ID, IImageKeys.ACTION_REFERENCER);
64
				Application.PLUGIN_ID, IImageKeys.CORPUS);
65 65
	}
66 66

  
67 67
	/* (non-Javadoc)
tmp/org.txm.groovy.core/src/java/org/kohsuke/args4j/Starter.java (revision 772)
32 32
			System.err.println("The system property '" 
33 33
					+ PARAMETER_NAME
34 34
					+ "' must contain the classname to start.");
35
			System.exit(-1);
36 35
		}
37 36
		
38 37
		try {

Also available in: Unified diff