Revision: a7f9211719b1 Branch: default Author: Keith Creasy <kcreasy@xxxxxxx> Date: Fri Jul 5 09:39:08 2013Log: Changed config files to Translation Templates and updated localle strings. Got rid of literals in UI messages.
http://code.google.com/p/brailleblaster/source/detail?r=a7f9211719b1&repo=newdesign Modified: /dist/programData/lang/i18n.properties /dist/programData/lang/i18n_en_US.properties /src/main/org/brailleblaster/settings/ConfigFileDialog.java /src/main/org/brailleblaster/wordprocessor/BBMenu.java ======================================= --- /dist/programData/lang/i18n.properties Mon Sep 24 03:06:59 2012 +++ /dist/programData/lang/i18n.properties Fri Jul 5 09:39:08 2013 @@ -7,6 +7,7 @@ &Edit=&Edit &View=&View Tem&plates=Tem&plates +&Braille=&Braille &Translate=&Translate &Insert=&Insert &Advanced=&Advanced @@ -166,6 +167,7 @@ settingsTitle=User\u0027s settingssettingsWelcome=Show welcome screen and this dialogue every time the \ program starts
settingsTutorial=Read tutorial when finished settings +editTranslationTemplates=Edit Translation Templates ======================================= --- /dist/programData/lang/i18n_en_US.properties Thu Sep 6 18:55:19 2012 +++ /dist/programData/lang/i18n_en_US.properties Fri Jul 5 09:39:08 2013 @@ -7,6 +7,7 @@ &Edit=&Edit &View=&View Tem&plates=Tem&plates +&Braille=&Braille &Translate=&Translate &Insert=&Insert &Advanced=&Advanced =======================================--- /src/main/org/brailleblaster/settings/ConfigFileDialog.java Wed Jul 3 12:21:40 2013 +++ /src/main/org/brailleblaster/settings/ConfigFileDialog.java Fri Jul 5 09:39:08 2013
@@ -40,10 +40,10 @@ import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.Properties; import org.brailleblaster.BBIni; +import org.brailleblaster.localization.LocaleHandler; import org.brailleblaster.util.FileUtils; import org.brailleblaster.wordprocessor.WPManager; import org.eclipse.swt.SWT; @@ -72,6 +72,8 @@ // Dialog stuff. static Display display; static Shell configShell; + LocaleHandler lh = new LocaleHandler(); + // Word Processor Manager. WPManager dm; @@ -115,7 +117,7 @@ display = dm.getDisplay(); Display display = parent.getDisplay(); configShell = new Shell(parent, SWT.DIALOG_TRIM); - configShell.setText("Update Config File"); + configShell.setText(lh.localValue("editTranslationTemplates")); fileList = new ArrayList<ConfigFile>(); @@ -205,7 +207,7 @@ // Label next to file name combo box. Label name = new Label(configShell, SWT.HORIZONTAL); - name.setText("Config Filename"); + name.setText(lh.localValue("&TranslationTemplates")); // So our combos and buttons take up whole width of dialog. GridData fillGD = new GridData(GridData.FILL_HORIZONTAL); =======================================--- /src/main/org/brailleblaster/wordprocessor/BBMenu.java Wed Jun 26 13:03:08 2013 +++ /src/main/org/brailleblaster/wordprocessor/BBMenu.java Fri Jul 5 09:39:08 2013
@@ -84,7 +84,6 @@ MenuItem zoomImageItem; MenuItem selectAllItem; MenuItem stylePanelItem; - MenuItem configDlgItem; MenuItem nextElementItem; MenuItem assocSelectionItem; MenuItem lockSelectionItem; @@ -151,7 +150,7 @@ MenuItem viewItem = new MenuItem(menuBar, SWT.CASCADE); viewItem.setText(lh.localValue("&View")); MenuItem translateItem = new MenuItem(menuBar, SWT.CASCADE); - translateItem.setText(lh.localValue("&Translate")); + translateItem.setText(lh.localValue("&Braille")); MenuItem insertItem = new MenuItem(menuBar, SWT.CASCADE); insertItem.setText(lh.localValue("&Insert")); insertItem.setEnabled(false); /* FO */ @@ -496,18 +495,7 @@ System.out.println("Open Style Panel"); } }); - - // Config files. - configDlgItem = new MenuItem(editMenu, SWT.PUSH); - configDlgItem.setText( "Con&fig Files" ); - configDlgItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { -//- ConfigFileDialog cfd = new ConfigFileDialog(wp.getShell(), SWT.NONE, wordProc);
- } - }); - - nextElementItem = new MenuItem(editMenu, SWT.PUSH); + nextElementItem = new MenuItem(editMenu, SWT.PUSH);nextElementItem.setText(lh.localValue("&NexstElement") + "\tCtrl + Down");
nextElementItem.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -661,15 +649,15 @@ viewItem.setMenu(viewMenu); // Set up translate menu - Menu translateMenu = new Menu(wp.getShell(), SWT.DROP_DOWN); - xtranslateItem = new MenuItem(translateMenu, SWT.PUSH); + Menu brailleMenu = new Menu(wp.getShell(), SWT.DROP_DOWN); + xtranslateItem = new MenuItem(brailleMenu, SWT.PUSH); xtranslateItem.setText(lh.localValue("&Translate")); xtranslateItem.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { } }); - backTranslateItem = new MenuItem(translateMenu, SWT.PUSH); + backTranslateItem = new MenuItem(brailleMenu, SWT.PUSH); backTranslateItem.setText(lh.localValue("&BackTranslate")); backTranslateItem.setEnabled(false); backTranslateItem.addSelectionListener(new SelectionAdapter() { @@ -677,14 +665,14 @@ //dm.placeholder(); } }); - translationTemplatesItem = new MenuItem(translateMenu, SWT.PUSH); + translationTemplatesItem = new MenuItem(brailleMenu, SWT.PUSH); translationTemplatesItem.setText(lh.localValue("&TranslationTemplates")); translationTemplatesItem.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { -+ ConfigFileDialog cfd = new ConfigFileDialog(wp.getShell(), SWT.NONE, wordProc);
} }); - translateItem.setMenu(translateMenu); + translateItem.setMenu(brailleMenu); // Set up insert menu Menu insertMenu = new Menu(wp.getShell(), SWT.DROP_DOWN);