merged
authorwenzelm
Mon Dec 09 23:16:10 2013 +0100 (2013-12-09)
changeset 54710afdb394ee0c0
parent 54708 8e71c6ed4d74
parent 54709 87402674fe2f
child 54711 15a642b9ffac
merged
     1.1 --- a/src/Pure/GUI/gui.scala	Mon Dec 09 22:49:27 2013 +0100
     1.2 +++ b/src/Pure/GUI/gui.scala	Mon Dec 09 23:16:10 2013 +0100
     1.3 @@ -13,6 +13,7 @@
     1.4  import java.awt.geom.AffineTransform
     1.5  import javax.swing.{ImageIcon, JOptionPane, UIManager, JLayeredPane, JFrame, JWindow}
     1.6  
     1.7 +import scala.collection.convert.WrapAsJava
     1.8  import scala.swing.{ComboBox, TextArea, ScrollPane}
     1.9  import scala.swing.event.SelectionChanged
    1.10  
    1.11 @@ -129,8 +130,15 @@
    1.12    def isabelle_icon(): ImageIcon =
    1.13      new ImageIcon(getClass.getClassLoader.getResource("isabelle/isabelle_transparent-32.gif"))
    1.14  
    1.15 +  def isabelle_icons(): List[ImageIcon] =
    1.16 +    for (icon <- List("isabelle/isabelle_transparent-32.gif", "isabelle/isabelle_transparent.gif"))
    1.17 +      yield new ImageIcon(getClass.getClassLoader.getResource(icon))
    1.18 +
    1.19    def isabelle_image(): Image = isabelle_icon().getImage
    1.20  
    1.21 +  def isabelle_images(): java.util.List[Image] =
    1.22 +    WrapAsJava.seqAsJavaList(isabelle_icons.map(_.getImage))
    1.23 +
    1.24  
    1.25    /* component hierachy */
    1.26  
     2.1 --- a/src/Pure/GUI/system_dialog.scala	Mon Dec 09 22:49:27 2013 +0100
     2.2 +++ b/src/Pure/GUI/system_dialog.scala	Mon Dec 09 23:16:10 2013 +0100
     2.3 @@ -72,7 +72,7 @@
     2.4    private class Window extends Frame
     2.5    {
     2.6      title = _title
     2.7 -    iconImage = GUI.isabelle_image()
     2.8 +    peer.setIconImages(GUI.isabelle_images())
     2.9  
    2.10  
    2.11      /* text */
     3.1 --- a/src/Pure/build-jars	Mon Dec 09 22:49:27 2013 +0100
     3.2 +++ b/src/Pure/build-jars	Mon Dec 09 23:16:10 2013 +0100
     3.3 @@ -221,6 +221,7 @@
     3.4    echo isabelle.Isabelle_Charset_Provider > "$CHARSET_SERVICE"
     3.5  
     3.6    cp "$ISABELLE_HOME/lib/logo/isabelle_transparent-32.gif" isabelle/.
     3.7 +  cp "$ISABELLE_HOME/lib/logo/isabelle_transparent.gif" isabelle/.
     3.8  
     3.9    isabelle_jdk jar cfe "$(jvmpath "$TARGET")" isabelle.Main META-INF isabelle || \
    3.10      fail "Failed to produce $TARGET"