fixes issue 2112

src/com/dmdirc/installer/Step.java

@@ -23,6 +23,8 @@
 
 package com.dmdirc.installer;
 
+import java.awt.Image;
+
 /**
  * Simple step interface.
  */
@@ -34,4 +36,18 @@ public interface Step {
      * @return Step name
      */
     public abstract String getStepName();
+    
+    /**
+     * Returns the description for this step.
+     * 
+     * @return Step description
+     */
+    public abstract String getStepDescription();
+    
+    /**
+     * Returns the icon for this step.
+     * 
+     * @return Step icon
+     */
+    public abstract Image getIcon();
 }

src/com/dmdirc/installer/ui/InstallerDialog.java

@@ -58,12 +58,13 @@ public class InstallerDialog extends JFrame implements ActionListener {
     public static final int SMALL_GAP = 5;
 
     /**
-     *
+     * Instantiates a new installer dialog
+     * 
      * @param dialogTitle
      */
     public InstallerDialog(final String dialogTitle) {
         super(dialogTitle);
-        title = new TitlePanel(dialogTitle);
+        title = new TitlePanel(null);
         wizard = new WizardPanel(this);
         control = new WizardControlPanel();
         listeners = new ListenerList();
@@ -96,19 +97,20 @@ public class InstallerDialog extends JFrame implements ActionListener {
     }
 
     /**
-     *
+     * Adds a step.
      * 
-     * @param step
+     * @param step Step to add
      */
     public void addStep(final SwingStep step) {
         wizard.addStep(step);
     }
 
     /**
-     *
+     * Displays the installer.
      */
     public void display() {
         wizard.display();
+        title.setStep(wizard.getCurrentStep());
         control.setTotal(wizard.getTotalSteps());
         control.setProgress(wizard.getCurrentStepIndex());
         addWindowListener(new WindowAdapter() {
@@ -127,8 +129,9 @@ public class InstallerDialog extends JFrame implements ActionListener {
     }
 
     /**
-     *
-     * @param steps 
+     * Displays the installer with these steps added.
+     * 
+     * @param steps Steps to add
      */
     public void display(final List<Step> steps) {
         final List<SwingStep> swingSteps = new ArrayList<SwingStep>();
@@ -141,27 +144,27 @@ public class InstallerDialog extends JFrame implements ActionListener {
     }
 
     /**
+     * Enables the next step.
      *
-     *
-     * @param enable
+     * @param enable true to enable false to disable
      */
     public void enableNextStep(final boolean enable) {
         control.getNextButton().setEnabled(enable);
     }
 
     /**
+     * Enables the previous step.
      *
-     *
-     * @param enable
+     * @param enable true to enable false to disable
      */
     public void enablePreviousStep(final boolean enable) {
         control.getPrevButton().setEnabled(enable);
     }
 
     /**
-     *
+     * shows the cancel confirmation.
      * 
-     * @return
+     * @return true if confirmed
      */
     public boolean showCancelConfirmation() {
         return JOptionPane.showConfirmDialog(this,
@@ -318,7 +321,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
         } catch (IllegalAccessException ex) {
             throw new UnsupportedOperationException("Unable to switch to the " +
                                                     "system look and feel", ex);
-        }
+        }   
 
         UIManager.put("swing.useSystemFontSettings", true);
         UIManager.put("swing.boldMetal", false);
@@ -346,6 +349,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
         } else {
             return;
         }
+        title.setStep(shownStep);
         if (shownStep != null) {
             fireStepAboutToBeDisplayed(shownStep);
         }

src/com/dmdirc/installer/ui/StepConfirm.java

@@ -25,6 +25,7 @@ package com.dmdirc.installer.ui;
 import com.dmdirc.installer.TextStep;
 
 import java.awt.BorderLayout;
+import java.awt.Image;
 import javax.swing.SwingUtilities;
 
 /**
@@ -56,6 +57,18 @@ public final class StepConfirm extends SwingStep implements TextStep {
         return "Confirm";
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public Image getIcon() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepDescription() {
+        return "";
+    }
+
     /** {@inheritDoc} */
     @Override
     public void addText(final String text) {

src/com/dmdirc/installer/ui/StepError.java

@@ -23,6 +23,7 @@
 package com.dmdirc.installer.ui;
 
 import java.awt.BorderLayout;
+import java.awt.Image;
 
 /**
  * This step shows an unable to install error
@@ -59,4 +60,16 @@ public final class StepError extends SwingStep {
     public String getStepName() {
         return "Error";
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public Image getIcon() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepDescription() {
+        return "";
+    }
 }

src/com/dmdirc/installer/ui/StepInstall.java

@@ -26,6 +26,7 @@ import com.dmdirc.installer.TextStep;
 
 import java.awt.BorderLayout;
 
+import java.awt.Image;
 import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
 
@@ -63,6 +64,18 @@ public final class StepInstall extends SwingStep implements TextStep {
         return "Install";
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public Image getIcon() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepDescription() {
+        return "";
+    }
+
     /** {@inheritDoc} */
     @Override
     public synchronized void addText(final String text) {

src/com/dmdirc/installer/ui/StepSettings.java

@@ -29,6 +29,7 @@ import com.dmdirc.installer.Installer.ShortcutType;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.Image;
 import java.awt.Insets;
 import javax.swing.Box;
 import javax.swing.JCheckBox;
@@ -122,6 +123,18 @@ public final class StepSettings extends SwingStep implements Settings {
         return "Settings";
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public Image getIcon() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepDescription() {
+        return "";
+    }
+
     /** {@inheritDoc} */
     @Override
     public boolean getShortcutMenuState() {

src/com/dmdirc/installer/ui/StepWelcome.java

@@ -19,10 +19,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package com.dmdirc.installer.ui;
 
 import java.awt.BorderLayout;
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.net.URL;
 
 /**
  * Tells the user what this application does
@@ -61,4 +63,16 @@ public final class StepWelcome extends SwingStep {
     public String getStepName() {
         return "Welcome";
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public Image getIcon() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getStepDescription() {
+        return "";
+    }
 }

src/com/dmdirc/installer/ui/TitlePanel.java

@@ -23,12 +23,12 @@
 
 package com.dmdirc.installer.ui;
 
+import com.dmdirc.installer.Step;
 import com.dmdirc.installer.ui.EtchedLineBorder.BorderSide;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
 
-import java.awt.Toolkit;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -41,22 +41,25 @@ public class TitlePanel extends JPanel {
 
     private static final long serialVersionUID = 7173184984913948951L;
     private final JLabel title;
+    private final JLabel image;
 
     /**
      * Instantiates a new title panel.
      * 
-     * @param titleText Initial title text
+     * @param step Initial title text
      */
-    public TitlePanel(final String titleText) {
+    public TitlePanel(final Step step) {
         super(new BorderLayout());
-        title = new JLabel(titleText);
+        
+        title = new JLabel();
+        image = new JLabel();
+        
+        setStep(step);
 
         title.setFont(title.getFont().deriveFont((float) (title.getFont().
                 getSize() * 1.5)));
         add(title, BorderLayout.CENTER);
-        add(new JLabel(new ImageIcon(Toolkit.getDefaultToolkit().createImage(Thread.
-                currentThread().getContextClassLoader().getResource(
-                "com/dmdirc/res/icon.png")))), BorderLayout.EAST);
+        add(image, BorderLayout.EAST);
         setBackground(Color.WHITE);
         setBorder(new EtchedLineBorder(EtchedBorder.RAISED, BorderSide.BOTTOM));
     }
@@ -64,9 +67,24 @@ public class TitlePanel extends JPanel {
     /**
      * Sets the title text.
      *
-     * @param titleText new title text
+     * @param step new title text
      */
-    public void setText(final String titleText) {
-        title.setText(titleText);
+    public void setStep(final Step step) {
+        if (step == null) {
+            title.setText("");
+            image.setIcon(null);
+            return;
+        }
+        
+        if ("".equals(step.getStepDescription())) {
+            title.setText(step.getStepName());
+        } else {
+            title.setText(step.getStepName() + "\n" + step.getStepDescription());
+        }
+        if (step.getIcon() == null) {
+            image.setIcon(null);
+        } else {
+            image.setIcon(new ImageIcon(step.getIcon()));
+        }
     }
 }

src/com/dmdirc/installer/ui/WizardControlPanel.java

@@ -132,6 +132,10 @@ public class WizardControlPanel extends JPanel {
         updateProgressLabel();
         if (step + 1 == total) {
             next.setText("Finish");
+        } else if (step == 0) {
+            prev.setEnabled(false);
+        } else if (step > 0) {
+            prev.setEnabled(true);
         } else {
             next.setText("Next \u00BB");
         }