Révision 3440

TXM/trunk/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java (revision 3440)
13 13
	
14 14
	private static final String BUNDLE_NAME = "org.txm.lexicaltable.rcp.messages.messages"; //$NON-NLS-1$
15 15
	
16
	public static String errorCannotBuildALexicalTableWithLessThan2Lines;
17

  
16 18
	public static String errorColonDifferentColumnsNumberColonBeforeP0AfterP1;
17 19
	
18 20
	public static String mergeOrDeleteColumns;
......
38 40
	public static String openingMargeConfigurationDialog;
39 41
	
40 42
	public static String canNotCreateALexicalTableWithAnIndexCreatedOnACorpus;
43

  
44
	public static String DataImportedP0ColumnsAndP1Rows;
45

  
46
	public static String ErrorDataImportFailedP0;
47

  
48
	public static String PleaseReopenTheLexicalTableToSeeTheModifications;
41 49
	
42 50
	public static String vocabulariesMustShareTheSamePropertiesColonP0;
43 51
	
TXM/trunk/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages.properties (revision 3440)
1 1
#TXM messages generated by the PluginMessagesManager class
2 2
#Tue Dec 18 10:24:08 CET 2018
3 3
canNotCreateALexicalTableWithAnIndexCreatedOnACorpus=** Can not create a lexical table from an index created on a corpus.
4
DataImportedP0ColumnsAndP1Rows=Data imported: {0} columns and {1} rows.
4 5
deleteColsColonP0=Deleting columns {0}...
6
errorCannotBuildALexicalTableWithLessThan2Lines=Error: cannot build a lexical table with less than 2 lines
5 7
errorColonDifferentColumnsNumberColonBeforeP0AfterP1=** Error\: the number of columns differs\: {0} before and {1} after.
8
ErrorDataImportFailedP0=Error: data import failed: 
6 9
errorWhileImportingDataColonP0=** Error while importing data {0}.
7 10
failedToImportLexicalTable=** Failed to import lexical table.
8 11
mergeColsColonP0=Merging columns\: {0}...
......
10 13
mergeOrDeleteRows=Merge or Delete rows
11 14
mergingLines=Merging lines
12 15
openingMargeConfigurationDialog=Opening the margins configuration dialog box
16
PleaseReopenTheLexicalTableToSeeTheModifications=Re-open the lexical table to see the modifications
13 17
selectWhichMarginsYouWantToUse=Select which margins you want to use
14 18
tP0vP1fminP2fmaxP3=T {0} V {1} Fmin {2} Fmax {3}
15 19
useAllOccurrences=Calculate the margins from the frequencies of all the words of the corpus
TXM/trunk/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LineLabelProvider.java (revision 3440)
100 100
		return null;
101 101
	}
102 102
	
103
	public static final String EMPTY = "";
103
	public static final String EMPTY = ""; //$NON-NLS-1$
104 104
	
105 105
	/*
106 106
	 * (non-Javadoc)
......
130 130
				System.out.println(ee);
131 131
				System.out.println(ee);
132 132
				;
133
				return "error";
133
				return "error"; //$NON-NLS-1$
134 134
			}
135 135
			// }
136 136
		}
TXM/trunk/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java (revision 3440)
649 649
	 */
650 650
	@Deprecated
651 651
	public void exportData(File file) {
652
		lexicalTable.getData().toTxt(file, TXMPreferences.DEFAULT_ENCODING, "\t", ""); //$NON-NLS-1$
652
		lexicalTable.getData().toTxt(file, TXMPreferences.DEFAULT_ENCODING, "\t", ""); //$NON-NLS-1$ //$NON-NLS-2$
653 653
	}
654 654
	
