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

UI completion cleanups

slava 2006-10-07 18:36:32 +00:00
parent 93c3dcf19b
commit 3a6c3b3600
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO.FACTOR.txt
View File

@ -13,7 +13,8 @@
- help search looks funny - help search looks funny
- menus should not require mouse to be held - menus should not require mouse to be held
- tab completion: add a USE: if necessary - tab completion: add a USE: if necessary
- reloading buttons.factor fails - completion is not ideal: eg, search for "buttons"
- live search: timer delay would be nice
+ ui: + ui:

2
library/ui/tools/browser.factor
View File

@ -98,7 +98,7 @@ C: browser ( -- gadget )
{ {
[ "" [ browser call-tool ] <word-search> ] [ "" [ browser call-tool ] <word-search> ]
set-browser-search set-browser-search
f [ "Word search" <labelled-gadget> ]
1/5 1/5
} }
} { 0 1 } make-track* ; } { 0 1 } make-track* ;

2
library/ui/tools/help.factor
View File

@ -31,7 +31,7 @@ C: help-gadget ( -- gadget )
{ {
[ "" [ help-gadget call-tool ] <help-search> ] [ "" [ help-gadget call-tool ] <help-search> ]
set-help-gadget-search set-help-gadget-search
f [ "Help search" <labelled-gadget> ]
1/5 1/5
} }
} { 0 1 } make-track* ; } { 0 1 } make-track* ;

10
library/ui/tools/listener.factor
View File

@ -108,14 +108,18 @@ M: listener-gadget tool-help
: show-word-search ( listener action -- ) : show-word-search ( listener action -- )
>r dup listener-gadget-input selected-word r> >r dup listener-gadget-input selected-word r>
<word-search> swap show-minibuffer ; <word-search> "Word search" <labelled-gadget>
swap show-minibuffer ;
: show-source-files-search ( listener action -- ) : show-source-files-search ( listener action -- )
"" swap <source-files-search> swap show-minibuffer ; "" swap <source-files-search>
"Source file search" <labelled-gadget>
swap show-minibuffer ;
: show-vocabs-search ( listener action -- ) : show-vocabs-search ( listener action -- )
>r dup listener-gadget-input selected-word r> >r dup listener-gadget-input selected-word r>
<vocabs-search> swap show-minibuffer ; <vocabs-search> "Vocabulary search" <labelled-gadget>
swap show-minibuffer ;
: show-list ( seq presenter action listener -- ) : show-list ( seq presenter action listener -- )
>r >r >r <model> r> r> <list> <scroller> r> >r >r >r <model> r> r> <list> <scroller> r>

10
library/ui/tools/search.factor
View File

@ -19,7 +19,7 @@ C: search-field ( string -- gadget )
<editor> over set-gadget-delegate <editor> over set-gadget-delegate
dup dup set-control-self dup dup set-control-self
[ set-editor-text ] keep [ set-editor-text ] keep
[ select-all ] keep ; [ editor-doc-end ] keep ;
search-field H{ search-field H{
{ T{ key-down f f "UP" } [ find-search-list select-prev ] } { T{ key-down f f "UP" } [ find-search-list select-prev ] }
@ -63,12 +63,12 @@ M: live-search focusable-child* live-search-field ;
all-words all-words
[ word-completions ] curry [ word-completions ] curry
[ word-completion. ] [ word-completion. ]
<live-search> "Word search" <labelled-gadget> ; <live-search> ;
: <help-search> ( string action -- gadget ) : <help-search> ( string action -- gadget )
[ search-help ] [ search-help ]
[ first ($link) ] [ first ($link) ]
<live-search> "Help search" <labelled-gadget> ; <live-search> ;
: string-completion. ( pair quot -- ) : string-completion. ( pair quot -- )
>r first2 over completion>string swap r> call write-object ; >r first2 over completion>string swap r> call write-object ;
@ -78,10 +78,10 @@ M: live-search focusable-child* live-search-field ;
source-files get hash-keys natural-sort source-files get hash-keys natural-sort
[ string-completions ] curry [ string-completions ] curry
[ [ <pathname> ] string-completion. ] [ [ <pathname> ] string-completion. ]
<live-search> "Source file search" <labelled-gadget> ; <live-search> ;
: <vocabs-search> ( string action -- gadget ) : <vocabs-search> ( string action -- gadget )
vocabs vocabs
[ string-completions ] curry [ string-completions ] curry
[ [ <vocab-link> ] string-completion. ] [ [ <vocab-link> ] string-completion. ]
<live-search> "Vocabulary search" <labelled-gadget> ; <live-search> ;