Revision 1865

tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java (revision 1865)
41 41
import org.eclipse.swt.widgets.Shell;
42 42
import org.eclipse.ui.handlers.HandlerUtil;
43 43
import org.txm.Toolbox;
44
import org.txm.core.messages.TXMCoreMessages;
44 45
import org.txm.objects.Project;
45 46
import org.txm.rcp.StatusLine;
46 47
import org.txm.rcp.commands.OpenImportForm;
......
141 142
			protected IStatus run(IProgressMonitor monitor) {
142 143
				this.runInit(monitor);
143 144
				try {
144
					
145
					boolean doUpdate = project.getDoUpdate();
145 146
					if (project.compute(monitor)) {
146 147
						
147 148
						this.releaseSemaphore();
148 149

  
149 150
						monitor.done();
151
						if (doUpdate) {
152
							Log.info(TXMUIMessages.updateDone);
153
						} else {
154
							Log.info(TXMUIMessages.importDone);
155
						}
150 156
						return Status.OK_STATUS;
151 157
					}
152 158
				} catch (Exception e) {
tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java (revision 1865)
54 54
		// Auto compute the result when a parameter changes
55 55
		this.addField(new BooleanFieldEditor(RCPPreferences.AUTO_UPDATE_EDITOR, TXMUIMessages.automaticRecomputingWhenChangingAParameter, BooleanFieldEditor.SEPARATE_LABEL, this.getFieldEditorParent()));
56 56
		
57
		//this.addField(new BooleanFieldEditor(RCPPreferences.AUTO_COMPUTE_ON_EDITOR_OPEN, "Compute when opening its window", BooleanFieldEditor.SEPARATE_LABEL, this.getFieldEditorParent()));
57
		this.addField(new BooleanFieldEditor(RCPPreferences.AUTO_COMPUTE_ON_EDITOR_OPEN, "Compute when opening its window", BooleanFieldEditor.SEPARATE_LABEL, this.getFieldEditorParent()));
58 58
				
59 59
		// Auto save each result after computing and auto load them at startup
60 60
		this.addField(new BooleanFieldEditor(TBXPreferences.AUTO_PERSISTENCE_ENABLED, TXMUIMessages.enableAutomaticSaveOfAllResultsPersistence, BooleanFieldEditor.SEPARATE_LABEL, this.getFieldEditorParent()));
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java (revision 1865)
519 519
	public static String corporaOfPreviousTXMP0; 
520 520
	public static String corporaWillBeRestoredInTheFollowingOrderCorporaAlreadyRestoredWillNotBeReplaced;
521 521

  
522
	public static String selectThecorporaSetsToRestore; 
522
	public static String selectThecorporaSetsToRestore;
523 523

  
524
	public static String importDone;
525
	
526
	public static String updateDone;
527

  
524 528
	static {
525 529
		// initialize resource bundle
526 530
		Utf8NLS.initializeMessages(BUNDLE_NAME, TXMUIMessages.class);
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 1865)
993 993
zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag = \	Zoom +/-: Mouse wheel OR Shift + Right Mouse + Drag\n
994 994

  
995 995
zoomToSelectionColonCtrlPlusLeftMousePlusdrag = \	Zoom to selection: Ctrl + Left Mouse + Drag\n
996

  
997
importDone=Import done.
998

  
999
updateDone=Update done.
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties (revision 1865)
988 988

  
989 989
zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag = \	Zoom +/- : Roulette OU Maj + Clic Droit + Glisser\n
990 990

  
991
zoomToSelectionColonCtrlPlusLeftMousePlusdrag = \	Zoomer sur la sélection : Ctrl + Clic Gauche + Glisser\n
991
zoomToSelectionColonCtrlPlusLeftMousePlusdrag = \	Zoomer sur la sélection : Ctrl + Clic Gauche + Glisser\n
992

  
993
importDone=Import terminé.
994

  
995
updateDone=Mise à jour terminée.
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 1865)
984 984
				return null;
985 985
			}
986 986

  
987
			//TODO until the TXMResult don't know if its parameters are set by the user or by the default preference value, we need to use the AUTO_COMPUTE_ON_EDITOR_OPEN preference
987 988
			// compute the result only if the editor wasn't already opened
988
			if (!wasAlreadyOpened && RCPPreferences.getInstance().getBoolean(RCPPreferences.AUTO_COMPUTE_ON_EDITOR_OPEN))	{
989
			if (!wasAlreadyOpened && (RCPPreferences.getInstance().getBoolean(RCPPreferences.AUTO_COMPUTE_ON_EDITOR_OPEN)))	{
989 990
				editor.compute(false);
991
			} else {
992
				editor.refresh(false);
990 993
			}
991 994
		}
992 995
		catch (Exception e) {
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 1865)
241 241
	 * Opens an editor specified by its id, computes the specified result then refreshes the editor components.
242 242
	 * @param result
243 243
	 * @param editorPartId
244
	 * @param alwaysRecreateEditor force editor creation
244 245
	 * @return
245 246
	 */
246 247
	public static ChartEditor openEditor(ChartResult result, String editorPartId, boolean alwaysRecreateEditor)	{
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/preferences/LexicalTablePreferences.java (revision 1865)
39 39
		preferences.putInt(F_MIN, 2);
40 40
		preferences.putInt(V_MAX, 200);
41 41
		preferences.putBoolean(USE_ALL_OCCURRENCES, true);
42
		preferences.put(UNIT_PROPERTY, "word");
42 43
	}
43 44
	
44 45
}
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1865)
2232 2232
					Log.finest(NLS.bind("TXMResult.compute(): Warning {0} modifications have been lost.", this.getSimpleName()));
2233 2233
				}
2234 2234
				this.altered = false;
2235
				
2236 2235
				Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing of result type " + this.getClass() + " done.");
2237 2236
			}
2238 2237
			

Also available in: Unified diff