[izpack-changes] r1836 - in izpack-src/trunk: . lib src/dist-files src/doc-ng/XHTML src/lib/com/izforge/izpack/compiler src/lib/com/izforge/izpack/installer
noreply at berlios.de
noreply at berlios.de
Mon May 14 14:29:06 CEST 2007
Author: jponge
Date: 2007-05-14 14:28:47 +0200 (Mon, 14 May 2007)
New Revision: 1836
Added:
izpack-src/trunk/lib/substance.jar
Modified:
izpack-src/trunk/Versions.txt
izpack-src/trunk/src/dist-files/IzPack-install.xml
izpack-src/trunk/src/doc-ng/XHTML/node4.html
izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java
izpack-src/trunk/src/lib/com/izforge/izpack/installer/GUIInstaller.java
Log:
Support for the toned-down Substance look and feel themes (Julien Ponge)
Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt 2007-05-14 12:02:38 UTC (rev 1835)
+++ izpack-src/trunk/Versions.txt 2007-05-14 12:28:47 UTC (rev 1836)
@@ -18,6 +18,7 @@
- Locale support of Shortcut specification file (Klaus Bartz using a hint of Loic)
- Enabled distributed pack-definitions (Hans Aikema based on patch by Syed Khadeer)
- Update of the Liquid and JGoodies look and feel libraries (Julien Ponge).
+- Support for the toned-down Substance look and feel themes (Julien Ponge).
> 3.10.2 (build 2007.05.11)
Added: izpack-src/trunk/lib/substance.jar
===================================================================
(Binary files differ)
Property changes on: izpack-src/trunk/lib/substance.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: izpack-src/trunk/src/dist-files/IzPack-install.xml
===================================================================
--- izpack-src/trunk/src/dist-files/IzPack-install.xml 2007-05-14 12:02:38 UTC (rev 1835)
+++ izpack-src/trunk/src/dist-files/IzPack-install.xml 2007-05-14 12:28:47 UTC (rev 1836)
@@ -58,7 +58,7 @@
<!-- Flexible and in the screen proportions -->
<guiprefs height="600" resizable="yes" width="800">
- <laf name="looks">
+ <laf name="looks" >
<os family="unix"/>
</laf>
<!-- GUI addaption for more informations see "Modifying the GUI" in the documentation -->
Modified: izpack-src/trunk/src/doc-ng/XHTML/node4.html
===================================================================
--- izpack-src/trunk/src/doc-ng/XHTML/node4.html 2007-05-14 12:02:38 UTC (rev 1835)
+++ izpack-src/trunk/src/doc-ng/XHTML/node4.html 2007-05-14 12:28:47 UTC (rev 1836)
@@ -465,6 +465,8 @@
<li>Metouia: <tt>metouia</tt></li>
<li>JGoodies Looks: <tt>looks</tt></li>
+
+<li>Substance: <tt>substance</tt></li>
</ul>
<p>If you don't specify a look and feel for a particular operating system, then the default native one will be used: Windows on Windows, Aqua on Mac OS X and Metal on the Unix-like variants.<br />
@@ -504,6 +506,12 @@
</guiprefs>
</pre>
+<p>The <i>Substance</i> look and feel <i>toned-down</i> themes can be specified using the <tt>variant</tt> parameter, with the value being one of:
+<tt>business, business-blue, business-black, creme, sahara, moderate, officesilver</tt>. We have reduced the choice to the toned-down themes
+since they are the only ones to actually look decent (the other families colors are way too saturated).
+Please consult <a href="https://substance.dev.java.net/docs/skins/toneddown.html">https://substance.dev.java.net/docs/skins/toneddown.html</a> for a
+gallery of the different toned-down themes.</p>
+
<p>Starting from IzPack 3.7, some characteristics can be customized with the <tt><modifier></tt> tag. There is a
separate description in the <a href="node5.html">Advanced Features</a> chapter paragraph
<a href="node5.html#modifyingGui">Modifying the GUI</a>.</p>
Modified: izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java 2007-05-14 12:02:38 UTC (rev 1835)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java 2007-05-14 12:28:47 UTC (rev 1836)
@@ -430,6 +430,7 @@
lafMap.put("kunststoff", "kunststoff.jar");
lafMap.put("metouia", "metouia.jar");
lafMap.put("looks", "looks.jar");
+ lafMap.put("substance", "substance.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-05-14 12:02:38 UTC (rev 1835)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/GUIInstaller.java 2007-05-14 12:28:47 UTC (rev 1836)
@@ -408,6 +408,33 @@
UIManager.setLookAndFeel(variant);
}
+
+ // Substance (http://substance.dev.java.net/)
+ if ("substance".equals(laf))
+ {
+ Map variants = new TreeMap();
+ variants.put("default", "org.jvnet.substance.SubstanceLookAndFeel"); // Ugly!!!
+ variants.put("business", "org.jvnet.substance.skin.SubstanceBusinessLookAndFeel");
+ variants.put("business-blue", "org.jvnet.substance.skin.SubstanceBusinessBlueSteelLookAndFeel");
+ variants.put("business-black", "org.jvnet.substance.skin.SubstanceBusinessBlackSteelLookAndFeel");
+ variants.put("creme", "org.jvnet.substance.skin.SubstanceCremeLookAndFeel");
+ variants.put("sahara", "org.jvnet.substance.skin.SubstanceSaharaLookAndFeel");
+ variants.put("moderate", "org.jvnet.substance.skin.SubstanceModerateLookAndFeel");
+ variants.put("officesilver", "org.jvnet.substance.skin.SubstanceOfficeSilver2007LookAndFeel");
+ String variant = (String) variants.get("default");
+
+ Map params = (Map) installdata.guiPrefs.lookAndFeelParams.get(laf);
+ if (params.containsKey("variant"))
+ {
+ String param = (String) params.get("variant");
+ if (variants.containsKey(param))
+ {
+ variant = (String) variants.get(param);
+ }
+ }
+
+ UIManager.setLookAndFeel(variant);
+ }
}
/**
More information about the izpack-changes
mailing list