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

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

db4
Slava Pestov 2008-07-14 00:52:55 -05:00
parent 6e24307df4 4e5551759a
commit 919eadc1a8
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extra/ui/tools/browser/browser.factor
View File

@ -20,13 +20,11 @@ TUPLE: browser-gadget < track pane history ;
"handbook" >link <history> >>history drop ; "handbook" >link <history> >>history drop ;
: <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*
toolbar, dup <help-pane> >>pane
g <help-pane> g-> set-browser-gadget-pane dup pane>> <scroller> 1 track-add* ;
<scroller> 1 track,
] make-gadget ;
M: browser-gadget call-tool* show-help ; M: browser-gadget call-tool* show-help ;

35
extra/ui/tools/traceback/traceback.factor
View File

@ -1,10 +1,11 @@
! Copyright (C) 2006, 2008 Slava Pestov. ! Copyright (C) 2006, 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors continuations kernel models namespaces USING: accessors continuations kernel models namespaces
prettyprint ui ui.commands ui.gadgets ui.gadgets.labelled assocs prettyprint ui ui.commands ui.gadgets ui.gadgets.labelled assocs
ui.gadgets.tracks ui.gadgets.buttons ui.gadgets.panes ui.gadgets.tracks ui.gadgets.buttons ui.gadgets.panes
ui.gadgets.status-bar ui.gadgets.scrollers ui.gestures sequences ui.gadgets.status-bar ui.gadgets.scrollers ui.gestures sequences
hashtables inspector ; hashtables inspector ;
IN: ui.tools.traceback IN: ui.tools.traceback
: <callstack-display> ( model -- gadget ) : <callstack-display> ( model -- gadget )
@ -24,20 +25,18 @@ TUPLE: traceback-gadget < track ;
M: traceback-gadget pref-dim* drop { 550 600 } ; M: traceback-gadget pref-dim* drop { 550 600 } ;
: <traceback-gadget> ( model -- gadget ) : <traceback-gadget> ( model -- gadget )
{ 0 1 } traceback-gadget new-track { 0 1 } traceback-gadget new-track
swap >>model swap >>model
[
g model>> dup model>>
[ { 1 0 } <track>
[ over <datastack-display> 1/2 track-add*
[ <datastack-display> 1/2 track, ] swap <retainstack-display> 1/2 track-add*
[ <retainstack-display> 1/2 track, ] 1/3 track-add*
bi
] { 1 0 } make-track 1/3 track, dup model>> <callstack-display> 2/3 track-add*
]
[ <callstack-display> 2/3 track, ] bi dup <toolbar> f track-add* ;
toolbar,
] make-gadget ;
: <namestack-display> ( model -- gadget ) : <namestack-display> ( model -- gadget )
[ [ continuation-name namestack. ] when* ] [ [ continuation-name namestack. ] when* ]

9
extra/ui/tools/walker/walker.factor
View File

@ -61,12 +61,11 @@ M: walker-gadget focusable-child*
swap >>continuation swap >>continuation
swap >>status swap >>status
dup continuation>> <traceback-gadget> >>traceback dup continuation>> <traceback-gadget> >>traceback
[
toolbar,
g status>> self <thread-status> f track,
g traceback>> 1 track,
] make-gadget ;
dup <toolbar> f track-add*
dup status>> self <thread-status> f track-add*
dup traceback>> 1 track-add* ;
: walker-help ( -- ) "ui-walker" help-window ; : walker-help ( -- ) "ui-walker" help-window ;
\ walker-help H{ { +nullary+ t } } define-command \ walker-help H{ { +nullary+ t } } define-command