[izpack-changes] r1534 - in izpack-src/trunk/src: img/installer/img lib/com/izforge/izpack/installer lib/com/izforge/izpack/panels

[noreply at berlios.de]

Author: rsshilli
Date: 2006-08-24 18:06:10 +0200 (Thu, 24 Aug 2006)
New Revision: 1534

Added:
   izpack-src/trunk/src/img/installer/img/done.png
Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/icons.xml
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/FinishPanel.java
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java
Log:
Adding a done icon that is a nice checkmark instead of a red X.

Added: izpack-src/trunk/src/img/installer/img/done.png
===================================================================
(Binary files differ)


Property changes on: izpack-src/trunk/src/img/installer/img/done.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2006-08-24 14:41:56 UTC (rev 1533)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2006-08-24 16:06:10 UTC (rev 1534)
@@ -972,6 +972,16 @@
         quitButton.setText(text1);
     }
 
+    public void setQuitButtonIcon(String iconName)
+    {
+        String useButtonIcons = (String) installdata.guiPrefs.modifier.get("useButtonIcons");
+
+        if ( useButtonIcons == null || "yes".equalsIgnoreCase(useButtonIcons))
+        {
+            quitButton.setIcon(icons.getImageIcon(iconName));
+        }
+    }
+
     /*
      * FocusTraversalPolicy objects to handle keybord blocking; the declaration os Object allows to
      * use a pre version 1.4 VM.

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/icons.xml
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/icons.xml	2006-08-24 14:41:56 UTC (rev 1533)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/icons.xml	2006-08-24 16:06:10 UTC (rev 1534)
@@ -5,6 +5,7 @@
     <icon res="/img/leftarrow.png" id="stepback"/>
     <icon res="/img/rightarrow.png" id="stepforward"/>
     <icon res="/img/stop.png" id="stop"/>
+    <icon res="/img/done.png" id="done"/>
     <icon res="/img/kcontrol.png" id="host"/>
     <icon res="/img/info.png" id="information"/>
     <icon res="/img/contents.png" id="history"/>

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/FinishPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/FinishPanel.java	2006-08-24 14:41:56 UTC (rev 1533)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/FinishPanel.java	2006-08-24 16:06:10 UTC (rev 1534)
@@ -48,10 +48,10 @@
     private static final long serialVersionUID = 3257282535107998009L;
 
     /** The automated installers generation button. */
-    private JButton autoButton;
+    protected JButton autoButton;
 
     /** The variables substitutor. */
-    private VariableSubstitutor vs;
+    protected VariableSubstitutor vs;
 
     /**
      * The constructor.
@@ -82,6 +82,7 @@
         parent.lockNextButton();
         parent.lockPrevButton();
         parent.setQuitButtonText(parent.langpack.getString("FinishPanel.done"));
+        parent.setQuitButtonIcon("done");
         if (idata.installSuccess)
         {
             // We set the information
@@ -158,7 +159,7 @@
      * @param destination The path to translate.
      * @return The translated path.
      */
-    private String translatePath(String destination)
+    protected String translatePath(String destination)
     {
         // Parse for variables
         destination = vs.substitute(destination, null);

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java	2006-08-24 14:41:56 UTC (rev 1533)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java	2006-08-24 16:06:10 UTC (rev 1534)
@@ -77,6 +77,7 @@
         parent.lockNextButton();
         parent.lockPrevButton();
         parent.setQuitButtonText(parent.langpack.getString("FinishPanel.done"));
+        parent.setQuitButtonIcon("done");
         if (idata.installSuccess)
         {