tlcockpit (23apr20)

git-svn-id: svn://tug.org/texlive/trunk@54850 c570f23f-e606-0410-a88d-b1316a301751

16 files changed, 218 insertions, 118 deletions

diff --git a/Master/texmf-dist/doc/man/man1/tlcockpit.man1.pdf b/Master/texmf-dist/doc/man/man1/tlcockpit.man1.pdf
index 94efaad3be3..5a4884b45e9 100644
--- a/Master/texmf-dist/doc/man/man1/tlcockpit.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlcockpit.man1.pdf
diff --git a/Master/texmf-dist/doc/support/tlcockpit/ChangeLog b/Master/texmf-dist/doc/support/tlcockpit/ChangeLog
index 662d0a6d4c0..498f8099e6c 100644
--- a/Master/texmf-dist/doc/support/tlcockpit/ChangeLog
+++ b/Master/texmf-dist/doc/support/tlcockpit/ChangeLog
@@ -1,10 +1,86 @@
+2020-04-23  Norbert Preining  <norbert@preining.info>
+
+	* Release 1.2 (HEAD -> master) [a35c518]
+
+2020-04-23  Norbert Preining  <norbert@preining.info>
+
+	* update release script [ecd7160]
+
+2020-04-23  Norbert Preining  <norbert@preining.info>
+
+	* update jars [cac100a]
+
+2020-04-19  Norbert Preining  <norbert@preining.info>
+
+	* disable another forced dialog size (origin/master, origin/HEAD) [22ada11]
+
+2020-04-18  Norbert Preining  <norbert@preining.info>
+
+	* update jar (jdk14 from OpenJDK/Debian, jdk8 from Oracle) [38c9dfe]
+
+2020-04-18  Norbert Preining  <norbert@preining.info>
+
+	* update release version number [e2f8707]
+
+2020-04-10  Norbert Preining  <norbert@preining.info>
+
+	* use lfs for storing jar files, update attributes [2e3e78a]
+
+2020-04-10  Norbert Preining  <norbert@preining.info>
+
+	* update jars [7d8c1f9]
+
+2020-04-10  Norbert Preining  <norbert@preining.info>
+
+	* bump jdk8 scala and scalafx versions, bump tlcockpit version [420c7a6]
+
+2020-04-10  Norbert Preining  <norbert@preining.info>
+
+	* do not request 1500 height of dialogs, should auto-size [e3a8d44]
+
+2020-04-10  Norbert Preining  <norbert@preining.info>
+
+	* update scalafx version [d7f57bc]
+
+2020-04-10  Norbert Preining  <norbert@preining.info>
+
+	* update README, bump copyright year to 2020 [7baf6c7]
+
+2020-04-09  Norbert Preining  <norbert@preining.info>
+
+	* use java.specification.version, support single number versions [96ad401]
+
+2020-04-09  Norbert Preining  <norbert@preining.info>
+
+	* build default with JDK14, result runs on JDK11, too [67aa7f2]
+
+2020-04-09  Norbert Preining  <norbert@preining.info>
+
+	* configuration of startup tab via menu and .tlcockpit.conf [f9a3835]
+
+2020-04-09  Norbert Preining  <norbert@preining.info>
+
+	* switch to newer sbt on jdk14 builds, add sbt file for jdk14 [afdf9e1]
+
+2019-09-30  Norbert Preining  <norbert@preining.info>
+
+	* add HiDPI info to README [d0f9a73]
+
+2019-09-03  Norbert Preining  <norbert@preining.info>
+
+	* bump sbt build version to 1.2.8 [48ae3bf]
+
+2019-07-14  Norbert Preining  <norbert@preining.info>
+
+	* update README and app copyright, add explanation about JDKs [0b04518]
+
 2019-07-11  Norbert Preining  <norbert@preining.info>
 
-	* Release 1.1 (HEAD -> master) [c62030d]
+	* Release 1.1 (tag: v1.1) [c62030d]
 
 2019-07-11  Norbert Preining  <norbert@preining.info>
 
