diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 9af4143a..b88eb0c3 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/build.xml b/diylc/diylc-swing/build.xml index aa5db7f6..980f4f86 100644 --- a/diylc/diylc-swing/build.xml +++ b/diylc/diylc-swing/build.xml @@ -7,7 +7,7 @@ - + @@ -67,19 +67,21 @@ + - + + @@ -110,6 +112,7 @@ + diff --git a/diylc/diylc-swing/diylc.l4j.ini b/diylc/diylc-swing/diylc.l4j.ini index 1ae2d02e..1abdcae2 100644 --- a/diylc/diylc-swing/diylc.l4j.ini +++ b/diylc/diylc-swing/diylc.l4j.ini @@ -1 +1 @@ --Xms512m -Xmx1024m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 \ No newline at end of file +-splash:splash.png -Xms512m -Xmx1024m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 \ No newline at end of file diff --git a/diylc/diylc-swing/install.iss b/diylc/diylc-swing/install.iss index 52655335..d2f4e31c 100644 --- a/diylc/diylc-swing/install.iss +++ b/diylc/diylc-swing/install.iss @@ -15,6 +15,7 @@ Source: "diylc.exe"; DestDir: "{app}" Source: "diylc.l4j.ini"; DestDir: "{app}" Source: "config.xml"; DestDir: "{app}" Source: "update.xml"; DestDir: "{app}" +Source: "splash.png"; DestDir: "{app}" Source: "diylc.ico"; DestDir: "{app}" Source: "build\jar\diylc.jar"; DestDir: "{app}" Source: "build\jar\lib\*"; DestDir: "{app}\lib" diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 9af4143a..b88eb0c3 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/run.sh b/diylc/diylc-swing/run.sh index e45938c3..898f67a5 100644 --- a/diylc/diylc-swing/run.sh +++ b/diylc/diylc-swing/run.sh @@ -1 +1 @@ -java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter \ No newline at end of file +java -splash:splash.png -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter \ No newline at end of file diff --git a/diylc/diylc-swing/splash.png b/diylc/diylc-swing/splash.png new file mode 100644 index 00000000..c157d178 Binary files /dev/null and b/diylc/diylc-swing/splash.png differ diff --git a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java index 66d0d8c4..b8c8e3a8 100644 --- a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java +++ b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java @@ -33,7 +33,7 @@ public class DIYLCStarter { /** * @param args */ - public static void main(String[] args) { + public static void main(String[] args) { URL url = DIYLCStarter.class.getResource("log4j.properties"); Properties properties = new Properties(); try { @@ -95,7 +95,5 @@ public class DIYLCStarter { } catch (Exception e) { LOG.error("Could not read config.properties file", e); } - - } } diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml index 8a7472bb..39a8179a 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -1774,6 +1774,10 @@ NEW_FEATURE Ability to change PCB board shape from rectangular to oval. + + NEW_FEATURE + Added bitchin new splash screen + IMPROVEMENT Do not block the UI while checking for new version at startup (can be problematic when there's connectivity issues)