clarified dock icon: setup earlier on startup;
authorwenzelm
Thu, 07 Jan 2021 13:28:13 +0100
changeset 73095 d08cbc36a99a
parent 73094 86a18742e5b2
child 73096 84cde7fc4b86
clarified dock icon: setup earlier on startup;
src/Pure/Admin/build_release.scala
src/Pure/GUI/gui.scala
src/Pure/Tools/main.scala
--- a/src/Pure/Admin/build_release.scala	Thu Jan 07 13:23:54 2021 +0100
+++ b/src/Pure/Admin/build_release.scala	Thu Jan 07 13:28:13 2021 +0100
@@ -258,7 +258,8 @@
     path: Path,
     isabelle_home_prefix: String,
     jdk_component: String,
-    classpath: List[Path])
+    classpath: List[Path],
+    dock_icon: Boolean = false)
   {
     val script = """#!/usr/bin/env bash
 #
@@ -290,7 +291,8 @@
   "-Disabelle.root=$ISABELLE_HOME" "${JAVA_OPTIONS[@]}" \
   -classpath """" + classpath.map(p => "$ISABELLE_HOME/" + p.implode).mkString(":") + """" \
   "-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \
-  isabelle.Main "$@"
+""" + (if (dock_icon) """"-Xdock:icon=$ISABELLE_HOME/lib/logo/isabelle_transparent-128.png" \
+""" else "") + """isabelle.Main "$@"
 """
     File.write(path, script)
     File.set_executable(path, true)
@@ -669,7 +671,7 @@
 
             make_isabelle_app(
               app_dir + Path.explode(isabelle_name),
-              isabelle_home.implode, jdk_component, classpath)
+              isabelle_home.implode, jdk_component, classpath, dock_icon = true)
 
             make_isabelle_options(
               app_dir + isabelle_options,
--- a/src/Pure/GUI/gui.scala	Thu Jan 07 13:23:54 2021 +0100
+++ b/src/Pure/GUI/gui.scala	Thu Jan 07 13:28:13 2021 +0100
@@ -157,20 +157,6 @@
 
   def isabelle_image(): Image = isabelle_icon().getImage
 
-  def isabelle_image_large(): Image =
-    Toolkit.getDefaultToolkit.getImage(
-      File.platform_path(Path.explode("~~/lib/logo/isabelle_transparent-128.png")))
-
-  def set_application_icon()
-  {
-    if (Platform.is_macos && Taskbar.isTaskbarSupported) {
-      val taskbar = Taskbar.getTaskbar
-      if (taskbar.isSupported(Taskbar.Feature.ICON_IMAGE)) {
-        taskbar.setIconImage(isabelle_image_large())
-      }
-    }
-  }
-
 
   /* location within multi-screen environment */
 
--- a/src/Pure/Tools/main.scala	Thu Jan 07 13:23:54 2021 +0100
+++ b/src/Pure/Tools/main.scala	Thu Jan 07 13:28:13 2021 +0100
@@ -26,8 +26,6 @@
           Isabelle_System.init()
           Isabelle_Fonts.init()
 
-          GUI.set_application_icon()
-
 
           /* ROOTS template */