Set text color almost everywhere

diff --git a/basis/help/stylesheet/stylesheet.factor b/basis/help/stylesheet/stylesheet.factor
index 0b64ae07f2d20fbdb3c93bd2749464cfa000d6d9..dd2f4f8c6c54c4dbf304bcece91c6823fed80a9f 100644 (file)
--- a/basis/help/stylesheet/stylesheet.factor
+++ b/basis/help/stylesheet/stylesheet.factor
@@ -26,6 +26,7 @@ SYMBOL: default-span-style
 H{
     { font-name $ default-sans-serif-font-name }
     { font-size $ font-size-span }
+    { foreground $ text-color }
     { font-style plain }
 } default-span-style set-global
 

diff --git a/basis/prettyprint/stylesheet/stylesheet.factor b/basis/prettyprint/stylesheet/stylesheet.factor
index b11abc92934b13a5394dda713f1e767538babe0b..225d0e5da9756f8787fe73ccfc0e902f6dad0249 100644 (file)
--- a/basis/prettyprint/stylesheet/stylesheet.factor
+++ b/basis/prettyprint/stylesheet/stylesheet.factor
@@ -21,7 +21,8 @@ GENERIC: word-style ( word -- style )
 
 M: word word-style
     [ presented associate ]
-    [ "word-style" word-prop ] bi assoc-union! ;
+    [ "word-style" word-prop ] bi assoc-union!
+    text-color foreground pick set-at ;
 
 M: highlighted-word word-style
     call-next-method

diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index 123ecc6e9369fd41785c7e875952cacfc6901ca5..dc8abd016cef7981cba7e40ae147adbffec68e42 100644 (file)
--- a/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -134,7 +134,7 @@ PRIVATE>
     <button-pen> ;
 
 : border-button-label-theme ( gadget -- )
-    dup label? [ [ clone t >>bold? ] change-font ] when drop ;
+    dup label? [ [ clone t >>bold? text-color >>foreground ] change-font ] when drop ;
 
 : border-button-theme ( gadget -- gadget )
     dup gadget-child border-button-label-theme

diff --git a/basis/ui/gadgets/labeled/labeled.factor b/basis/ui/gadgets/labeled/labeled.factor
index 9c6b3f208fef2d944c3cd50f3f72d02125f5f962..acdaef69adbdcf4c76167f297017ece49f1bccde 100644 (file)
--- a/basis/ui/gadgets/labeled/labeled.factor
+++ b/basis/ui/gadgets/labeled/labeled.factor
@@ -21,7 +21,7 @@ M: labeled-gadget focusable-child* content>> ;
 
 : add-title-bar ( title track -- track )
     swap >label
-    [ t >>bold? ] change-font
+    [ t >>bold? text-color >>foreground ] change-font
     { 0 4 } <border>
     title-bar-interior >>interior
     f track-add ;

diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor
index 38fb92e1f03c131e7ec7beaab51d9236ebf7ae1d..998bfb538acfbbe8653671eadc98c307c93ff0ba 100644 (file)
--- a/basis/ui/gadgets/labels/labels.factor
+++ b/basis/ui/gadgets/labels/labels.factor
@@ -3,7 +3,7 @@
 USING: accessors arrays colors.constants combinators fonts fry
 kernel make math.functions models namespaces sequences splitting
 strings ui.baseline-alignment ui.gadgets ui.gadgets.tracks
-ui.pens.solid ui.render ui.text ;
+ui.pens.solid ui.render ui.text ui.tools.common ;
 IN: ui.gadgets.labels
 
 ! A label gadget draws a string.
@@ -92,7 +92,7 @@ M: label-control model-changed
         swap >>model ;
 
 : text-theme ( gadget -- gadget )
-    monospace-font >>font ;
+    monospace-font >>font theme-font-colors ;
 
 : reverse-video-theme ( label -- label )
     sans-serif-font reverse-video-font >>font

diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index 15856529466fe460a7a543f1a025fd6e68febe37..8f284f93e72b68a7c5fbb0017ec9297af3cb8292 100644 (file)
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -101,6 +101,7 @@ CONSTANT: next 1
 
 : <search-field> ( browser -- field )
     '[ _ search-browser ] <action-field>
+        [ theme-font-colors ] change-editor
         "Search" >>default-text
         10 >>min-cols
         10 >>max-cols

diff --git a/basis/ui/tools/common/common.factor b/basis/ui/tools/common/common.factor
index 32663738dcd18e095b9a933f59a1b21dab9cdf6b..4a74aca5e967eb96117705e5a293f4977841f951 100644 (file)
--- a/basis/ui/tools/common/common.factor
+++ b/basis/ui/tools/common/common.factor
@@ -49,3 +49,6 @@ SLOT: scroller
 
 : white-interior ( track -- track )
     content-background <solid> >>interior ;
+
+: theme-font-colors ( gadget -- gadget )
+    [ content-background >>background text-color >>foreground ] change-font ;

diff --git a/basis/ui/tools/debugger/debugger.factor b/basis/ui/tools/debugger/debugger.factor
index 765bed7841dda060d8611a697d81c3e447c9a262..10450a4cc834e6010d2effa0c4446f3586a027c3 100644 (file)
--- a/basis/ui/tools/debugger/debugger.factor
+++ b/basis/ui/tools/debugger/debugger.factor
@@ -36,7 +36,7 @@ M: restart-renderer row-columns
     [ error>> <error-pane> add-gadget ]
     [
         dup restart-hook>> [
-            [ "To continue, pick one of the options below:" <label> add-gadget ] dip
+            [ "To continue, pick one of the options below:" <label> theme-font-colors add-gadget ] dip
             restart-list>> add-gadget
         ] [ drop ] if
     ] bi ;

diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor
index 50e3b676ce8abb7f708e8cec20373d26a032a753..9c228b3d29e5ebbb160dc056726389540d438152 100644 (file)
--- a/basis/ui/tools/inspector/inspector.factor
+++ b/basis/ui/tools/inspector/inspector.factor
@@ -73,8 +73,8 @@ M: hashtable make-slot-descriptions
 : <inspector-table> ( model -- table )
     [ make-slot-descriptions ] <arrow> inspector-renderer <table>
         [ invoke-primary-operation ] >>action
-        monospace-font >>font
-        COLOR: dark-gray >>column-line-color
+        monospace-font >>font theme-font-colors
+        line-color >>column-line-color
         6 >>gap
         15 >>min-rows
         15 >>max-rows

diff --git a/basis/ui/tools/listener/completion/completion.factor b/basis/ui/tools/listener/completion/completion.factor
index 39ee58ff22c999b8ce93e2aa3fb90640f7662174..47437c631257d0f1b2ec5dd83f608ca892a75445 100644 (file)
--- a/basis/ui/tools/listener/completion/completion.factor
+++ b/basis/ui/tools/listener/completion/completion.factor
@@ -1,14 +1,16 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs calendar colors colors.constants
-documents documents.elements fry kernel words sets splitting math
-math.vectors models.delay models.arrow combinators.short-circuit
-parser present sequences tools.completion help.vocabs generic fonts
-definitions.icons ui.images ui.commands ui.operations ui.gadgets
-ui.gadgets.editors ui.gadgets.glass ui.gadgets.scrollers
-ui.gadgets.tables ui.gadgets.tracks ui.gadgets.labeled ui.gadgets.theme
-ui.gadgets.worlds ui.gadgets.wrappers ui.gestures ui.pens.solid
-ui.tools.listener.history combinators vocabs ui.tools.listener.popups ;
+combinators combinators.short-circuit definitions.icons
+documents documents.elements fonts fry generic help.vocabs
+kernel math math.vectors models.arrow models.delay parser
+present sequences sets splitting tools.completion ui.commands
+ui.gadgets ui.gadgets.editors ui.gadgets.glass
+ui.gadgets.labeled ui.gadgets.scrollers ui.gadgets.tables
+ui.gadgets.theme ui.gadgets.tracks ui.gadgets.worlds
+ui.gadgets.wrappers ui.gestures ui.images ui.operations
+ui.pens.solid ui.tools.common ui.tools.listener.history
+ui.tools.listener.popups vocabs words ;
 IN: ui.tools.listener.completion
 
 ! We don't directly depend on the listener tool but we use a few slots
@@ -139,7 +141,7 @@ GENERIC# accept-completion-hook 1 ( item popup -- )
 : <completion-table> ( interactor completion-mode -- table )
     [ completion-element ] [ completion-quot ] [ nip ] 2tri
     [ <completion-model> ] dip <table>
-        monospace-font >>font
+        monospace-font >>font theme-font-colors
         t >>selection-required?
         t >>single-click?
         30 >>min-cols

diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index 67237e7003b498a06a8176f726d5bed7c43789a5..6b217c327e8bc2f375556699f2d75942d03b437c 100644 (file)
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -73,6 +73,7 @@ M: color-completion (word-at-caret) 2drop f ;
 
 : <interactor> ( -- gadget )
     interactor new-editor
+        theme-font-colors
         <flag> >>flag
         dup one-word-elt <element-model> >>token-model
         dup <word-model> >>word-model
@@ -95,12 +96,18 @@ M: interactor stream-element-type drop +character+ ;
 GENERIC: (print-input) ( object -- )
 
 M: input (print-input)
-    dup presented associate
-    [ string>> H{ { font-style bold } } format ] with-nesting nl ;
+    dup presented associate [
+        string>>
+        H{ { font-style bold } { foreground $ text-color } }
+        format
+    ] with-nesting nl ;
 
 M: word (print-input)
-    "Command: " H{ { font-name "sans-serif" } { font-style bold } }
-    format . ;
+    "Command: "
+    H{ { font-name "sans-serif" }
+       { font-style bold }
+       { foreground $ text-color }
+    } format . ;
 
 : print-input ( object interactor -- )
     output>> [ (print-input) ] with-output-stream* ;

diff --git a/basis/ui/tools/traceback/traceback.factor b/basis/ui/tools/traceback/traceback.factor
index a7b730fb4564cb48c340b3c20e289d19c3db7667..8d092f2928b2558e4773e32a58d46db0c592fe8b 100644 (file)
--- a/basis/ui/tools/traceback/traceback.factor
+++ b/basis/ui/tools/traceback/traceback.factor
@@ -28,7 +28,7 @@ M: stack-entry-renderer row-value drop object>> ;
         10 >>max-rows
         40 >>min-cols
         40 >>max-cols
-        monospace-font >>font
+        monospace-font >>font theme-font-colors
         [ i:inspector ] >>action
         t >>single-click? ;
 

diff --git a/basis/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor
index 0478edaee9adc793eb2d8ec1b068d891f4196c9f..1e60de76a70dcb260f59a1bb2e09fa6653e24bdc 100644 (file)
--- a/basis/ui/tools/walker/walker.factor
+++ b/basis/ui/tools/walker/walker.factor
@@ -78,9 +78,9 @@ M: thread-status model-changed
 : add-thread-status ( track -- track )
     horizontal <track> { 5 5 } >>gap
         "Thread:" <label>
-            dup font>> t >>bold? drop
+            [ t >>bold? text-color >>foreground ] change-font
             f track-add
-        self name>> <label> f track-add
+        self name>> <label> [ text-color >>foreground ] change-font f track-add
         over status>> <thread-status>
             dup font>> t >>bold? drop
             f track-add