steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2008-07-14 16:43:30 -05:00
parent 46f188ab2c 8a8114a355
commit 1ce5b3f23e
3 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/bake/bake.factor
View File

@ -94,4 +94,4 @@ MACRO: bake ( seq -- quot ) [bake] ;
: `{ \ } [ >array ] parse-literal \ bake parsed ; parsing : `{ \ } [ >array ] parse-literal \ bake parsed ; parsing
: `V{ \ } [ >vector ] parse-literal \ bake parsed ; parsing : `V{ \ } [ >vector ] parse-literal \ bake parsed ; parsing
: `[ \ } [ >quotation ] parse-literal \ bake parsed ; parsing : `[ \ ] [ >quotation ] parse-literal \ bake parsed ; parsing

15
extra/ui/tools/listener/listener.factor
View File

@ -120,14 +120,13 @@ M: engine-word word-completion-string
TUPLE: stack-display < track ; TUPLE: stack-display < track ;
: <stack-display> ( -- gadget ) : <stack-display> ( workspace -- gadget )
g workspace-listener listener>>
{ 0 1 } stack-display new-track { 0 1 } stack-display new-track
[ over <toolbar> f track-add*
dup <toolbar> f track, swap
stack>> [ [ stack. ] curry try ] stack>> [ [ stack. ] curry try ] t "Data stack" <labelled-pane>
t "Data stack" <labelled-pane> 1 track, 1 track-add* ;
] make-gadget ;
M: stack-display tool-scroller M: stack-display tool-scroller
find-workspace workspace-listener tool-scroller ; find-workspace workspace-listener tool-scroller ;

47
extra/ui/tools/tools.factor
View File

@ -12,31 +12,36 @@ tools.test tools.vocabs ui.gadgets.buttons ui.gadgets.status-bar
mirrors ; mirrors ;
IN: ui.tools IN: ui.tools
: <workspace-tabs> ( -- tabs ) : <workspace-tabs> ( workspace -- tabs )
g gadget-model model>>
"tool-switching" workspace command-map commands>> "tool-switching" workspace command-map commands>>
[ command-string ] { } assoc>map <enum> >alist [ command-string ] { } assoc>map <enum> >alist
<toggle-buttons> ; <toggle-buttons> ;
: <workspace-book> ( -- gadget ) : <workspace-book> ( workspace -- gadget )
[
<stack-display> ,
<browser-gadget> ,
<inspector-gadget> ,
<profiler-gadget> ,
] { } make g gadget-model <book> ;
dup
<stack-display>
<browser-gadget>
<inspector-gadget>
<profiler-gadget>
4array
swap model>>
<book> ;
: <workspace> ( -- workspace ) : <workspace> ( -- workspace )
{ 0 1 } workspace new-track { 0 1 } workspace new-track
0 <model> >>model
[ 0 <model> >>model
<listener-gadget> g set-workspace-listener <listener-gadget> >>listener
<workspace-book> g set-workspace-book dup <workspace-book> >>book
<workspace-tabs> f track,
g workspace-book 1/5 track, dup <workspace-tabs> f track-add*
g workspace-listener 4/5 track, dup book>> 1/5 track-add*
toolbar, dup listener>> 4/5 track-add*
] make-gadget ; 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? [