mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-30 16:24:09 +03:00
Splashscreen
This commit is contained in:
@ -302,6 +302,7 @@
|
||||
|
||||
<option value="-Xms128M"/>
|
||||
<option value="-Xmx512M"/>
|
||||
<option value="-splash:$APP_ROOT/Contents/Java/lib/splash.png"/>
|
||||
|
||||
<bundledocument extensions="ino,c,cpp,h"
|
||||
icon="macosx/template.app/Contents/Resources/pde.icns"
|
||||
|
10
build/linux/dist/arduino
vendored
10
build/linux/dist/arduino
vendored
@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
CURDIR=`pwd`
|
||||
APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
|
||||
@ -20,5 +20,11 @@ export LD_LIBRARY_PATH
|
||||
|
||||
export PATH="${APPDIR}/java/bin:${PATH}"
|
||||
|
||||
java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base --curdir $CURDIR "$@"
|
||||
if [[ "$@" == *"--upload"* || "$@" == *"--upload"* || "$@" == *"--get-pref"* ]] ; then
|
||||
SPLASH=""
|
||||
else
|
||||
SPLASH="-splash:./lib/splash.png"
|
||||
fi
|
||||
|
||||
java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir $CURDIR "$@"
|
||||
|
||||
|
@ -87,6 +87,9 @@
|
||||
<key>MainClass</key>
|
||||
<string>processing.app.Base</string>
|
||||
|
||||
<key>SplashFile</key>
|
||||
<string>$APP_PACKAGE/Contents/Resources/Java/lib/splash.png</string>
|
||||
|
||||
<key>JVMVersion</key>
|
||||
<string>1.6*</string>
|
||||
|
||||
|
BIN
build/shared/lib/splash.png
Normal file
BIN
build/shared/lib/splash.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 122 KiB |
@ -4,6 +4,7 @@ ARDUINO 1.6.2
|
||||
[ide]
|
||||
* In platform.txt, pre and post build hooks can now be specified. Example: recipe.hooks.prebuild.0.pattern=echo "Hello {build.source.path}". Thanks @Wackerbarth
|
||||
* Windows and MacOSX JVM Xmx halved to 512M
|
||||
* Introduced starting splashscreen with progress status: will be used for notifying user of long running startup tasks
|
||||
|
||||
ARDUINO 1.6.1 - 2015.03.10
|
||||
|
||||
|
@ -29,21 +29,16 @@
|
||||
</classPath>
|
||||
<jre>
|
||||
<path>java</path>
|
||||
<minVersion>1.6.0</minVersion>
|
||||
<minVersion>1.8.0</minVersion>
|
||||
<maxVersion></maxVersion>
|
||||
<jdkPreference>preferJre</jdkPreference>
|
||||
<opt>-splash:./lib/splash.png</opt>
|
||||
</jre>
|
||||
<splash>
|
||||
<file>about.bmp</file>
|
||||
<waitForWindow>true</waitForWindow>
|
||||
<timeout>60</timeout>
|
||||
<timeoutErr>true</timeoutErr>
|
||||
</splash>
|
||||
<messages>
|
||||
<startupErr>An error occurred while starting the application.</startupErr>
|
||||
<bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
|
||||
<jreVersionErr>This application requires at least Java Development Kit</jreVersionErr>
|
||||
<launcherErr>The registry refers to a nonexistent Java Development Kit installation or the runtime is corrupted.</launcherErr>
|
||||
<launcherErr>The registry refers to a nonexistent Java Development Kit installation or the runtime is corrupted.</launcherErr>
|
||||
<instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
|
||||
</messages>
|
||||
</launch4jConfig>
|
||||
|
@ -29,7 +29,7 @@
|
||||
</classPath>
|
||||
<jre>
|
||||
<path>java</path>
|
||||
<minVersion>1.6.0</minVersion>
|
||||
<minVersion>1.8.0</minVersion>
|
||||
<maxVersion></maxVersion>
|
||||
<jdkPreference>preferJre</jdkPreference>
|
||||
</jre>
|
||||
|
Reference in New Issue
Block a user