Merge branch 'png' of git://github.com/klazuka/factor into png2

2009-09-28 15:02:03 -05:00 · 2009-09-28 15:02:03 -05:00 · 49deeb6ed3
parent 1fb7cf37c4 53789bef1b
commit 49deeb6ed3
30 changed files with 2 additions and 2 deletions
--- a/basis/definitions/icons/class-predicate-word.png
+++ b/basis/definitions/icons/class-predicate-word.png
--- a/basis/definitions/icons/class-predicate-word.tiff
+++ b/basis/definitions/icons/class-predicate-word.tiff
--- a/basis/definitions/icons/class-word.png
+++ b/basis/definitions/icons/class-word.png
--- a/basis/definitions/icons/class-word.tiff
+++ b/basis/definitions/icons/class-word.tiff
--- a/basis/definitions/icons/constant-word.png
+++ b/basis/definitions/icons/constant-word.png
--- a/basis/definitions/icons/constant-word.tiff
+++ b/basis/definitions/icons/constant-word.tiff
--- a/basis/definitions/icons/generic-word.png
+++ b/basis/definitions/icons/generic-word.png
--- a/basis/definitions/icons/generic-word.tiff
+++ b/basis/definitions/icons/generic-word.tiff
--- a/basis/definitions/icons/help-article.png
+++ b/basis/definitions/icons/help-article.png
--- a/basis/definitions/icons/help-article.tiff
+++ b/basis/definitions/icons/help-article.tiff
--- a/basis/definitions/icons/icons.factor
+++ b/basis/definitions/icons/icons.factor
@ -8,7 +8,7 @@ IN: definitions.icons
 GENERIC: definition-icon ( definition -- path )

 : definition-icon-path ( string -- string' )
-    "vocab:definitions/icons/" prepend-path ".tiff" append ;
+    "vocab:definitions/icons/" prepend-path ".png" append ;

 <<

--- a/basis/definitions/icons/macro-word.png
+++ b/basis/definitions/icons/macro-word.png
--- a/basis/definitions/icons/macro-word.tiff
+++ b/basis/definitions/icons/macro-word.tiff
--- a/basis/definitions/icons/normal-word.png
+++ b/basis/definitions/icons/normal-word.png
--- a/basis/definitions/icons/normal-word.tiff
+++ b/basis/definitions/icons/normal-word.tiff
--- a/basis/definitions/icons/open-vocab.png
+++ b/basis/definitions/icons/open-vocab.png
--- a/basis/definitions/icons/open-vocab.tiff
+++ b/basis/definitions/icons/open-vocab.tiff
--- a/basis/definitions/icons/parsing-word.png
+++ b/basis/definitions/icons/parsing-word.png
--- a/basis/definitions/icons/parsing-word.tiff
+++ b/basis/definitions/icons/parsing-word.tiff
--- a/basis/definitions/icons/primitive-word.png
+++ b/basis/definitions/icons/primitive-word.png
--- a/basis/definitions/icons/primitive-word.tiff
+++ b/basis/definitions/icons/primitive-word.tiff
--- a/basis/definitions/icons/runnable-vocab.png
+++ b/basis/definitions/icons/runnable-vocab.png
--- a/basis/definitions/icons/runnable-vocab.tiff
+++ b/basis/definitions/icons/runnable-vocab.tiff
--- a/basis/definitions/icons/symbol-word.png
+++ b/basis/definitions/icons/symbol-word.png
--- a/basis/definitions/icons/symbol-word.tiff
+++ b/basis/definitions/icons/symbol-word.tiff
--- a/basis/definitions/icons/unopen-vocab.png
+++ b/basis/definitions/icons/unopen-vocab.png
--- a/basis/definitions/icons/unopen-vocab.tiff
+++ b/basis/definitions/icons/unopen-vocab.tiff
--- a/basis/definitions/icons/word-help-article.png
+++ b/basis/definitions/icons/word-help-article.png
--- a/basis/definitions/icons/word-help-article.tiff
+++ b/basis/definitions/icons/word-help-article.tiff
--- a/basis/ui/images/images.factor
+++ b/basis/ui/images/images.factor
@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces cache images images.loader accessors assocs
 kernel opengl opengl.gl opengl.textures ui.gadgets.worlds
-memoize images.tiff ;
+memoize images.tiff images.png ;
 IN: ui.images

 TUPLE: image-name path ;