! Copyright (C) 2006, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays assocs classes combinators
-combinators.short-circuit compiler.units debugger fry help
+combinators.short-circuit compiler.units debugger fonts help
help.apropos help.crossref help.home help.markup help.stylesheet
-help.topics io.styles kernel locals make models namespaces
-sequences sets ui ui.commands ui.gadgets ui.gadgets.borders
-ui.gadgets.editors ui.gadgets.glass ui.gadgets.labels
-ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar
-ui.gadgets.theme ui.gadgets.toolbar ui.gadgets.tracks
+help.topics io.styles kernel literals make math math.vectors
+models namespaces sequences sets system ui ui.commands
+ui.gadgets ui.gadgets.borders ui.gadgets.editors
+ui.gadgets.glass ui.gadgets.panes ui.gadgets.scrollers
+ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.tracks
ui.gadgets.viewports ui.gadgets.worlds ui.gestures ui.pens.solid
-ui.tools.browser.history ui.tools.browser.popups ui.tools.common
-vocabs ;
+ui.theme ui.tools.browser.history ui.tools.browser.popups
+ui.tools.common unicode vocabs ;
IN: ui.tools.browser
TUPLE: browser-gadget < tool history scroller search-field popup ;
-{ 650 700 } browser-gadget set-tool-dim
+browser-gadget default-font-size { 54 58 } n*v set-tool-dim
M: browser-gadget history-value
[ control-value ] [ scroller>> scroll-position ]
CONSTANT: next 1
: add-navigation-arrow ( str direction -- str )
- prev = [ "<" prefix ] [ ">" suffix ] if ;
+ prev = [ "←" prefix ] [ "→" suffix ] if ;
: $navigation-arrow ( content element direction -- )
[ prefix 1array ] dip add-navigation-arrow , ;
-:: ($navigation) ( topic direction -- )
- topic [
- direction prev/next-article
- [ 1array \ $long-link direction $navigation-arrow ] when*
- ] { } make [ ($navigation-table) ] unless-empty ;
-
-: $navigation ( topic direction -- )
- title-style get [
- help-path-style get [
- ($navigation)
- ] with-style
+:: $navigation ( topic direction -- )
+ help-path-style get [
+ topic [
+ direction prev/next-article
+ [ 1array \ $long-link direction $navigation-arrow ] when*
+ ] { } make [ ($navigation-table) ] unless-empty
] with-style ;
: $title ( topic -- )
- title-style get clone page-color over delete-at dup
+ title-style get clone page-color over delete-at
[
- [
- [ ($title) ]
- [ ($navigation-path) ] bi
- ] with-nesting
- ] with-style ;
+ [ ($title) ]
+ [ ($navigation-path) ] bi
+ ] with-nesting ;
: <help-header> ( browser-gadget -- gadget )
model>> [ '[ _ $title ] try ] <pane-control> ;
<scroller> >>scroller scroller>> white-interior 1 track-add ;
: search-browser ( string browser -- )
- '[ <apropos-search> _ show-help ] unless-empty ;
+ '[
[ blank? ] trim <apropos-search> _ show-help ] unless-empty ;
: <search-field> ( browser -- field )
'[ _ search-browser ] <action-field>
+ "Search" >>default-text
10 >>min-cols
10 >>max-cols
white-interior ;
: <browser-toolbar> ( browser -- toolbar )
- [ <toolbar> ] [ search-field>> "Search" label-on-left 1 track-add ] bi ;
+ [ <toolbar> ] [
+ search-field>> horizontal <track>
+ 0 >>fill swap 1 track-add
+ 1 track-add
+ ] bi ;
: add-browser-toolbar ( track -- track )
dup <browser-toolbar> format-toolbar f track-add ;
[ [ dup vocab-link? [ lookup-vocab ] when ] dip in? ]
} 2|| ;
-M: browser-gadget definitions-changed ( set browser -- )
+M: browser-gadget definitions-changed
[ control-value swap showing-definition? ] keep
'[ _ [ history-value ] keep set-history-value ] when ;
: com-forward ( browser -- ) history>> go-forward ;
+: browser-focus-search ( browser -- ) search-field>> request-focus ;
+
: com-home ( browser -- ) "help.home" swap show-help ;
: browser-help ( -- ) "ui-browser" com-browse ;
\ glossary H{ { +nullary+ t } } define-command
browser-gadget "toolbar" f {
- { T{ key-down f { A+ } "LEFT" } com-back }
- { T{ key-down f { A+ } "RIGHT" } com-forward }
- { T{ key-down f { A+ } "H" } com-home }
+ { T{ key-down f ${ os macosx? M+ A+ ? } "LEFT" } com-back }
+ { T{ key-down f ${ os macosx? M+ A+ ? } "RIGHT" } com-forward }
+ { T{ key-down f ${ os macosx? M+ A+ ? } "HOME" } com-home }
{ T{ key-down f f "F1" } browser-help }
- { T{ key-down f { A+ } "F1" } glossary }
+ { T{ key-down f ${ os macosx? M+ A+ ? } "F1" } glossary }
} define-command-map
: ?show-help ( link browser -- )
: com-next ( browser -- ) [ next-article ] navigate ;
browser-gadget "navigation" "Commands for navigating in the article hierarchy" {
- { T{ key-down f { A+ } "u" } com-up }
- { T{ key-down f { A+ } "p" } com-prev }
- { T{ key-down f { A+ } "n" } com-next }
- { T{ key-down f { A+ } "k" } com-show-outgoing-links }
- { T{ key-down f { A+ } "K" } com-show-incoming-links }
-} define-command-map
+ { T{ key-down f ${ os macosx? M+ A+ ? } "UP" } com-up }
+ { T{ key-down f ${ os macosx? M+ A+ ? } "p" } com-prev }
+ { T{ key-down f ${ os macosx? M+ A+ ? } "n" } com-next }
+ { T{ key-down f ${ os macosx? M+ A+ ? } "k" } com-show-outgoing-links }
+ { T{ key-down f ${ os macosx? M+ A+ ? } "K" } com-show-incoming-links }
+ { T{ key-down f ${ os macosx? M+ A+ ? } "f" } browser-focus-search }
+} os macosx? [ {
+ { T{ key-down f { M+ } "[" } com-back }
+ { T{ key-down f { M+ } "]" } com-forward }
+} append ] when define-command-map
browser-gadget "multi-touch" f {
{ left-action com-back }
{ right-action com-forward }
} define-command-map
+browser-gadget "touchbar" f {
+ { f com-back }
+ { f com-forward }
+ { f com-home }
+ { f browser-help }
+ { f glossary }
+} define-command-map
+
browser-gadget "scrolling"
"The browser's scroller can be scrolled from the keyboard."
{
: com-font-size-minus ( browser -- )
-2 adjust-help-font-size model>> notify-connections ;
+: com-font-size-normal ( browser -- )
+ font-size-span default-style get font-size of -
+ adjust-help-font-size model>> notify-connections ;
+
browser-gadget "fonts" f {
- { T{ key-down f { A+ } "+" } com-font-size-plus }
- { T{ key-down f { A+ } "=" } com-font-size-plus }
- { T{ key-down f { A+ } "_" } com-font-size-minus }
- { T{ key-down f { A+ } "-" } com-font-size-minus }
+ { T{ key-down f ${ os macosx? M+ C+ ? } "+" } com-font-size-plus }
+ { T{ key-down f ${ os macosx? M+ C+ ? } "=" } com-font-size-plus }
+ { T{ key-down f ${ os macosx? M+ C+ ? } "_" } com-font-size-minus }
+ { T{ key-down f ${ os macosx? M+ C+ ? } "-" } com-font-size-minus }
+ { T{ key-down f ${ os macosx? M+ C+ ? } "0" } com-font-size-normal }
} define-command-map
MAIN: browser-window
projects / factor.git / blobdiff