separate module "GUI", to keep this out of the way of generic Isabelle_System operations, notably for non-Isabelle/jEdit applications;
tuned signature;
1.1 --- a/src/Pure/System/gui_setup.scala Thu Apr 04 17:33:04 2013 +0200
1.2 +++ b/src/Pure/System/gui_setup.scala Thu Apr 04 17:47:28 2013 +0200
1.3 @@ -23,7 +23,7 @@
1.4 }
1.5
1.6 def top = new MainFrame {
1.7 - iconImage = Isabelle_System.get_icon().getImage
1.8 + iconImage = GUI.isabelle_image()
1.9
1.10 title = "Isabelle setup"
1.11
2.1 --- a/src/Pure/System/isabelle_system.scala Thu Apr 04 17:33:04 2013 +0200
2.2 +++ b/src/Pure/System/isabelle_system.scala Thu Apr 04 17:47:28 2013 +0200
2.3 @@ -11,7 +11,6 @@
2.4 import java.util.regex.Pattern
2.5 import java.io.{File => JFile, BufferedReader, InputStreamReader,
2.6 BufferedWriter, OutputStreamWriter}
2.7 -import javax.swing.ImageIcon
2.8
2.9 import scala.util.matching.Regex
2.10
2.11 @@ -421,10 +420,4 @@
2.12 case None => Isabelle_System.getenv_strict("ISABELLE_LOGIC")
2.13 }
2.14 }
2.15 -
2.16 -
2.17 - /* icon */
2.18 -
2.19 - def get_icon(): ImageIcon =
2.20 - new ImageIcon(platform_path(Path.explode("~~/lib/logo/isabelle.gif")))
2.21 }
3.1 --- a/src/Pure/Tools/build_dialog.scala Thu Apr 04 17:33:04 2013 +0200
3.2 +++ b/src/Pure/Tools/build_dialog.scala Thu Apr 04 17:47:28 2013 +0200
3.3 @@ -64,7 +64,7 @@
3.4 more_dirs: List[(Boolean, Path)],
3.5 session: String): MainFrame = new MainFrame
3.6 {
3.7 - iconImage = Isabelle_System.get_icon().getImage
3.8 + iconImage = GUI.isabelle_image()
3.9
3.10
3.11 /* GUI state */
4.1 --- a/src/Pure/Tools/ml_statistics.scala Thu Apr 04 17:33:04 2013 +0200
4.2 +++ b/src/Pure/Tools/ml_statistics.scala Thu Apr 04 17:47:28 2013 +0200
4.3 @@ -134,7 +134,7 @@
4.4 ML_Statistics.standard_fields.map(chart(_)).foreach(c =>
4.5 Swing_Thread.later {
4.6 new Frame {
4.7 - iconImage = Isabelle_System.get_icon().getImage
4.8 + iconImage = GUI.isabelle_image()
4.9 title = name
4.10 contents = Component.wrap(new ChartPanel(c))
4.11 visible = true
5.1 --- a/src/Pure/Tools/task_statistics.scala Thu Apr 04 17:33:04 2013 +0200
5.2 +++ b/src/Pure/Tools/task_statistics.scala Thu Apr 04 17:47:28 2013 +0200
5.3 @@ -53,7 +53,7 @@
5.4 def show_frame(bins: Int = 100): Unit =
5.5 Swing_Thread.later {
5.6 new Frame {
5.7 - iconImage = Isabelle_System.get_icon().getImage
5.8 + iconImage = GUI.isabelle_image()
5.9 title = name
5.10 contents = Component.wrap(new ChartPanel(chart(bins)))
5.11 visible = true
6.1 --- a/src/Pure/build-jars Thu Apr 04 17:33:04 2013 +0200
6.2 +++ b/src/Pure/build-jars Thu Apr 04 17:47:28 2013 +0200
6.3 @@ -42,6 +42,7 @@
6.4 System/color_value.scala
6.5 System/command_line.scala
6.6 System/event_bus.scala
6.7 + System/gui.scala
6.8 System/gui_setup.scala
6.9 System/html5_panel.scala
6.10 System/interrupt.scala
7.1 --- a/src/Tools/Graphview/src/graphview.scala Thu Apr 04 17:33:04 2013 +0200
7.2 +++ b/src/Tools/Graphview/src/graphview.scala Thu Apr 04 17:47:28 2013 +0200
7.3 @@ -37,7 +37,7 @@
7.4 catch { case exn: Throwable => println(Exn.message(exn)); sys.exit(1) }
7.5
7.6 val top = new MainFrame {
7.7 - iconImage = Isabelle_System.get_icon().getImage
7.8 + iconImage = GUI.isabelle_image()
7.9
7.10 title = "Graphview"
7.11 minimumSize = new Dimension(640, 480)