new splash screen

This commit is contained in:
Branislav Stojkovic
2017-05-06 12:11:07 +02:00
parent d62221b796
commit b745ae8e15
9 changed files with 13 additions and 7 deletions
Binary file not shown.
+5 -2
View File
@@ -7,7 +7,7 @@
<property name="jar.dir" value="${build.dir}/jar" /> <property name="jar.dir" value="${build.dir}/jar" />
<property name="report.dir" value="${build.dir}/junitreport" /> <property name="report.dir" value="${build.dir}/junitreport" />
<property name="main.class" value="org.diylc.DIYLCStarter" /> <property name="main.class" value="org.diylc.DIYLCStarter" />
<property name="diylc.version" value="3.39.0" /> <property name="diylc.version" value="3.40.0" />
<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" /> <property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" /> <property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
@@ -67,19 +67,21 @@
<attribute name="Built-By" value="${user.name}" /> <attribute name="Built-By" value="${user.name}" />
<attribute name="Main-Class" value="${main.class}" /> <attribute name="Main-Class" value="${main.class}" />
<attribute name="Class-Path" value="${manifest.class.path}" /> <attribute name="Class-Path" value="${manifest.class.path}" />
<attribute name="SplashScreen-Image" value="splash.png" />
</manifest> </manifest>
</jar> </jar>
</target> </target>
<target name="mac" depends="jar"> <target name="mac" depends="jar">
<taskdef name="jarbundler" classname="net.sourceforge.jarbundler.JarBundler" /> <taskdef name="jarbundler" classname="net.sourceforge.jarbundler.JarBundler" />
<jarbundler bundleid="org.diylc" dir="${jar.dir}" name="DIYLC" version="${diylc.version}" mainclass="${main.class}" stubfile="JavaApplicationStub" vmoptions="-Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true" icon="icons/diylc.icns" workingdirectory="$APP_PACKAGE/Contents/Resources" infostring="DIY Layout Creator by bancika (diy-fever.com)"> <jarbundler bundleid="org.diylc" dir="${jar.dir}" name="DIYLC" version="${diylc.version}" mainclass="${main.class}" stubfile="JavaApplicationStub" vmoptions="splash:splash.png -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true" icon="icons/diylc.icns" workingdirectory="$APP_PACKAGE/Contents/Resources" infostring="DIY Layout Creator by bancika (diy-fever.com)">
<jarfileset dir="${jar.dir}"> <jarfileset dir="${jar.dir}">
<include name="diylc.jar" /> <include name="diylc.jar" />
<include name="lib/**/*.jar" /> <include name="lib/**/*.jar" />
<include name="library/**/*.jar" /> <include name="library/**/*.jar" />
</jarfileset> </jarfileset>
<resourcefileset dir="${basedir}"> <resourcefileset dir="${basedir}">
<include name="splash.png" />
<include name="update.xml" /> <include name="update.xml" />
<include name="templates**/*.diy" /> <include name="templates**/*.diy" />
<include name="themes**/*.xml" /> <include name="themes**/*.xml" />
@@ -110,6 +112,7 @@
<zipfileset dir="." includes="run.sh" /> <zipfileset dir="." includes="run.sh" />
<zipfileset dir="." includes="diylc.l4j.ini" /> <zipfileset dir="." includes="diylc.l4j.ini" />
<zipfileset dir="." includes="diylc.exe" /> <zipfileset dir="." includes="diylc.exe" />
<zipfileset dir="." includes="splash.png" />
</zip> </zip>
<zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip"> <zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip">
<zipfileset filemode="755" dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app" /> <zipfileset filemode="755" dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app" />
+1 -1
View File
@@ -1 +1 @@
-Xms512m -Xmx1024m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -splash:splash.png -Xms512m -Xmx1024m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8
+1
View File
@@ -15,6 +15,7 @@ Source: "diylc.exe"; DestDir: "{app}"
Source: "diylc.l4j.ini"; DestDir: "{app}" Source: "diylc.l4j.ini"; DestDir: "{app}"
Source: "config.xml"; DestDir: "{app}" Source: "config.xml"; DestDir: "{app}"
Source: "update.xml"; DestDir: "{app}" Source: "update.xml"; DestDir: "{app}"
Source: "splash.png"; DestDir: "{app}"
Source: "diylc.ico"; DestDir: "{app}" Source: "diylc.ico"; DestDir: "{app}"
Source: "build\jar\diylc.jar"; DestDir: "{app}" Source: "build\jar\diylc.jar"; DestDir: "{app}"
Source: "build\jar\lib\*"; DestDir: "{app}\lib" Source: "build\jar\lib\*"; DestDir: "{app}\lib"
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter java -splash:splash.png -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter
Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

@@ -95,7 +95,5 @@ public class DIYLCStarter {
} catch (Exception e) { } catch (Exception e) {
LOG.error("Could not read config.properties file", e); LOG.error("Could not read config.properties file", e);
} }
} }
} }
+4
View File
@@ -1774,6 +1774,10 @@
<changeType>NEW_FEATURE</changeType> <changeType>NEW_FEATURE</changeType>
<description>Ability to change PCB board shape from rectangular to oval.</description> <description>Ability to change PCB board shape from rectangular to oval.</description>
</org.diylc.appframework.update.Change> </org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Added bitchin new splash screen</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change> <org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType> <changeType>IMPROVEMENT</changeType>
<description>Do not block the UI while checking for new version at startup (can be problematic when there's connectivity issues)</description> <description>Do not block the UI while checking for new version at startup (can be problematic when there's connectivity issues)</description>