Replace usages of 'track-add*' with 'track-add'
parent
3d9607bda0
commit
a81969b268
|
@ -12,9 +12,9 @@ TUPLE: labelled-gadget < track content ;
|
||||||
|
|
||||||
: <labelled-gadget> ( gadget title -- newgadget )
|
: <labelled-gadget> ( gadget title -- newgadget )
|
||||||
{ 0 1 } labelled-gadget new-track
|
{ 0 1 } labelled-gadget new-track
|
||||||
swap <label> reverse-video-theme f track-add*
|
swap <label> reverse-video-theme f track-add
|
||||||
swap >>content
|
swap >>content
|
||||||
dup content>> 1 track-add* ;
|
dup content>> 1 track-add ;
|
||||||
|
|
||||||
M: labelled-gadget focusable-child* labelled-gadget-content ;
|
M: labelled-gadget focusable-child* labelled-gadget-content ;
|
||||||
|
|
||||||
|
|
|
@ -65,10 +65,10 @@ M: f >label drop <gadget> ;
|
||||||
|
|
||||||
: label-on-left ( gadget label -- button )
|
: label-on-left ( gadget label -- button )
|
||||||
{ 1 0 } <track>
|
{ 1 0 } <track>
|
||||||
swap >label f track-add*
|
swap >label f track-add
|
||||||
swap 1 track-add* ;
|
swap 1 track-add ;
|
||||||
|
|
||||||
: label-on-right ( label gadget -- button )
|
: label-on-right ( label gadget -- button )
|
||||||
{ 1 0 } <track>
|
{ 1 0 } <track>
|
||||||
swap f track-add*
|
swap f track-add
|
||||||
swap >label 1 track-add* ;
|
swap >label 1 track-add ;
|
||||||
|
|
|
@ -71,9 +71,9 @@ M: value-ref finish-editing
|
||||||
: <slot-editor> ( ref -- gadget )
|
: <slot-editor> ( ref -- gadget )
|
||||||
{ 0 1 } slot-editor new-track
|
{ 0 1 } slot-editor new-track
|
||||||
swap >>ref
|
swap >>ref
|
||||||
dup <toolbar> f track-add*
|
dup <toolbar> f track-add
|
||||||
<source-editor> >>text
|
<source-editor> >>text
|
||||||
dup text>> <scroller> 1 track-add*
|
dup text>> <scroller> 1 track-add
|
||||||
dup revert ;
|
dup revert ;
|
||||||
|
|
||||||
M: slot-editor pref-dim* call-next-method { 600 200 } vmin ;
|
M: slot-editor pref-dim* call-next-method { 600 200 } vmin ;
|
||||||
|
@ -97,8 +97,8 @@ TUPLE: editable-slot < track printer ref ;
|
||||||
|
|
||||||
: display-slot ( gadget editable-slot -- )
|
: display-slot ( gadget editable-slot -- )
|
||||||
dup clear-track
|
dup clear-track
|
||||||
swap 1 track-add*
|
swap 1 track-add
|
||||||
<edit-button> f track-add*
|
<edit-button> f track-add
|
||||||
drop ;
|
drop ;
|
||||||
|
|
||||||
: update-slot ( editable-slot -- )
|
: update-slot ( editable-slot -- )
|
||||||
|
@ -109,7 +109,7 @@ TUPLE: editable-slot < track printer ref ;
|
||||||
[ clear-track ]
|
[ clear-track ]
|
||||||
[
|
[
|
||||||
dup ref>> <slot-editor>
|
dup ref>> <slot-editor>
|
||||||
[ 1 track-add* drop ]
|
[ 1 track-add drop ]
|
||||||
[ [ scroll>gadget ] [ request-focus ] bi* ] 2bi
|
[ [ scroll>gadget ] [ request-focus ] bi* ] 2bi
|
||||||
] bi ;
|
] bi ;
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ IN: ui.gadgets.status-bar
|
||||||
|
|
||||||
: open-status-window ( gadget title -- )
|
: open-status-window ( gadget title -- )
|
||||||
f <model> [ <world> ] keep
|
f <model> [ <world> ] keep
|
||||||
<status-bar> f track-add*
|
<status-bar> f track-add
|
||||||
open-world-window ;
|
open-world-window ;
|
||||||
|
|
||||||
: show-summary ( object gadget -- )
|
: show-summary ( object gadget -- )
|
||||||
|
|
|
@ -40,7 +40,7 @@ M: world request-focus-on ( child gadget -- )
|
||||||
{ 0 0 } >>window-loc
|
{ 0 0 } >>window-loc
|
||||||
swap >>status
|
swap >>status
|
||||||
swap >>title
|
swap >>title
|
||||||
swap 1 track-add*
|
swap 1 track-add
|
||||||
dup request-focus ;
|
dup request-focus ;
|
||||||
|
|
||||||
M: world layout*
|
M: world layout*
|
||||||
|
|
|
@ -22,9 +22,9 @@ TUPLE: browser-gadget < track pane history ;
|
||||||
: <browser-gadget> ( -- gadget )
|
: <browser-gadget> ( -- gadget )
|
||||||
{ 0 1 } browser-gadget new-track
|
{ 0 1 } browser-gadget new-track
|
||||||
dup init-history
|
dup init-history
|
||||||
dup <toolbar> f track-add*
|
dup <toolbar> f track-add
|
||||||
dup <help-pane> >>pane
|
dup <help-pane> >>pane
|
||||||
dup pane>> <scroller> 1 track-add* ;
|
dup pane>> <scroller> 1 track-add ;
|
||||||
|
|
||||||
M: browser-gadget call-tool* show-help ;
|
M: browser-gadget call-tool* show-help ;
|
||||||
|
|
||||||
|
|
|
@ -25,9 +25,9 @@ TUPLE: debugger < track restarts ;
|
||||||
|
|
||||||
: <debugger> ( error restarts restart-hook -- gadget )
|
: <debugger> ( error restarts restart-hook -- gadget )
|
||||||
{ 0 1 } debugger new-track
|
{ 0 1 } debugger new-track
|
||||||
dup <toolbar> f track-add*
|
dup <toolbar> f track-add
|
||||||
-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* debugger-restarts ;
|
||||||
|
|
||||||
|
|
|
@ -17,9 +17,9 @@ TUPLE: inspector-gadget < track object pane ;
|
||||||
|
|
||||||
: <inspector-gadget> ( -- gadget )
|
: <inspector-gadget> ( -- gadget )
|
||||||
{ 0 1 } inspector-gadget new-track
|
{ 0 1 } inspector-gadget new-track
|
||||||
dup <toolbar> f track-add*
|
dup <toolbar> f track-add
|
||||||
<pane> >>pane
|
<pane> >>pane
|
||||||
dup pane>> <scroller> 1 track-add* ;
|
dup pane>> <scroller> 1 track-add ;
|
||||||
|
|
||||||
: inspect-object ( obj mirror keys inspector -- )
|
: inspect-object ( obj mirror keys inspector -- )
|
||||||
2nip swap >>object refresh ;
|
2nip swap >>object refresh ;
|
||||||
|
|
|
@ -14,7 +14,7 @@ TUPLE: listener-gadget < track input output stack ;
|
||||||
|
|
||||||
: listener-output, ( listener -- listener )
|
: listener-output, ( listener -- listener )
|
||||||
<scrolling-pane> >>output
|
<scrolling-pane> >>output
|
||||||
dup output>> <scroller> "Output" <labelled-gadget> 1 track-add* ;
|
dup output>> <scroller> "Output" <labelled-gadget> 1 track-add ;
|
||||||
|
|
||||||
: listener-streams ( listener -- input output )
|
: listener-streams ( listener -- input output )
|
||||||
[ input>> ] [ output>> <pane-stream> ] bi ;
|
[ input>> ] [ output>> <pane-stream> ] bi ;
|
||||||
|
@ -27,7 +27,7 @@ TUPLE: listener-gadget < track input output stack ;
|
||||||
dup input>>
|
dup input>>
|
||||||
{ 0 100 } <limited-scroller>
|
{ 0 100 } <limited-scroller>
|
||||||
"Input" <labelled-gadget>
|
"Input" <labelled-gadget>
|
||||||
f track-add* ;
|
f track-add ;
|
||||||
|
|
||||||
: welcome. ( -- )
|
: welcome. ( -- )
|
||||||
"If this is your first time with Factor, please read the " print
|
"If this is your first time with Factor, please read the " print
|
||||||
|
@ -125,10 +125,10 @@ TUPLE: stack-display < track ;
|
||||||
: <stack-display> ( workspace -- gadget )
|
: <stack-display> ( workspace -- gadget )
|
||||||
listener>>
|
listener>>
|
||||||
{ 0 1 } stack-display new-track
|
{ 0 1 } stack-display new-track
|
||||||
over <toolbar> f track-add*
|
over <toolbar> f track-add
|
||||||
swap
|
swap
|
||||||
stack>> [ [ stack. ] curry try ] t "Data stack" <labelled-pane>
|
stack>> [ [ stack. ] curry try ] t "Data stack" <labelled-pane>
|
||||||
1 track-add* ;
|
1 track-add ;
|
||||||
|
|
||||||
M: stack-display tool-scroller
|
M: stack-display tool-scroller
|
||||||
find-workspace workspace-listener tool-scroller ;
|
find-workspace workspace-listener tool-scroller ;
|
||||||
|
|
|
@ -9,9 +9,9 @@ TUPLE: profiler-gadget < track pane ;
|
||||||
|
|
||||||
: <profiler-gadget> ( -- gadget )
|
: <profiler-gadget> ( -- gadget )
|
||||||
{ 0 1 } profiler-gadget new-track
|
{ 0 1 } profiler-gadget new-track
|
||||||
dup <toolbar> f track-add*
|
dup <toolbar> f track-add
|
||||||
<pane> >>pane
|
<pane> >>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 profiler-gadget-pane r> with-pane ;
|
||||||
|
|
|
@ -62,9 +62,9 @@ search-field H{
|
||||||
: <live-search> ( string seq limited? presenter -- gadget )
|
: <live-search> ( string seq limited? presenter -- gadget )
|
||||||
{ 0 1 } live-search new-track
|
{ 0 1 } live-search new-track
|
||||||
<search-field> >>field
|
<search-field> >>field
|
||||||
dup field>> f track-add*
|
dup field>> f track-add
|
||||||
-roll <search-list> >>list
|
-roll <search-list> >>list
|
||||||
dup list>> <scroller> 1 track-add*
|
dup list>> <scroller> 1 track-add
|
||||||
|
|
||||||
swap
|
swap
|
||||||
over field>> set-editor-string
|
over field>> set-editor-string
|
||||||
|
|
|
@ -38,10 +38,10 @@ IN: ui.tools
|
||||||
<listener-gadget> >>listener
|
<listener-gadget> >>listener
|
||||||
dup <workspace-book> >>book
|
dup <workspace-book> >>book
|
||||||
|
|
||||||
dup <workspace-tabs> f track-add*
|
dup <workspace-tabs> f track-add
|
||||||
dup book>> 1/5 track-add*
|
dup book>> 1/5 track-add
|
||||||
dup listener>> 4/5 track-add*
|
dup listener>> 4/5 track-add
|
||||||
dup <toolbar> f track-add* ;
|
dup <toolbar> f track-add ;
|
||||||
|
|
||||||
: resize-workspace ( workspace -- )
|
: resize-workspace ( workspace -- )
|
||||||
dup track-sizes over control-value zero? [
|
dup track-sizes over control-value zero? [
|
||||||
|
|
|
@ -30,13 +30,13 @@ M: traceback-gadget pref-dim* drop { 550 600 } ;
|
||||||
|
|
||||||
dup model>>
|
dup model>>
|
||||||
{ 1 0 } <track>
|
{ 1 0 } <track>
|
||||||
over <datastack-display> 1/2 track-add*
|
over <datastack-display> 1/2 track-add
|
||||||
swap <retainstack-display> 1/2 track-add*
|
swap <retainstack-display> 1/2 track-add
|
||||||
1/3 track-add*
|
1/3 track-add
|
||||||
|
|
||||||
dup model>> <callstack-display> 2/3 track-add*
|
dup model>> <callstack-display> 2/3 track-add
|
||||||
|
|
||||||
dup <toolbar> f track-add* ;
|
dup <toolbar> f track-add ;
|
||||||
|
|
||||||
: <namestack-display> ( model -- gadget )
|
: <namestack-display> ( model -- gadget )
|
||||||
[ [ continuation-name namestack. ] when* ]
|
[ [ continuation-name namestack. ] when* ]
|
||||||
|
|
|
@ -62,9 +62,9 @@ M: walker-gadget focusable-child*
|
||||||
swap >>status
|
swap >>status
|
||||||
dup continuation>> <traceback-gadget> >>traceback
|
dup continuation>> <traceback-gadget> >>traceback
|
||||||
|
|
||||||
dup <toolbar> f track-add*
|
dup <toolbar> f track-add
|
||||||
dup status>> self <thread-status> f track-add*
|
dup status>> self <thread-status> f track-add
|
||||||
dup traceback>> 1 track-add* ;
|
dup traceback>> 1 track-add ;
|
||||||
|
|
||||||
: walker-help ( -- ) "ui-walker" help-window ;
|
: walker-help ( -- ) "ui-walker" help-window ;
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ M: gadget tool-scroller drop f ;
|
||||||
: show-popup ( gadget workspace -- )
|
: show-popup ( gadget workspace -- )
|
||||||
dup hide-popup
|
dup hide-popup
|
||||||
over >>popup
|
over >>popup
|
||||||
over f track-add* drop
|
over f track-add drop
|
||||||
request-focus ;
|
request-focus ;
|
||||||
|
|
||||||
: show-titled-popup ( workspace gadget title -- )
|
: show-titled-popup ( workspace gadget title -- )
|
||||||
|
|
Loading…
Reference in New Issue