Moves some docs to where they belong and fixes formatting

diff --git a/basis/ui/tools/browser/popups/popups.factor b/basis/ui/tools/browser/popups/popups.factor
index 1dfa16236c23bd01c40f31dbdc9f219d0412d9cb..81f5099440c499dbe1d06da091260299f4027473 100644 (file)
--- a/basis/ui/tools/browser/popups/popups.factor
+++ b/basis/ui/tools/browser/popups/popups.factor
@@ -49,4 +49,3 @@ SLOT: model
 
 : com-show-incoming-links ( browser-gadget -- )
     [ usage ] "Incoming links" show-links-popup ;
-

diff --git a/basis/ui/tools/button-list/button-list-docs.factor b/basis/ui/tools/button-list/button-list-docs.factor
index e3d6693b0b95d10ebc1c0de18f9b97b5a1a6a4df..3d262d19947db8463d1128b7fa4e0c0ed30a07cb 100644 (file)
--- a/basis/ui/tools/button-list/button-list-docs.factor
+++ b/basis/ui/tools/button-list/button-list-docs.factor
@@ -4,5 +4,3 @@ IN: ui.tools.button-list
 HELP: show-active-buttons-popup
 { $description "Displays a popup window for fuzzy selection of any labeled button in any window of the session." } ;
 
-HELP: com-show-active-buttons
-{ $description "Mapped to a keyboard gesture to execute " { $link show-active-buttons-popup } "." } ;

diff --git a/basis/ui/tools/button-list/button-list.factor b/basis/ui/tools/button-list/button-list.factor
index 83a4733e2558408cfa974fb1ea5d6f03fe33dbc6..026a1631bc2a45f174e52f847b6a2495e6adb2b8 100644 (file)
--- a/basis/ui/tools/button-list/button-list.factor
+++ b/basis/ui/tools/button-list/button-list.factor
@@ -12,6 +12,7 @@ IN: ui.tools.button-list
 TUPLE: button-list-popup < wrapper ;
 
 MIXIN: clickable
+INSTANCE: button clickable
 
 SYMBOL: active-buttons
 active-buttons [ H{ } ] initialize
@@ -28,8 +29,6 @@ active-buttons [ H{ } ] initialize
 M: clickable graft* [ store-labelled-button drop ] [ call-next-method ] bi ;
 M: button ungraft* [ remove-labelled-button drop ] [ call-next-method ] bi ;
 
-INSTANCE: button clickable
-
 : <active-buttons-table> ( model -- table )
     [ keys [ ">" swap 2array ] map ] <arrow> trivial-renderer [ second ] <search-table> 
     dup table>>

diff --git a/basis/ui/tools/common/common-docs.factor b/basis/ui/tools/common/common-docs.factor
index d3c028a307f75ba3d12104ceb2789700543b5c80..9bd62e028118f28846d2e4183b052aedf9be17dc 100644 (file)
--- a/basis/ui/tools/common/common-docs.factor
+++ b/basis/ui/tools/common/common-docs.factor
@@ -1,4 +1,4 @@
-USING: classes help.markup help.syntax sequences ui.gadgets ;
+USING: classes help.markup help.syntax sequences ui.gadgets ui.tools.button-list ;
 IN: ui.tools.common
 
 HELP: set-tool-dim
@@ -8,3 +8,6 @@ HELP: set-tool-dim
 HELP: with-lines
 { $values { "track" gadget } }
 { $description "Lines are added to the track gadget to visually demarcate its children." } ;
+
+HELP: com-show-active-buttons
+{ $description "Mapped to a keyboard gesture to execute " { $link show-active-buttons-popup } "." } ;

diff --git a/basis/ui/tools/tools.factor b/basis/ui/tools/tools.factor
index 61857020051e7f1ac6e803a17010aa8522be1776..a3ac3c8709a5f0f0808d60f8342345fc6b86e5f3 100644 (file)
--- a/basis/ui/tools/tools.factor
+++ b/basis/ui/tools/tools.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel literals memory namespaces sequences system
-tools.test ui
-ui.backend ui.commands ui.gestures ui.tools.browser
+tools.test ui ui.backend ui.commands ui.gestures ui.tools.browser
 ui.tools.common ui.tools.error-list ui.tools.listener
 vocabs.refresh ;
 IN: ui.tools