655 655
	/**
TXM/trunk/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ImportTable.java (revision 3440)
43 43
import org.txm.core.preferences.TXMPreferences;
44 44
import org.txm.lexicaltable.core.functions.LexicalTable;
45 45
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor;
46
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
46 47
import org.txm.rcp.TXMWindows;
47 48
import org.txm.rcp.handlers.BaseAbstractHandler;
48 49
import org.txm.rcp.swt.dialog.LastOpened;
......
90 91
					try {
91 92
						LTeditor.getLexicalTable().getData().importData(file, encoding, colseparator, txtseparator);
92 93
						SWTEditorsUtils.closeEditors(LTeditor.getLexicalTable(), true);
93
						Log.info("Re-open the lexical table to see the modifications");
94
						Log.info(LexicalTableUIMessages.PleaseReopenTheLexicalTableToSeeTheModifications);
94 95
					}
95 96
					catch (Exception e) {
96
						System.out.println("Error: data import failed: " + e);
97
						System.out.println(LexicalTableUIMessages.ErrorDataImportFailedP0 + e);
97 98
						Log.printStackTrace(e);
98 99
					}
99 100
					
......
117 118
						lt.compute();
118 119
						lt.getData().importData(file, encoding, colseparator, txtseparator);
119 120
						lt.setAltered();
120
						System.out.println(NLS.bind("Data imported: {0} columns and {1} rows.", lt.getNColumns(), lt.getNRows()));
121
						System.out.println(NLS.bind(LexicalTableUIMessages.DataImportedP0ColumnsAndP1Rows, lt.getNColumns(), lt.getNRows()));
121 122
						SWTEditorsUtils.closeEditors(lt, true);
122
						Log.info("Re-open the lexical table to see the modifications");
123
						Log.info(LexicalTableUIMessages.PleaseReopenTheLexicalTableToSeeTheModifications);
123 124
					}
124 125
					catch (Exception e) {
125
						System.out.println("Error: data import failed: " + e);
126
						System.out.println(LexicalTableUIMessages.ErrorDataImportFailedP0 + e);
126 127
						Log.printStackTrace(e);
127 128
					}
128 129
				}
TXM/trunk/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java (revision 3440)
133 133
			final PartitionIndex firstIndex = partitionIndexes.get(0);
134 134
			
135 135
			if (!useAllOccurrences && firstIndex.size() <= 1) {
136
				Log.warning("Error: cannot build a lexical table with less than 2 lines");
136
				Log.warning(LexicalTableUIMessages.errorCannotBuildALexicalTableWithLessThan2Lines);
137 137
				return false;
138 138
			}
139 139
			
TXM/trunk/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/PropertiesUIMessages.java (revision 3440)
28 28

  
29 29
	public static String maximumValuesToDisplay;
30 30

  
31
	public static String corpusProperties; 
31
	public static String corpusProperties;
32 32

  
33
	public static String Description;
34

  
35
	public static String Documentation;
36

  
37
	public static String ShowTheStartPage; 
38

  
33 39
	
34 40
	static {
35 41
		// initialize resource bundle
TXM/trunk/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages.properties (revision 3440)
4 4
corpusProperties=corpus properties
5 5
descriptionColon=Description\: 
6 6
displayedNameColon=Displayed name\: 
7
Description=Description
8
Documentation=Documentation
7 9
editProperties=edit properties
8 10
maximumValuesToDisplay=Maximum number of values to display
11
ShowTheStartPage=Shows the start page.
9 12
theMaximumNumberOfWordPropertyValuesToShow=The maximum number of word property values to show
10 13
vMax=V max
TXM/trunk/org.txm.properties.rcp/src/org/txm/properties/rcp/editors/DocumentationTab.java (revision 3440)
11 11
import org.eclipse.swt.widgets.ToolItem;
12 12
import org.txm.core.results.TXMResult;
13 13
import org.txm.objects.Project;
14
import org.txm.properties.rcp.messages.PropertiesUIMessages;
14 15
import org.txm.rcp.IImageKeys;
15 16
import org.txm.rcp.swt.GLComposite;
16 17
import org.txm.utils.logger.Log;
......
31 32
		super(folder, editor);
32 33
		
33 34
		this.result = editor.getResult().getParent();
34
		tab.setText("Documentation");
35
		tab.setText(PropertiesUIMessages.Documentation);
35 36
		
36 37
		buildContent(parent);
37 38
	}
......
79 80
		home.setImage(IImageKeys.getImage(IImageKeys.HOME));
80 81
		home.setHotImage(IImageKeys.getImage(IImageKeys.HOME));
81 82
		home.setDisabledImage(IImageKeys.getImage(IImageKeys.HOME));
82
		home.setToolTipText("Shows the opening page.");
83
		home.setToolTipText(PropertiesUIMessages.ShowTheStartPage);
83 84
		
84 85
		TXMResult r = this.editor.getResult().getParent();
85 86
		Project p = r.getFirstParent(Project.class);
TXM/trunk/org.txm.properties.rcp/src/org/txm/properties/rcp/editors/PropertiesGeneralTab.java (revision 3440)
18 18
import org.eclipse.swt.widgets.Text;
19 19
import org.txm.core.results.TXMResult;
20 20
import org.txm.properties.rcp.Messages;
21
import org.txm.properties.rcp.messages.PropertiesUIMessages;
21 22
import org.txm.rcp.IImageKeys;
22 23
import org.txm.rcp.views.corpora.CorporaView;
23 24

  
......
144 145
		
145 146
		l = new Label(parent, SWT.NONE);
146 147
		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
147
		l.setText("Description");
148
		l.setText(PropertiesUIMessages.Description);
148 149
		
149 150
		Browser b = new Browser(parent, SWT.H_SCROLL | SWT.V_SCROLL);
150 151
		b.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1));
TXM/trunk/org.txm.properties.rcp/src/org/txm/properties/rcp/editors/PropertiesTab.java (revision 3440)
15 15

  
16 16
	public PropertiesTab(TabFolder folder, PropertiesPagedEditor editor) {
17 17
		tab = new TabItem(folder, SWT.NONE);
18
		parent = new GLComposite(folder, SWT.NONE, "tab");
18
		parent = new GLComposite(folder, SWT.NONE, "tab"); //$NON-NLS-1$
19 19
		tab.setControl(parent);
20 20
		
21 21
		this.folder = folder;
TXM/trunk/org.txm.links.rcp/src/org/txm/links/rcp/messages/messages.properties (revision 3440)
2 2
#Tue Dec 18 10:24:08 CET 2018
3 3
noMatchesWasSetCommandCanceled=No matches parameter set, command aborted.
4 4
noQueryWasSetCommandCanceled=No Query parameter set, command aborted.
5
NoResultFondWithP0=No result found with 
TXM/trunk/org.txm.links.rcp/src/org/txm/links/rcp/messages/Messages.java (revision 3440)
8 8
	private static final String BUNDLE_NAME = "org.txm.links.rcp.messages.messages"; //$NON-NLS-1$
9 9
	
10 10
	public static String noMatchesWasSetCommandCanceled; 
11
	public static String noQueryWasSetCommandCanceled; 
11
	public static String noQueryWasSetCommandCanceled;
12

  
13
	public static String NoResultFondWithP0; 
12 14
	
13 15
	static {
14 16
		// initialize resource bundle
TXM/trunk/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToMatchable.java (revision 3440)
74 74
			// create a local result node in the project node, store in some parameters and call the linked command
75 75
			TXMResult result = this.getResultParent(event, event.getCommand().getId());
76 76
			if (result == null) {
77
				System.out.println("No result found with " + event);
77
				System.out.println(Messages.NoResultFondWithP0 + event);
78 78
				return null;
79 79
			}
80
			String resultParametersNodePath = result.getProject().getParametersNodeRootPath() + TXMResult.createUUID() + "_link"; // FIXME: we can't put the class name here since we does not know the
80
			String resultParametersNodePath = result.getProject().getParametersNodeRootPath() + TXMResult.createUUID() + "_link"; // FIXME: we can't put the class name here since we does not know the //$NON-NLS-1$
81 81
																																	 // target class
82 82
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.PARENT_PARAMETERS_NODE_PATH, result.getParametersNodePath());
83 83
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.MATCHES, matches.toString());
TXM/trunk/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToQueryable.java (revision 3440)
107 107
			// create a local result node in the project node, store in some parameters and call the linked command
108 108
			String id = event.getCommand().getId();
109 109
			TXMResult result = this.getResultParent(event, id);
110
			String resultParametersNodePath = result.getProject().getParametersNodeRootPath() + TXMResult.createUUID() + "_link"; // FIXME: we can't put the class name here since
110
			String resultParametersNodePath = result.getProject().getParametersNodeRootPath() + TXMResult.createUUID() + "_link"; // FIXME: we can't put the class name here since //$NON-NLS-1$
111 111
																																	 // we does not know the target class
112 112
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.PARENT_PARAMETERS_NODE_PATH, result.getParametersNodePath());
113 113
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.QUERY, query);
TXM/trunk/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java (revision 3440)
95 95
	 */
