X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FMainWindow.java;h=30a9eeaae0917c82ebf2214187c8c6e341fed99b;hb=c74ea301cd9c71a434685bb75de2b7a2bb2440e4;hp=11428186526bd97c3288f8161bb66c8551dba9e7;hpb=b71f4f4aeb7440b88dd82a252cd296506427c440;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java
index 1142818..30a9eea 100644
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -22,15 +22,24 @@ package net.pterodactylus.jsite.gui;
 import java.awt.BorderLayout;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
 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 javax.swing.SwingConstants;
+import javax.swing.border.EmptyBorder;
 
 import net.pterodactylus.jsite.i18n.I18n;
 import net.pterodactylus.jsite.i18n.I18nable;
+import net.pterodactylus.jsite.i18n.gui.I18nAction;
+import net.pterodactylus.jsite.i18n.gui.I18nMenu;
 import net.pterodactylus.jsite.main.Version;
 import net.pterodactylus.util.swing.StatusBar;
 import net.pterodactylus.util.swing.SwingUtils;
@@ -50,7 +59,19 @@ public class MainWindow extends JFrame implements I18nable {
 	private StatusBar statusBar = new StatusBar();
 
 	/** The content pane. */
-	private JPanel contentPane = new JPanel();
+	private JPanel contentPane = new JPanel(new BorderLayout(12, 12));
+
+	/** The jSite menu. */
+	private I18nMenu jSiteMenu;
+
+	/** The node menu. */
+	private I18nMenu nodeMenu;
+
+	/** The language menu. */
+	private I18nMenu languageMenu;
+
+	/** The about menu. */
+	private I18nMenu aboutMenu;
 
 	/**
 	 * Creates a new main window that redirects all actions to the given swing
@@ -94,14 +115,34 @@ 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"));
+		jSiteMenu = new I18nMenu("mainWindow.menu.jSite");
+		menuBar.add(jSiteMenu);
+
+		jSiteMenu.add(new FixedJMenuItem(swingInterface.getConfigureAction()));
+		jSiteMenu.addSeparator();
+		jSiteMenu.add(new FixedJMenuItem(swingInterface.getImportConfigAction()));
+		jSiteMenu.addSeparator();
+		jSiteMenu.add(new FixedJMenuItem(swingInterface.getQuitAction()));
+
+		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);
+		}
+
+		aboutMenu = new I18nMenu("mainWindow.menu.help");
+		menuBar.add(aboutMenu);
+
+		aboutMenu.add(new FixedJMenuItem(swingInterface.getHelpAboutAction()));
 
 		setJMenuBar(menuBar);
 
@@ -113,6 +154,19 @@ public class MainWindow extends JFrame implements I18nable {
 		super.getContentPane().add(toolBar, BorderLayout.PAGE_START);
 
 		super.getContentPane().add(contentPane, BorderLayout.CENTER);
+
+		addWindowListener(new WindowAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@SuppressWarnings("synthetic-access")
+			@Override
+			public void windowClosing(WindowEvent windowEvent) {
+				swingInterface.getQuitAction().actionPerformed(null);
+			}
+		});
+
 		initComponents();
 	}
 
@@ -121,6 +175,31 @@ public class MainWindow extends JFrame implements I18nable {
 	 */
 	private void initComponents() {
 		super.getContentPane().add(statusBar, BorderLayout.PAGE_END);
+
+		/*
+		 * the main window consists of two panels which are vertically oriented.
+		 * the upper panel contains of a tabbed pane, the lower panel consists
+		 * of a table that lists the running requests.
+		 */
+
+		JPanel upperPanel = new JPanel(new BorderLayout(12, 12));
+		getContentPane().add(upperPanel, BorderLayout.PAGE_START);
+		contentPane.setBorder(new EmptyBorder(12, 12, 12, 12));
+
+		JTabbedPane tabbedPane = new JTabbedPane(SwingConstants.TOP, JTabbedPane.SCROLL_TAB_LAYOUT);
+		upperPanel.add(tabbedPane, BorderLayout.CENTER);
+
+		Box projectOverviewPanel = new Box(BoxLayout.PAGE_AXIS);
+		tabbedPane.add(I18n.get("mainWindow.pane.overview.title"), projectOverviewPanel);
+		projectOverviewPanel.setBorder(new EmptyBorder(12, 12, 12, 12));
+		projectOverviewPanel.add(Box.createVerticalGlue());
+		JButton addProjectButton = new JButton(swingInterface.getAddProjectAction());
+		addProjectButton.setAlignmentX(0.5f);
+		projectOverviewPanel.add(addProjectButton);
+		projectOverviewPanel.add(Box.createVerticalGlue());
+
+// JPanel lowerPanel = new JPanel(new BorderLayout(12, 12));
+// getContentPane().add(lowerPanel, BorderLayout.CENTER);
 	}
 
 	/**
@@ -142,6 +221,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);
 	}