Using ui.gadgets.colors everywhere

basis/ui/gadgets/labeled/labeled.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov, 2015 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors colors.constants fonts kernel ui.gadgets
-ui.gadgets.borders ui.gadgets.corners ui.gadgets.frames
+ui.gadgets.borders ui.gadgets.colors ui.gadgets.corners ui.gadgets.frames
 ui.gadgets.grids ui.gadgets.labels ui.gadgets.lines
 ui.gadgets.tracks ui.gadgets.packs ui.tools.common 
 ui.pens.gradient ui.pens.image ui.pens.solid ui.render ;
@@ -13,8 +13,6 @@ TUPLE: labeled-gadget < track content color ;
 
 M: labeled-gadget focusable-child* content>> ;
 
-CONSTANT: title-bar-gradient { COLOR: white COLOR: grey90 }
-
 : add-title-bar ( title track -- track )
     swap >label
     [ t >>bold? ] change-font

basis/ui/gadgets/lines/lines.factor

@@ -1,14 +1,8 @@
 ! Copyright (C) 2015 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors colors.constants kernel ui.pens.solid ;
+USING: accessors colors.constants kernel ui.gadgets.colors ui.pens.solid ;
 IN: ui.gadgets.lines
 
-<PRIVATE
-
-CONSTANT: line-color COLOR: grey75
-
-PRIVATE>
-
 : with-lines ( track -- track )
     dup orientation>> >>gap 
     line-color <solid> >>interior ;

basis/ui/gadgets/menus/menus.factor

@@ -3,7 +3,7 @@
 USING: accessors colors.constants kernel locals math.rectangles
 math.vectors namespaces opengl sequences sorting ui.commands
 ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.corners
-ui.gadgets.frames ui.gadgets.glass ui.gadgets.packs
+ui.gadgets.colors ui.gadgets.frames ui.gadgets.glass ui.gadgets.packs
 ui.gadgets.worlds ui.tools.common ui.gestures ui.operations ui.pens
 ui.pens.solid ui.render ;
 IN: ui.gadgets.menus
@@ -22,9 +22,6 @@ M:: object <menu-item> ( target hook command -- button )
 
 <PRIVATE
 
-CONSTANT: menu-background-color COLOR: grey95
-CONSTANT: menu-border-color COLOR: grey75
-
 TUPLE: separator-pen color ;
 
 C: <separator-pen> separator-pen
@@ -52,7 +49,7 @@ M: ---- <menu-item>
     { 0 3 } >>gap
     margins
     menu-border-color <solid> >>boundary 
-    menu-background-color <solid> >>interior ;
+    menu-background <solid> >>interior ;
 
 : <commands-menu> ( target hook commands -- menu )
     [ <menu-item> ] 2with map <menu> ;

basis/ui/gadgets/status-bar/status-bar.factor

@@ -2,13 +2,10 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar colors.constants fonts kernel models
 models.arrow models.delay sequences summary ui
-ui.gadgets.borders ui.gadgets.labels ui.gadgets.tracks
+ui.gadgets.borders ui.gadgets.colors ui.gadgets.labels ui.gadgets.tracks
 ui.gadgets.worlds ui.pens.solid ui.private ;
 IN: ui.gadgets.status-bar
 
-CONSTANT: status-bar-background COLOR: FactorDarkSlateBlue
-CONSTANT: status-bar-foreground COLOR: white
-
 : status-bar-font ( -- font )
     sans-serif-font clone
     status-bar-background >>background

basis/ui/gadgets/toolbar/toolbar.factor

@@ -1,13 +1,11 @@
 ! Copyright (C) 2015 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs classes colors.constants fry kernel
-ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons
+ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.colors
 ui.gadgets.buttons.private ui.gadgets.packs ui.gadgets.tracks
 ui.pens.solid ;
 IN: ui.gadgets.toolbar
 
-CONSTANT: toolbar-background COLOR: grey95
-
 : <toolbar> ( target -- toolbar )
     <shelf>
         1 >>fill