-	* ship both jdk8 and jdk11 jars, wrapper checks version (origin/master, origin/HEAD) [cf285a0]
+	* ship both jdk8 and jdk11 jars, wrapper checks version [cf285a0]
 
 2019-07-11  Norbert Preining  <norbert@preining.info>
 
@@ -168,7 +244,7 @@
 
 2018-04-08  Norbert Preining  <norbert@preining.info>
 
-	* update jar and runner to add exec (tag: v0.9) [d8bfe81]
+	* update jar and runner to add exec [d8bfe81]
 
 2018-04-08  Norbert Preining  <norbert@preining.info>
 
diff --git a/Master/texmf-dist/doc/support/tlcockpit/NEWS b/Master/texmf-dist/doc/support/tlcockpit/NEWS
index e84482445fe..32620419008 100644
--- a/Master/texmf-dist/doc/support/tlcockpit/NEWS
+++ b/Master/texmf-dist/doc/support/tlcockpit/NEWS
@@ -1,5 +1,11 @@
 NEWS for tlcockpit
 
+version 1.2 (20200419)
+----------------------
+- Allow configuration of startup tab from menu, configuration is
+  saved into ~/.tlcockpit.conf
+- build with jdk14 (result still runs on jdk11)
+
 version 1.1 (20190711)
 ----------------------
 - build jdk8 and jdk11 versions - jdk11 includes javafx
diff --git a/Master/texmf-dist/doc/support/tlcockpit/README.md b/Master/texmf-dist/doc/support/tlcockpit/README.md
index c5b9bbd8d26..cdcf61d6995 100644
--- a/Master/texmf-dist/doc/support/tlcockpit/README.md
+++ b/Master/texmf-dist/doc/support/tlcockpit/README.md
@@ -27,11 +27,15 @@ Debugging can be enabled by passing the option `-d` or, for more detailed debugg
 
 Requirements
 ------------
-You need at least `tlmgr` from after 2017-11-23, in TeX Live language at least
-version 45888  or `texlive.infra`.
+Currently TLCockpit is shipped with two jars, one for JDK8 and one for JDK9+.
+The JDK8 version does *not* contain the JavaFX as it is normally shipped together
+with the JDK. The JDK9+ version contains JavaFX modules and thus should work
+without the need for additional installations.
 
