Révision 440
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteGroovyScriptFromFile.java (revision 440) | ||
|---|---|---|
| 60 | 60 |
ISelection selection = HandlerUtil.getCurrentSelection(event); |
| 61 | 61 |
Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event).getShell(); |
| 62 | 62 |
|
| 63 |
String scriptCurrentDir = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.USER_TXM_HOME)+ "/scripts";
|
|
| 63 |
String scriptCurrentDir = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE)+ "/scripts";
|
|
| 64 | 64 |
|
| 65 | 65 |
FileDialog dialog = new FileDialog(shell, SWT.OPEN); |
| 66 | 66 |
|
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteScript.java (revision 440) | ||
|---|---|---|
| 110 | 110 |
} |
| 111 | 111 |
dialog.setFilterExtensions(new String[] { "*.groovy" }); //$NON-NLS-1$
|
| 112 | 112 |
|
| 113 |
String scriptCurrentDir = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.USER_TXM_HOME)+ "/scripts";
|
|
| 113 |
String scriptCurrentDir = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE)+ "/scripts";
|
|
| 114 | 114 |
|
| 115 | 115 |
dialog.setFilterPath(scriptCurrentDir); |
| 116 | 116 |
result = dialog.open(); |
| ... | ... | |
| 120 | 120 |
|
| 121 | 121 |
if (executionFromEditor && txteditor != null) { // save file if needed
|
| 122 | 122 |
if (txteditor.isSaveOnCloseNeeded()) { // check if file need to be saved
|
| 123 |
boolean doit = TXMPreferences.getBoolean(RCPPreferences.PREFERENCES_NODE, RCPPreferences.SAVE_BEFORE_EXECUTION);
|
|
| 123 |
boolean doit = TXMPreferences.getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION, RCPPreferences.PREFERENCES_NODE);
|
|
| 124 | 124 |
//System.out.println("Save file? "+doit);
|
| 125 | 125 |
if (!doit) { // ask user
|
| 126 | 126 |
MessageDialog dialog = new MessageDialog(shell, Messages.ExecuteScript_0+result, null, |
| ... | ... | |
| 132 | 132 |
Composite container = (Composite) super.createDialogArea(parent); |
| 133 | 133 |
checkDefault = new Button(container, SWT.CHECK); |
| 134 | 134 |
checkDefault.setText(Messages.ExecuteScript_6); |
| 135 |
boolean b = TXMPreferences.getBoolean(RCPPreferences.PREFERENCES_NODE, RCPPreferences.SAVE_BEFORE_EXECUTION);
|
|
| 135 |
boolean b = TXMPreferences.getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION, RCPPreferences.PREFERENCES_NODE);
|
|
| 136 | 136 |
checkDefault.setSelection(b); |
| 137 | 137 |
|
| 138 | 138 |
checkDefault.addSelectionListener(new SelectionListener() {
|
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java (revision 440) | ||
|---|---|---|
| 160 | 160 |
// } else { System.out.println(Messages.ImportSelectedText_12+corpusElem.getAttribute("lang"));} //$NON-NLS-1$
|
| 161 | 161 |
|
| 162 | 162 |
String locale = Locale.getDefault().getLanguage(); |
| 163 |
String lang = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.IMPORT_DEFAULT_LANG, locale); |
|
| 163 |
//FIXME: the default value should be computed in the preferences initializer |
|
| 164 |
String lang = TXMPreferences.getString(TBXPreferences.IMPORT_DEFAULT_LANG, null, TBXPreferences.PREFERENCES_NODE, locale); |
|
| 164 | 165 |
if (lang.length() == 0) lang = locale; |
| 165 | 166 |
if ("??".equals(lang)) { //$NON-NLS-1$
|
| 166 | 167 |
LangDetector detector = new LangDetector(quicksrc); |
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenManual.java (revision 440) | ||
|---|---|---|
| 66 | 66 |
|
| 67 | 67 |
public static void open() {
|
| 68 | 68 |
String locale = Locale.getDefault().getLanguage(); |
| 69 |
String installdir = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.INSTALL_DIR, ""); //$NON-NLS-1$
|
|
| 69 |
String installdir = TXMPreferences.getString(TBXPreferences.INSTALL_DIR, TBXPreferences.PREFERENCES_NODE);
|
|
| 70 | 70 |
|
| 71 | 71 |
String file = files.get(locale); |
| 72 | 72 |
if (file == null) file = files.get(default_locale); |
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteGroovyText.java (revision 440) | ||
|---|---|---|
| 110 | 110 |
scriptfile)); |
| 111 | 111 |
return null; |
| 112 | 112 |
} |
| 113 |
final String scriptRootDir = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.USER_TXM_HOME)+ "/scripts";
|
|
| 113 |
final String scriptRootDir = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE)+ "/scripts";
|
|
| 114 | 114 |
|
| 115 | 115 |
// get current selection of the corpora view |
| 116 | 116 |
final Object corpusViewSelection = CorporaView.getSelection(); |
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateMacro.java (revision 440) | ||
|---|---|---|
| 63 | 63 |
public Object execute(ExecutionEvent event) throws ExecutionException {
|
| 64 | 64 |
|
| 65 | 65 |
//get scripts dir |
| 66 |
String scriptRootDir = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.USER_TXM_HOME)+ "/scripts";
|
|
| 66 |
String scriptRootDir = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE)+ "/scripts";
|
|
| 67 | 67 |
File currentRootDir = new File(scriptRootDir, "macro"); //$NON-NLS-1$ |
| 68 | 68 |
|
| 69 | 69 |
//if selection is a file, get its path |
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateFolder.java (revision 440) | ||
|---|---|---|
| 62 | 62 |
.getActivePage().getActivePart(); |
| 63 | 63 |
|
| 64 | 64 |
//get scripts dir |
| 65 |
String dir = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.USER_TXM_HOME, System.getProperty("user.home")); //$NON-NLS-1$
|
|
| 65 |
//FIXME: the default value should be defined in the preferences initializer |
|
| 66 |
String dir = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, null, TBXPreferences.PREFERENCES_NODE, System.getProperty("user.home")); //$NON-NLS-1$
|
|
| 66 | 67 |
|
| 67 | 68 |
//if selection is a file, get its path |
| 68 | 69 |
ISelection selection = HandlerUtil.getCurrentSelection(event); |
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateFile.java (revision 440) | ||
|---|---|---|
| 62 | 62 |
public Object execute(ExecutionEvent event) throws ExecutionException {
|
| 63 | 63 |
|
| 64 | 64 |
//get scripts dir |
| 65 |
String scriptCurrentDir = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.USER_TXM_HOME)+ "/scripts";
|
|
| 65 |
String scriptCurrentDir = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE)+ "/scripts";
|
|
| 66 | 66 |
|
| 67 | 67 |
boolean useSavedValue = true; // if a file/folder is selected, dont use the saved value |
| 68 | 68 |
|
Formats disponibles : Unified diff