Add article and word help icons

diff --git a/basis/definitions/icons/icons.factor b/basis/definitions/icons/icons.factor
index c5b997b5fefcdb35556f3117452c349a2a30fddb..fb25ccf7151bc5b83163427e441fb588b8290f11 100644 (file)
--- a/basis/definitions/icons/icons.factor
+++ b/basis/definitions/icons/icons.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs classes.predicate fry generic io.pathnames kernel
 macros sequences vocabs words words.symbol words.constant
-lexer parser ;
+lexer parser help.topics ;
 IN: definitions.icons
 
 GENERIC: definition-icon ( definition -- path )
@@ -30,6 +30,8 @@ ICON: symbol symbol-word
 ICON: constant constant-word
 ICON: word normal-word
 ICON: vocab-link unopen-vocab
+ICON: word-link word-help-article
+ICON: link help-article
 
 PRIVATE>
 

diff --git a/basis/tools/apropos/apropos.factor b/basis/tools/apropos/apropos.factor
index 28cb26395e2299bc39dbf6610e702cd422f8c42a..c7126c10d090b93a25975ad673efd717844b3690 100644 (file)
--- a/basis/tools/apropos/apropos.factor
+++ b/basis/tools/apropos/apropos.factor
@@ -11,7 +11,7 @@ IN: tools.apropos
         dup [ vocab-spec? ] all? [
             $vocabs
         ] [
-            [ <$link> ] map $list
+            [ <$pretty-link> 1array ] map $table
         ] if
     ] if ;
 

diff --git a/basis/ui/tools/browser/popups/popups.factor b/basis/ui/tools/browser/popups/popups.factor
index 3d1351876a5f13095d9fd8abb9aa613eff183961..8150dc1a08bf5cfa58718b1180dab0b0dc496b17 100644 (file)
--- a/basis/ui/tools/browser/popups/popups.factor
+++ b/basis/ui/tools/browser/popups/popups.factor
@@ -2,14 +2,16 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs definitions fry help.topics kernel
 colors.constants math.rectangles models.filter namespaces sequences
-sorting ui.gadgets ui.gadgets.glass ui.gadgets.labeled
-ui.gadgets.scrollers ui.gadgets.tables ui.gadgets.search-tables
-ui.gadgets.wrappers ui.gestures ui.operations ui.pens.solid ;
+sorting definitions.icons ui.gadgets ui.gadgets.glass
+ui.gadgets.labeled ui.gadgets.scrollers ui.gadgets.tables
+ui.gadgets.search-tables ui.gadgets.wrappers ui.gestures ui.operations
+ui.pens.solid ui.images ;
 IN: ui.tools.browser.popups
 
 SINGLETON: link-renderer
 
-M: link-renderer row-columns drop second 1array ;
+M: link-renderer row-columns
+    drop first2 [ definition-icon <image-name> ] dip 2array ;
 
 M: link-renderer row-value drop first ;