diff --git a/res/images/skins/default/sprite.png b/res/images/skins/default/sprite.png index 5a946e6c7fa..79ce5134e34 100644 Binary files a/res/images/skins/default/sprite.png and b/res/images/skins/default/sprite.png differ diff --git a/res/images/skins/rebel/sprite.png b/res/images/skins/rebel/sprite.png index b273a5fea78..e510ed027de 100644 Binary files a/res/images/skins/rebel/sprite.png and b/res/images/skins/rebel/sprite.png differ diff --git a/res/images/skins/smith/sprite.png b/res/images/skins/smith/sprite.png index a32e4611530..eae6d5bc9d7 100644 Binary files a/res/images/skins/smith/sprite.png and b/res/images/skins/smith/sprite.png differ diff --git a/src/main/java/forge/view/home/HomeTopLevel.java b/src/main/java/forge/view/home/HomeTopLevel.java index c965eb325e3..ca465af988d 100644 --- a/src/main/java/forge/view/home/HomeTopLevel.java +++ b/src/main/java/forge/view/home/HomeTopLevel.java @@ -50,7 +50,6 @@ public class HomeTopLevel extends FPanel { private FButton btnDraft, btnConstructed, btnSealed, btnQuest, btnSettings, btnUtilities, btnExit, btnDeckEditor; private FSkin skin; private String constraints; - private String imgDirAddress; private ControlHomeUI control; private ViewConstructed constructed; @@ -66,7 +65,6 @@ public class HomeTopLevel extends FPanel { public HomeTopLevel() { super(); skin = AllZone.getSkin(); - imgDirAddress = "res/images/ui/HomeScreen/default_600/"; constructed = new ViewConstructed(this); sealed = new ViewSealed(this); @@ -146,7 +144,7 @@ public class HomeTopLevel extends FPanel { add(pnlMenu, "w 36%!, h 96%!, gap 2% 2% 2% 2%"); add(pnlContent, "w 58%!, h 96%!, gap 0% 2% 2% 2%"); - JLabel lblIcon = new JLabel(new ImageIcon(imgDirAddress + "Main_logo.png")); + JLabel lblIcon = new JLabel(new ImageIcon(skin.getImage("image.logo"))); pnlMenu.add(lblIcon, "ax center"); constraints = "w 80%!, gapleft 10%, gaptop 1%, gapbottom 1%, h 40px!"; @@ -225,26 +223,6 @@ public class HomeTopLevel extends FPanel { pnlContent.repaint(); } - /** @return String */ - public String getImgDirAddress() { - return imgDirAddress; - } - - /** @return ImageIcon */ - public ImageIcon getStartButtonDown() { - return new ImageIcon(imgDirAddress + "btnStart_Down.png"); - } - - /** @return ImageIcon */ - public ImageIcon getStartButtonOver() { - return new ImageIcon(imgDirAddress + "btnStart_Over.png"); - } - - /** @return ImageIcon */ - public ImageIcon getStartButtonUp() { - return new ImageIcon(imgDirAddress + "btnStart_Up.png"); - } - /** @return ControlConstructed */ public ControlConstructed getConstructedController() { return constructed.getController(); diff --git a/src/main/java/forge/view/home/StartButton.java b/src/main/java/forge/view/home/StartButton.java index cf5b005949d..1fe4c4dc512 100644 --- a/src/main/java/forge/view/home/StartButton.java +++ b/src/main/java/forge/view/home/StartButton.java @@ -1,7 +1,11 @@ package forge.view.home; +import javax.swing.ImageIcon; import javax.swing.JButton; +import forge.AllZone; +import forge.view.toolbox.FSkin; + /** * TODO: Write javadoc for this type. * @@ -13,13 +17,18 @@ public class StartButton extends JButton { */ public StartButton(HomeTopLevel v0) { super(); + final FSkin skin = AllZone.getSkin(); setRolloverEnabled(true); - setPressedIcon(v0.getStartButtonDown()); - setRolloverIcon(v0.getStartButtonOver()); - setIcon(v0.getStartButtonUp()); + setRolloverIcon(new ImageIcon(skin.getImage("button.startDOWN"))); setOpaque(false); + setIcon(new ImageIcon(skin.getImage("button.startUP"))); setContentAreaFilled(false); setBorder(null); setBorderPainted(false); + + // For some reason, setPressedIcon doesn't work (probably related to thread safety). + // So, the "down" image is used for the "over" state. Perhaps later can + // change back. Doublestrike 12-01-11. + //setPressedIcon(new ImageIcon(skin.getImage("button.startDOWN"))); } } diff --git a/src/main/java/forge/view/toolbox/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java index 8311d496a08..72d72fd4488 100644 --- a/src/main/java/forge/view/toolbox/FSkin.java +++ b/src/main/java/forge/view/toolbox/FSkin.java @@ -160,6 +160,12 @@ public class FSkin { this.setIcon("dock.concede", image.getSubimage(80, 80, 80, 80)); this.setIcon("dock.decklist", image.getSubimage(80, 160, 80, 80)); + this.setImage("image.logo", image.getSubimage(280, 240, 200, 200)); + + this.setImage("button.startUP", image.getSubimage(0, 240, 160, 80)); + this.setImage("button.startOVER", image.getSubimage(0, 320, 160, 80)); + this.setImage("button.startDOWN", image.getSubimage(0, 400, 160, 80)); + this.setImage("button.upLEFT", image.getSubimage(360, 0, 40, 40)); this.setImage("button.upCENTER", image.getSubimage(400, 0, 1, 40)); this.setImage("button.upRIGHT", image.getSubimage(440, 0, 40, 40));