@@ -16,8 +14,11 @@ CONSTANT: toolbar-background COLOR: grey95
         [ [ "toolbar" ] dip class-of get-command-at commands>> ]
         [ '[ [ _ ] 2dip <command-button> add-gadget ] ]
         bi assoc-each ;
+        
+: format-toolbar ( toolbar -- toolbar )
+    { 3 3 } <border> 
+    toolbar-background <solid> >>interior
+    align-left ;
 
 : add-toolbar ( track -- track )
-    dup <toolbar> { 3 3 } <border> 
+    dup <toolbar> format-toolbar f track-add ;
-    toolbar-background <solid> >>interior
-    align-left f track-add ;

basis/ui/tools/browser/browser.factor

@@ -4,7 +4,7 @@ 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.editors
+ui.gadgets.borders ui.gadgets.buttons ui.gadgets.colors ui.gadgets.editors
 ui.gadgets.glass ui.gadgets.labels ui.gadgets.lines ui.gadgets.panes
 ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tracks ui.gadgets.toolbar
 ui.gadgets.viewports ui.gadgets.worlds ui.gestures
@@ -37,9 +37,6 @@ M: browser-gadget set-history-value
 : <help-header> ( browser-gadget -- gadget )
     model>> [ '[ _ $title ] try ] <pane-control> ;
 
-CONSTANT: help-header-background
-T{ rgba { red 0.9568 } { green 0.9450 } { blue 0.8509 } { alpha 1.0 } } inline
-
 : add-help-header ( track -- track )
     dup <help-header> { 3 3 } <border>
     help-header-background <solid> >>interior 

basis/ui/tools/browser/popups/popups.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs colors.constants
 definitions.icons fry help help.topics kernel math.rectangles
-models.arrow namespaces sequences tools.crossref ui.gadgets
+models.arrow namespaces sequences tools.crossref ui.gadgets ui.gadgets.colors
 ui.gadgets.glass ui.gadgets.labeled ui.gadgets.search-tables
 ui.gadgets.tables ui.gadgets.wrappers ui.gestures ui.images
 ui.operations ui.pens.solid ;
@@ -33,7 +33,7 @@ TUPLE: links-popup < wrapper ;
 
 : <links-popup> ( model quot title -- gadget )
     [ <links-table> COLOR: white <solid> >>interior ] dip
-    COLOR: yellow <labeled-gadget> links-popup new-wrapper ;
+    popup-color <labeled-gadget> links-popup new-wrapper ;
 
 links-popup H{
     { T{ key-down f f "ESC" } [ hide-glass ] }

basis/ui/tools/inspector/inspector.factor

@@ -3,7 +3,7 @@
 USING: accessors colors inspector namespaces kernel models fry
 colors.constants models.arrow prettyprint sequences mirrors assocs
 classes io io.styles arrays hashtables math.order sorting refs fonts
-ui.tools.browser ui.commands ui.operations ui.gadgets ui.gadgets.panes
+ui.tools.browser ui.commands ui.operations ui.gadgets ui.gadgets.colors ui.gadgets.panes
 ui.gadgets.scrollers ui.gadgets.slots ui.gadgets.tracks ui.gestures
 ui.gadgets.buttons ui.gadgets.lines ui.gadgets.tables 
 ui.gadgets.toolbar ui.gadgets.status-bar
@@ -81,13 +81,6 @@ M: hashtable make-slot-descriptions
         40 >>min-cols
         40 >>max-cols ;
 
-<PRIVATE
-
-CONSTANT: object-color COLOR: aquamarine2
-CONSTANT: contents-color COLOR: orchid2
-
-PRIVATE>
-
 : <inspector-gadget> ( model -- gadget )
     vertical inspector-gadget new-track with-lines
         add-toolbar

basis/ui/tools/listener/listener.factor

@@ -7,7 +7,7 @@ documents.elements fry hashtables help help.markup help.tips io
 io.styles kernel lexer listener locals make math models
 models.arrow models.delay namespaces parser prettyprint
 quotations sequences source-files.errors strings system threads
-tools.errors.model ui ui.commands ui.gadgets ui.gadgets.buttons
+tools.errors.model ui ui.commands ui.gadgets ui.gadgets.buttons ui.gadgets.colors
 ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled ui.gadgets.lines
 ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar
 ui.gadgets.tracks ui.gadgets.toolbar 
@@ -212,7 +212,7 @@ TUPLE: listener-gadget < tool error-summary output scroller input ;
 
 : <error-summary> ( -- gadget )
     error-list-model get [ drop error-summary. ] <pane-control>
-        COLOR: light-yellow <solid> >>interior ;
+    error-summary-background <solid> >>interior ;
 
 : init-error-summary ( listener -- listener )
     <error-summary> >>error-summary
@@ -333,12 +333,6 @@ M: object accept-completion-hook 2drop ;
     [ history>> history-add drop ] [ control-value ] [ select-all ] tri
     parse-lines-interactive ;
 
-<PRIVATE
-
-CONSTANT: debugger-color COLOR: chocolate1
-
-PRIVATE>
-
 : <debugger-popup> ( error continuation -- popup )
     over compute-restarts [ hide-glass ] <debugger> 
     "Error" debugger-color <framed-labeled-gadget> ;

basis/ui/tools/traceback/traceback.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays colors.constants continuations fonts fry inspector
 kernel models models.arrow prettyprint sequences ui.commands
-ui.gadgets ui.gadgets.borders ui.gadgets.buttons
+ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.colors
 ui.gadgets.labeled ui.gadgets.lines ui.gadgets.panes ui.gadgets.scrollers
 ui.gadgets.status-bar ui.gadgets.tables ui.gadgets.toolbar ui.gadgets.tracks
 ui.gestures ui.tools.common ;
@@ -21,10 +21,6 @@ M: stack-entry-renderer row-columns drop string>> 1array ;
 
 M: stack-entry-renderer row-value drop object>> ;
 
-CONSTANT: data-stack-color COLOR: DodgerBlue
-CONSTANT: retain-stack-color COLOR: HotPink
-CONSTANT: call-stack-color COLOR: GreenYellow
-
 : <stack-table> ( model -- table )
     [ [ <stack-entry> ] map ] <arrow> stack-entry-renderer <table>
         10 >>min-rows

basis/ui/tools/walker/walker.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors colors kernel concurrency.messaging colors.constants inspector
-ui.tools.listener ui.tools.traceback ui.gadgets.buttons ui.gadgets.lines
+ui.tools.listener ui.tools.traceback ui.gadgets.buttons ui.gadgets.colors ui.gadgets.lines
 ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.tracks ui.commands ui.gadgets
 models models.arrow ui.tools.browser ui.tools.common ui.gestures
 ui.gadgets.labels ui.pens.solid ui threads namespaces make tools.walker assocs
@@ -54,13 +54,10 @@ M: walker-gadget focusable-child*
 
 : <thread-status> ( model thread -- gadget )
     '[ _ walker-state-string ] <arrow> <label-control> ;
-    
-CONSTANT: thread-status-color
-T{ rgba { red 0.9295 } { green 0.9569 } { blue 0.8510 } { alpha 1.0 } } inline
 
 : add-thread-status ( track -- track )
     dup status>> self <thread-status> margins
-    thread-status-color <solid> >>interior
+    thread-status-background <solid> >>interior
     f track-add ;
     
 : add-traceback ( track -- track )