support for idea-icons (using ideaIC-129.354/platform/icons/src from IntelliJ IDEA Community Edition 12.1.2);
authorwenzelm
Fri Jun 28 14:05:12 2013 +0200 (2013-06-28 ago)
changeset 52471ff0e0bb81597
parent 52470 dedd7952a62c
child 52472 3a43a8b1ecb0
support for idea-icons (using ideaIC-129.354/platform/icons/src from IntelliJ IDEA Community Edition 12.1.2);
Admin/components/components.sha1
Admin/components/main
src/Tools/jEdit/lib/Tools/jedit
src/Tools/jEdit/src/rendering.scala
     1.1 --- a/Admin/components/components.sha1	Thu Jun 27 23:17:26 2013 +0200
     1.2 +++ b/Admin/components/components.sha1	Fri Jun 28 14:05:12 2013 +0200
     1.3 @@ -28,6 +28,7 @@
     1.4  8e1d36f5071e3def2cb281f7fefe9f52352cb88f  jedit_build-20120903.tar.gz
     1.5  8fa0c67f59beba369ab836562eed4e56382f672a  jedit_build-20121201.tar.gz
     1.6  06e9be2627ebb95c45a9bcfa025d2eeef086b408  jedit_build-20130104.tar.gz
     1.7 +c85c0829b8170f25aa65ec6852f505ce2a50639b  jedit_build-20130628.tar.gz
     1.8  8122526f1fc362ddae1a328bdbc2152853186fee  jfreechart-1.0.14.tar.gz
     1.9  6c737137cc597fc920943783382e928ea79e3feb  kodkodi-1.2.16.tar.gz
    1.10  5f95c96bb99927f3a026050f85bd056f37a9189e  kodkodi-1.5.2.tar.gz
     2.1 --- a/Admin/components/main	Thu Jun 27 23:17:26 2013 +0200
     2.2 +++ b/Admin/components/main	Fri Jun 28 14:05:12 2013 +0200
     2.3 @@ -4,7 +4,7 @@
     2.4  exec_process-1.0.3
     2.5  Haskabelle-2013
     2.6  jdk-7u21
     2.7 -jedit_build-20130104
     2.8 +jedit_build-20130628
     2.9  jfreechart-1.0.14
    2.10  kodkodi-1.5.2
    2.11  polyml-5.5.0-3
     3.1 --- a/src/Tools/jEdit/lib/Tools/jedit	Thu Jun 27 23:17:26 2013 +0200
     3.2 +++ b/src/Tools/jEdit/lib/Tools/jedit	Fri Jun 28 14:05:12 2013 +0200
     3.3 @@ -211,6 +211,7 @@
     3.4    "$ISABELLE_JEDIT_BUILD_HOME/contrib/SideKick.jar"
     3.5    "$ISABELLE_JEDIT_BUILD_HOME/contrib/cobra.jar"
     3.6    "$ISABELLE_JEDIT_BUILD_HOME/contrib/js.jar"
     3.7 +  "$ISABELLE_JEDIT_BUILD_HOME/contrib/idea-icons.jar"
     3.8  )
     3.9  
    3.10  declare -a JFREECHART_JARS=()
     4.1 --- a/src/Tools/jEdit/src/rendering.scala	Thu Jun 27 23:17:26 2013 +0200
     4.2 +++ b/src/Tools/jEdit/src/rendering.scala	Fri Jun 28 14:05:12 2013 +0200
     4.3 @@ -42,9 +42,16 @@
     4.4  
     4.5    /* icons */
     4.6  
     4.7 -  private def load_icon(name: String): Icon =
     4.8 +  def load_icon(name: String): Icon =
     4.9    {
    4.10 -    val icon = GUIUtilities.loadIcon(name)
    4.11 +    val name1 =
    4.12 +      if (name.startsWith("idea-icons/")) {
    4.13 +        val file =
    4.14 +          Isabelle_System.platform_file_url(Path.explode("$JEDIT_HOME/dist/jars/idea-icons.jar"))
    4.15 +        "jar:" + file + "!/" + name
    4.16 +      }
    4.17 +      else name
    4.18 +    val icon = GUIUtilities.loadIcon(name1)
    4.19      if (icon.getIconWidth < 0 || icon.getIconHeight < 0) error("Bad icon: " + name)
    4.20      else icon
    4.21    }