Marble theme.

Replaced some icons in UI.
Updates runtime.

launch4j/Readme.txt

@@ -20,7 +20,7 @@ It is best to restart the application first after switching to one of these them
 
 Recommended difficulty level for the best balance of AI speed and strength is the default 6.
 
-Thanks to Epiko for creating the very nice Magarena splash screen.
+Thanks to Epiko for creating the very nice Magarena splash screen and Marble theme.
 
 Have fun!
 
@@ -32,7 +32,7 @@ Release 1.7 (January 14, 2011)
 - new splash screen
 - added mana info for lands in hand and on battlefield
 - added Enter as hotkey to switch between image and text mode
-- added support for user made UI themes, check out the downloadable moon theme
+- added support for user made UI themes, check out the downloadable Marble and Moon themes
 - added support for user defined card cubes next to the default cube
 
 - fixed Pongify, it can now target your own permanents with filter legal targets enabled

src/magic/data/IconImages.java

@@ -27,7 +27,6 @@ public class IconImages {
 	public static final ImageIcon ARENA=loadIcon("arena.png");
 	public static final ImageIcon CUBE=loadIcon("cube.png");
 	public static final ImageIcon ANY=loadIcon("any.png");
-	public static final ImageIcon NEW=loadIcon("new.png");
 	public static final ImageIcon LOG=loadIcon("log.png");
 	public static final ImageIcon TEXT=loadIcon("text.png");
 	public static final ImageIcon OK=loadIcon("ok.gif");
@@ -70,7 +69,7 @@ public class IconImages {
 	public static final ImageIcon GRAVEYARD=loadIcon("graveyard.gif");
 	public static final ImageIcon GRAVEYARD2=loadIcon("graveyard2.gif");
 	public static final ImageIcon EXILE=loadIcon("exile.png");
-	public static final ImageIcon GAME=loadIcon("game.gif");
+	public static final ImageIcon NUMBER=loadIcon("number.png");
 	public static final ImageIcon DIFFICULTY=loadIcon("difficulty.png");
 	public static final ImageIcon DIFFICULTY2=loadIcon("difficulty2.gif");
 	public static final ImageIcon CANNOTTAP=loadIcon("cannottap.png");
@@ -82,6 +81,7 @@ public class IconImages {
 	public static final ImageIcon BLOCK=loadIcon("block.gif");	
 	public static final ImageIcon BLOCKED=loadIcon("blocked.gif");
 	public static final ImageIcon MESSAGE=loadIcon("message.png");
+	public static final ImageIcon PROGRESS=loadIcon("progress.png");
 	public static final ImageIcon TROPHY=loadIcon("trophy.gif");
 	public static final ImageIcon GOLD=loadIcon("gold.png");
 	public static final ImageIcon SILVER=loadIcon("silver.png");

src/magic/ui/TournamentDialog.java

@@ -97,7 +97,7 @@ public class TournamentDialog extends JDialog implements ActionListener {
 		handSlider.setBounds(190,95,270,50);
 		mainPanel.add(handSlider);
 
-		gameSlider=new SliderPanel("Games",IconImages.GAME,3,11,2,config.getNrOfGames());
+		gameSlider=new SliderPanel("Games",IconImages.NUMBER,3,11,2,config.getNrOfGames());
 		gameSlider.setBounds(190,165,270,50);
 		mainPanel.add(gameSlider);
 		

src/magic/ui/TournamentPanel.java

@@ -10,7 +10,6 @@ import javax.swing.JButton;
 import javax.swing.JPanel;
 
 import magic.data.CubeDefinitions;
-import magic.data.IconImages;
 import magic.data.TournamentConfig;
 import magic.model.MagicCubeDefinition;
 import magic.model.MagicPlayerDefinition;
@@ -75,7 +74,6 @@ public class TournamentPanel extends JPanel implements ActionListener {
 		add(tournamentDifficultyViewer);
 
 		playButton=new JButton("Play game");
-		playButton.setIcon(IconImages.START);
 		playButton.setFont(FontsAndBorders.FONT4);
 		playButton.addActionListener(this);
 		playButton.setFocusable(false);
@@ -83,7 +81,6 @@ public class TournamentPanel extends JPanel implements ActionListener {
 		add(playButton);
 				
 		newButton=new JButton("New");
-		newButton.setIcon(IconImages.NEW);
 		newButton.setFont(FontsAndBorders.FONT4);
 		newButton.addActionListener(this);
 		newButton.setFocusable(false);

src/magic/ui/viewer/GameTournamentViewer.java

@@ -42,7 +42,7 @@ public class GameTournamentViewer extends JPanel implements ChangeListener {
 
 		tabSelector=new TabSelector(this,false);
 		tabSelector.addTab(IconImages.MESSAGE,"Message");
-		tabSelector.addTab(IconImages.TROPHY,"Progress");
+		tabSelector.addTab(IconImages.PROGRESS,"Progress");
 		titleBar.add(tabSelector,BorderLayout.EAST);
 	}
 	

src/magic/ui/viewer/TournamentDifficultyViewer.java

@@ -39,7 +39,7 @@ public class TournamentDifficultyViewer extends JPanel implements ChangeListener
 		add(cardPanel,BorderLayout.CENTER);
 
 		tabSelector=new TabSelector(this,false);
-		tabSelector.addTab(IconImages.TROPHY,"Progress");
+		tabSelector.addTab(IconImages.PROGRESS,"Progress");
 		tabSelector.addTab(IconImages.DIFFICULTY,"Difficulty");
 		titleBar.add(tabSelector,BorderLayout.EAST);
 	}