use panel instead of box for add project button

[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 843eaa1..2a50313 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -23,6 +23,9 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
@@ -35,7 +38,6 @@ import java.util.TimerTask;
 import java.util.logging.Logger;
 
 import javax.swing.Box;
-import javax.swing.BoxLayout;
 import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -62,7 +64,7 @@ import net.pterodactylus.util.swing.SwingUtils;
 
 /**
  * Defines the main window of the application.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  */
 public class MainWindow extends JFrame implements WindowListener, I18nable, PropertyChangeListener {
@@ -114,7 +116,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
        private JTabbedPane projectPane;
 
        /** The project overview panel. */
-       private Box projectOverviewPanel;
+       private JPanel projectOverviewPanel;
 
        /** Maps from node to menus. */
        private final Map<Node, JMenu> nodeMenus = new HashMap<Node, JMenu>();
@@ -125,7 +127,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
        /**
         * Creates a new main window that redirects all actions to the given swing
         * interface.
-        * 
+        *
         * @param swingInterface
         *            The swing interface to receive all actions
         */
@@ -147,7 +149,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Sets the text of the status bar.
-        * 
+        *
         * @param text
         *            The text of the status bar
         */
@@ -172,7 +174,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Returns the status bar clear delay (in milliseconds).
-        * 
+        *
         * @return The status bar clear delay
         */
        public int getStatusBarClearDelay() {
@@ -181,7 +183,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Sets the status bar clear delay (in milliseconds).
-        * 
+        *
         * @param statusBarClearDelay
         *            The status bar clear delay
         */
@@ -191,7 +193,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Sets whether the advanced mode is activated.
-        * 
+        *
         * @param advancedMode
         *            <code>true</code> if the advanced mode is activated,
         *            <code>false</code> if the simple mode is activated
@@ -210,7 +212,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Returns the currently selected project.
-        * 
+        *
         * @return The currently selected project
         */
        public Project getSelectedProject() {
@@ -219,7 +221,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Sets the given node to the “online” state.
-        * 
+        *
         * @param node
         *            The node to set online
         */
@@ -229,7 +231,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Sets the given node to the “offline” state in the status bar.
-        * 
+        *
         * @param node
         *            The node to set offline
         */
@@ -239,7 +241,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Sets the given node to the “error” state in the status bar.
-        * 
+        *
         * @param node
         *            The node to set the error state for
         */
@@ -253,7 +255,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Adds a node to the menu.
-        * 
+        *
         * @param node
         *            The node to add
         */
@@ -274,7 +276,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Removes a node from the menu.
-        * 
+        *
         * @param node
         *            The node to remove
         */
@@ -286,7 +288,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Adds a project to the project pane.
-        * 
+        *
         * @param project
         *            The project to add
         * @param switchToProject
@@ -309,6 +311,17 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
        }
 
        /**
+        * Removes the pane containing the given project.
+        *
+        * @param project
+        *            The project whose pane to remove
+        */
+       void removeProject(Project project) {
+               int projectIndex = getProjectIndex(project);
+               projectPane.remove(projectIndex);
+       }
+
+       /**
         * @param project
         */
        void projectInsertStarted(Project project) {
@@ -361,7 +374,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Returns the index of the project panel that contains the given project.
-        * 
+        *
         * @param project
         *            The wanted project
         * @return The index of {@link #projectPane}’s tab that contains the given
@@ -422,9 +435,10 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                setJMenuBar(menuBar);
 
                JToolBar toolBar = new JToolBar(I18n.get("mainWindow.toolbar.name"));
-               toolBar.add(swingInterface.getAddNodeAction());
-               toolBar.addSeparator();
+               toolBar.add(swingInterface.getConfigureAction());
                toolBar.add(swingInterface.getQuitAction());
+               toolBar.addSeparator();
+               toolBar.add(swingInterface.getAddNodeAction());
                super.getContentPane().add(toolBar, BorderLayout.PAGE_START);
 
                super.getContentPane().add(contentPane, BorderLayout.CENTER);
@@ -454,15 +468,12 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                projectPane = new JTabbedPane(SwingConstants.TOP, JTabbedPane.SCROLL_TAB_LAYOUT);
                contentPane.add(projectPane, BorderLayout.CENTER);
 
-               projectOverviewPanel = new Box(BoxLayout.PAGE_AXIS);
+               projectOverviewPanel = new JPanel(new GridBagLayout());
                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());
-               addProjectButton.setAlignmentX(0.5f);
-               projectOverviewPanel.add(addProjectButton);
-               projectOverviewPanel.add(Box.createVerticalGlue());
+               projectOverviewPanel.add(addProjectButton, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
        }
 
        //
@@ -504,7 +515,6 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                                ((ProjectPanel) tabComponent).updateI18n();
                        }
                }
-               SwingUtils.repackCentered(this);
        }
 
        //
@@ -574,17 +584,11 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                        /* if a project was changed, update the tab title and tooltip. */
                        if (Project.PROPERTY_NAME.equals(propertyName) || Project.PROPERTY_DESCRIPTION.equals(propertyName)) {
                                Project project = (Project) eventSource;
-                               int tabCount = projectPane.getTabCount();
-                               for (int tabIndex = 0; tabIndex < tabCount; tabIndex++) {
-                                       Component tabComponent = projectPane.getComponentAt(tabIndex);
-                                       if (tabComponent instanceof ProjectPanel) {
-                                               Project tabProject = ((ProjectPanel) tabComponent).getProject();
-                                               if (tabProject.equals(project)) {
-                                                       projectPane.setTitleAt(tabIndex, project.getName());
-                                                       projectPane.setToolTipTextAt(tabIndex, project.getDescription());
-                                                       projectPane.repaint();
-                                               }
-                                       }
+                               int projectIndex = getProjectIndex(project);
+                               if (projectIndex != -1) {
+                                       projectPane.setTitleAt(projectIndex, project.getName());
+                                       projectPane.setToolTipTextAt(projectIndex, project.getDescription());
+                                       projectPane.repaint();
                                }
                        }
                } else if (eventSource instanceof Node) {