Adapt to i18n changes, move language properties to application directory.

[jkeytool.git] / src / net / pterodactylus / jkeytool / gui / swing / SwingInterface.java

diff --git a/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java b/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
index 107dc8d..b67ce84 100644 (file)
--- a/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
+++ b/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
@@ -30,13 +30,18 @@ import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
+import javax.swing.JToolBar;
 
 import net.pterodactylus.jkeytool.core.Core;
 import net.pterodactylus.jkeytool.gui.Interface;
 import net.pterodactylus.jkeytool.main.Main;
+import net.pterodactylus.util.i18n.I18n;
 import net.pterodactylus.util.i18n.gui.I18nAction;
+import net.pterodactylus.util.i18n.gui.I18nMenu;
 import net.pterodactylus.util.swing.StatusBar;
 
 /**
@@ -49,6 +54,9 @@ public class SwingInterface implements Interface {
        /** The core to control. */
        private Core core;
 
+       /** The I18n container. */
+       private I18n i18n = new I18n("jkeytool", SwingInterface.class);
+
        /** The main frame. */
        private JFrame mainFrame = new JFrame("jkeytool " + Main.getVersion());
 
@@ -88,14 +96,14 @@ public class SwingInterface implements Interface {
        //
 
        private void createActions() {
-               createKeyStoreAction = new I18nAction("jkeytool.action.createKeyStore") {
+               createKeyStoreAction = new I18nAction(i18n, "jkeytool.action.createKeyStore") {
 
                        @SuppressWarnings("synthetic-access")
                        public void actionPerformed(ActionEvent actionEvent) {
                                createKeyStore();
                        }
                };
-               quitAction = new I18nAction("jkeytool.action.quit") {
+               quitAction = new I18nAction(i18n, "jkeytool.action.quit") {
 
                        /**
                         * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
@@ -108,6 +116,8 @@ public class SwingInterface implements Interface {
        }
 
        private void createFrame() {
+               mainFrame.setJMenuBar(createMenubar());
+               mainFrame.getContentPane().add(createToolbar(), BorderLayout.PAGE_START);
                mainFrame.getContentPane().add(createCenterPanel(), BorderLayout.CENTER);
                mainFrame.getContentPane().add(statusBar, BorderLayout.PAGE_END);
                mainFrame.pack();
@@ -122,6 +132,27 @@ public class SwingInterface implements Interface {
                return centerPanel;
        }
 
+       private JMenuBar createMenubar() {
+               JMenuBar menubar = new JMenuBar();
+
+               JMenu fileMenu = new I18nMenu(i18n, "jkeytool.menu.file");
+               menubar.add(fileMenu);
+               fileMenu.add(createKeyStoreAction);
+               fileMenu.addSeparator();
+               fileMenu.add(quitAction);
+
+               return menubar;
+       }
+
+       private JToolBar createToolbar() {
+               JToolBar toolbar = new JToolBar();
+
+               toolbar.add(createKeyStoreAction);
+               toolbar.add(quitAction);
+
+               return toolbar;
+       }
+
        //
        // INTERFACE Interface
        //