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

diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java
index ed2b1db..b5bc5fb 100644
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -47,7 +47,7 @@ import net.pterodactylus.util.swing.SwingUtils;
 
 /**
  * Defines the main window of the application.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  * @version $Id$
  */
@@ -72,15 +72,18 @@ public class MainWindow extends JFrame implements I18nable {
 	private I18nMenu languageMenu;
 
 	/** The about menu. */
-	private I18nMenu aboutMenu;
-	
+	private I18nMenu helpMenu;
+
 	/** The tabbed project pane. */
 	private JTabbedPane projectPane;
 
+	/** The project overview panel. */
+	private Box projectOverviewPanel;
+
 	/**
 	 * Creates a new main window that redirects all actions to the given swing
 	 * interface.
-	 * 
+	 *
 	 * @param swingInterface
 	 *            The swing interface to receive all actions
 	 */
@@ -101,7 +104,7 @@ public class MainWindow extends JFrame implements I18nable {
 
 	/**
 	 * Sets the text of the status bar.
-	 * 
+	 *
 	 * @param text
 	 *            The text of the status bar
 	 */
@@ -117,7 +120,11 @@ public class MainWindow extends JFrame implements I18nable {
 		return contentPane;
 	}
 
-	
+	/**
+	 * Returns the currently selected project.
+	 *
+	 * @return The currently selected project
+	 */
 	public Project getSelectedProject() {
 		return null;
 	}
@@ -153,14 +160,17 @@ public class MainWindow extends JFrame implements I18nable {
 		menuBar.add(languageMenu);
 
 		for (I18nAction languageAction: swingInterface.getLanguageActions()) {
-			languageMenu.add(languageAction);
+			languageMenu.add(new FixedJMenuItem(languageAction));
 		}
 
-		menuBar.add(new JPanel());
-		aboutMenu = new I18nMenu("mainWindow.menu.help");
-		menuBar.add(aboutMenu);
+		JPanel spacerPanel = new JPanel();
+		spacerPanel.setOpaque(false);
+		menuBar.add(spacerPanel);
 
-		aboutMenu.add(new FixedJMenuItem(swingInterface.getHelpAboutAction()));
+		helpMenu = new I18nMenu("mainWindow.menu.help");
+		menuBar.add(helpMenu);
+
+		helpMenu.add(new FixedJMenuItem(swingInterface.getHelpAboutAction()));
 
 		setJMenuBar(menuBar);
 
@@ -207,8 +217,9 @@ public class MainWindow extends JFrame implements I18nable {
 		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 = new Box(BoxLayout.PAGE_AXIS);
+		projectOverviewPanel.setName(I18n.get("mainWindow.pane.overview.title"));
+		projectPane.add(projectOverviewPanel);
 		projectOverviewPanel.setBorder(new EmptyBorder(12, 12, 12, 12));
 		projectOverviewPanel.add(Box.createVerticalGlue());
 		JButton addProjectButton = new JButton(swingInterface.getAddProjectAction());
@@ -228,12 +239,28 @@ public class MainWindow extends JFrame implements I18nable {
 	 * {@inheritDoc}
 	 */
 	public void updateI18n() {
+		swingInterface.getConfigureAction().updateI18n();
+		swingInterface.getImportConfigAction().updateI18n();
+		swingInterface.getQuitAction().updateI18n();
 		swingInterface.getManageNodesAction().updateI18n();
 		swingInterface.getNodeConnectAction().updateI18n();
 		swingInterface.getNodeDisconnectAction().updateI18n();
+		swingInterface.getAddProjectAction().updateI18n();
+		swingInterface.getCloneProjectAction().updateI18n();
+		swingInterface.getDeleteProjectAction().updateI18n();
+		swingInterface.getHelpAboutAction().updateI18n();
+		jSiteMenu.updateI18n();
 		nodeMenu.updateI18n();
 		languageMenu.updateI18n();
+		for (I18nAction languageAction: swingInterface.getLanguageActions()) {
+			languageAction.updateI18n();
+		}
+		helpMenu.updateI18n();
 		getJMenuBar().revalidate();
+		projectOverviewPanel.setName(I18n.get("mainWindow.pane.overview.title"));
+		for (int componentIndex = 0; componentIndex < projectPane.getTabCount(); componentIndex++) {
+			projectPane.setTitleAt(componentIndex, projectPane.getComponentAt(componentIndex).getName());
+		}
 		SwingUtils.repackCentered(this);
 	}