Changeset 671 for AE/installer2

Timestamp:

Feb 10, 2013, 6:58:13 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99p:

• Resize tool-icons for menu
• Fix readme-parser bug for Mod_Info.cfg

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• backend/ImageResizer.java (added)
• backend/packages/Mod_Info.java (modified) (1 diff)
• gui/MainWin.java (modified) (4 diffs)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.99o
+appversion=0.99p

AE/installer2/src/net/oni2/aeinstaller/backend/packages/Mod_Info.java

@@ -46 +46 @@
                                 if (strLine.indexOf("->") < 1)
                                         continue;
-                                if (strLine.indexOf("//") >= 0)
-                                        strLine = strLine.substring(0, strLine.indexOf("//"));
+                                int pos = strLine.indexOf("//");
+                                while (pos >= 0) {
+                                        if ((pos < 6)
+                                                        || !strLine.substring(pos - 5, pos).equals("http:")) {
+                                                strLine = strLine.substring(0, pos);
+                                                break;
+                                        } else {
+                                                pos = strLine.indexOf("//", pos + 1);
+                                        }
+                                }
                                 String[] split = strLine.split("->", 2);
                                 String sName = split[0].trim();

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -20 +20 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -42 +41 @@
 import net.oni2.aeinstaller.AEInstaller2;
 import net.oni2.aeinstaller.backend.AppExecution;
+import net.oni2.aeinstaller.backend.ImageResizer;
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.Settings;
@@ -451 +451 @@
                                 params.add(exe.getPath());
                                 final File wd = m.getWorkingDir();
-                                Icon ico = null;
+                                ImageIcon ico = null;
                                 if (m.getIconFile() != null && m.getIconFile().exists()) {
                                         ico = new ImageIcon(m.getIconFile().getPath());
@@ -459 +459 @@
                                         ico = new ImageIcon(icon);
                                 }
+                                ico = ImageResizer.resizeImage(ico, 32, 32);
                                 item.setAction(new AbstractAction(m.getName(), ico) {
                                         private static final long serialVersionUID = 1L;