Author: tchemit Date: 2008-08-10 13:26:39 +0000 (Sun, 10 Aug 2008) New Revision: 992 Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties Log: delete test of i18n add applicationName in QuitAction add dynamic i18n menu no i18n init in ChangeLocationActionNameProvider Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java 2008-08-10 13:26:39 UTC (rev 992) @@ -32,7 +32,6 @@ public AboutUI() { super(); - String test = _("toto.tata"); getApplicationWebsite().setEditorKit(new HTMLEditorKit()); getApplicationWebsite().addHyperlinkListener(createHyperLinkListener(getApplicationWebsite())); Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java 2008-08-10 13:26:39 UTC (rev 992) @@ -18,6 +18,7 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.jaxx.action.ActionFactory; import org.codelutin.jaxx.action.MyAbstractAction; +import org.codelutin.jaxx.util.UIHelper; import org.codelutin.option.Context; import javax.swing.AbstractButton; @@ -68,7 +69,7 @@ button.setToolTipText(null); } else { MyAbstractAction action = (MyAbstractAction) button.getAction(); - String t = org.codelutin.i18n.I18n._(action.getI18nToolTipText(), params); + String t = _(action.getI18nToolTipText(), params); button.setToolTipText(t); } } @@ -106,7 +107,25 @@ public static void refreshI18nActions(Context context, ActionFactory actionFactory, JAXXObject mainUI) { Locale locale = (Locale) context.getMainConfig().getProperty("locale"); - String[] actions = actionFactory.getActionNames(); + + for (String command : new ChangeLocationActionNameProvider().getActionCommands()) { + AbstractButton button = (AbstractButton) mainUI.getObjectById(command); + + MyAbstractAction myAbstractAction = (MyAbstractAction) button.getAction(); + ChangeLocaleAction action; + if (myAbstractAction.hasDelegate()) { + action = (ChangeLocaleAction) myAbstractAction.getDelegate(); + } else { + action = (ChangeLocaleAction) myAbstractAction; + } + action.disposeUI(); + boolean enable = !action.equalsLocale(locale); + UpdateButton(button, enable, enable ? action.getLocale() : null); + button.setEnabled(enable); + } + + /*String[] actions = actionFactory.getActionNames(); + for (String actionName : actions) { Matcher matcher = ChangeLocaleAction.PATTERN_NAME.matcher(actionName); if (!matcher.matches()) { @@ -123,9 +142,35 @@ boolean enable = !action.equalsLocale(locale); UpdateButton(button, enable, enable ? action.getLocale() : null); button.setEnabled(enable); + }*/ + } + + public static void createI18nMenu(JAXXObject ui) { + javax.swing.JMenu i18nParent = (javax.swing.JMenu) ui.getObjectById("i18nMenu"); + String libelle = _("commandline.menu.i18n"); + i18nParent.setText(libelle); + i18nParent.setIcon(UIHelper.createImageIcon("action/translate.png")); + String mnemonic = libelle; + if (mnemonic.isEmpty()) { + mnemonic = "L"; } + i18nParent.setMnemonic(mnemonic.charAt(0)); + if (i18nParent.getItemCount() == 0) { + i18nParent.removeAll(); + } + // create the entries in menu + for (String command : new ChangeLocationActionNameProvider().getActionCommands()) { + createI18nEntry(command, i18nParent, ui); + } } + protected static void createI18nEntry(String language, javax.swing.JMenu i18nParent, JAXXObject ui) { + javax.swing.JMenuItem entry = new javax.swing.JMenuItem(); + entry.setName(language); + ui.get$objectMap().put(language, entry); + i18nParent.add(entry); + } + protected ActionHelper() { // no instance } Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java 2008-08-10 13:26:39 UTC (rev 992) @@ -38,7 +38,7 @@ public String[] getActionCommands() { //TODO Il faudrait ajuter une méthode à I18n pour initialiser le système uniquement si nécessaire. - org.codelutin.i18n.I18n.init(); + //org.codelutin.i18n.I18n.init(); Locale[] locales = I18n.getBundleManager().getLocales(); java.util.List<String> tmpList = new java.util.ArrayList<String>(); Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java 2008-08-10 13:26:39 UTC (rev 992) @@ -49,7 +49,6 @@ @Override public void disposeUI() { - String test = _("toto"); super.disposeUI(); if (ui != null) { ui.dispose(); Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java 2008-08-10 13:26:39 UTC (rev 992) @@ -47,10 +47,12 @@ boolean result = super.beforeAction(e); if (result) { + org.codelutin.option.Config config = getContext().getMainConfig(); + String applicationName = (String) config.getProperty("projectName"); String[] response = {_("commandline.yes"), _("commandline.no")}; int n = JOptionPane.showOptionDialog(null, - _("commandline.close_question"), - _("commandline.question"), + _("commandline.close_question", applicationName), + _("commandline.question", applicationName), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, //do not use a custom Icon @@ -60,7 +62,6 @@ result = n == JOptionPane.YES_OPTION; } - log.info("to treate ? " + result); return result; } @@ -70,9 +71,4 @@ getContext().dispose(false); } - @Override - public void disposeUI() { - super.disposeUI(); - } - } \ No newline at end of file Modified: trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties =================================================================== --- trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties 2008-08-10 13:26:39 UTC (rev 992) @@ -1,25 +1,24 @@ commandline= commandline.action.about=About commandline.action.about.help= -commandline.action.about.tooltip= +commandline.action.about.tooltip=Show about ui commandline.action.changeLocale.help= -commandline.action.changeLocale.tooltip= +commandline.action.changeLocale.tooltip=Change language commandline.action.config=Preferences commandline.action.config.help= -commandline.action.config.tooltip= +commandline.action.config.tooltip=Show Preference ui commandline.action.help=Help commandline.action.help.help= -commandline.action.help.tooltip= +commandline.action.help.tooltip=Show help ui commandline.action.quit=Quit commandline.action.quit.help= -commandline.action.quit.tooltip= +commandline.action.quit.tooltip=Quit application commandline.action.site=Site commandline.action.site.help= -commandline.action.site.tooltip= -commandline.close_question=Really quit ? +commandline.action.site.tooltip=Open in a browser the website of the application +commandline.close_question=Really quit {0} ? commandline.confirm.changeLanguage= +commandline.menu.i18n=Language commandline.no=No -commandline.question=Quit +commandline.question=Quit {0} commandline.yes=Yes -toto= -toto.tata= Modified: trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties =================================================================== --- trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-08-10 13:26:39 UTC (rev 992) @@ -1,25 +1,24 @@ commandline= commandline.action.about=A propos commandline.action.about.help= -commandline.action.about.tooltip= +commandline.action.about.tooltip=Afficher les informations sur l'application commandline.action.changeLocale.help= -commandline.action.changeLocale.tooltip= +commandline.action.changeLocale.tooltip=Changer la langue de l'application commandline.action.config=Pr\u00E9f\u00E9rences commandline.action.config.help= -commandline.action.config.tooltip= +commandline.action.config.tooltip=Changer la configuration commandline.action.help=Aide commandline.action.help.help= -commandline.action.help.tooltip= +commandline.action.help.tooltip=Voir l'aide commandline.action.quit=Quitter commandline.action.quit.help= -commandline.action.quit.tooltip= +commandline.action.quit.tooltip=Quitter l'application commandline.action.site=Site commandline.action.site.help= -commandline.action.site.tooltip= -commandline.close_question=Voulez-vous quitter ? +commandline.action.site.tooltip=Ouvrir dans un navigateur le site de l'application +commandline.close_question=Voulez-vous quitter {0} ? commandline.confirm.changeLanguage= +commandline.menu.i18n=Langue commandline.no=Non -commandline.question=Quitter +commandline.question=Quitter {0} commandline.yes=Oui -toto= -toto.tata=