[izpack-changes] r1642 - in izpack-src/branches/branch-3.9: . src/lib/com/izforge/izpack/panels

Tue Nov 21 10:50:18 CET 2006

Author: jponge
Date: 2006-11-21 10:50:08 +0100 (Tue, 21 Nov 2006)
New Revision: 1642

Modified:
   izpack-src/branches/branch-3.9/Versions.txt
   izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/panels/UserInputPanel.java
Log:
UserInputPanel multiline label fix (Vladimir Ralev, JBoss/RedHat)

Modified: izpack-src/branches/branch-3.9/Versions.txt
===================================================================

--- izpack-src/branches/branch-3.9/Versions.txt	2006-11-14 09:51:52 UTC (rev 1641)
+++ izpack-src/branches/branch-3.9/Versions.txt	2006-11-21 09:50:08 UTC (rev 1642)
@@ -1,8 +1,10 @@
 [ The list of the different public versions of IzPack ]
 
 	> 3.9.1 (build xxxx.xx.xx)
-- Fixed the DesktopShortcutCheckboxEnabled Builtin Variable in docu (Fabrice Mirabile))
+
+- Fixed the DesktopShortcutCheckboxEnabled Builtin Variable in docu (Fabrice Mirabile)
 - Fixed build.xml (PathSelectionPanel without using TargetPanel) (Fabrice Mirabile)
+- UserInputPanel multiline label fix (Vladimir Ralev, JBoss/RedHat)
 
 
   > 3.9.0 (build 2006.09.25)

Modified: izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/panels/UserInputPanel.java
===================================================================
--- izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/panels/UserInputPanel.java	2006-11-14 09:51:52 UTC (rev 1641)
+++ izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/panels/UserInputPanel.java	2006-11-21 09:50:08 UTC (rev 1642)
@@ -2054,8 +2054,21 @@
                     }
                 }
 
-                MultiLineLabel label = new MultiLineLabel(description, justify);
-
+                javax.swing.JTextPane label = new javax.swing.JTextPane();
+                
+                // Not editable, but still selectable.
+                label.setEditable(false);
+                
+                // If html tags are present enable html rendering, otherwise the JTextPane
+                // looks exactly like MultiLineLabel.
+                if(description.startsWith("<html>") && description.endsWith("</html>"))
+                    label.setContentType("text/html");               
+                label.setText(description);
+                
+                // Background color and font to match the label's.
+                label.setBackground(javax.swing.UIManager.getColor("label.backgroud"));
+                label.setMargin(new java.awt.Insets(3, 0, 3, 0));
+                    
                 uiElements.add(new Object[] { null, DESCRIPTION, null, constraints, label,
                         forPacks, forOs});
             }


