fix broken JMenuItem

[jSite2.git] / src / net / pterodactylus / jsite / gui / MainWindow.java

diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java
index 1142818..694cc98 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -24,7 +24,6 @@ import java.awt.Container;
 import java.awt.Dimension;
 
 import javax.swing.JFrame;
-import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JPanel;
 import javax.swing.JToolBar;
@@ -52,6 +51,12 @@ public class MainWindow extends JFrame implements I18nable {
        /** The content pane. */
        private JPanel contentPane = new JPanel();
 
+       /** The node menu. */
+       private I18nMenu nodeMenu;
+
+       /** The language menu. */
+       private I18nMenu languageMenu;
+
        /**
         * Creates a new main window that redirects all actions to the given swing
         * interface.
@@ -94,14 +99,20 @@ public class MainWindow extends JFrame implements I18nable {
        private void initWindow() {
                JMenuBar menuBar = new JMenuBar();
 
-               final JMenu nodeMenu = new JMenu(I18n.get("mainWindow.menu.node.name"));
+               nodeMenu = new I18nMenu("mainWindow.menu.node");
                menuBar.add(nodeMenu);
-               nodeMenu.setMnemonic(I18n.get("mainWindow.menu.node.mnemonic").charAt(0));
 
-               nodeMenu.add(swingInterface.getManageNodesAction());
+               nodeMenu.add(new FixedJMenuItem(swingInterface.getManageNodesAction()));
                nodeMenu.addSeparator();
-               nodeMenu.add(swingInterface.getNodeConnectAction());
-               nodeMenu.add(swingInterface.getNodeDisconnectAction());
+               nodeMenu.add(new FixedJMenuItem(swingInterface.getNodeConnectAction()));
+               nodeMenu.add(new FixedJMenuItem(swingInterface.getNodeDisconnectAction()));
+
+               languageMenu = new I18nMenu("mainWindow.menu.language");
+               menuBar.add(languageMenu);
+
+               for (I18nAction languageAction: swingInterface.getLanguageActions()) {
+                       languageMenu.add(languageAction);
+               }
 
                setJMenuBar(menuBar);
 
@@ -142,6 +153,9 @@ public class MainWindow extends JFrame implements I18nable {
                swingInterface.getManageNodesAction().updateI18n();
                swingInterface.getNodeConnectAction().updateI18n();
                swingInterface.getNodeDisconnectAction().updateI18n();
+               nodeMenu.updateI18n();
+               languageMenu.updateI18n();
+               getJMenuBar().revalidate();
                SwingUtils.repackCentered(this);
        }