Fixed item #3489081 Confusing icon for "Language" in the toolbar

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/CheatMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/CheatMenu.java
index 9213457..235344a 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/CheatMenu.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/CheatMenu.java
@@ -77,7 +77,7 @@ public class CheatMenu extends JMenu implements L10nComponent {
                 
                 addItems();
                 setEnabled(true);
-                setL10nMessages(null, null);
+                setL10nMessages(null, _("DETECTED_LANGUAGE"));
                 localeListener = new LocaleListenerImpl(this);
                 I18n.addLocaleListener(localeListener);
         }

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/EditMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/EditMenu.java
index adc5b20..f756492 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/EditMenu.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/EditMenu.java
@@ -89,7 +89,7 @@ public class EditMenu extends JMenu implements L10nComponent {
                 \r
                 addItems(actions, parent, view);\r
                 \r
-                setL10nMessages(null, null);\r
+                setL10nMessages(null, _("DETECTED_LANGUAGE"));\r
                 localeListener = new LocaleListenerImpl(this);\r
                 I18n.addLocaleListener(localeListener);\r
         }\r

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/FileMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/FileMenu.java
index 924bc12..ca63ea5 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/FileMenu.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/FileMenu.java
@@ -103,7 +103,7 @@ public class FileMenu extends JMenu implements L10nComponent {
                actionPrintMulti = new PrintMultiAction(parent, view);\r
                actions.put("PrintMulti", actionPrintMulti);;\r
                addItems();\r
-               setL10nMessages(null, null);\r
+               setL10nMessages(null, _("DETECTED_LANGUAGE"));\r
                localeListener = new LocaleListenerImpl(this);\r
                I18n.addLocaleListener(localeListener);\r
        }\r

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/HelpMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/HelpMenu.java
index 9f33b2f..5cc4749 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/HelpMenu.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/HelpMenu.java
@@ -88,7 +88,7 @@ public class HelpMenu extends JMenu implements L10nComponent {
                actionAbout = new AboutAction(parent, grid, "", null, "", Integer.valueOf(0));\r
                actions.put("About", actionAbout);\r
                addItems(view);\r
-               setL10nMessages(null, null);\r
+               setL10nMessages(null, _("DETECTED_LANGUAGE"));\r
                localeListener = new LocaleListenerImpl(this);\r
                I18n.addLocaleListener(localeListener);\r
        }\r

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java
index 098cfab..1f65c1e 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java
@@ -45,18 +45,8 @@ public class LanguageMenu extends JMenu implements L10nComponent {
         private String langCode;\r
         \r
         public LanguageMenu() {\r
-                icons.put("de", StockIcons.ICON_FLAG_DE);\r
-                icons.put("el", StockIcons.ICON_FLAG_EL);\r
-                icons.put("eo", StockIcons.ICON_FLAG_EO);\r
-                icons.put("en", StockIcons.ICON_FLAG_EN);\r
-                icons.put("es", StockIcons.ICON_FLAG_ES);\r
-                icons.put("fr", StockIcons.ICON_FLAG_FR);\r
-                icons.put("ja", StockIcons.ICON_FLAG_JA);\r
-                icons.put("pt", StockIcons.ICON_FLAG_PT);\r
-                icons.put("ru", StockIcons.ICON_FLAG_RU);\r
-                icons.put("zh", StockIcons.ICON_FLAG_ZH);\r
                 addItems();\r
-                setIcon(StockIcons.ICON_GO_HOME);\r
+                setIcon(languageIcon(_("DETECTED_LANGUAGE")));\r
                 \r
                 addMenuListener(new MenuListener() {\r
                         \r
@@ -86,9 +76,7 @@ public class LanguageMenu extends JMenu implements L10nComponent {
                 localeListener = new LocaleListenerImpl(this);\r
                 I18n.addLocaleListener(localeListener);\r
         }\r
-               \r
-        private final HashMap<String, Icon> icons = new HashMap<String, Icon>();\r
-\r
+                       \r
         private void addItems() {\r
                 ButtonGroup myGroup = new ButtonGroup();\r
                 addItem("de", _("German"), myGroup);\r
@@ -108,7 +96,7 @@ public class LanguageMenu extends JMenu implements L10nComponent {
 \r
                 radioItem = new JRadioButtonMenuItem(language);\r
                 itemsMap.put(code, radioItem);\r
-                radioItem.setAction(new AbstractAction(language, icons.get(code)) {\r
+                radioItem.setAction(new AbstractAction(language, languageIcon(code)) {\r
 \r
                         @Override\r
                         public void actionPerformed(ActionEvent arg0) {\r
@@ -137,6 +125,7 @@ public class LanguageMenu extends JMenu implements L10nComponent {
                @Override\r
                public void setL10nMessages(Locale locale, String languageCode) {\r
                        setText(_("Language"));\r
+                       setIcon(languageIcon(languageCode));\r
                        \r
                        if (this.isSelected()) {\r
                                return;\r
@@ -163,4 +152,30 @@ public class LanguageMenu extends JMenu implements L10nComponent {
                        }\r
                }\r
         \r
+               public static Icon languageIcon(final String langCode) {\r
+                       if ("de".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_DE;\r
+                       } else if ("el".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_EL;\r
+                       } else if ("eo".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_EO;\r
+                       } else if ("en".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_EN;\r
+                       } else if ("es".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_ES;\r
+                       } else if ("fr".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_FR;\r
+                       } else if ("ja".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_JA;\r
+                       } else if ("pt".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_PT;\r
+                       } else if ("ru".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_RU;\r
+                       } else if ("zh".equals(langCode)) {\r
+                               return StockIcons.ICON_FLAG_ZH;\r
+                       }\r
+                       Thread.dumpStack();\r
+                       return StockIcons.ICON_GO_HOME;\r
+               }\r
+               \r
 }\r

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/LevelMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/LevelMenu.java
index ab07ac3..b01706a 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/LevelMenu.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/LevelMenu.java
@@ -88,7 +88,7 @@ public class LevelMenu extends JMenu implements L10nComponent {
                addItems();\r
                setIcon(StockIcons.ICON_PLUS);\r
 \r
-               setL10nMessages(null, null);\r
+               setL10nMessages(null, _("DETECTED_LANGUAGE"));\r
                localeListener = new LocaleListenerImpl(this);\r
                I18n.addLocaleListener(localeListener);\r
                \r

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/LocaleListenerImpl.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/LocaleListenerImpl.java
index a746496..0914f9f 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/LocaleListenerImpl.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/LocaleListenerImpl.java
@@ -17,7 +17,6 @@ class LocaleListenerImpl implements LocaleListener {
        @Override
        public void onLocaleChanged(Locale locale) {
                String languageCode = _("DETECTED_LANGUAGE");
-//             System.out.println("LocaleListenerImpl.onLocaleChanged() detected : "+languageCode);
                l10nComp.setL10nMessages(locale, languageCode);
        }
        

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/NumbersMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/NumbersMenu.java
index 8f3f70d..285462d 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/NumbersMenu.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/NumbersMenu.java
@@ -64,7 +64,7 @@ public class NumbersMenu extends JMenu implements L10nComponent {
                addItems();\r
                setIcon(StockIcons.ICON_FONT);\r
                \r
-               setL10nMessages(null, null);\r
+               setL10nMessages(null, _("DETECTED_LANGUAGE"));\r
                localeListener = new LocaleListenerImpl(this);\r
                I18n.addLocaleListener(localeListener);\r
                \r

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/ToolBar.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/ToolBar.java
index 3c85694..749c4c7 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/ToolBar.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/ToolBar.java
@@ -50,7 +50,7 @@ public class ToolBar extends JToolBar implements L10nComponent {
                        components[i].setFocusable(false);
                }
                
-        setL10nMessages(null, null);
+        setL10nMessages(null, _("DETECTED_LANGUAGE"));
         localeListener = new LocaleListenerImpl(this);
         I18n.addLocaleListener(localeListener);
        }
@@ -91,7 +91,7 @@ public class ToolBar extends JToolBar implements L10nComponent {
            };
            button = new JButton(actionInvokeLanguageDialog);
            button.setEnabled(true);
-           actionInvokeLanguageDialog.putValue(Action.SMALL_ICON, StockIcons.ICON_GO_HOME);
+           actionInvokeLanguageDialog.putValue(Action.SMALL_ICON, LanguageMenu.languageIcon(_("DETECTED_LANGUAGE")));
            actionInvokeLanguageDialog.putValue(Action.SHORT_DESCRIPTION, _("Language"));
 
                button.setText("");
@@ -100,6 +100,7 @@ public class ToolBar extends JToolBar implements L10nComponent {
 
        @Override
        public void setL10nMessages(Locale locale, String languageCode) {
+           actionInvokeLanguageDialog.putValue(Action.SMALL_ICON, LanguageMenu.languageIcon(languageCode));
                actionInvokeLanguageDialog.putValue(Action.SHORT_DESCRIPTION, _("Language"));
        }