X-Git-Url: https://git.pterodactylus.net/?p=jSite2.git;a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FMainWindow.java;h=2a50313afd347f2eabefcb13cde6752a87ca119d;hp=2e04224743a527b6ade88509eb49b5799cbc6633;hb=df04b7034a7b7e672e87519d00b26a669615eff6;hpb=0fb6af2eeecf591148346548855b4834ece81e18 diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java index 2e04224..2a50313 100644 --- 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,12 +38,12 @@ 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; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; import javax.swing.JToolBar; @@ -61,9 +64,8 @@ import net.pterodactylus.util.swing.SwingUtils; /** * Defines the main window of the application. - * + * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> - * @version $Id$ */ 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 nodeMenus = new HashMap(); @@ -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 */ @@ -138,6 +140,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop SwingUtils.center(this); I18n.registerI18nable(this); addWindowListener(this); + setIconImage(IconLoader.loadImage("/jSite-frame-icon.png")); } // @@ -146,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 */ @@ -171,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() { @@ -180,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 */ @@ -190,7 +193,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop /** * Sets whether the advanced mode is activated. - * + * * @param advancedMode * true if the advanced mode is activated, * false if the simple mode is activated @@ -209,20 +212,50 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop /** * Returns the currently selected project. - * + * * @return The currently selected project */ public Project getSelectedProject() { return null; } + /** + * Sets the given node to the “online” state. + * + * @param node + * The node to set online + */ + public void setOnline(Node node) { + nodeLabels.get(node).setOnline(); + } + + /** + * Sets the given node to the “offline” state in the status bar. + * + * @param node + * The node to set offline + */ + public void setOffline(Node node) { + nodeLabels.get(node).setOffline(); + } + + /** + * Sets the given node to the “error” state in the status bar. + * + * @param node + * The node to set the error state for + */ + public void setError(Node node) { + nodeLabels.get(node).setError(); + } + // // ACTIONS // /** * Adds a node to the menu. - * + * * @param node * The node to add */ @@ -243,7 +276,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop /** * Removes a node from the menu. - * + * * @param node * The node to remove */ @@ -255,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 @@ -270,10 +303,25 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop project.addPropertyChangeListener(this); if (switchToProject) { projectPane.setSelectedIndex(newTabIndex); + while (project.getBasePath().length() == 0) { + JOptionPane.showMessageDialog(this, I18n.get("mainWindow.information.changeProjectBasePath.message"), I18n.get("mainWindow.information.changeProjectBasePath.title"), JOptionPane.INFORMATION_MESSAGE); + projectPanel.changeBasePath(); + } } } /** + * 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) { @@ -326,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 @@ -387,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); @@ -419,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)); } // @@ -443,8 +489,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(); @@ -455,6 +499,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(); } @@ -467,7 +515,6 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop ((ProjectPanel) tabComponent).updateI18n(); } } - SwingUtils.repackCentered(this); } // @@ -537,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) {