add configuration action item to toolbar

[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 7c2795f..d4924d0 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -62,7 +62,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 {
@@ -125,7 +125,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 +147,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 +172,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 +181,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 +191,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 +210,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 +219,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 +229,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 +239,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 +253,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Adds a node to the menu.
-        * 
+        *
         * @param node
         *            The node to add
         */
@@ -274,7 +274,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /**
         * Removes a node from the menu.
-        * 
+        *
         * @param node
         *            The node to remove
         */
@@ -286,7 +286,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 +309,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 +372,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 +433,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);
@@ -478,8 +490,6 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                swingInterface.getQuitAction().updateI18n();
                swingInterface.getAddNodeAction().updateI18n();
                swingInterface.getAddProjectAction().updateI18n();
-               swingInterface.getCloneProjectAction().updateI18n();
-               swingInterface.getDeleteProjectAction().updateI18n();
                swingInterface.getHelpAboutAction().updateI18n();
                jSiteMenu.updateI18n();
                nodeMenu.updateI18n();
@@ -490,6 +500,10 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                        swingInterface.getNodeEditAction(node).updateI18n();
                        swingInterface.getNodeDeleteAction(node).updateI18n();
                }
+               for (Project project: swingInterface.getProjects()) {
+                       swingInterface.getCloneProjectAction(project).updateI18n();
+                       swingInterface.getDeleteProjectAction(project).updateI18n();
+               }
                for (I18nAction languageAction: swingInterface.getLanguageActions()) {
                        languageAction.updateI18n();
                }
@@ -502,7 +516,6 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                                ((ProjectPanel) tabComponent).updateI18n();
                        }
                }
-               SwingUtils.repackCentered(this);
        }
 
        //
@@ -572,17 +585,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) {