more uniform Isabelle splash screen -- avoid problems with jEdit splash and Java 11 on some Linux window managers;
authorwenzelm
Tue Apr 30 20:54:07 2019 +0200 (6 months ago)
changeset 70220089753519be0
parent 70219 b21efbf64292
child 70223 13f8f89f5c41
more uniform Isabelle splash screen -- avoid problems with jEdit splash and Java 11 on some Linux window managers;
Admin/MacOS/Info.plist
Admin/Windows/launch4j/isabelle.xml
src/Tools/jEdit/etc/settings
src/Tools/jEdit/lib/Tools/jedit
     1.1 --- a/Admin/MacOS/Info.plist	Tue Apr 30 17:03:32 2019 +0100
     1.2 +++ b/Admin/MacOS/Info.plist	Tue Apr 30 20:54:07 2019 +0200
     1.3 @@ -58,6 +58,7 @@
     1.4  <key>JVMOptions</key>
     1.5  <array>
     1.6  {JAVA_OPTIONS}
     1.7 +<string>-splash:$APP_ROOT/Contents/Resources/{ISABELLE_NAME}/lib/logo/isabelle.gif</string>
     1.8  <string>-Dapple.awt.application.name={ISABELLE_NAME}</string>
     1.9  <string>-Disabelle.root=$APP_ROOT/Contents/Resources/{ISABELLE_NAME}</string>
    1.10  <string>-Disabelle.app=true</string>
     2.1 --- a/Admin/Windows/launch4j/isabelle.xml	Tue Apr 30 17:03:32 2019 +0100
     2.2 +++ b/Admin/Windows/launch4j/isabelle.xml	Tue Apr 30 20:54:07 2019 +0200
     2.3 @@ -30,7 +30,7 @@
     2.4      <maxVersion></maxVersion>
     2.5      <jdkPreference>jdkOnly</jdkPreference>
     2.6      <runtimeBits>64</runtimeBits>
     2.7 -    <opt>-Disabelle.root=&quot;%EXEDIR%&quot; -Dcygwin.root=&quot;%EXEDIR%\contrib\cygwin&quot;</opt>
     2.8 +    <opt>-splash:&quot;%EXEDIR%\lib\logo\isabelle.gif&quot; -Disabelle.root=&quot;%EXEDIR%&quot; -Dcygwin.root=&quot;%EXEDIR%\contrib\cygwin&quot;</opt>
     2.9    </jre>
    2.10    <splash>
    2.11      <file>{SPLASH}</file>
     3.1 --- a/src/Tools/jEdit/etc/settings	Tue Apr 30 17:03:32 2019 +0100
     3.2 +++ b/src/Tools/jEdit/etc/settings	Tue Apr 30 20:54:07 2019 +0200
     3.3 @@ -3,7 +3,7 @@
     3.4  JEDIT_HOME="$COMPONENT"
     3.5  JEDIT_SETTINGS="$ISABELLE_HOME_USER/jedit"
     3.6  
     3.7 -JEDIT_OPTIONS="-reuseview -nobackground -log=9"
     3.8 +JEDIT_OPTIONS="-reuseview -nobackground -nosplash -log=9"
     3.9  
    3.10  JEDIT_JAVA_OPTIONS="-Xms512m -Xmx2560m -Xss8m"
    3.11  JEDIT_JAVA_SYSTEM_OPTIONS="-Duser.language=en -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.application.name=Isabelle"
     4.1 --- a/src/Tools/jEdit/lib/Tools/jedit	Tue Apr 30 17:03:32 2019 +0100
     4.2 +++ b/src/Tools/jEdit/lib/Tools/jedit	Tue Apr 30 20:54:07 2019 +0200
     4.3 @@ -433,5 +433,6 @@
     4.4      JEDIT_LOGIC_FOCUS JEDIT_INCLUDE_SESSIONS JEDIT_PRINT_MODE JEDIT_NO_BUILD JEDIT_BUILD_MODE
     4.5    export JEDIT_ML_PROCESS_POLICY="$ML_PROCESS_POLICY"
     4.6    classpath "$JEDIT_HOME/dist/jedit.jar"
     4.7 -  exec isabelle java "${JAVA_ARGS[@]}" isabelle.Main "${ARGS[@]}"
     4.8 +  exec isabelle java -splash:"$(platform_path "$ISABELLE_HOME/lib/logo/isabelle.gif")" \
     4.9 +    "${JAVA_ARGS[@]}" isabelle.Main "${ARGS[@]}"
    4.10  fi