-A recent Java (at least Java 8) installation that includes JavaFX is required. If you see
-errors like
+The default for TLCockpit shell wrapper (used on Unix and Mac) is to check for the
+version of Java (using `java -version`) and use the appropriate jar.
+
+If you are running Java 8 and see the following errors
 ```
 Error: A JNI error has occurred, please check your installation and try again
 Exception in thread "main" java.lang.NoClassDefFoundError: javafx/event/EventTarget
@@ -44,11 +48,19 @@ that means that the Java installation does not provides JavaFX.
 On Windows the latest JRE from Oracle include JavaFX. On Linux one might
 need to install some extra packages (Debian/Ubuntu: openjfx).
 
-With recent release of Java 11 problems are getting worse, since JavaFX is now
-separately packaged, and ScalaFX only supports (by now) JavaFX8. That means, for
-now it is necessary to have a Java 8 installation. As soon as ScalaFX supports
-JavaFX11 we will move to use it.
+HiDPI support
+-------------
+Depending on your JDK version and operating system, Java might not correctly
+detect the presence of a HiDPI screen.
+
+Upgrading to JDK14 should help in this case.
 
+For other versions, you might be able to fix it by setting the environment
+variable
+```
+export GDK_SCALE=2
+```
+(or even `=3`) might help.
 
 Development
 -----------
@@ -110,10 +122,12 @@ The Tools menu, as well as the expert and debug panes open
 
 ![Menu, Expert, Debug](screenshots/tlcockpit-menu-debug-expert.jpg)
 
-License
--------
+Copyright and License
+---------------------
 
-GPL3+
+Copyright 2017-2020 Norbert Preining
+Licenced under the GNU General Public License, version 3 or any higher version
+(GPL3+)
 
 
 Author
diff --git a/Master/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jar b/Master/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jar
index 90b12ad2f47..bdcfcb11800 100755
--- a/Master/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jar
+++ b/Master/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jar
diff --git a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar
index 6a3f93fbebd..091bdf27571 100644
--- a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar
+++ b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar
diff --git a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.sh b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.sh
index 1b2e8d9cb04..11da62a683b 100755
--- a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.sh
+++ b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Public domain. Originally written by Norbert Preining and Karl Berry, 2018-2019.
+# Public domain. Originally written by Norbert Preining and Karl Berry, 2018-2020.
 
 scriptname=`basename "$0"`
 javaVersion=$(java -version 2>&1 | head -1)
diff --git a/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk12 b/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk12
deleted file mode 100644
index 0e31eb34239..00000000000
--- a/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk12
+++ /dev/null
@@ -1,55 +0,0 @@
-name := "tlcockpit"
-
-version := "1.1"
-
-scalaVersion := "2.12.7"
-
-val javaVersion:Int = 12
-
-libraryDependencies += "io.spray" %%  "spray-json" % "1.3.3"
-libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3"
-libraryDependencies += "org.json4s" %% "json4s-native" % "3.6.0-M3"
-libraryDependencies += "org.json4s" %% "json4s-jackson" % "3.6.0-M3"
-
-// Add dependency on ScalaFX library
-// libraryDependencies += "org.scalafx" %% "scalafx" % "11-R16"
-libraryDependencies += "org.scalafx" % "scalafx_2.12" % "12.0.1-R17"
-
-lazy val root = (project in file(".")).
-  enablePlugins(BuildInfoPlugin).
-  settings(
-    buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion, BuildInfoKey(("javaVersion", javaVersion))),
-    buildInfoPackage := "TLCockpit"
-  )
-
-
-// Determine OS version of JavaFX binaries
-lazy val osName = System.getProperty("os.name") match {
-  case n if n.startsWith("Linux")   => "linux"
-  case n if n.startsWith("Mac")     => "mac"
-  case n if n.startsWith("Windows") => "win"
-  case _ => throw new Exception("Unknown platform!")
-}
-
-lazy val javaFXModules = Seq("base", "controls", "fxml", "graphics", "media", "swing", "web")
-libraryDependencies ++= javaFXModules.map( m =>
-  // with this the modules will NOT be included in the fat jar!
-  // "org.openjfx" % s"javafx-$m" % javaVersion % "provided" classifier osName
-  "org.openjfx" % s"javafx-$m" % javaVersion.toString classifier osName
-)
-
-assemblyMergeStrategy in assembly := {
- case PathList("module-info.class", xs @ _*) => MergeStrategy.discard
- case PathList("META-INF", "MANIFEST.MF", xs @ _*) => MergeStrategy.discard
- case x => MergeStrategy.first
-}
-
-mainClass in assembly := Some("TLCockpit.ApplicationMain")
-
-assemblyJarName in assembly := "tlcockpit-jdk12.jar"
-assemblyOutputPath in assembly := file("jar/tlcockpit-jdk12.jar")
-
-
-// for scalafx
-fork := true
diff --git a/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk11 b/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk14
index bf490132f5c..4beec43b953 100644
--- a/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk11
+++ b/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk14
@@ -1,10 +1,10 @@
 name := "tlcockpit"
 
-version := "1.1"
+version := "1.2"
 
-scalaVersion := "2.12.7"
+scalaVersion := "2.12.11"
 
-val javaVersion:Int = 11
+val javaVersion:Int = 14
 
 libraryDependencies += "io.spray" %%  "spray-json" % "1.3.3"
 libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
@@ -14,7 +14,7 @@ libraryDependencies += "org.json4s" %% "json4s-jackson" % "3.6.0-M3"
 
 // Add dependency on ScalaFX library
 // libraryDependencies += "org.scalafx" %% "scalafx" % "11-R16"
-libraryDependencies += "org.scalafx" % "scalafx_2.12" % "12.0.1-R17"
+libraryDependencies += "org.scalafx" % "scalafx_2.12" % "12.0.2-R18"
 
 lazy val root = (project in file(".")).
   enablePlugins(BuildInfoPlugin).
@@ -47,8 +47,8 @@ assemblyMergeStrategy in assembly := {
 
 mainClass in assembly := Some("TLCockpit.ApplicationMain")
 
-assemblyJarName in assembly := "tlcockpit-jdk11.jar"
-assemblyOutputPath in assembly := file("jar/tlcockpit-jdk11.jar")
+assemblyJarName in assembly := "tlcockpit.jar"
+assemblyOutputPath in assembly := file("jar/tlcockpit.jar")
 
 
 // for scalafx
diff --git a/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk8 b/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk8
index ac19d090776..026ba15e18a 100644
--- a/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk8
+++ b/Master/texmf-dist/source/support/tlcockpit/build.sbt-jdk8
@@ -1,12 +1,12 @@
 name := "tlcockpit"
 
-version := "1.1"
+version := "1.2"
 
-scalaVersion := "2.12.7"
+scalaVersion := "2.12.11"
 
 val javaVersion:Int = 8
 
-libraryDependencies += "org.scalafx" %% "scalafx" % "8.0.181-R13"
+libraryDependencies += "org.scalafx" %% "scalafx" % "8.0.192-R14"
 libraryDependencies += "io.spray" %%  "spray-json" % "1.3.3"
 libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
 libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3"
diff --git a/Master/texmf-dist/source/support/tlcockpit/project/build.properties b/Master/texmf-dist/source/support/tlcockpit/project/build.properties
index 091249b92ed..77ee500d9ba 100644
--- a/Master/texmf-dist/source/support/tlcockpit/project/build.properties
+++ b/Master/texmf-dist/source/support/tlcockpit/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.2.6
+sbt.version = 1.3.9
diff --git a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/ApplicationMain.scala b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/ApplicationMain.scala
index 4574ac4966e..1864c8ab217 100644
--- a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/ApplicationMain.scala
+++ b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/ApplicationMain.scala
@@ -47,6 +47,10 @@ import scalafx.event.ActionEvent
 import scalafx.collections.ObservableBuffer
 import scalafx.collections.ObservableMap
 
+// configuration file handling support
+import java.util.Properties
+import java.io.{ File, FileOutputStream, FileInputStream }
+
 // JSON support - important load TLPackageJsonProtocol later!
 import spray.json._
 import TeXLive.JsonProtocol._
@@ -88,47 +92,50 @@ object ApplicationMain extends JFXApp with LazyLogging {
 
   logger.trace("starting program tlcockpit")
 
-  val javaVersion = System.getProperty("java.version")
+  val javaVersion = System.getProperty("java.specification.version")
   val javaVersionSplit: Array[String] = javaVersion.split('.')
   logger.debug(s"Got javaVersion ${javaVersion}")
-  if (javaVersionSplit.length == 1) {
-    logger.warn(s"Cannot find Java version from ${javaVersion}, continuing anyway!")
-  } else {
-    val major = toInt(javaVersionSplit(0))
-    val minor = toInt(javaVersionSplit(1))
-    major match {
-      case Some(i) =>
-        if (major.get == 1) {
-          minor match {
-            case Some(j) =>
-              if (minor.get < 8) {
-                logger.error(s"Java version ${javaVersion} too old, need >= 1.8, terminating!")
-                Platform.exit()
-                sys.exit(1)
-              } else if (minor.get == 8) {
-                if (BuildInfo.javaVersion != 8) {
-                  logger.warn(s"Build and run versions disagree: build: ${BuildInfo.javaVersion}, run: ${major.get}.${minor.get}, trying anyway!")
-                }
+  val major = toInt(javaVersionSplit(0))
+  major match {
+    case Some(i) =>
+      if (major.get == 1) {
+        val minor = toInt(javaVersionSplit(1))
+        minor match {
+          case Some(j) =>
+            if (minor.get < 8) {
+              logger.error(s"Java version ${javaVersion} too old, need >= 1.8, terminating!")
+              Platform.exit()
+              sys.exit(1)
+            } else if (minor.get == 8) {
+              if (BuildInfo.javaVersion != 8) {
+                logger.warn(s"Build and run versions disagree: build: ${BuildInfo.javaVersion}, run: ${major.get}.${minor.get}, trying anyway!")
               }
-            case None =>
-              logger.warn(s"Cannot find Java version from ${javaVersion}, continuing anyway!")
-          }
-        } else {
-          if (major.get > 9) {
-            if (major.get != BuildInfo.javaVersion) {
-              logger.warn(s"Build and run versions disagree: build: ${BuildInfo.javaVersion}, run: ${major.get}, trying anyway!")
             }
-          } else {
-            logger.warn(s"Strange version number, please report: ${javaVersion}, continuing anyway!")
+          case None =>
+            logger.warn(s"Cannot find Java version from ${javaVersion}, continuing anyway!")
+        }
+      } else {
+        if (major.get > 9) {
+          if (major.get != BuildInfo.javaVersion) {
+            logger.warn(s"Build and run versions disagree: build: ${BuildInfo.javaVersion}, run: ${major.get}, trying anyway!")
           }
+        } else {
+          logger.warn(s"Strange version number, please report: ${javaVersion}, continuing anyway!")
         }
-      case None =>
-        logger.warn(s"Cannot find Java version from ${javaVersion}, continuing anyway!")
-    }
-    // in all other cases just hope it is fine
-    logger.info(s"Running on Java Version ${javaVersion}")
+      }
+    case None =>
+      logger.warn(s"Cannot find Java version from ${javaVersion}, continuing anyway!")
   }
+  logger.info(s"Running on Java Version ${javaVersion}")
+
 
+  val userHomeDirectory = System.getProperty("user.home")
+  val confPath = userHomeDirectory + "/.tlcockpit.conf"
+  val props = new Properties()
+  val propsFile = new File(confPath)
+  if (propsFile.exists()) {
+    props.load(new FileInputStream(propsFile))
+  }
 
   var tlmgrBusy = BooleanProperty(false)
 
@@ -362,7 +369,7 @@ object ApplicationMain extends JFXApp with LazyLogging {
       title = "About TLCockpit"
       graphic = new ImageView(logoImage)
       headerText = "TLCockpit version " + version + "\n\nManage your TeX Live with speed!"
-      contentText = "Copyright 2017-2018 Norbert Preining\nLicense: GPL3+\nSources: https://github.com/TeX-Live/tlcockpit"
+      contentText = "Copyright 2017-2020 Norbert Preining\nLicense: GPL3+\nSources: https://github.com/TeX-Live/tlcockpit"
     }.showAndWait()
   }
 
@@ -1068,10 +1075,39 @@ tlmgr>
     })
   }
 
+  def save_properties(): Unit = {
+    props.store(new FileOutputStream(confPath), null)
+  }
+  val StartTabPkgs = new RadioMenuItem("Packages") {
+    onAction = (ae) => {
+      props.setProperty("StartupTab", "packages")
+      save_properties()
+    }
+  }
+  val StartTabUpds = new RadioMenuItem("Updates")  {
+    onAction = (ae) => {
+      props.setProperty("StartupTab","updates")
+      save_properties()
+    }
+  }
+  val StartTabBcks = new RadioMenuItem("Backups")  {
+    onAction = (ae) => {
+      props.setProperty("StartupTab","backups")
+      save_properties()
+    }
+  }
+
+  val startupTabMenu: Menu = new Menu("Startup Tab") {
+    val foo = new ToggleGroup
+    foo.toggles = Seq(StartTabPkgs, StartTabUpds, StartTabBcks)
+    items = List(StartTabPkgs, StartTabUpds, StartTabBcks)
+  }
+
   val optionsMenu: Menu = new Menu("Options") {
     items = List(
       new MenuItem("General ...") { onAction = (ae) => callback_general_options() },
       new MenuItem("Paper ...") { onAction = (ae) => callback_paper() },
+      startupTabMenu
       /* new MenuItem("Platforms ...") { disable = true; onAction = (ae) => not_implemented_info() },
       new SeparatorMenuItem,
       new CheckMenuItem("Expert options") { disable = true },
@@ -1415,6 +1451,27 @@ tlmgr>
 
   stage.width = 800
 
+  val selectedTab = props.getOrDefault("StartupTab", "packages")
+  StartTabPkgs.selected = true
+  StartTabUpds.selected = false
+  StartTabBcks.selected = false
+  var StartupTab = 0
+  selectedTab match {
+    case "packages" => {}
+    case "updates" => {
+      StartTabPkgs.selected = false
+      StartTabUpds.selected = true
+      StartupTab = 1
+    }
+    case "backups" => {
+      StartTabPkgs.selected = false
+      StartTabBcks.selected = true
+      StartupTab = 2
+    }
+    case _ => {
+      logger.warn(s"Unrecognized setting for StartupTab in config file: $selectedTab")
+    }
+  }
 
   var currentPromise = Promise[(String,Array[String])]()
   val pendingJobs = scala.collection.mutable.Queue[(String,(String, Array[String]) => Unit)]()
@@ -1567,6 +1624,7 @@ tlmgr>
       logger.debug("Before loading tlpdb")
       load_tlpdb_update_pkgs_view_no_json()
       logger.debug("after loading tlpdb")
+      pkgstabs.selectionModel().select(StartupTab)
     })
   }
 
diff --git a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/LocationDialog.scala b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/LocationDialog.scala
index 647e0cc0389..2a45fb3db51 100644
--- a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/LocationDialog.scala
+++ b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/LocationDialog.scala
@@ -109,7 +109,7 @@ class LocationDialog(locs: Map[String,String]) extends LazyLogging {
   grid.columnConstraints = Seq(new ColumnConstraints(100, 100, 200), new ColumnConstraints(250, 250, 5000, Priority.Always, HPos.LEFT, true))
   dialog.dialogPane().content = grid
   dialog.width = 500
-  dialog.height = 1500
+  // dialog.height = 1500
 
   dialog.resultConverter = dialogButton =>
     if (dialogButton == ButtonType.OK) {
diff --git a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/OptionsDialog.scala b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/OptionsDialog.scala
index 52a9d5d0ce1..3e23270d95b 100644
--- a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/OptionsDialog.scala
+++ b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/OptionsDialog.scala
@@ -109,7 +109,8 @@ class OptionsDialog(opts: List[TLOption]) extends LazyLogging  {
   grid.columnConstraints = Seq(new ColumnConstraints(300, 300, 500), new ColumnConstraints(200, 200, 5000, Priority.Always, HPos.LEFT, true))
   dialog.dialogPane().content = grid
   dialog.width = 500
-  dialog.height = 1500
+  // This seems to be necessary for some old versions of ScalaFX or JavaFX or Java??
+  // dialog.height = 1500
 
   dialog.resultConverter = dialogButton =>
     if (dialogButton == ButtonType.OK) {
diff --git a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/PaperDialog.scala b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/PaperDialog.scala
index 3d7a2e84031..cb3e28907ca 100644
--- a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/PaperDialog.scala
+++ b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/PaperDialog.scala
@@ -64,7 +64,7 @@ class PaperDialog(paperconf: Map[String, TLPaperConf]) extends LazyLogging   {
   grid.columnConstraints = Seq(new ColumnConstraints(100, 100, 150), new ColumnConstraints(150, 150, 5000, Priority.Always, HPos.LEFT, true))
   dialog.dialogPane().content = grid
   dialog.width = 300
-  dialog.height = 1500
+  // dialog.height = 1500
 
   dialog.resultConverter = dialogButton =>
     if (dialogButton == ButtonType.OK)
diff --git a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/PkgInfoDialog.scala b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/PkgInfoDialog.scala
index 89ba164de20..fbea1ecd62d 100644
--- a/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/PkgInfoDialog.scala
+++ b/Master/texmf-dist/source/support/tlcockpit/src/main/scala/TLCockpit/PkgInfoDialog.scala
@@ -116,7 +116,7 @@ class PkgInfoDialog(tlp: TLPackage) extends Dialog {
   grid.columnConstraints = Seq(new ColumnConstraints(100, 200, 200), new ColumnConstraints(100, 400, 5000, Priority.Always, HPos.LEFT, true))
   dialog.dialogPane().content = grid
   dialog.width = 600
-  dialog.height = 1500
+  // dialog.height = 1500
   // dialog
 
   def showAndWait(): Unit = this.dialog.showAndWait()