Index: java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties =================================================================== --- java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties (revision 840) +++ java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties (revision 849) @@ -1,2 +1,2 @@ appname=AE Installer 2 -appversion=.07 +appversion=.08 Index: java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java =================================================================== --- java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 840) +++ java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 849) @@ -27,5 +27,4 @@ import net.oni2.aeinstaller.backend.oni.OniSplit; import net.oni2.aeinstaller.backend.oni.management.Installer; -import net.oni2.aeinstaller.gui.HTMLLinkLabel; import net.oni2.aeinstaller.gui.MainWin; import net.oni2.moddepot.DepotManager; @@ -37,4 +36,5 @@ import net.oni2.resourcebundle.UTF8ResourceBundleLoader; import net.oni2.svnaccess.SVN; +import net.oni2.swingcomponents.HTMLLinkLabel; import org.javabuilders.swing.SwingJavaBuilder; Index: java/installer2/src/net/oni2/aeinstaller/backend/ColorCopy.java =================================================================== --- java/installer2/src/net/oni2/aeinstaller/backend/ColorCopy.java (revision 840) +++ (revision ) @@ -1,17 +1,0 @@ -package net.oni2.aeinstaller.backend; - -import java.awt.Color; - -/** - * @author Christian Illy - */ -public class ColorCopy { - /** - * @param orig - * Color to copy - * @return New color instance with same RGB but 100% opaque - */ - public static Color copyColor(Color orig) { - return new Color(orig.getRed(), orig.getGreen(), orig.getBlue()); - } -} Index: java/installer2/src/net/oni2/aeinstaller/gui/HTMLLinkLabel.java =================================================================== --- java/installer2/src/net/oni2/aeinstaller/gui/HTMLLinkLabel.java (revision 840) +++ (revision ) @@ -1,78 +1,0 @@ -package net.oni2.aeinstaller.gui; - -import java.awt.Color; -import java.awt.Desktop; -import java.awt.Font; -import java.io.IOException; -import java.net.URISyntaxException; - -import javax.swing.JEditorPane; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.UIDefaults; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; -import javax.swing.text.DefaultCaret; - -import net.oni2.aeinstaller.backend.ColorCopy; - -/** - * @author Christian Illy - */ -public class HTMLLinkLabel extends JEditorPane { - private static final long serialVersionUID = 2416829757362043910L; - - private String prefix; - private String suffix; - - /** - * Create a new HTMLLinkLabel - */ - public HTMLLinkLabel() { - super(); - - ((DefaultCaret) this.getCaret()).setUpdatePolicy(DefaultCaret.NEVER_UPDATE); - - setContentType("text/html"); - - JLabel label = new JLabel(); - Font font = label.getFont(); - - StringBuffer style = new StringBuffer("font-family:" + font.getFamily() - + ";"); - style.append("font-weight:" + (font.isBold() ? "bold" : "normal") + ";"); - style.append("font-size:" + font.getSize() + "pt;"); - - prefix = ""; - suffix = ""; - - addHyperlinkListener(new HyperlinkListener() { - - @Override - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) - try { - Desktop.getDesktop().browse(e.getURL().toURI()); - } catch (IOException e1) { - e1.printStackTrace(); - } catch (URISyntaxException e1) { - e1.printStackTrace(); - } - } - }); - setEditable(false); - - Color bgColor = ColorCopy.copyColor(new JFrame().getBackground()); - UIDefaults defaults = new UIDefaults(); - defaults.put("EditorPane[Enabled].backgroundPainter", bgColor); - putClientProperty("Nimbus.Overrides", defaults); - putClientProperty("Nimbus.Overrides.InheritDefaults", true); - setBackground(bgColor); - } - - @Override - public void setText(String t) { - super.setText(prefix + t + suffix); - } - -} Index: java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.java =================================================================== --- java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.java (revision 840) +++ java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.java (revision 849) @@ -11,6 +11,6 @@ import javax.swing.KeyStroke; -import net.oni2.aeinstaller.gui.HTMLLinkLabel; import net.oni2.resourcebundle.UTF8ResourceBundleLoader; +import net.oni2.swingcomponents.HTMLLinkLabel; import org.javabuilders.BuildResult; Index: java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java =================================================================== --- java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java (revision 840) +++ java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java (revision 849) @@ -1,8 +1,6 @@ package net.oni2.aeinstaller.gui.packageinfobox; -import java.awt.Insets; import java.util.ResourceBundle; -import javax.swing.JLabel; import javax.swing.JPanel; @@ -10,6 +8,6 @@ import net.oni2.aeinstaller.backend.packages.Package; import net.oni2.aeinstaller.backend.packages.Type; -import net.oni2.aeinstaller.gui.HTMLLinkLabel; import net.oni2.resourcebundle.UTF8ResourceBundleLoader; +import net.oni2.swingcomponents.HTMLLinkLabel; import org.javabuilders.BuildResult; @@ -28,12 +26,12 @@ private BuildResult result = SwingJavaBuilder.build(this, bundle); - private JLabel lblTitleVal; - private JLabel lblCreatorVal; - private JLabel lblTypesVal; - private JLabel lblPlatformVal; - private JLabel lblPackageNumberVal; - private JLabel lblVersionNumberVal; + private HTMLLinkLabel lblTitleVal; + private HTMLLinkLabel lblCreatorVal; + private HTMLLinkLabel lblTypesVal; + private HTMLLinkLabel lblPlatformVal; + private HTMLLinkLabel lblPackageNumberVal; + private HTMLLinkLabel lblVersionNumberVal; private HTMLLinkLabel lblDescriptionVal; - private JLabel lblDownloadSizeVal; + private HTMLLinkLabel lblDownloadSizeVal; /** @@ -42,5 +40,11 @@ public PackageInfoBox() { super(); - lblDescriptionVal.setMargin(new Insets(-15, 0, 0, 0)); + lblTitleVal.enableBorder(false); + lblCreatorVal.enableBorder(false); + lblTypesVal.enableBorder(false); + lblPlatformVal.enableBorder(false); + lblPackageNumberVal.enableBorder(false); + lblVersionNumberVal.enableBorder(false); + lblDownloadSizeVal.enableBorder(false); } @@ -60,6 +64,6 @@ if (mod != null) { - lblTitleVal.setText("" + mod.getName() + ""); - lblCreatorVal.setText("" + mod.getCreator() + ""); + lblTitleVal.setText(mod.getName()); + lblCreatorVal.setText(mod.getCreator()); lblDescriptionVal.setText(mod.getDescription()); @@ -70,5 +74,5 @@ types += t.getName(); } - lblTypesVal.setText("" + types + ""); + lblTypesVal.setText(types); lblPlatformVal.setText(mod.getPlatform().toString()); lblPackageNumberVal.setText(mod.getPackageNumberString()); Index: java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.yml =================================================================== --- java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.yml (revision 840) +++ java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.yml (revision 849) @@ -3,19 +3,19 @@ content: - JLabel(name=lblTitle, text=lblTitle.text) - - JLabel(name=lblTitleVal) + - HTMLLinkLabel(name=lblTitleVal) - JLabel(name=lblCreator, text=lblCreator.text) - - JLabel(name=lblCreatorVal) + - HTMLLinkLabel(name=lblCreatorVal) - JLabel(name=lblTypes, text=lblTypes.text) - - JLabel(name=lblTypesVal) + - HTMLLinkLabel(name=lblTypesVal) - JLabel(name=lblPlatform, text=lblPlatform.text) - - JLabel(name=lblPlatformVal) + - HTMLLinkLabel(name=lblPlatformVal) - JLabel(name=lblPackageNumber, text=lblPackageNumber.text) - - JLabel(name=lblPackageNumberVal) + - HTMLLinkLabel(name=lblPackageNumberVal) - JLabel(name=lblVersionNumber, text=lblVersionNumber.text) - - JLabel(name=lblVersionNumberVal) + - HTMLLinkLabel(name=lblVersionNumberVal) - JScrollPane(name=scrollDescription, vScrollBar=always, hScrollBar=asNeeded): HTMLLinkLabel(name=lblDescriptionVal) - JLabel(name=lblDownloadSize, text=lblDownloadSize.text) - - JLabel(name=lblDownloadSizeVal) + - HTMLLinkLabel(name=lblDownloadSizeVal) - MigLayout: | [min] [grow]