96 96
	public static final String FILESSITE = "files_site"; //$NON-NLS-1$
97 97
	
98

  
99 98
	
99
	
100 100
	/**
101 101
	 * To enable/disable the results persistence (save after a computing and load at Toolbox start).
102 102
	 */
......
170 170
	public static final String NORMALISEATTRIBUTEVALUES = "normalize.attribute.values";
171 171
	
172 172
	public static final String CORPUS_VERSION = "corpus_version";
173

  
174 173
	
174
	
175 175
	/**
176 176
	 * Gets the instance.
177 177
	 * 
......
215 215
		preferences.putBoolean(TBXPreferences.ANNOTATE, false);
216 216
		
217 217
		preferences.put(TBXPreferences.METADATA_ENCODING, "UTF-8"); //$NON-NLS-1$
218
		preferences.put(TBXPreferences.METADATA_TXTSEPARATOR, "\""); //$NON-NLS-1$
219
		preferences.put(TBXPreferences.METADATA_COLSEPARATOR, ","); //$NON-NLS-1$
218
		
219
		if (Locale.getDefault().getCountry().equals("fr")) {
220
			preferences.put(TBXPreferences.METADATA_COLSEPARATOR, ";"); //$NON-NLS-1$
221
			preferences.put(TBXPreferences.METADATA_TXTSEPARATOR, "\""); //$NON-NLS-1$
222
		} else {
223
			preferences.put(TBXPreferences.METADATA_COLSEPARATOR, ","); //$NON-NLS-1$
224
			preferences.put(TBXPreferences.METADATA_TXTSEPARATOR, "\""); //$NON-NLS-1$
225
		}
220 226
		preferences.put(TBXPreferences.EMPTY_PROPERTY_VALUE_CODE, "__UNDEF__"); //$NON-NLS-1$
221 227
		
222 228
		preferences.put(EXPORT_COL_SEPARATOR, "\t"); //$NON-NLS-1$
TXM/trunk/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 3440)
122 122
	public static String couldntReadCorpusColon;
123 123
	
124 124
	public static String dataDirectoryIsMissingColonP0;
125

  
126
	public static String deleteColsColonP0;
125 127
	
126 128
	public static String doesNotExists;
127 129
	
......
160 162
	public static String errorWhileConnectingToSearchEngine;
161 163
	
162 164
	public static String errorWhileGettingMetadatasFromBaseimportMetadatasColon;
165

  
166
	public static String errorWhileImportingDataColonP0;
163 167
	
164 168
	public static String errorWhileWaitingForCQP;
165 169
	
......
182 186
	public static String failedToGetLastCQPErrorColon;
183 187
	
184 188
	public static String failedToGetSupValuesOf;
189

  
190
	public static String failedToImportLexicalTable;
185 191
	
186 192
	public static String failedToLoadBaseParametersFromTheP0File;
187 193
	
......
231 237
	
232 238
	public static String matchesFound;
233 239
	
240
	public static String mergeColsColonP0;
241

  
242
	public static String mergeOrDeleteColumns;
243

  
244
	public static String mergeOrDeleteRows;
245

  
246
	public static String mergingLines;
247

  
234 248
	public static String noValuesGiven;
235 249
	
236 250
	public static String noWorkspaceFoundCreatingANewOneP0;
......
266 280
	public static String sAXColon;
267 281
	
268 282
	public static String selectionErrorColonTheCorpus;
283

  
284
	public static String sortDone;
269 285
	
270 286
	public static String supBeginningExecutionOfP0;
271 287
	
......
280 296
	public static String theFocusIsEmptyOrNull;
281 297
	
282 298
	public static String theP0PartFocusDoesntBelongToPartitionP1;
299

  
300
	public static String tP0vP1fminP2fmaxP3;
283 301
	
284 302
	public static String txmDirectoryIsMissingColonP0;
285 303
	
TXM/trunk/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 3440)
67 67
creatingCorpus = Importing corpus...
68 68

  
69 69
dataDirectoryIsMissingColonP0 = The ''data'' folder {0} is missing
70
deleteColsColonP0=
70 71

  
71 72
doesNotExists = \ does not exist.
72 73

  
......
105 106
errorWhileConnectingToSearchEngine = ** Failed to connect to the search engine: 
106 107

  
107 108
errorWhileGettingMetadatasFromBaseimportMetadatasColon = ** Error while retrieving metadata of the corpus: 
109
errorWhileImportingDataColonP0=
108 110

  
109 111
errorWhilePostInstallingPluginsP0 = Error while post-installing plugins: {0}
110 112

  
......
135 137
failedToGetLastCQPErrorColon = ** Failed to retrieve last CQP error: 
136 138

  
137 139
failedToGetSupValuesOf = ** Failed to retrieve structural values of 
140
failedToImportLexicalTable=
138 141

  
139 142
failedToLoadBaseParametersFromTheP0File = ** Failed to load the corpus parameters from the {0} file.
140 143

  
......
197 200
managerErrorDuringInitializationColonP0NotFound = ** Catalog Manager initialization error: {0} not found.
198 201

  
199 202
matchesFound = matches found.
203
mergeColsColonP0=
204
mergeOrDeleteColumns=
205
mergeOrDeleteRows=
206
mergingLines=
200 207

  
201 208
noValuesGiven = No values given
202 209

  
......
233 240
sAXColon = SAX: 
234 241

  
235 242
selectionErrorColonTheCorpus = Object selection error: the corpus 
243
sortDone=
236 244

  
237 245
supBeginningExecutionOfP0 = > beginning execution of {0}
238 246

  
......
247 255
theFocusIsEmptyOrNull = ** The focus is empty or null.
248 256

  
249 257
theP0PartFocusDoesntBelongToPartitionP1 = There is no {0} part in the {1} partition.
258
tP0vP1fminP2fmaxP3=
250 259

  
251 260
txmDirectoryIsMissingColonP0 = The ''txm'' folder {0} is missing
252 261

  
TXM/trunk/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages.properties (revision 3440)
7 7
queryColonP0=query\: {0}
8 8
structuralProperties=Structural properties\: 
9 9
structure=Structure\: 
10
warningTheNavigatorTableContentHasBeenCutToP0LinesWasP1=Warning: the navigator table content has been cut to {0} (was {1}).
TXM/trunk/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/InternalViewUIMessages.java (revision 3440)
12 12
public class InternalViewUIMessages extends NLS {
13 13
	
14 14
	private static final String BUNDLE_NAME = "org.txm.internalview.rcp.messages.messages"; //$NON-NLS-1$
15

  
16
	public static String warningTheNavigatorTableContentHasBeenCutToP0LinesWasP1;
15 17
	
16 18
	public static String errorColonSelectionIsNotACorpus;
17 19
	
TXM/trunk/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java (revision 3440)
6 6
import java.util.List;
7 7

  
8 8
import org.eclipse.jface.viewers.ColumnLabelProvider;
9
import org.eclipse.jface.viewers.ISelection;
10 9
import org.eclipse.jface.viewers.ISelectionChangedListener;
11 10
import org.eclipse.jface.viewers.IStructuredContentProvider;
12
import org.eclipse.jface.viewers.IStructuredSelection;
13 11
import org.eclipse.jface.viewers.SelectionChangedEvent;
14 12
import org.eclipse.jface.viewers.TableViewer;
15 13
import org.eclipse.jface.viewers.TableViewerColumn;
16 14
import org.eclipse.jface.viewers.Viewer;
17 15
import org.eclipse.osgi.util.NLS;
18 16
import org.eclipse.swt.SWT;
19
import org.eclipse.swt.events.KeyEvent;
20
import org.eclipse.swt.events.KeyListener;
21 17
import org.eclipse.swt.events.MouseEvent;
22 18
import org.eclipse.swt.events.MouseListener;
23 19
import org.eclipse.swt.layout.GridData;
......
47 43
import org.txm.searchengine.cqp.corpus.Property;
48 44
import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
49 45
import org.txm.searchengine.cqp.corpus.WordProperty;
50
import org.txm.searchengine.cqp.corpus.query.Match;
51 46
import org.txm.searchengine.cqp.corpus.query.CQLQuery;
47
import org.txm.searchengine.cqp.corpus.query.Match;
52 48
import org.txm.utils.logger.Log;
53 49

  
54 50
/**
......
404 400
		navigationPanel.layout();
405 401
		
406 402
		if (internalView.getSegmentLength() > internalView.getNLinesPerPage()) {
407
			Log.info(NLS.bind("Warning: the navigator table content has been cut to {0} (was {1}).", internalView.getNLinesPerPage(), internalView.getSegmentLength()));
403
			Log.info(NLS.bind(InternalViewUIMessages.warningTheNavigatorTableContentHasBeenCutToP0LinesWasP1, internalView.getNLinesPerPage(), internalView.getSegmentLength()));
408 404
		}
409 405
	}
410 406
	
TXM/trunk/org.txm.analec.rcp/src/org/txm/annotation/urs/view/ElementPropertiesView.java (revision 3440)
130 130
		parent.setLayout(layout);
131 131
		
132 132
		//previous and next buttons
133
		buttons = new ToolBar(parent, SWT.NONE);
134
		GridData buttons_gdata = new GridData(GridData.FILL, GridData.CENTER, true, false);
133
		buttons = new ToolBar(parent, SWT.WRAP);
134
		GridData buttons_gdata = new GridData(GridData.FILL, GridData.CENTER, false, false);
135 135
		buttons_gdata.horizontalSpan = 2;
136 136
		buttons.setLayoutData(buttons_gdata);
137
		
137 138
		firstButton = new ToolItem(buttons, SWT.PUSH);
138 139
		firstButton.setImage(IImageKeys.getImage(IImageKeys.CTRLSTART));
140
		//firstButton.setText("First");
139 141
		firstButton.setToolTipText("Select the first element");
140 142
		firstButton.addSelectionListener(new SelectionListener() {
141 143
			@Override
......
149 151
		
150 152
		previousButton = new ToolItem(buttons, SWT.PUSH);
151 153
		previousButton.setImage(IImageKeys.getImage(IImageKeys.CTRLREVERSE));
154
		//previousButton.setText("Previous");
152 155
		previousButton.setToolTipText("Select the previous element");
153 156
		previousButton.addSelectionListener(new SelectionListener() {
154 157
			@Override
......
161 164
		});
162 165
		nextButton = new ToolItem(buttons, SWT.PUSH);
163 166
		nextButton.setImage(IImageKeys.getImage(IImageKeys.CTRLPLAY));
167
		//nextButton.setText("Next");
164 168
		nextButton.setToolTipText("Select the next element");
165 169
		nextButton.addSelectionListener(new SelectionListener() {
166 170
			@Override
......
171 175
			@Override
172 176
			public void widgetDefaultSelected(SelectionEvent e) { }
173 177
		});
174
		lastButton = new ToolItem(buttons, SWT.ARROW | SWT.END);
178
		lastButton = new ToolItem(buttons, SWT.PUSH);
175 179
		lastButton.setImage(IImageKeys.getImage(IImageKeys.CTRLEND));
180
		//lastButton.setText("Last");
176 181
		lastButton.setToolTipText("Select the last element");
177 182
		lastButton.addSelectionListener(new SelectionListener() {
178 183
			@Override
......
184 189
			public void widgetDefaultSelected(SelectionEvent e) { }
185 190
		});
186 191
		
187
		applyButton = new ToolItem(buttons, SWT.ARROW | SWT.END);
188
		applyButton.setText("OK");
192
		applyButton = new ToolItem(buttons, SWT.PUSH);
193
		applyButton.setImage(IImageKeys.getImage(IImageKeys.CHECKED));
194
		//applyButton.setText("OK");
189 195
		applyButton.setToolTipText("Apply all new values in the fields");
190 196
		applyButton.addSelectionListener(new SelectionListener() {
191 197
			@Override
......
200 206
			public void widgetDefaultSelected(SelectionEvent e) { }
201 207
		});
202 208
		
209
		
203 210
		fields = new Composite(parent, SWT.NONE);
204 211
		GridData fields_gdata = new GridData(GridData.FILL, GridData.FILL, true, true);
205 212
		fields.setLayoutData(fields_gdata);
TXM/trunk/org.txm.analec.rcp/src/org/txm/annotation/urs/view/PropertyField.java (revision 3440)
7 7
import org.eclipse.jface.bindings.keys.KeyStroke;
8 8
import org.eclipse.jface.fieldassist.ComboContentAdapter;
9 9
import org.eclipse.jface.fieldassist.TXMAutoCompleteField;
10
import org.eclipse.osgi.util.NLS;
10 11
import org.eclipse.swt.SWT;
11 12
import org.eclipse.swt.events.KeyEvent;
12 13
import org.eclipse.swt.events.KeyListener;
......
41 42
		label = new Label(this, SWT.NONE);
42 43
		label.setText(property);
43 44
		label.setAlignment(SWT.RIGHT);
44
		
45
		label.setToolTipText(NLS.bind("Apply the new ''{0}'' value with the RETURN or TAB keys", property));
45 46
		GridData lData = new GridData(GridData.FILL, GridData.CENTER, false, false);
46 47
		lData.minimumWidth = 75;
47 48
		lData.widthHint = 75;
48 49
		label.setLayoutData(lData);
49 50
		
50 51
		t = new Combo(this, SWT.BORDER);
51
		t.setToolTipText(property);
52
		t.setToolTipText(NLS.bind("Apply the new ''{0}'' value with the RETURN or TAB keys", property));
52 53
		GridData tData = new GridData(GridData.FILL, GridData.FILL, true, false);
53 54
		tData.minimumWidth = 150;
54 55
		tData.widthHint = 150;
TXM/trunk/org.txm.perl.rcp/src/org/txm/perl/rcp/preferences/PerlPreferencesPage.java (revision 3440)
3 3
import org.eclipse.jface.preference.StringFieldEditor;
4 4
import org.eclipse.ui.IWorkbench;
5 5
import org.txm.perl.core.PerlPreferences;
6
import org.txm.perl.rcp.messages.Messages;
6 7
import org.txm.rcp.IImageKeys;
7 8
import org.txm.rcp.preferences.TXMPreferencePage;
8 9
import org.txm.rcp.preferences.TXMPreferenceStore;
......
19 20
	public void init(IWorkbench workbench) {
20 21
		
21 22
		this.setPreferenceStore(new TXMPreferenceStore(PerlPreferences.getInstance().getPreferencesNodeQualifier()));
22
		this.setTitle("Perl");
23
		this.setImageDescriptor(IImageKeys.getImageDescriptor("org.txm.perl.rcp", "icon/perl.png"));
23
		this.setTitle("Perl"); //$NON-NLS-1$
24
		this.setImageDescriptor(IImageKeys.getImageDescriptor("org.txm.perl.rcp", "icon/perl.png")); //$NON-NLS-1$ //$NON-NLS-2$
24 25
	}
25 26
	
26 27
	@Override
27 28
	protected void createFieldEditors() {
28
		this.addField(new StringFieldEditor(PerlPreferences.HOME, "HOME", this.getFieldEditorParent()));
29
		this.addField(new StringFieldEditor(PerlPreferences.HOME, Messages.HomeFolder, this.getFieldEditorParent()));
29 30
		
30
		this.addField(new StringFieldEditor(PerlPreferences.EXECUTABLE_NAME, "PERL executable name", this.getFieldEditorParent()));
31
		this.addField(new StringFieldEditor(PerlPreferences.EXECUTABLE_NAME, Messages.ExecutableName, this.getFieldEditorParent()));
31 32
		
32
		this.addField(new StringFieldEditor(PerlPreferences.ADDITIONAL_PARAMETERS, "PERL executable additional parameters", this.getFieldEditorParent()));
33
		this.addField(new StringFieldEditor(PerlPreferences.ADDITIONAL_PARAMETERS, Messages.ExecutableAdditionalParameters, this.getFieldEditorParent()));
33 34
	}
34 35
}
TXM/trunk/org.txm.perl.rcp/src/org/txm/perl/rcp/messages/messages.properties (revision 3440)
1
ExecutableAdditionalParameters=executable additional parameters
2
ExecutableName=Executable name
3
HomeFolder=HOME folder
0 4

  
TXM/trunk/org.txm.perl.rcp/src/org/txm/perl/rcp/messages/Messages.java (revision 3440)
1
package org.txm.perl.rcp.messages;
2

  
3
import org.eclipse.osgi.util.NLS;
4

  
5
public class Messages extends NLS {
6
	
7
	private static final String BUNDLE_NAME = "org.txm.perl.rcp.preferences.messages"; //$NON-NLS-1$
8
	
9
	public static String ExecutableAdditionalParameters;
10
	
11
	public static String ExecutableName;
12
	
13
	public static String HomeFolder;
14
	static {
15
		// initialize resource bundle
16
		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
17
	}
18
	
19
	private Messages() {}
20
}
0 21

  
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_fr.properties (revision 3440)
13 13
openingIndexResults=Ouverture de l'Index
14 14
openingTheIndexResults=Ouverture du tableau d'index
15 15
pageSize=Résultats par page 
16
tP0vP1fminP2fmaxP3=t {0}, v {1}, fmin {2}, fmax {3}
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java (revision 3440)
24 24
	public static String failedToComputeIndex;
25 25
	
26 26
	public static String IndexEditor_17;
27
	
27

  
28 28
	public static String indexOfInfP0SupWithPropertyColonP1InTheCorpusColonP2;
29 29
	
30 30
	public static String indexOfInfP0SupWithPropertyColonP1InThePartitionColonP2;
......
33 33
	
34 34
	public static String openingTheIndexResults;
35 35
	
36
	public static String common_frequency;
37

  
38
	public static String common_query;
39

  
40
	public static String common_units;
41

  
36 42
	public static String computingIndex;
37 43
	
38 44
	public static String pageSize;
......
40 46
	public static String openingIndexResults;
41 47
	
42 48
	
49
	public static String sortDone;
50

  
51
	public static String sortingColumn;
52

  
53
	public static String tP0vP1fminP2fmaxP3;
54

  
43 55
	static {
44 56
		// initialize resource bundle
45 57
		Utf8NLS.initializeMessages(BUNDLE_NAME, IndexUIMessages.class);
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages.properties (revision 3440)
1
common_query=
2
common_units=
1 3
#TXM messages generated by the PluginMessagesManager class
2 4
#Tue Dec 18 10:24:08 CET 2018
5
common_frequency=
3 6
computingIndex=Computing index…
4 7
couldntInitializeIndexTable=**  Can not initialize the index table
5 8
failedToComputeIndex=** Failed to compute the index
6 9
index=Index
7 10
indexColonQueryIsEmpty=Index\: query is empty.
8 11
IndexEditor_17=
12
tP0vP1fminP2fmaxP3=t {0}, v {1}, fmin {2}, fmax {3}
9 13
indexOfInfP0SupWithPropertyColonP1InTheCorpusColonP2=Index of the query <{0}> with property {1} in the {2} corpus.
10 14
indexOfInfP0SupWithPropertyColonP1InThePartitionColonP2=Index of the query <{0}> with property {1} in the {2} partition.
11 15
infos=Informations
......
13 17
openingIndexResults=Opening the Index
14 18
openingTheIndexResults=Opening the index table
15 19
pageSize=Results per page
20
sortDone=
21
sortingColumn=
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java (revision 3440)
481 481
		navigationArea.setNextEnabled(to < index.getV());
482 482
		navigationArea.setLastEnabled(to < index.getV());
483 483
		
484
		lFminInfo.setText(TXMCoreMessages.bind("t {0}, v {1}, fmin {2}, fmax {3}", index.getT(), index.getV(), index.getFmin(), index.getFmax()));
484
		lFminInfo.setText(TXMCoreMessages.bind(IndexUIMessages.tP0vP1fminP2fmaxP3, index.getT(), index.getV(), index.getFmin(), index.getFmax()));
485 485
		lFminInfo.getParent().layout();
486 486
		
487 487
		String unitColumnHeader = ""; //$NON-NLS-1$
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java (revision 3440)
512 512
		navigationArea.setNextEnabled(to < index.getV());
513 513
		navigationArea.setLastEnabled(to < index.getV());
514 514
		
515
		lFminInfo.setText(TXMCoreMessages.bind("t {0}, v {1}, fmin {2}, fmax {3}", index.getT(), index.getV(), index.getFmin(), index.getFmax()));
515
		lFminInfo.setText(TXMCoreMessages.bind(IndexUIMessages.tP0vP1fminP2fmaxP3, index.getT(), index.getV(), index.getFmin(), index.getFmax()));
516 516
		lFminInfo.getParent().layout();
517 517
		
518 518
		String unitColumnHeader = ""; //$NON-NLS-1$
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/handlers/SendIndexTo.java (revision 3440)
78 78
		CQPCorpus corpus = CQPCorpus.getFirstParentCorpus(index);
79 79
		
80 80
		// TODO enable subcorpus from index query when the hidden subcorpus deletion will be managed or another system implemented (eg new SubCorpus(TXMResult result)
81
		if (id.contains("Concordance")) {
81
		if (id.contains("Concordance")) { //$NON-NLS-1$
82 82
			CQLQuery cqlQuery = (CQLQuery) index.getQuery();
83 83
			if (cqlQuery == null || cqlQuery.isEmpty() || // no query
84
					cqlQuery.getQueryString().equals("[]") ||
85
					cqlQuery.getQueryString().equals(".*")) { // don't bother creating a subcorpus use the parent corpus
84
					cqlQuery.getQueryString().equals("[]") || //$NON-NLS-1$
85
					cqlQuery.getQueryString().equals(".*")) { // don't bother creating a subcorpus use the parent corpus //$NON-NLS-1$
86 86
				return corpus;
87 87
			}
88 88
			

Formats disponibles : Unified diff