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 0c46ad5..694cc98 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -20,13 +20,16 @@
 package net.pterodactylus.jsite.gui;
 
 import java.awt.BorderLayout;
+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;
 
 import net.pterodactylus.jsite.i18n.I18n;
+import net.pterodactylus.jsite.i18n.I18nable;
 import net.pterodactylus.jsite.main.Version;
 import net.pterodactylus.util.swing.StatusBar;
 import net.pterodactylus.util.swing.SwingUtils;
@@ -37,7 +40,7 @@ import net.pterodactylus.util.swing.SwingUtils;
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  * @version $Id$
  */
-public class MainWindow extends JFrame {
+public class MainWindow extends JFrame implements I18nable {
 
        /** The swing interface that receives all actions. */
        private final SwingInterface swingInterface;
@@ -45,6 +48,15 @@ public class MainWindow extends JFrame {
        /** The status bar. */
        private StatusBar statusBar = new StatusBar();
 
+       /** 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.
@@ -59,6 +71,7 @@ public class MainWindow extends JFrame {
                setPreferredSize(new Dimension(480, 280));
                pack();
                SwingUtils.center(this);
+               I18n.registerI18nable(this);
                setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
        }
 
@@ -86,16 +99,31 @@ public class MainWindow extends JFrame {
        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);
+
+               JToolBar toolBar = new JToolBar(I18n.get("mainWindow.toolbar.name"));
+               toolBar.add(swingInterface.getManageNodesAction());
+               toolBar.addSeparator();
+               toolBar.add(swingInterface.getNodeConnectAction());
+               toolBar.add(swingInterface.getNodeDisconnectAction());
+               super.getContentPane().add(toolBar, BorderLayout.PAGE_START);
+
+               super.getContentPane().add(contentPane, BorderLayout.CENTER);
                initComponents();
        }
 
@@ -103,7 +131,32 @@ public class MainWindow extends JFrame {
         * Initializes all components of this window.
         */
        private void initComponents() {
-               getContentPane().add(statusBar, BorderLayout.PAGE_END);
+               super.getContentPane().add(statusBar, BorderLayout.PAGE_END);
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public Container getContentPane() {
+               return contentPane;
+       }
+
+       //
+       // INTERFACE I18nable
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       public void updateI18n() {
+               swingInterface.getManageNodesAction().updateI18n();
+               swingInterface.getNodeConnectAction().updateI18n();
+               swingInterface.getNodeDisconnectAction().updateI18n();
+               nodeMenu.updateI18n();
+               languageMenu.updateI18n();
+               getJMenuBar().revalidate();
+               SwingUtils.repackCentered(this);
        }
 
 }