X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FMainWindow.java;h=ed2b1dbc0f373e19065aeb383e1e4c43e0a173ad;hb=90f3a1c8e0c85f19c82130e49d7a605cb9e55286;hp=694cc98f0b91f688e5695e146e273406518c03fa;hpb=6c4d18e3242bda4df55d9f2207134acb5ef26fbb;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java
index 694cc98..ed2b1db 100644
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -22,14 +22,25 @@ 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.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.core.Project;
 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;
@@ -49,7 +60,10 @@ 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;
@@ -57,6 +71,12 @@ public class MainWindow extends JFrame implements I18nable {
 	/** The language menu. */
 	private I18nMenu languageMenu;
 
+	/** The about menu. */
+	private I18nMenu aboutMenu;
+	
+	/** The tabbed project pane. */
+	private JTabbedPane projectPane;
+
 	/**
 	 * Creates a new main window that redirects all actions to the given swing
 	 * interface.
@@ -89,6 +109,19 @@ public class MainWindow extends JFrame implements I18nable {
 		statusBar.setText(text);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Container getContentPane() {
+		return contentPane;
+	}
+
+	
+	public Project getSelectedProject() {
+		return null;
+	}
+
 	//
 	// PRIVATE METHODS
 	//
@@ -99,6 +132,15 @@ public class MainWindow extends JFrame implements I18nable {
 	private void initWindow() {
 		JMenuBar menuBar = new JMenuBar();
 
+		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);
 
@@ -114,6 +156,12 @@ public class MainWindow extends JFrame implements I18nable {
 			languageMenu.add(languageAction);
 		}
 
+		menuBar.add(new JPanel());
+		aboutMenu = new I18nMenu("mainWindow.menu.help");
+		menuBar.add(aboutMenu);
+
+		aboutMenu.add(new FixedJMenuItem(swingInterface.getHelpAboutAction()));
+
 		setJMenuBar(menuBar);
 
 		JToolBar toolBar = new JToolBar(I18n.get("mainWindow.toolbar.name"));
@@ -124,6 +172,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();
 	}
 
@@ -132,14 +193,31 @@ public class MainWindow extends JFrame implements I18nable {
 	 */
 	private void initComponents() {
 		super.getContentPane().add(statusBar, BorderLayout.PAGE_END);
-	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Container getContentPane() {
-		return contentPane;
+		/*
+		 * 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));
+
+		projectPane = new JTabbedPane(SwingConstants.TOP, JTabbedPane.SCROLL_TAB_LAYOUT);
+		upperPanel.add(projectPane, BorderLayout.CENTER);
+
+		Box projectOverviewPanel = new Box(BoxLayout.PAGE_AXIS);
+		projectPane.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);
 	}
 
 	//