Fixed issue where "ENTER" doesn't close language dialog, and minor sync issue.

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageDialog.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageDialog.java
index c8d84e2..918ee2d 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageDialog.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageDialog.java
@@ -24,6 +24,8 @@ import java.awt.FlowLayout;
 import java.awt.GridLayout;\r
 import java.awt.Point;\r
 import java.awt.event.ActionEvent;\r
+import java.awt.event.KeyAdapter;\r
+import java.awt.event.KeyEvent;\r
 import java.util.HashMap;\r
 import java.util.Locale;\r
 \r
@@ -136,15 +138,14 @@ public class LanguageDialog extends JDialog implements L10nComponent {
                itemsMap.get("fr").setText(_("French"));\r
                itemsMap.get("ja").setText(_("Japanese"));\r
                itemsMap.get("pt").setText(_("Portuguese"));\r
+               itemsMap.get("ru").setText(_("Russian"));\r
                itemsMap.get("zh").setText(_("Mandarin"));\r
        }\r
 \r
     private final HashMap<String, Icon> icons = new HashMap<String, Icon>();\r
        \r
        private void addItem(final String code, String language, ButtonGroup group) {\r
-               JRadioButton radioItem;\r
-\r
-               radioItem = new JRadioButton(language, icons.get(code));\r
+               final JRadioButton radioItem = new JRadioButton(language, icons.get(code));\r
                itemsMap.put(code, radioItem);\r
                \r
                if (code.equals(code)) {\r
@@ -154,12 +155,22 @@ public class LanguageDialog extends JDialog implements L10nComponent {
 \r
             @Override\r
             public void actionPerformed(ActionEvent arg0) {\r
+               System.out\r
+                                               .println("LanguageDialog.addItem(...).new AbstractAction() {...}.actionPerformed()");\r
                     I18n.reset(code);\r
             }\r
         });\r
-\r
+        radioItem.addKeyListener(new KeyAdapter() {\r
+               @Override\r
+               public void keyPressed(KeyEvent ke) {\r
+                       if (ke.getKeyCode() == KeyEvent.VK_ENTER) {\r
+                               dispose();\r
+                       }\r
+               }\r
+               });\r
+        \r
                group.add(radioItem);\r
                panel.add(radioItem);\r
        }\r
 \r
-}
\ No newline at end of file
+}\r

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java
index 6c49bfb..098cfab 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/LanguageMenu.java
@@ -149,6 +149,7 @@ public class LanguageMenu extends JMenu implements L10nComponent {
             refreshItem(languageCode, "fr", "French");\r
             refreshItem(languageCode, "ja", "Japanese");\r
             refreshItem(languageCode, "pt", "Portuguese");\r
+            refreshItem(languageCode, "ru", "Russian");\r
             refreshItem(languageCode, "zh", "Mandarin");\r
                }\r
 \r