[izpack-changes] r1861 - in izpack-src/trunk: . lib src/lib/com/izforge/izpack/compiler src/lib/com/izforge/izpack/installer

[noreply at berlios.de]

Author: jponge
Date: 2007-06-14 22:56:40 +0200 (Thu, 14 Jun 2007)
New Revision: 1861

Added:
   izpack-src/trunk/lib/nimbus.jar
Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/GUIInstaller.java
Log:
Nimbus look and feel support (Julien Ponge)


Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2007-06-12 07:59:26 UTC (rev 1860)
+++ izpack-src/trunk/Versions.txt	2007-06-14 20:56:40 UTC (rev 1861)
@@ -26,6 +26,7 @@
 - HTMLInfoPanel to launch links in external browser on any Windows and Linux (Vladimir Ralev)
 - PacksModel fix (Markus Schlegel via Julien Ponge).
 - Workaround for layout problems in UserInputPanel when clicking previous button (Dennis Reil)
+- Nimbus look and feel support (Julien Ponge)
 
   > 3.10.3 (build xxxx.xx.xx)
 

Added: izpack-src/trunk/lib/nimbus.jar
===================================================================
(Binary files differ)


Property changes on: izpack-src/trunk/lib/nimbus.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java	2007-06-12 07:59:26 UTC (rev 1860)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java	2007-06-14 20:56:40 UTC (rev 1861)
@@ -431,6 +431,7 @@
             lafMap.put("metouia", "metouia.jar");
             lafMap.put("looks", "looks.jar");
             lafMap.put("substance", "substance.jar");
+						lafMap.put("nimbus", "nimbus.jar");
 
             // is this really what we want? a double loop? needed, since above,
             // it's

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/GUIInstaller.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/GUIInstaller.java	2007-06-12 07:59:26 UTC (rev 1860)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/GUIInstaller.java	2007-06-14 20:56:40 UTC (rev 1861)
@@ -386,6 +386,13 @@
             return;
         }
 
+				// Nimbus (http://nimbus.dev.java.net/)
+				if ("nimbus".equals(laf))
+				{
+						UIManager.setLookAndFeel("org.jdesktop.swingx.plaf.nimbus.NimbusLookAndFeel");
+						return;
+				}
+
         // JGoodies Looks (http://looks.dev.java.net/)
         if ("looks".equals(laf))
         {
@@ -407,6 +414,7 @@
             }
 
             UIManager.setLookAndFeel(variant);
+						return;
         }
 
         // Substance (http://substance.dev.java.net/)
@@ -434,6 +442,7 @@
             }
 
             UIManager.setLookAndFeel(variant);
+						return;
         }
     }