diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index 8f180714c8..33523701aa 100755 --- a/basis/ui/tools/browser/browser.factor +++ b/basis/ui/tools/browser/browser.factor @@ -39,17 +39,17 @@ M: browser-gadget ungraft* : showing-definition? ( defspec assoc -- ? ) [ key? ] 2keep - [ >r dup word-link? [ link-name ] when r> key? ] 2keep + [ >r dup word-link? [ name>> ] when r> key? ] 2keep >r dup vocab-link? [ vocab ] when r> key? or or ; M: browser-gadget definitions-changed ( assoc browser -- ) history>> - dup model-value rot showing-definition? + dup value>> rot showing-definition? [ notify-connections ] [ drop ] if ; : help-action ( browser-gadget -- link ) - history>> model-value >link ; + history>> value>> >link ; : com-follow ( link -- ) browser-gadget call-tool ; diff --git a/basis/ui/tools/debugger/debugger.factor b/basis/ui/tools/debugger/debugger.factor index 203406c6cb..5a3ad01d2e 100644 --- a/basis/ui/tools/debugger/debugger.factor +++ b/basis/ui/tools/debugger/debugger.factor @@ -11,7 +11,7 @@ USING: accessors arrays ui ui.commands ui.gestures ui.gadgets IN: ui.tools.debugger : ( restarts restart-hook -- gadget ) - [ restart-name ] rot ; + [ name>> ] rot ; TUPLE: debugger < track restarts ; diff --git a/basis/ui/tools/search/search.factor b/basis/ui/tools/search/search.factor index 407484ba97..89f238b574 100755 --- a/basis/ui/tools/search/search.factor +++ b/basis/ui/tools/search/search.factor @@ -118,7 +118,7 @@ M: live-search pref-dim* drop { 400 200 } ; : ( string files -- gadget ) source-file-candidates - f [ pathname-string ] ; + f [ string>> ] ; : all-source-files ( -- seq ) source-files get keys natural-sort ; @@ -146,7 +146,7 @@ M: live-search pref-dim* drop { 400 200 } ; : ( string seq -- gadget ) history-candidates - f [ input-string ] ; + f [ string>> ] ; : listener-history ( listener -- seq ) listener-gadget-input interactor-history ; diff --git a/basis/ui/tools/traceback/traceback.factor b/basis/ui/tools/traceback/traceback.factor index 05cb043e49..06ebb7eb4e 100755 --- a/basis/ui/tools/traceback/traceback.factor +++ b/basis/ui/tools/traceback/traceback.factor @@ -9,15 +9,15 @@ USING: accessors continuations kernel models namespaces IN: ui.tools.traceback : ( model -- gadget ) - [ [ continuation-call callstack. ] when* ] + [ [ call>> callstack. ] when* ] t "Call stack" ; : ( model -- gadget ) - [ [ continuation-data stack. ] when* ] + [ [ data>> stack. ] when* ] t "Data stack" ; : ( model -- gadget ) - [ [ continuation-retain stack. ] when* ] + [ [ return>> stack. ] when* ] t "Retain stack" ; TUPLE: traceback-gadget < track ; @@ -39,7 +39,7 @@ M: traceback-gadget pref-dim* drop { 550 600 } ; dup f track-add ; : ( model -- gadget ) - [ [ continuation-name namestack. ] when* ] + [ [ name>> namestack. ] when* ] ; : ( model -- gadget ) diff --git a/basis/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor index c667e6918d..767be92687 100755 --- a/basis/ui/tools/walker/walker.factor +++ b/basis/ui/tools/walker/walker.factor @@ -41,7 +41,7 @@ M: walker-gadget focusable-child* : walker-state-string ( status thread -- string ) [ "Thread: " % - dup thread-name % + dup name>> % " (" % swap { { +stopped+ "Stopped" } @@ -92,7 +92,7 @@ walker-gadget "toolbar" f { [ swap walker-for-thread? ] curry find-window ; : walker-window ( status continuation thread -- ) - [ ] [ thread-name ] bi open-status-window ; + [ ] [ name>> ] bi open-status-window ; [ dup find-walker-window dup