ui.theme: updates to color scheme.

[factor.git] / basis / ui / tools / browser / browser.factor

diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index ac98b0960762bf14d80367bbd4d7ca892a8d2f90..c106a22b95a24fad8f469d94e7e15f6573e19e3f 100644 (file)
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -1,15 +1,17 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays classes colors colors.constants combinators
-combinators.short-circuit compiler.units debugger fry help
-help.apropos help.crossref help.home help.stylesheet help.topics
-kernel models sequences sets ui ui.commands ui.gadgets
-ui.gadgets.borders ui.gadgets.buttons ui.gadgets.colors ui.gadgets.editors
-ui.gadgets.glass ui.gadgets.labels ui.gadgets.panes
-ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tracks ui.gadgets.toolbar
-ui.gadgets.packs ui.gadgets.viewports ui.gadgets.worlds ui.gestures
-ui.tools.browser.history ui.tools.browser.popups ui.tools.common
-ui.pens.solid vocabs ;
+USING: accessors arrays assocs classes colors.constants
+combinators combinators.short-circuit compiler.units debugger
+documents fry 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.editors.private
+ui.gadgets.glass ui.gadgets.labels ui.gadgets.labels.private
+ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar
+ui.theme ui.gadgets.theme ui.gadgets.toolbar ui.gadgets.tracks
+ui.gadgets.viewports ui.gadgets.worlds ui.gestures ui.pens.solid
+ui.render ui.text ui.tools.common ui.tools.browser.history
+ui.tools.browser.popups vocabs ;
 IN: ui.tools.browser
 
 TUPLE: browser-gadget < tool history scroller search-field popup ;
@@ -34,6 +36,35 @@ M: browser-gadget set-history-value
     [ set-control-value ]
     2bi ;
 
+CONSTANT: prev -1
+CONSTANT: next 1
+
+: add-navigation-arrow ( str direction -- str )
+    prev = [ "<" prefix ] [ ">" suffix ] if ;
+
+: $navigation-arrow ( content element direction -- )
+    [ prefix 1array ] dip add-navigation-arrow , ;
+
+:: ($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 ;
+
+: $navigation ( topic direction -- )
+    title-style get [ ($navigation) ] with-style ;
+
+: $title ( topic -- )
+    title-style get clone page-color over delete-at dup
+    [
+        [
+            [ ($title) ]
+            [ ($navigation-path) ] bi
+        ] with-nesting
+    ] with-style ;
+
 : <help-header> ( browser-gadget -- gadget )
     model>> [ '[ _ $title ] try ] <pane-control> ;
 
@@ -42,22 +73,22 @@ M: browser-gadget set-history-value
     help-header-background <solid> >>interior 
     { 1 0 } >>fill f track-add ;
 
-: <help-footer-prev> ( browser-gadget -- gadget )
-    model>> [ '[ _ $navigation-prev ] try ] <pane-control>
-    { 0 0 } <border> { 1/2 1/2 } >>align
-    toolbar-background <solid> >>interior ;
-
-: <help-footer-next> ( browser-gadget -- gadget )
-    model>> [ '[ _ $navigation-next ] try ] <pane-control>
+: <help-footer> ( browser-gadget direction -- gadget )
+    [ model>> ] dip '[ [ _ $navigation ] try ] <pane-control>
     { 0 0 } <border> { 1/2 1/2 } >>align
     toolbar-background <solid> >>interior ;
 
 : add-help-footer ( track -- track )
     horizontal <track> with-lines
-    dupd swap <help-footer-prev> 1 track-add
-    dupd swap <help-footer-next> 1 track-add
+    dupd swap prev <help-footer> 1 track-add
+    dupd swap next <help-footer> 1 track-add
     f track-add ;
 
+: print-topic ( topic -- )
+    >link
+    last-element off
+    article-content print-content ;
+
 : <help-pane> ( browser-gadget -- gadget )
     model>> [ '[ _ print-topic ] try ] <pane-control> ;
 
@@ -70,21 +101,18 @@ M: browser-gadget set-history-value
 
 : <search-field> ( browser -- field )
     '[ _ search-browser ] <action-field>
+        [ theme-font-colors ] change-editor
+        "Search" >>default-text
         10 >>min-cols
         10 >>max-cols
         white-interior ;
 
-: add-spacer ( track -- track )
-    <pile> { 10 0 } <border> f track-add ;
-
 : <browser-toolbar> ( browser -- toolbar )
-    horizontal <track>
-        0 >>fill
-        1/2 >>align
-        { 5 5 } >>gap
-        over <toolbar> f track-add
-        add-spacer
-        swap search-field>> "Search" label-on-left 1 track-add ;
+    [ <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 ;