--- a/src/Pure/System/gui_setup.scala Thu Apr 04 17:58:47 2013 +0200
+++ b/src/Pure/System/gui_setup.scala Thu Apr 04 18:06:48 2013 +0200
@@ -17,7 +17,7 @@
{
def startup(args: Array[String]) =
{
- Platform.init_laf()
+ GUI.init_laf()
top.pack()
top.visible = true
}
--- a/src/Pure/System/platform.scala Thu Apr 04 17:58:47 2013 +0200
+++ b/src/Pure/System/platform.scala Thu Apr 04 18:06:48 2013 +0200
@@ -8,7 +8,6 @@
package isabelle
import java.lang.System
-import javax.swing.UIManager
import scala.util.matching.Regex
@@ -58,21 +57,5 @@
/* JVM name */
val jvm_name: String = System.getProperty("java.vm.name")
-
-
- /* Swing look-and-feel */
-
- private def find_laf(name: String): Option[String] =
- UIManager.getInstalledLookAndFeels().find(_.getName == name).map(_.getClassName)
-
- def get_laf(): String =
- {
- if (is_windows || is_macos) UIManager.getSystemLookAndFeelClassName()
- else
- find_laf("Nimbus") orElse find_laf("GTK+") getOrElse
- UIManager.getCrossPlatformLookAndFeelClassName()
- }
-
- def init_laf(): Unit = UIManager.setLookAndFeel(get_laf())
}
--- a/src/Pure/Tools/build_dialog.scala Thu Apr 04 17:58:47 2013 +0200
+++ b/src/Pure/Tools/build_dialog.scala Thu Apr 04 18:06:48 2013 +0200
@@ -18,7 +18,7 @@
{
def main(args: Array[String]) =
{
- Platform.init_laf()
+ GUI.init_laf()
try {
args.toList match {
case
--- a/src/Pure/Tools/main.scala Thu Apr 04 17:58:47 2013 +0200
+++ b/src/Pure/Tools/main.scala Thu Apr 04 18:06:48 2013 +0200
@@ -15,7 +15,7 @@
{
val (out, rc) =
try {
- Platform.init_laf()
+ GUI.init_laf()
Isabelle_System.init()
Isabelle_System.isabelle_tool("jedit", ("-s" :: args.toList): _*)
}
--- a/src/Tools/Graphview/src/graphview.scala Thu Apr 04 17:58:47 2013 +0200
+++ b/src/Tools/Graphview/src/graphview.scala Thu Apr 04 18:06:48 2013 +0200
@@ -22,7 +22,7 @@
// FIXME avoid I/O etc. on Swing thread
val graph: Model.Graph =
try {
- Platform.init_laf()
+ GUI.init_laf()
Isabelle_System.init()
Isabelle_Font.install_fonts()
ToolTipManager.sharedInstance.setDismissDelay(1000*60*60)
--- a/src/Tools/jEdit/src/jedit_main.scala Thu Apr 04 17:58:47 2013 +0200
+++ b/src/Tools/jEdit/src/jedit_main.scala Thu Apr 04 18:06:48 2013 +0200
@@ -17,7 +17,7 @@
{
def main(args: Array[String])
{
- Platform.init_laf()
+ GUI.init_laf()
Isabelle_System.init()
System.setProperty("jedit.home",