Changeset 849

Timestamp:

May 2, 2013, 1:15:35 PM (12 years ago)

Author:

alloc

Message:

AEI2.08:

• Fixes #24

Location:

java

Files:

• SwingComponents/.classpath (added)
• SwingComponents/.project (added)
• SwingComponents/.settings (added)
• SwingComponents/.settings/org.eclipse.jdt.core.prefs (added)
• SwingComponents/src (added)
• SwingComponents/src/net (added)
• SwingComponents/src/net/oni2 (added)
• SwingComponents/src/net/oni2/swingcomponents (added)
• SwingComponents/src/net/oni2/swingcomponents/ColorCopy.java (added)
• SwingComponents/src/net/oni2/swingcomponents/HTMLLinkLabel.java (added)
• installer2/.classpath (modified) (1 diff)
• installer2/src/net/oni2/aeinstaller/AEInstaller.properties (modified) (1 diff)
• installer2/src/net/oni2/aeinstaller/AEInstaller2.java (modified) (2 diffs)
• installer2/src/net/oni2/aeinstaller/backend/ColorCopy.java (deleted)
• installer2/src/net/oni2/aeinstaller/gui/HTMLLinkLabel.java (deleted)
• installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.java (modified) (1 diff)
• installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java (modified) (6 diffs)
• installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.yml (modified) (1 diff)

java/installer2/.classpath

@@ -30 +30 @@
         <classpathentry kind="lib" path="/_ThirdPartyLibs/xz-1.2.jar"/>
         <classpathentry combineaccessrules="false" kind="src" path="/UTF8ResourceBundleLoader"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/SwingComponents"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.07
+appversion=.08

java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -27 +27 @@
 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 +36 @@
 import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
 import net.oni2.svnaccess.SVN;
+import net.oni2.swingcomponents.HTMLLinkLabel;
 
 import org.javabuilders.swing.SwingJavaBuilder;

java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.java

@@ -11 +11 @@
 import javax.swing.KeyStroke;
 
-import net.oni2.aeinstaller.gui.HTMLLinkLabel;
 import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
+import net.oni2.swingcomponents.HTMLLinkLabel;
 
 import org.javabuilders.BuildResult;

java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java

@@ -1 +1 @@
 package net.oni2.aeinstaller.gui.packageinfobox;
 
-import java.awt.Insets;
 import java.util.ResourceBundle;
 
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 
@@ -10 +8 @@
 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 +26 @@
         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 +40 @@
         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 +64 @@
 
                 if (mod != null) {
-                        lblTitleVal.setText("<html>" + mod.getName() + "</html>");
-                        lblCreatorVal.setText("<html>" + mod.getCreator() + "</html>");
+                        lblTitleVal.setText(mod.getName());
+                        lblCreatorVal.setText(mod.getCreator());
                         lblDescriptionVal.setText(mod.getDescription());
 
@@ -70 +74 @@
                                 types += t.getName();
                         }
-                        lblTypesVal.setText("<html>" + types + "</html>");
+                        lblTypesVal.setText(types);
                         lblPlatformVal.setText(mod.getPlatform().toString());
                         lblPackageNumberVal.setText(mod.getPackageNumberString());

java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.yml

@@ -3 +3 @@
   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]