diff --git a/basis/ui/tools/debugger/debugger.factor b/basis/ui/tools/debugger/debugger.factor index 5a3ad01d2e..4ba4374bb8 100644 --- a/basis/ui/tools/debugger/debugger.factor +++ b/basis/ui/tools/debugger/debugger.factor @@ -29,7 +29,7 @@ TUPLE: debugger < track restarts ; -rot >>restarts dup restarts>> rot 1 track-add ; -M: debugger focusable-child* debugger-restarts ; +M: debugger focusable-child* restarts>> ; : debugger-window ( error -- ) #! No restarts for the debugger window diff --git a/basis/ui/tools/deploy/deploy.factor b/basis/ui/tools/deploy/deploy.factor index b68e5162a3..285757e390 100755 --- a/basis/ui/tools/deploy/deploy.factor +++ b/basis/ui/tools/deploy/deploy.factor @@ -65,13 +65,13 @@ TUPLE: deploy-gadget < pack vocab settings ; [ deploy-gadget? ] find-parent ; : find-deploy-vocab ( gadget -- vocab ) - find-deploy-gadget deploy-gadget-vocab ; + find-deploy-gadget vocab>> ; : find-deploy-config ( gadget -- config ) find-deploy-vocab deploy-config ; : find-deploy-settings ( gadget -- settings ) - find-deploy-gadget deploy-gadget-settings ; + find-deploy-gadget settings>> ; : com-revert ( gadget -- ) dup find-deploy-config diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor index bb0f02ec7e..273d6bc549 100644 --- a/basis/ui/tools/inspector/inspector.factor +++ b/basis/ui/tools/inspector/inspector.factor @@ -47,4 +47,4 @@ inspector-gadget "multi-touch" f { } define-command-map M: inspector-gadget tool-scroller - inspector-gadget-pane find-scroller ; + pane>> find-scroller ; diff --git a/basis/ui/tools/interactor/interactor.factor b/basis/ui/tools/interactor/interactor.factor index 20428a39b6..39f10f42ae 100755 --- a/basis/ui/tools/interactor/interactor.factor +++ b/basis/ui/tools/interactor/interactor.factor @@ -76,7 +76,7 @@ M: interactor model-changed ] with-output-stream* ; : add-interactor-history ( str interactor -- ) - over empty? [ 2drop ] [ interactor-history adjoin ] if ; + over empty? [ 2drop ] [ history>> adjoin ] if ; : interactor-continue ( obj interactor -- ) mailbox>> mailbox-put ; diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index 2dee1ba4a9..683eff9457 100755 --- a/basis/ui/tools/listener/listener.factor +++ b/basis/ui/tools/listener/listener.factor @@ -110,7 +110,7 @@ M: engine-word word-completion-string ] [ 2drop ] if ; : insert-word ( word -- ) - get-workspace workspace-listener input>> + get-workspace listener>> input>> [ >r word-completion-string r> user-input ] [ interactor-use use-if-necessary ] 2bi ; @@ -131,10 +131,10 @@ TUPLE: stack-display < track ; 1 track-add ; M: stack-display tool-scroller - find-workspace workspace-listener tool-scroller ; + find-workspace listener>> tool-scroller ; : ui-listener-hook ( listener -- ) - >r datastack r> listener-gadget-stack set-model ; + >r datastack r> stack>> set-model ; : ui-error-hook ( error listener -- ) find-workspace debugger-popup ; @@ -168,7 +168,7 @@ M: stack-display tool-scroller } cleave ; : init-listener ( listener -- ) - f swap set-listener-gadget-stack ; + f swap (>>stack) ; : ( -- gadget ) { 0 1 } listener-gadget new-track diff --git a/basis/ui/tools/profiler/profiler.factor b/basis/ui/tools/profiler/profiler.factor index f440bd8766..462af87574 100755 --- a/basis/ui/tools/profiler/profiler.factor +++ b/basis/ui/tools/profiler/profiler.factor @@ -14,7 +14,7 @@ TUPLE: profiler-gadget < track pane ; dup pane>> 1 track-add ; : with-profiler-pane ( gadget quot -- ) - >r profiler-gadget-pane r> with-pane ; + >r pane>> r> with-pane ; : com-full-profile ( gadget -- ) [ profile. ] with-profiler-pane ; diff --git a/basis/ui/tools/search/search.factor b/basis/ui/tools/search/search.factor index 89f238b574..5237813fe0 100755 --- a/basis/ui/tools/search/search.factor +++ b/basis/ui/tools/search/search.factor @@ -14,7 +14,7 @@ IN: ui.tools.search TUPLE: live-search < track field list ; : search-value ( live-search -- value ) - live-search-list list-value ; + list>> list-value ; : search-gesture ( gesture live-search -- operation/f ) search-value object-operations @@ -32,7 +32,7 @@ M: live-search handle-gesture ( gesture live-search -- ? ) [ live-search? ] find-parent ; : find-search-list ( gadget -- list ) - find-live-search live-search-list ; + find-live-search list>> ; TUPLE: search-field < editor ; @@ -70,12 +70,12 @@ search-field H{ over field>> set-editor-string dup field>> end-of-document ; -M: live-search focusable-child* live-search-field ; +M: live-search focusable-child* field>> ; M: live-search pref-dim* drop { 400 200 } ; : current-word ( workspace -- string ) - workspace-listener listener-gadget-input selected-word ; + listener>> input>> selected-word ; : definition-candidates ( words -- candidates ) [ dup synopsis >lower ] { } map>assoc sort-values ; @@ -149,10 +149,10 @@ M: live-search pref-dim* drop { 400 200 } ; f [ string>> ] ; : listener-history ( listener -- seq ) - listener-gadget-input interactor-history ; + input>> history>> ; : com-history ( workspace -- ) - "" over workspace-listener listener-history + "" over listener>> listener-history "History search" show-titled-popup ; workspace "toolbar" f { diff --git a/basis/ui/tools/tools.factor b/basis/ui/tools/tools.factor index a437c2dbb6..21fa44b593 100755 --- a/basis/ui/tools/tools.factor +++ b/basis/ui/tools/tools.factor @@ -54,7 +54,7 @@ IN: ui.tools M: workspace model-changed nip - dup workspace-listener listener-gadget-output scroll>bottom + dup listener>> output>> scroll>bottom dup resize-workspace request-focus ; diff --git a/basis/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor index 767be92687..51091c576d 100755 --- a/basis/ui/tools/walker/walker.factor +++ b/basis/ui/tools/walker/walker.factor @@ -84,7 +84,7 @@ walker-gadget "toolbar" f { : walker-for-thread? ( thread gadget -- ? ) { { [ dup walker-gadget? not ] [ 2drop f ] } - { [ dup walker-gadget-closing? ] [ 2drop f ] } + { [ dup closing?>> ] [ 2drop f ] } [ thread>> eq? ] } cond ; diff --git a/basis/ui/tools/workspace/workspace.factor b/basis/ui/tools/workspace/workspace.factor index bc758e9eb8..ab6b3fe1cf 100755 --- a/basis/ui/tools/workspace/workspace.factor +++ b/basis/ui/tools/workspace/workspace.factor @@ -29,7 +29,7 @@ M: gadget tool-scroller drop f ; book>> children>> [ class eq? ] with find ; : show-tool ( class workspace -- tool ) - [ find-tool swap ] keep workspace-book model>> + [ find-tool swap ] keep book>> model>> set-model ; : select-tool ( workspace class -- ) swap show-tool drop ; @@ -81,10 +81,10 @@ SYMBOL: workspace-dim M: workspace pref-dim* drop workspace-dim get ; M: workspace focusable-child* - dup workspace-popup [ ] [ workspace-listener ] ?if ; + dup popup>> [ ] [ listener>> ] ?if ; : workspace-page ( workspace -- gadget ) - workspace-book current-page ; + book>> current-page ; M: workspace tool-scroller ( workspace -- scroller ) workspace-page tool-scroller ;