diff --git a/.gitignore b/.gitignore
index ec7bd22d3..3ddc5d1fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
*.rej
*.conflict~
*.identcache
+Thumbs.db
/build/
/reports/
/installer.cfg
diff --git a/build.xml b/build.xml
index dae2f7257..ac7d46c87 100644
--- a/build.xml
+++ b/build.xml
@@ -24,12 +24,13 @@
-
-
+
+
+
diff --git a/build_common.xml b/build_common.xml
index 6adbc5253..73a27a564 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -156,6 +156,7 @@
false
false
+ false
${EXEICON}
@@ -163,8 +164,15 @@
${MINJAVAVERSION}
preferJre
- ${MAXHEAPSIZE}
+ 64/32
+ ${MAXHEAPSIZEPERCENT}
+
+ graphics/splash.bmp
+ true
+ 60
+ true
+
${VERSIONNUMBER}
${VERSION}${VERSIONSUFFIX}
@@ -179,46 +187,7 @@
-
-
-
-
- true
- ${EXETYPE}
- ${JARFILENAME}.jar
- ${DISTRIBUTIONDIR}/${EXE64FILENAME}.exe
-
-
-
- normal
- http://java.com/download
-
- false
- false
-
- ${EXEICON}
-
-
- ${MINJAVAVERSION}
-
- preferJre
- ${MAXHEAPSIZE64}
-
-
- ${VERSIONNUMBER}
- ${VERSION}${VERSIONSUFFIX}
- ${PRODUCTNAME}
- ${VENDOR}
- ${VERSIONNUMBER}
- ${VERSION}${VERSIONSUFFIX}
- ${PRODUCTNAME}
-
- ${INTERNALNAME}
- ${EXE64FILENAME}.exe
-
-
-
-
+
@@ -228,16 +197,11 @@
-
-
-
-
-
-
-
+
+
-
+
@@ -273,6 +237,8 @@
+ Uploading...
+
@@ -343,6 +309,10 @@
+
+
+
+
${PROJECTNAME} ${VERSION}${VERSIONSUFFIX} localization pack
-------------------------------------------------------------------
Please follow instructions on http://www.free-decompiler.com/flash/translations.html
@@ -438,7 +408,7 @@
-
+
diff --git a/graphics/splash.bmp b/graphics/splash.bmp
new file mode 100644
index 000000000..7b5a1b625
Binary files /dev/null and b/graphics/splash.bmp differ
diff --git a/graphics/splash.png b/graphics/splash.png
new file mode 100644
index 000000000..e3a0518ca
Binary files /dev/null and b/graphics/splash.png differ
diff --git a/graphics/splash.svg b/graphics/splash.svg
new file mode 100644
index 000000000..12ac6a2df
--- /dev/null
+++ b/graphics/splash.svg
@@ -0,0 +1,497 @@
+
+
+
+
diff --git a/installer.iss b/installer.iss
index 0771c31cb..9ded02f75 100644
--- a/installer.iss
+++ b/installer.iss
@@ -1,54 +1,53 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "JPEXS Free Flash Decompiler"
-#include "installer.cfg"
-#define MyAppPublisher "JPEXS"
-#define MyAppURL "http://www.free-decompiler.com/flash/"
-#define MyAppExeName "ffdec.exe"
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{E618D276-6596-41F4-8A98-447D442A77DB}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\FFDec
-DefaultGroupName={#MyAppName}
-AllowNoIcons=yes
-LicenseFile=dist\license.txt
-OutputDir=releases
-OutputBaseFilename=ffdec_{#MyAppVersion}_setup
-Compression=lzma
-SolidCompression=yes
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "dist\ffdec.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "dist\ffdec64.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "dist\lib\*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "dist\ffdec.bat"; DestDir: "{app}"; Flags: ignoreversion
-Source: "dist\ffdec.jar"; DestDir: "{app}"; Flags: ignoreversion
-Source: "dist\license.txt"; DestDir: "{app}"; Flags: ignoreversion
-
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "JPEXS Free Flash Decompiler"
+#include "installer.cfg"
+#define MyAppPublisher "JPEXS"
+#define MyAppURL "http://www.free-decompiler.com/flash/"
+#define MyAppExeName "ffdec.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{E618D276-6596-41F4-8A98-447D442A77DB}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\FFDec
+DefaultGroupName={#MyAppName}
+AllowNoIcons=yes
+LicenseFile=dist\license.txt
+OutputDir=releases
+OutputBaseFilename=ffdec_{#MyAppVersion}_setup
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "dist\ffdec.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "dist\lib\*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "dist\ffdec.bat"; DestDir: "{app}"; Flags: ignoreversion
+Source: "dist\ffdec.jar"; DestDir: "{app}"; Flags: ignoreversion
+Source: "dist\license.txt"; DestDir: "{app}"; Flags: ignoreversion
+
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+