Update old accessors from ui.tools.*
parent
e8f961f42d
commit
c570085151
|
@ -29,7 +29,7 @@ TUPLE: debugger < track restarts ;
|
||||||
-rot <restart-list> >>restarts
|
-rot <restart-list> >>restarts
|
||||||
dup restarts>> rot <debugger-display> <scroller> 1 track-add ;
|
dup restarts>> rot <debugger-display> <scroller> 1 track-add ;
|
||||||
|
|
||||||
M: debugger focusable-child* debugger-restarts ;
|
M: debugger focusable-child* restarts>> ;
|
||||||
|
|
||||||
: debugger-window ( error -- )
|
: debugger-window ( error -- )
|
||||||
#! No restarts for the debugger window
|
#! No restarts for the debugger window
|
||||||
|
|
|
@ -65,13 +65,13 @@ TUPLE: deploy-gadget < pack vocab settings ;
|
||||||
[ deploy-gadget? ] find-parent ;
|
[ deploy-gadget? ] find-parent ;
|
||||||
|
|
||||||
: find-deploy-vocab ( gadget -- vocab )
|
: find-deploy-vocab ( gadget -- vocab )
|
||||||
find-deploy-gadget deploy-gadget-vocab ;
|
find-deploy-gadget vocab>> ;
|
||||||
|
|
||||||
: find-deploy-config ( gadget -- config )
|
: find-deploy-config ( gadget -- config )
|
||||||
find-deploy-vocab deploy-config ;
|
find-deploy-vocab deploy-config ;
|
||||||
|
|
||||||
: find-deploy-settings ( gadget -- settings )
|
: find-deploy-settings ( gadget -- settings )
|
||||||
find-deploy-gadget deploy-gadget-settings ;
|
find-deploy-gadget settings>> ;
|
||||||
|
|
||||||
: com-revert ( gadget -- )
|
: com-revert ( gadget -- )
|
||||||
dup find-deploy-config
|
dup find-deploy-config
|
||||||
|
|
|
@ -47,4 +47,4 @@ inspector-gadget "multi-touch" f {
|
||||||
} define-command-map
|
} define-command-map
|
||||||
|
|
||||||
M: inspector-gadget tool-scroller
|
M: inspector-gadget tool-scroller
|
||||||
inspector-gadget-pane find-scroller ;
|
pane>> find-scroller ;
|
||||||
|
|
|
@ -76,7 +76,7 @@ M: interactor model-changed
|
||||||
] with-output-stream* ;
|
] with-output-stream* ;
|
||||||
|
|
||||||
: add-interactor-history ( str interactor -- )
|
: add-interactor-history ( str interactor -- )
|
||||||
over empty? [ 2drop ] [ interactor-history adjoin ] if ;
|
over empty? [ 2drop ] [ history>> adjoin ] if ;
|
||||||
|
|
||||||
: interactor-continue ( obj interactor -- )
|
: interactor-continue ( obj interactor -- )
|
||||||
mailbox>> mailbox-put ;
|
mailbox>> mailbox-put ;
|
||||||
|
|
|
@ -110,7 +110,7 @@ M: engine-word word-completion-string
|
||||||
] [ 2drop ] if ;
|
] [ 2drop ] if ;
|
||||||
|
|
||||||
: insert-word ( word -- )
|
: insert-word ( word -- )
|
||||||
get-workspace workspace-listener input>>
|
get-workspace listener>> input>>
|
||||||
[ >r word-completion-string r> user-input ]
|
[ >r word-completion-string r> user-input ]
|
||||||
[ interactor-use use-if-necessary ]
|
[ interactor-use use-if-necessary ]
|
||||||
2bi ;
|
2bi ;
|
||||||
|
@ -131,10 +131,10 @@ TUPLE: stack-display < track ;
|
||||||
1 track-add ;
|
1 track-add ;
|
||||||
|
|
||||||
M: stack-display tool-scroller
|
M: stack-display tool-scroller
|
||||||
find-workspace workspace-listener tool-scroller ;
|
find-workspace listener>> tool-scroller ;
|
||||||
|
|
||||||
: ui-listener-hook ( listener -- )
|
: ui-listener-hook ( listener -- )
|
||||||
>r datastack r> listener-gadget-stack set-model ;
|
>r datastack r> stack>> set-model ;
|
||||||
|
|
||||||
: ui-error-hook ( error listener -- )
|
: ui-error-hook ( error listener -- )
|
||||||
find-workspace debugger-popup ;
|
find-workspace debugger-popup ;
|
||||||
|
@ -168,7 +168,7 @@ M: stack-display tool-scroller
|
||||||
} cleave ;
|
} cleave ;
|
||||||
|
|
||||||
: init-listener ( listener -- )
|
: init-listener ( listener -- )
|
||||||
f <model> swap set-listener-gadget-stack ;
|
f <model> swap (>>stack) ;
|
||||||
|
|
||||||
: <listener-gadget> ( -- gadget )
|
: <listener-gadget> ( -- gadget )
|
||||||
{ 0 1 } listener-gadget new-track
|
{ 0 1 } listener-gadget new-track
|
||||||
|
|
|
@ -14,7 +14,7 @@ TUPLE: profiler-gadget < track pane ;
|
||||||
dup pane>> <scroller> 1 track-add ;
|
dup pane>> <scroller> 1 track-add ;
|
||||||
|
|
||||||
: with-profiler-pane ( gadget quot -- )
|
: with-profiler-pane ( gadget quot -- )
|
||||||
>r profiler-gadget-pane r> with-pane ;
|
>r pane>> r> with-pane ;
|
||||||
|
|
||||||
: com-full-profile ( gadget -- )
|
: com-full-profile ( gadget -- )
|
||||||
[ profile. ] with-profiler-pane ;
|
[ profile. ] with-profiler-pane ;
|
||||||
|
|
|
@ -14,7 +14,7 @@ IN: ui.tools.search
|
||||||
TUPLE: live-search < track field list ;
|
TUPLE: live-search < track field list ;
|
||||||
|
|
||||||
: search-value ( live-search -- value )
|
: search-value ( live-search -- value )
|
||||||
live-search-list list-value ;
|
list>> list-value ;
|
||||||
|
|
||||||
: search-gesture ( gesture live-search -- operation/f )
|
: search-gesture ( gesture live-search -- operation/f )
|
||||||
search-value object-operations
|
search-value object-operations
|
||||||
|
@ -32,7 +32,7 @@ M: live-search handle-gesture ( gesture live-search -- ? )
|
||||||
[ live-search? ] find-parent ;
|
[ live-search? ] find-parent ;
|
||||||
|
|
||||||
: find-search-list ( gadget -- list )
|
: find-search-list ( gadget -- list )
|
||||||
find-live-search live-search-list ;
|
find-live-search list>> ;
|
||||||
|
|
||||||
TUPLE: search-field < editor ;
|
TUPLE: search-field < editor ;
|
||||||
|
|
||||||
|
@ -70,12 +70,12 @@ search-field H{
|
||||||
over field>> set-editor-string
|
over field>> set-editor-string
|
||||||
dup field>> end-of-document ;
|
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 } ;
|
M: live-search pref-dim* drop { 400 200 } ;
|
||||||
|
|
||||||
: current-word ( workspace -- string )
|
: current-word ( workspace -- string )
|
||||||
workspace-listener listener-gadget-input selected-word ;
|
listener>> input>> selected-word ;
|
||||||
|
|
||||||
: definition-candidates ( words -- candidates )
|
: definition-candidates ( words -- candidates )
|
||||||
[ dup synopsis >lower ] { } map>assoc sort-values ;
|
[ dup synopsis >lower ] { } map>assoc sort-values ;
|
||||||
|
@ -149,10 +149,10 @@ M: live-search pref-dim* drop { 400 200 } ;
|
||||||
f [ string>> ] <live-search> ;
|
f [ string>> ] <live-search> ;
|
||||||
|
|
||||||
: listener-history ( listener -- seq )
|
: listener-history ( listener -- seq )
|
||||||
listener-gadget-input interactor-history <reversed> ;
|
input>> history>> <reversed> ;
|
||||||
|
|
||||||
: com-history ( workspace -- )
|
: com-history ( workspace -- )
|
||||||
"" over workspace-listener listener-history <history-search>
|
"" over listener>> listener-history <history-search>
|
||||||
"History search" show-titled-popup ;
|
"History search" show-titled-popup ;
|
||||||
|
|
||||||
workspace "toolbar" f {
|
workspace "toolbar" f {
|
||||||
|
|
|
@ -54,7 +54,7 @@ IN: ui.tools
|
||||||
|
|
||||||
M: workspace model-changed
|
M: workspace model-changed
|
||||||
nip
|
nip
|
||||||
dup workspace-listener listener-gadget-output scroll>bottom
|
dup listener>> output>> scroll>bottom
|
||||||
dup resize-workspace
|
dup resize-workspace
|
||||||
request-focus ;
|
request-focus ;
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ walker-gadget "toolbar" f {
|
||||||
: walker-for-thread? ( thread gadget -- ? )
|
: walker-for-thread? ( thread gadget -- ? )
|
||||||
{
|
{
|
||||||
{ [ dup walker-gadget? not ] [ 2drop f ] }
|
{ [ dup walker-gadget? not ] [ 2drop f ] }
|
||||||
{ [ dup walker-gadget-closing? ] [ 2drop f ] }
|
{ [ dup closing?>> ] [ 2drop f ] }
|
||||||
[ thread>> eq? ]
|
[ thread>> eq? ]
|
||||||
} cond ;
|
} cond ;
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ M: gadget tool-scroller drop f ;
|
||||||
book>> children>> [ class eq? ] with find ;
|
book>> children>> [ class eq? ] with find ;
|
||||||
|
|
||||||
: show-tool ( class workspace -- tool )
|
: show-tool ( class workspace -- tool )
|
||||||
[ find-tool swap ] keep workspace-book model>>
|
[ find-tool swap ] keep book>> model>>
|
||||||
set-model ;
|
set-model ;
|
||||||
|
|
||||||
: select-tool ( workspace class -- ) swap show-tool drop ;
|
: 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 pref-dim* drop workspace-dim get ;
|
||||||
|
|
||||||
M: workspace focusable-child*
|
M: workspace focusable-child*
|
||||||
dup workspace-popup [ ] [ workspace-listener ] ?if ;
|
dup popup>> [ ] [ listener>> ] ?if ;
|
||||||
|
|
||||||
: workspace-page ( workspace -- gadget )
|
: workspace-page ( workspace -- gadget )
|
||||||
workspace-book current-page ;
|
book>> current-page ;
|
||||||
|
|
||||||
M: workspace tool-scroller ( workspace -- scroller )
|
M: workspace tool-scroller ( workspace -- scroller )
|
||||||
workspace-page tool-scroller ;
|
workspace-page tool-scroller ;
|
||||||
|
|
Loading…
Reference in New Issue