Button tweakage

nbproject/coverage.properties

@@ -1,6 +1,6 @@
 #coverage viewer module properties for project
-#Tue Jan 06 10:02:47 GMT 2009
-coverage.activity=ON
+#Thu Jan 08 17:06:58 GMT 2009
+coverage.activity=OFF
 project.type=java
-coverage.templateFile=coverage/template.emma
 coverage.coverageFile=coverage/coverage.emma
+coverage.templateFile=coverage/template.emma

nbproject/private/private.properties

@@ -5,4 +5,3 @@ javac.debug=true
 javadoc.preview=true
 jaxws.endorsed.dir=/usr/local/netbeans-6.5/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.5/ide10/modules/ext/jaxb/api
 user.properties.file=/home/chris/.netbeans/6.5/build.properties
-file.reference.emma.jar=/home/chris/.netbeans/6.5/modules/ext/emma.jar

nbproject/project.properties

@@ -75,7 +75,7 @@ run.jvmargs=
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}:\
-    ${file.reference.emma.jar}
+    
 source.encoding=UTF-8
 src.dir=src
 test.src.dir=test

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

@@ -42,7 +42,7 @@ public class AddButton extends JButton {
         setUI(new ETButtonUI(Color.GREEN.darker().darker()));
         setBorder(BorderFactory.createCompoundBorder(
                 BorderFactory.createLineBorder(Color.DARK_GRAY),
-                BorderFactory.createEmptyBorder(0, 3, 0, 7)));
+                BorderFactory.createEmptyBorder(0, 3, 0, 6)));
         setBackground(Color.GRAY);
         setFocusPainted(false);
 

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

@@ -42,7 +42,7 @@ public class FilterButton extends JButton {
         setUI(new ETButtonUI(Color.BLUE));
         setBorder(BorderFactory.createCompoundBorder(
                 BorderFactory.createLineBorder(Color.DARK_GRAY),
-                BorderFactory.createEmptyBorder(0, 3, 0, 7)));
+                BorderFactory.createEmptyBorder(0, 3, 0, 6)));
         setBackground(Color.GRAY);
         setFocusPainted(false);
 

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

@@ -36,7 +36,7 @@ public class MenuButton extends JToggleButton {
     public MenuButton(final String text) {
         super(text);
 
-        setUI(new ETButtonUI(Color.DARK_GRAY));
+        setUI(new ETButtonUI(Color.LIGHT_GRAY));
         setMinimumSize(new Dimension(0, 25));
         setBackground(Color.GRAY);
         setFocusPainted(false);

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

@@ -22,13 +22,23 @@
 
 package uk.co.md87.evetool.ui.pages;
 
+import java.awt.Color;
+import java.awt.Font;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.imageio.ImageIO;
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-
 import javax.swing.SwingUtilities;
+
+import javax.swing.border.BevelBorder;
 import net.miginfocom.swing.MigLayout;
 
 import uk.co.md87.evetool.Account;
@@ -67,8 +77,39 @@ public class OverviewPage extends Page implements AccountManager.AccountListener
     }
 
     protected void addAccount(final Account account) {
-        // TODO: Number them or reformat or something
-        add(new JLabel("Account N - " + account.getId()), "span, wrap");
+        final JLabel header = new JLabel("Account #" + account.getId());
+        final JPanel headerP = new JPanel(new MigLayout("fillx"));
+        header.setFont(header.getFont().deriveFont(14f).deriveFont(Font.BOLD));
+        headerP.setBorder(BorderFactory.createCompoundBorder(
+                BorderFactory.createBevelBorder(BevelBorder.RAISED),
+                BorderFactory.createEmptyBorder(0, 5, 0, 5)));
+        headerP.add(header, "growx");
+
+        try {
+            final JButton editButton = new JButton(new ImageIcon(ImageIO
+                    .read(getClass().getResource("../res/edit-inactive.png"))));
+            editButton.setRolloverIcon(new ImageIcon(ImageIO
+                    .read(getClass().getResource("../res/edit.png"))));
+            editButton.setBorder(BorderFactory.createEmptyBorder());
+            editButton.setOpaque(false);
+            editButton.setContentAreaFilled(false);
+
+            final JButton delButton = new JButton(new ImageIcon(ImageIO
+                    .read(getClass().getResource("../res/close-inactive.png"))));
+            delButton.setRolloverIcon(new ImageIcon(ImageIO
+                    .read(getClass().getResource("../res/close-active.png"))));
+            delButton.setBorder(BorderFactory.createEmptyBorder());
+            delButton.setOpaque(false);
+            delButton.setContentAreaFilled(false);
+
+            headerP.add(editButton, "al right");
+            headerP.add(delButton, "al right");
+        } catch (IOException ex) {
+            Logger.getLogger(getClass().getName()).log(Level.SEVERE,
+                    "Error loading images", ex);
+        }
+
+        add(headerP, "span, growx, wrap");
 
         final JPanel panel = new JPanel(new MigLayout(" fillx", "[|fill,grow|fill,grow]"));
         panel.add(new JLabel("Loading..."), "span");