Add context panel and add button

src/uk/co/md87/evetool/ui/ContentPanel.java

@@ -36,12 +36,19 @@ import uk.co.md87.evetool.ui.pages.OverviewPage;
  */
 public class ContentPanel extends JPanel {
 
-    public ContentPanel(final AccountManager manager, final ApiFactory factory) {
+    public ContentPanel(final MainWindow window, final AccountManager manager,
+            final ApiFactory factory) {
         super(new CardLayout());
 
         //setBackground(Color.BLUE);
-        add(new OverviewPage(manager, factory), "push, grow");
+        add(new OverviewPage(window.getContextPanel(), manager, factory), "push, grow");
         add(new JLabel("Main content2", JLabel.CENTER), "push, grow");
     }
 
+    public static abstract class Page extends JPanel {
+
+        // TODO: Add method for activation
+
+    }
+
 }

src/uk/co/md87/evetool/ui/ContextPanel.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2009 Chris Smith
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.evetool.ui;
+
+import java.awt.Color;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import net.miginfocom.swing.MigLayout;
+
+/**
+ *
+ * @author chris
+ */
+public class ContextPanel extends JPanel {
+
+    public ContextPanel() {
+        super(new MigLayout("ins 2, fill"));
+
+        setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, Color.DARK_GRAY));
+        setBackground(Color.LIGHT_GRAY);
+    }
+
+}

src/uk/co/md87/evetool/ui/MainWindow.java

@@ -28,9 +28,10 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.imageio.ImageIO;
 import javax.swing.JFrame;
-
 import javax.swing.UIManager;
+
 import net.miginfocom.swing.MigLayout;
+
 import uk.co.md87.evetool.AccountManager;
 import uk.co.md87.evetool.ApiFactory;
 
@@ -43,6 +44,7 @@ public class MainWindow extends JFrame {
 
     private final AccountManager manager;
     private final ApiFactory factory;
+    private final ContextPanel contextPanel;
 
     public MainWindow(final AccountManager manager, final ApiFactory factory) {
         super("EVE Tool - Initialising...");
@@ -51,6 +53,8 @@ public class MainWindow extends JFrame {
 
         this.factory = factory;
         this.manager = manager;
+
+        this.contextPanel = new ContextPanel();
         
         setLayout(new MigLayout("insets 0, fill, wrap 2", "[]0[fill,grow]",
                 "[fill,grow]0[]"));
@@ -66,10 +70,15 @@ public class MainWindow extends JFrame {
         }
     }
 
+    public ContextPanel getContextPanel() {
+        return contextPanel;
+    }
+
     protected void addComponents() {
-        add(new MenuPanel(), "width 201!");
-        add(new ContentPanel(manager, factory));
-        add(new StatusPanel(), "growx, span, height 30!");
+        add(new MenuPanel(this), "width 201!, spany2");
+        add(new ContentPanel(this, manager, factory));
+        add(contextPanel, "growx, height 30!");
+        add(new StatusPanel(this), "growx, span, height 30!");
     }
 
 }

src/uk/co/md87/evetool/ui/MenuPanel.java

@@ -40,7 +40,7 @@ import uk.co.md87.evetool.ui.workers.PortraitLoaderWorker;
  */
 public class MenuPanel extends JPanel {
 
-    public MenuPanel() {
+    public MenuPanel(final MainWindow window) {
         super(new MigLayout("wrap 1, fillx, ins 4"));
 
         setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1, Color.DARK_GRAY));

src/uk/co/md87/evetool/ui/StatusPanel.java

@@ -31,6 +31,8 @@ import uk.co.md87.evetool.Main;
 
 /**
  *
+ * TODO: Document StatusPanel
+ * TODO: Annoying serialVersionUID things
  * @author chris
  */
 public class StatusPanel extends JPanel {
@@ -38,7 +40,7 @@ public class StatusPanel extends JPanel {
     private final JLabel leftLabel;
     private final JLabel rightLabel;
 
-    public StatusPanel() {
+    public StatusPanel(final MainWindow window) {
         super(new MigLayout());
 
         leftLabel = new JLabel("Welcome to EVE Tool", JLabel.LEFT);

src/uk/co/md87/evetool/ui/components/AddButton.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2009 Chris Smith
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.evetool.ui.components;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Insets;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+
+/**
+ *
+ * @author chris
+ */
+public class AddButton extends JButton {
+
+    public AddButton(final String text) {
+        super(text);
+
+        setBorder(BorderFactory.createCompoundBorder(
+                BorderFactory.createLineBorder(Color.DARK_GRAY),
+                BorderFactory.createEmptyBorder(0, 0, 0, 5)));
+        setBackground(Color.GREEN.darker().darker());
+        setForeground(Color.WHITE);
+        setIconTextGap(2);
+        //setFont(getFont().deriveFont(Font.BOLD));
+
+        try {
+            setIcon(new ImageIcon(ImageIO.read(getClass().getResource("../res/icon25_11.png"))));
+        } catch (IOException ex) {
+            // TODO: Do something with ex
+        }
+    }
+
+}

src/uk/co/md87/evetool/ui/pages/OverviewPage.java

@@ -35,6 +35,9 @@ import uk.co.md87.evetool.Account;
 import uk.co.md87.evetool.AccountManager;
 import uk.co.md87.evetool.ApiFactory;
 import uk.co.md87.evetool.api.EveApi;
+import uk.co.md87.evetool.ui.ContentPanel.Page;
+import uk.co.md87.evetool.ui.ContextPanel;
+import uk.co.md87.evetool.ui.components.AddButton;
 import uk.co.md87.evetool.ui.workers.AccountUpdateWorker;
 
 /**
@@ -42,13 +45,14 @@ import uk.co.md87.evetool.ui.workers.AccountUpdateWorker;
  * TODO: Document OverviewPage
  * @author chris
  */
-public class OverviewPage extends JPanel implements AccountManager.AccountListener {
+public class OverviewPage extends Page implements AccountManager.AccountListener {
 
     private final ApiFactory factory;
     private final Map<Account, EveApi> apis = new HashMap<Account, EveApi>();
     private final Map<Account, JPanel> panels = new HashMap<Account, JPanel>();
 
-    public OverviewPage(final AccountManager manager, final ApiFactory factory) {
+    public OverviewPage(final ContextPanel context, final AccountManager manager,
+            final ApiFactory factory) {
         this.factory = factory;
 
         setLayout(new MigLayout("fillx"));
@@ -56,6 +60,8 @@ public class OverviewPage extends JPanel implements AccountManager.AccountListen
         for (Account account : manager.getAccounts(this)) {
             addAccount(account);
         }
+
+        context.add(new AddButton("Add account"), "growy");
     }
 
     protected void addAccount(final Account account) {