Fixes ungraft and removes accidental duplication

diff --git a/basis/ui/tools/button-list/button-list.factor b/basis/ui/tools/button-list/button-list.factor
index 026a1631bc2a45f174e52f847b6a2495e6adb2b8..bbf68cb274f64a1fa477af62300b7a8d09351003 100644 (file)
--- a/basis/ui/tools/button-list/button-list.factor
+++ b/basis/ui/tools/button-list/button-list.factor
@@ -27,7 +27,7 @@ active-buttons [ H{ } ] initialize
     label-from-button [ dup active-buttons get delete-at ] [ f ] if* ;
 
 M: clickable graft* [ store-labelled-button drop ] [ call-next-method ] bi ;
-M: button ungraft* [ remove-labelled-button drop ] [ call-next-method ] bi ;
+M: clickable ungraft* [ remove-labelled-button drop ] [ call-next-method ] bi ;
 
 : <active-buttons-table> ( model -- table )
     [ keys [ ">" swap 2array ] map ] <arrow> trivial-renderer [ second ] <search-table> 

diff --git a/basis/ui/tools/tools.factor b/basis/ui/tools/tools.factor
index a3ac3c8709a5f0f0808d60f8342345fc6b86e5f3..8a69436074eb6b2fc7e392d0b432415a3f811bd5 100644 (file)
--- a/basis/ui/tools/tools.factor
+++ b/basis/ui/tools/tools.factor
@@ -37,28 +37,6 @@ tool "common" f {
     { T{ key-down f f "F11" } toggle-fullscreen }
 } ? prepend define-command-map
 
-
-tool "tool-switching" f {
-    { T{ key-down f ${ os macosx? M+ A+ ? } "l" } show-listener }
-    { T{ key-down f ${ os macosx? M+ A+ ? } "L" } listener-window }
-    { T{ key-down f ${ os macosx? M+ A+ ? } "b" } show-browser }
-    { T{ key-down f ${ os macosx? M+ A+ ? } "B" } browser-window }
-} define-command-map
-
-tool "common" f {
-    { T{ key-down f ${ os macosx? M+ C+ ? } "w" } close-window }
-    { T{ key-down f ${ os macosx? M+ C+ ? } "q" } com-exit }
-    { T{ key-down f { A+ } "f" } com-show-active-buttons }
-    { T{ key-down f f "F2" } refresh-all }
-    { T{ key-down f f "F3" } show-error-list }
-} os macosx? {
-    { T{ key-down f { C+ M+ } "f" } toggle-fullscreen }
-} {
-    { T{ key-down f { C+ } "F4" } close-window }
-    { T{ key-down f { A+ } "F4" } com-exit }
-    { T{ key-down f f "F11" } toggle-fullscreen }
-} ? prepend define-command-map
-
 : ui-tools-main ( -- )
     f ui-stop-after-last-window? set-global
     listener-window ;