From 35dd01de39c4a69095e757363693fd7a86b408b7 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 6 Jan 2009 14:21:37 -0600
Subject: [PATCH] Clean up the browser tool

---
 basis/ui/tools/browser/browser.factor     | 18 ++++++++----------
 basis/ui/tools/deploy/deploy.factor       |  2 +-
 basis/ui/tools/inspector/inspector.factor |  2 +-
 basis/ui/tools/listener/listener.factor   |  4 ++--
 basis/ui/tools/profiler/profiler.factor   |  2 +-
 basis/ui/tools/walker/walker.factor       |  2 +-
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index 094739e8c3..f506d77b8e 100644
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -5,7 +5,7 @@ assocs words vocabs accessors fry combinators.short-circuit
 models models.history tools.apropos ui.tools.workspace
 ui.commands ui.gadgets ui.gadgets.panes ui.gadgets.scrollers
 ui.gadgets.tracks ui.gestures ui.gadgets.buttons ui.gadgets.packs
-ui.gadgets.editors ui.gadgets.labels ui ;
+ui.gadgets.editors ui.gadgets.labels ui.gadgets.status-bar ui ;
 IN: ui.tools.browser
 
 TUPLE: browser-gadget < track pane scroller search-field ;
@@ -34,8 +34,8 @@ TUPLE: browser-gadget < track pane scroller search-field ;
 
 : <help-pane-scroller> ( browser -- scroller )
     pane>> <limited-scroller>
-        { 550 700 } >>max-dim
-        { 550 700 } >>min-dim ;
+        { 550 400 } >>max-dim
+        { 550 400 } >>min-dim ;
 
 : <browser-gadget> ( link -- gadget )
     { 0 1 } browser-gadget new-track
@@ -65,15 +65,13 @@ M: browser-gadget definitions-changed ( assoc browser -- )
 
 M: browser-gadget focusable-child* search-field>> ;
 
-: open-browser-window ( link -- )
-    <browser-gadget> "Browser" open-window ;
-
-: browser-window ( link -- )
+: com-follow ( link -- )
     [ browser-gadget? ] find-window
     [ [ raise-window ] [ gadget-child show-help ] bi ]
-    [ open-browser-window ] if* ;
+    [ <browser-gadget> "Browser" open-status-window ] if* ;
 
-: com-follow ( link -- ) browser-window ;
+: browser-window ( -- )
+    "handbook" com-follow ;
 
 : com-back ( browser -- ) model>> go-back ;
 
@@ -81,7 +79,7 @@ M: browser-gadget focusable-child* search-field>> ;
 
 : com-documentation ( browser -- ) "handbook" swap show-help ;
 
-: browser-help ( -- ) "ui-browser" browser-window ;
+: browser-help ( -- ) "ui-browser" com-follow ;
 
 \ browser-help H{ { +nullary+ t } } define-command
 
diff --git a/basis/ui/tools/deploy/deploy.factor b/basis/ui/tools/deploy/deploy.factor
index d3d2c5c9fb..b7fa846ef2 100644
--- a/basis/ui/tools/deploy/deploy.factor
+++ b/basis/ui/tools/deploy/deploy.factor
@@ -82,7 +82,7 @@ TUPLE: deploy-gadget < pack vocab settings ;
     close-window ;
 
 : com-help ( -- )
-    "ui.tools.deploy" browser-window ;
+    "ui.tools.deploy" com-follow ;
 
 \ com-help H{
     { +nullary+ t }
diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor
index fbd0855d01..ec59f27119 100644
--- a/basis/ui/tools/inspector/inspector.factor
+++ b/basis/ui/tools/inspector/inspector.factor
@@ -31,7 +31,7 @@ TUPLE: inspector-gadget < track object pane ;
 
 \ &globals H{ { +nullary+ t } { +listener+ t } } define-command
 
-: inspector-help ( -- ) "ui-inspector" browser-window ;
+: inspector-help ( -- ) "ui-inspector" com-follow ;
 
 \ inspector-help H{ { +nullary+ t } } define-command
 
diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index 74f0fd4b6d..c2a83efaab 100644
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -120,7 +120,7 @@ M: engine-word word-completion-string
 
 : listener-thread ( listener -- )
     dup listener-streams [
-        [ browser-window ] help-hook set
+        [ com-follow ] help-hook set
         [ '[ _ ui-error-hook ] error-hook set ]
         [ '[ _ ui-inspector-hook ] inspector-hook set ] bi
         welcome.
@@ -161,7 +161,7 @@ M: engine-word word-completion-string
         init-listener
         dup <listener-scroller> 1 track-add ;
 
-: listener-help ( -- ) "ui-listener" browser-window ;
+: listener-help ( -- ) "ui-listener" com-follow ;
 
 \ listener-help H{ { +nullary+ t } } define-command
 
diff --git a/basis/ui/tools/profiler/profiler.factor b/basis/ui/tools/profiler/profiler.factor
index a916be5316..fd3c873f18 100644
--- a/basis/ui/tools/profiler/profiler.factor
+++ b/basis/ui/tools/profiler/profiler.factor
@@ -136,7 +136,7 @@ M: method-renderer row-columns
 
 M: profiler-gadget pref-dim* call-next-method { 700 400 } vmax ;
 
-: profiler-help ( -- ) "ui-profiler" browser-window ;
+: profiler-help ( -- ) "ui-profiler" com-follow ;
 
 \ profiler-help H{ { +nullary+ t } } define-command
 
diff --git a/basis/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor
index d4683ab292..67e30c49db 100644
--- a/basis/ui/tools/walker/walker.factor
+++ b/basis/ui/tools/walker/walker.factor
@@ -66,7 +66,7 @@ M: walker-gadget focusable-child*
         dup status>> self <thread-status> f track-add
         dup traceback>> 1 track-add ;
     
-: walker-help ( -- ) "ui-walker" browser-window ;
+: walker-help ( -- ) "ui-walker" com-follow ;
 
 \ walker-help H{ { +nullary+ t } } define-command