@@ -34,6 +34,10 @@ <str id="installer.prev" txt="Edellinen"/> <str id="installer.quit" txt="Lopeta"/> <str id="installer.madewith" txt="(Tehty IzPackilla - http://izpack.org/)"/> + <str id="installer.reboot.ask.title" txt="Uudelleen käynnistys vaaditaan"/> + <str id="installer.reboot.ask.message" txt="Tietokoneen uudelleen käynnistys vaaditaan, jotta jotkut muutokset tulevat voimaan. Haluatko käynnistää uudelleen nyt?"/> + <str id="installer.reboot.notice.title" txt="Uudelleen käynnistys suositeltua"/> + <str id="installer.reboot.notice.message" txt="On suositeltavaa käynnistää tietokone uudelleen, jotta jotkut muutokset tulevat voimaan."/> <str id="installer.quit.title" txt="Haluatko varmasti lopettaa?"/> <str id="installer.quit.message" txt="Tämä keskeyttää asennuksen!"/> <str id="installer.warning" txt="Varoitus!"/> bin/langpacks/installer/fin.xml @@ -210,7 +210,7 @@ <property file="src/ant.properties"/> <property name="ver" value="4.3"/> - <property name="rel" value="1"/> + <property name="rel" value="2"/> <property name="build.number" value="${ver}.${rel}"/> <property name="src.dir" value="${basedir}/src/lib"/> src/build.xml @@ -23,7 +23,7 @@ <!-- The info section --> <info> <appname>IzPack</appname> - <appversion>4.3.1</appversion> + <appversion>4.3.2</appversion> <authors> <author email="" name="Julien Ponge (project founder)"/> <author email="" name="The fantastic IzPack developers and contributors"/> src/dist-files/IzPack-install.xml @@ -26,7 +26,7 @@ <p>IzPack is published under the terms of Apache License Version 2.0.<br></p> -<p><b>Version check:</b><br><img src="http://izpack.org/version-check/?version=4.3.1"></p> +<p><b>Version check:</b><br><img src="http://izpack.org/version-check/?version=4.3.2"></p> </body> src/dist-files/install-readme.html @@ -56,7 +56,7 @@ public class Compiler extends Thread /** * The IzPack version. */ - public final static String IZPACK_VERSION = "4.3.1"; + public final static String IZPACK_VERSION = "4.3.2"; /** * The IzPack home directory. src/lib/com/izforge/izpack/compiler/Compiler.java @@ -20,6 +20,7 @@ package com.izforge.izpack.panels; +import java.awt.BorderLayout; import java.awt.Color; import java.awt.Font; import java.awt.event.ActionEvent; @@ -52,7 +53,9 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.JRadioButton; +import javax.swing.JScrollPane; import javax.swing.JTextField; +import javax.swing.border.Border; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.filechooser.FileFilter; @@ -315,6 +318,8 @@ public class UserInputPanel extends IzPanel implements ActionListener, ItemListe private Vector<UIElement> elements = new Vector<UIElement>(); + private JPanel panel; + /*--------------------------------------------------------------------------*/ // This method can be used to search for layout problems. If this class is // compiled with this method uncommented, the layout guides will be shown @@ -410,7 +415,10 @@ public class UserInputPanel extends IzPanel implements ActionListener, ItemListe { layout = new TwoColumnLayout(10, 5, 30, topbuff, TwoColumnLayout.LEFT); } - setLayout(layout); + setLayout(new BorderLayout()); + + panel = new JPanel(); + panel.setLayout(layout); if (!haveSpec) { @@ -1114,7 +1122,7 @@ public class UserInputPanel extends IzPanel implements ActionListener, ItemListe if (!element.isDisplayed()) { element.setDisplayed(true); - add(element.getComponent(), element.getConstraints()); + panel.add(element.getComponent(), element.getConstraints()); } } else @@ -1122,10 +1130,17 @@ public class UserInputPanel extends IzPanel implements ActionListener, ItemListe if (element.isDisplayed()) { element.setDisplayed(false); - remove(element.getComponent()); + panel.remove(element.getComponent()); } } } + + JScrollPane scroller = new JScrollPane(panel); + Border emptyBorder = BorderFactory.createEmptyBorder(); + scroller.setViewportBorder(emptyBorder); + scroller.getVerticalScrollBar().setBorder(emptyBorder); + scroller.getHorizontalScrollBar().setBorder(emptyBorder); + add(scroller, BorderLayout.CENTER); } /*--------------------------------------------------------------------------*/ @@ -1419,7 +1434,7 @@ public class UserInputPanel extends IzPanel implements ActionListener, ItemListe constraints.align = justify; constraints.position = TwoColumnConstraints.NORTH; - add(label, constraints); + panel.add(label, constraints); } } src/lib/com/izforge/izpack/panels/UserInputPanel.java @@ -748,7 +748,7 @@ public class Log implements LogError, LogWarning, LogMessage } else { - message.append(MessageFormat.format(record.template, new Object[]{record.variables})); + message.append(MessageFormat.format(record.template, (Object[])record.variables)); } message.append(newline); @@ -782,7 +782,7 @@ public class Log implements LogError, LogWarning, LogMessage } else { - message.append(MessageFormat.format(record.template, new Object[]{record.variables})); + message.append(MessageFormat.format(record.template, (Object[])record.variables)); } // ---------------------------------------------------- @@ -824,7 +824,7 @@ public class Log implements LogError, LogWarning, LogMessage } else { - message.append(MessageFormat.format(record.template, new Object[]{record.variables})); + message.append(MessageFormat.format(record.template, (Object[])record.variables)); } // ---------------------------------------------------- @@ -878,7 +878,7 @@ public class Log implements LogError, LogWarning, LogMessage message.append("Debug - ").append(record.channel).append(": "); } - message.append(MessageFormat.format(record.template, new Object[]{record.variables})); + message.append(MessageFormat.format(record.template, (Object[])record.variables)); // ---------------------------------------------------- // append the exception src/lib/com/izforge/izpack/util/Log.java 9d8d365824c36ffab56bd11590a30bfeada8223d cf7c90095f0170635cb0ca24246bee7917f96726 Julien Ponge julien.ponge@gmail.com http://github.com/jponge/izpack/commit/a4f53658e48988ab18885b9adcf2f5c136bad4f7 a4f53658e48988ab18885b9adcf2f5c136bad4f7 2009-11-08T09:38:02-08:00 2009-11-08T09:38:02-08:00 Merge branch 'master' into with-git-submodules 6d14eeae5b47198e2a6db1ea8341dac74586cfb7 Julien Ponge julien.ponge@gmail.com