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

ui.gadgets.colors moved to ui.gadgets.theme

db4
nicolas-p 2015-07-30 19:43:32 +02:00 committed by John Benediktsson
parent 23a1174e81
commit bf2b829846
21 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/ui/gadgets/buttons/buttons.factor
View File

@ -3,7 +3,7 @@
USING: accessors assocs classes colors colors.constants combinators USING: accessors assocs classes colors colors.constants combinators
combinators.short-circuit combinators.smart fry kernel locals combinators.short-circuit combinators.smart fry kernel locals
math.vectors models namespaces sequences ui.commands ui.gadgets math.vectors models namespaces sequences ui.commands ui.gadgets
ui.gadgets.borders ui.gadgets.colors ui.gadgets.labels ui.gadgets.packs ui.gadgets.borders ui.gadgets.labels ui.gadgets.packs
ui.gadgets.theme ui.gadgets.tracks ui.gadgets.worlds ui.gestures ui.gadgets.theme ui.gadgets.tracks ui.gadgets.worlds ui.gestures
ui.pens ui.pens.image ui.pens.solid ui.pens.tile ; ui.pens ui.pens.image ui.pens.solid ui.pens.tile ;
FROM: models => change-model ; FROM: models => change-model ;

1
basis/ui/gadgets/colors/summary.txt
View File

@ -1 +0,0 @@
Common colors and gradients used by the UI

4
basis/ui/gadgets/labeled/labeled.factor
View File

@ -1,9 +1,9 @@
! Copyright (C) 2006, 2009 Slava Pestov, 2015 Nicolas Pénet. ! Copyright (C) 2006, 2009 Slava Pestov, 2015 Nicolas Pénet.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors colors.constants fonts kernel ui.gadgets USING: accessors colors.constants fonts kernel ui.gadgets
ui.gadgets.borders ui.gadgets.colors ui.gadgets.corners ui.gadgets.frames ui.gadgets.borders ui.gadgets.corners ui.gadgets.frames
ui.gadgets.grids ui.gadgets.labels ui.gadgets.grids ui.gadgets.labels
ui.gadgets.tracks ui.gadgets.packs ui.tools.common ui.gadgets.tracks ui.gadgets.packs ui.gadgets.theme ui.tools.common
ui.pens.gradient ui.pens.image ui.pens.solid ui.render ; ui.pens.gradient ui.pens.image ui.pens.solid ui.render ;
IN: ui.gadgets.labeled IN: ui.gadgets.labeled

2
basis/ui/gadgets/menus/menus.factor
View File

@ -3,7 +3,7 @@
USING: accessors colors.constants kernel locals math.rectangles USING: accessors colors.constants kernel locals math.rectangles
math.vectors namespaces opengl sequences sorting ui.commands math.vectors namespaces opengl sequences sorting ui.commands
ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.corners ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.corners
ui.gadgets.colors ui.gadgets.frames ui.gadgets.glass ui.gadgets.packs ui.gadgets.frames ui.gadgets.glass ui.gadgets.packs ui.gadgets.theme
ui.gadgets.worlds ui.tools.common ui.gestures ui.operations ui.pens ui.gadgets.worlds ui.tools.common ui.gestures ui.operations ui.pens
ui.pens.solid ui.render ; ui.pens.solid ui.render ;
IN: ui.gadgets.menus IN: ui.gadgets.menus

4
basis/ui/gadgets/status-bar/status-bar.factor
View File

@ -2,8 +2,8 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors calendar colors.constants fonts kernel models USING: accessors calendar colors.constants fonts kernel models
models.arrow models.delay sequences summary ui models.arrow models.delay sequences summary ui
ui.gadgets.borders ui.gadgets.colors ui.gadgets.labels ui.gadgets.tracks ui.gadgets.borders ui.gadgets.labels ui.gadgets.tracks
ui.gadgets.worlds ui.pens.solid ui.private ; ui.gadgets.theme ui.gadgets.worlds ui.pens.solid ui.private ;
IN: ui.gadgets.status-bar IN: ui.gadgets.status-bar
: status-bar-font ( -- font ) : status-bar-font ( -- font )

4
basis/ui/gadgets/tables/tables.factor
View File

@ -4,8 +4,8 @@ USING: accessors arrays colors colors.constants combinators
combinators.short-circuit fonts fry kernel locals math combinators.short-circuit fonts fry kernel locals math
math.functions math.order math.rectangles math.vectors models math.functions math.order math.rectangles math.vectors models
namespaces opengl sequences splitting strings ui.commands namespaces opengl sequences splitting strings ui.commands
ui.gadgets ui.gadgets.colors ui.gadgets.line-support ui.gadgets.menus ui.gadgets ui.gadgets.line-support ui.gadgets.menus
ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.worlds ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.theme ui.gadgets.worlds
ui.gestures ui.images ui.pens.solid ui.render ui.text ; ui.gestures ui.images ui.pens.solid ui.render ui.text ;
IN: ui.gadgets.tables IN: ui.gadgets.tables

0
basis/ui/gadgets/colors/authors.txt → basis/ui/gadgets/theme/light/authors.txt
View File

6
basis/ui/gadgets/colors/colors.factor → basis/ui/gadgets/theme/light/light.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2015 Nicolas Pénet. ! Copyright (C) 2015 Nicolas Pénet.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors colors colors.constants ui.pens.solid ; USING: accessors colors colors.constants ui.pens.solid ;
IN: ui.gadgets.colors IN: ui.gadgets.theme
CONSTANT: toolbar-background COLOR: grey95 CONSTANT: toolbar-background COLOR: grey95
CONSTANT: toolbar-button-pressed-background COLOR: dark-gray CONSTANT: toolbar-button-pressed-background COLOR: dark-gray
@ -54,6 +54,4 @@ CONSTANT: error-summary-background
T{ rgba { red 0.9569 } { green 0.9177 } { blue 0.8510 } { alpha 1.0 } } inline T{ rgba { red 0.9569 } { green 0.9177 } { blue 0.8510 } { alpha 1.0 } } inline
CONSTANT: content-background COLOR: white CONSTANT: content-background COLOR: white
CONSTANT: text-color COLOR: black
: white-interior ( track -- track )
content-background <solid> >>interior ;

1
basis/ui/gadgets/theme/light/summary.txt Normal file
View File

@ -0,0 +1 @@
Light-colored theme

4
basis/ui/gadgets/theme/theme.factor
View File

@ -1,6 +1,8 @@
! (c)2009, 2010 Slava Pestov, Joe Groff bsd license ! (c)2009, 2010 Slava Pestov, Joe Groff bsd license
USING: io.pathnames sequences ui.images ; USING: io.pathnames sequences ui.images vocabs ;
IN: ui.gadgets.theme IN: ui.gadgets.theme
: theme-image ( name -- image-name ) : theme-image ( name -- image-name )
"vocab:ui/gadgets/theme/" prepend-path ".tiff" append <image-name> ; "vocab:ui/gadgets/theme/" prepend-path ".tiff" append <image-name> ;
<< "ui.gadgets.theme.light" require >>

2
basis/ui/gadgets/toolbar/toolbar.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs classes fry kernel locals ui.baseline-alignment ui.commands USING: accessors assocs classes fry kernel locals ui.baseline-alignment ui.commands
ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets ui.gadgets.borders ui.gadgets.buttons
ui.gadgets.buttons.private ui.gadgets.colors ui.gadgets.packs ui.gadgets.buttons.private ui.gadgets.packs ui.gadgets.theme
ui.gadgets.tracks ui.pens ui.pens.solid ; ui.gadgets.tracks ui.pens ui.pens.solid ;
IN: ui.gadgets.toolbar IN: ui.gadgets.toolbar

4
basis/ui/tools/browser/browser.factor
View File

@ -4,10 +4,10 @@ USING: accessors arrays classes colors colors.constants combinators
combinators.short-circuit compiler.units debugger fry help combinators.short-circuit compiler.units debugger fry help
help.apropos help.crossref help.home help.stylesheet help.topics help.apropos help.crossref help.home help.stylesheet help.topics
kernel models sequences sets ui ui.commands ui.gadgets kernel models sequences sets ui ui.commands ui.gadgets
ui.gadgets.borders ui.gadgets.buttons ui.gadgets.colors ui.gadgets.editors ui.gadgets.borders ui.gadgets.buttons ui.gadgets.editors
ui.gadgets.glass ui.gadgets.labels ui.gadgets.panes ui.gadgets.glass ui.gadgets.labels ui.gadgets.panes
ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tracks ui.gadgets.toolbar 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.gadgets.packs ui.gadgets.theme ui.gadgets.viewports ui.gadgets.worlds ui.gestures
ui.tools.browser.history ui.tools.browser.popups ui.tools.common ui.tools.browser.history ui.tools.browser.popups ui.tools.common
ui.pens.solid vocabs ; ui.pens.solid vocabs ;
IN: ui.tools.browser IN: ui.tools.browser

4
basis/ui/tools/browser/popups/popups.factor
View File

@ -2,9 +2,9 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays assocs colors.constants USING: accessors arrays assocs colors.constants
definitions.icons fry help help.topics kernel math.rectangles definitions.icons fry help help.topics kernel math.rectangles
models.arrow namespaces sequences tools.crossref ui.gadgets ui.gadgets.colors models.arrow namespaces sequences tools.crossref ui.gadgets
ui.gadgets.glass ui.gadgets.labeled ui.gadgets.search-tables ui.gadgets.glass ui.gadgets.labeled ui.gadgets.search-tables
ui.gadgets.tables ui.gadgets.wrappers ui.gestures ui.images ui.gadgets.tables ui.gadgets.theme ui.gadgets.wrappers ui.gestures ui.images
ui.operations ui.pens.solid ; ui.operations ui.pens.solid ;
FROM: ui.gadgets.wrappers => wrapper ; FROM: ui.gadgets.wrappers => wrapper ;
IN: ui.tools.browser.popups IN: ui.tools.browser.popups

7
basis/ui/tools/common/common.factor
View File

@ -1,8 +1,8 @@
! Copyright (C) 2009 Slava Pestov. ! Copyright (C) 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs classes classes.mixin kernel namespaces USING: accessors assocs classes classes.mixin kernel namespaces
parser ui.gadgets ui.gadgets.borders ui.gadgets.colors parser ui.gadgets ui.gadgets.borders
ui.pens.solid ui.gadgets.scrollers ui.gadgets.tracks ui.pens.solid ui.gadgets.scrollers ui.gadgets.tracks ui.gadgets.theme
combinators.short-circuit ; combinators.short-circuit ;
IN: ui.tools.common IN: ui.tools.common
@ -46,3 +46,6 @@ SLOT: scroller
: with-lines ( track -- track ) : with-lines ( track -- track )
dup orientation>> >>gap dup orientation>> >>gap
line-color <solid> >>interior ; line-color <solid> >>interior ;
: white-interior ( track -- track )
content-background <solid> >>interior ;

5
basis/ui/tools/debugger/debugger.factor
View File

@ -3,10 +3,11 @@
USING: accessors arrays hashtables io kernel math models USING: accessors arrays hashtables io kernel math models
colors.constants namespaces sequences words continuations colors.constants namespaces sequences words continuations
debugger prettyprint help editors fonts ui ui.commands debugger prettyprint help editors fonts ui ui.commands
ui.debugger ui.gestures ui.gadgets ui.gadgets.colors ui.pens.solid ui.debugger ui.gestures ui.gadgets ui.pens.solid
ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons
ui.gadgets.labels ui.gadgets.presentations ui.gadgets.panes ui.gadgets.labels ui.gadgets.presentations ui.gadgets.panes
ui.gadgets.viewports ui.gadgets.tables ui.gadgets.tracks ui.gadgets.toolbar ui.gadgets.viewports ui.gadgets.tables ui.gadgets.theme
ui.gadgets.tracks ui.gadgets.toolbar
ui.gadgets.scrollers ui.gadgets.borders ui.gadgets.status-bar ui.gadgets.scrollers ui.gadgets.borders ui.gadgets.status-bar
ui.tools.traceback ui.tools.inspector ui.tools.browser ui.tools.common ; ui.tools.traceback ui.tools.inspector ui.tools.browser ui.tools.common ;
IN: ui.tools.debugger IN: ui.tools.debugger

6
basis/ui/tools/error-list/error-list.factor
View File

@ -8,9 +8,9 @@ models models.arrow models.arrow.smart models.search models.mapping debugger
namespaces summary locals ui ui.commands ui.gadgets ui.gadgets.panes namespaces summary locals ui ui.commands ui.gadgets ui.gadgets.panes
ui.gadgets.tables ui.gadgets.labeled ui.gadgets.tracks ui.gestures ui.gadgets.tables ui.gadgets.labeled ui.gadgets.tracks ui.gestures
ui.operations ui.tools.browser ui.tools.common ui.gadgets.scrollers ui.operations ui.tools.browser ui.tools.common ui.gadgets.scrollers
ui.tools.inspector ui.tools.inspector ui.gadgets.buttons ui.gadgets.borders ui.gadgets.labels
ui.gadgets.buttons ui.gadgets.borders ui.gadgets.colors ui.gadgets.packs ui.gadgets.packs ui.gadgets.theme ui.gadgets.toolbar ui.gadgets.status-bar
ui.gadgets.labels ui.gadgets.toolbar ui.gadgets.status-bar ui.baseline-alignment ui.images ui.baseline-alignment ui.images
compiler.errors tools.errors tools.errors.model ; compiler.errors tools.errors tools.errors.model ;
IN: ui.tools.error-list IN: ui.tools.error-list

4
basis/ui/tools/inspector/inspector.factor
View File

@ -3,9 +3,9 @@
USING: accessors colors inspector namespaces kernel models fry USING: accessors colors inspector namespaces kernel models fry
colors.constants models.arrow prettyprint sequences mirrors assocs colors.constants models.arrow prettyprint sequences mirrors assocs
classes io io.styles arrays hashtables math.order sorting refs fonts classes io io.styles arrays hashtables math.order sorting refs fonts
ui.tools.browser ui.commands ui.operations ui.gadgets ui.gadgets.colors ui.gadgets.panes ui.tools.browser ui.commands ui.operations ui.gadgets ui.gadgets.panes
ui.gadgets.scrollers ui.gadgets.slots ui.gadgets.tracks ui.gestures ui.gadgets.scrollers ui.gadgets.slots ui.gadgets.tracks ui.gestures
ui.gadgets.buttons ui.gadgets.tables ui.gadgets.buttons ui.gadgets.tables ui.gadgets.theme
ui.gadgets.toolbar ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.status-bar
ui.gadgets.labeled ui.tools.common ui combinators ui.gadgets.worlds ; ui.gadgets.labeled ui.tools.common ui combinators ui.gadgets.worlds ;
IN: ui.tools.inspector IN: ui.tools.inspector

4
basis/ui/tools/listener/completion/completion.factor
View File

@ -4,9 +4,9 @@ USING: accessors arrays assocs calendar colors colors.constants
documents documents.elements fry kernel words sets splitting math documents documents.elements fry kernel words sets splitting math
math.vectors models.delay models.arrow combinators.short-circuit math.vectors models.delay models.arrow combinators.short-circuit
parser present sequences tools.completion help.vocabs generic fonts parser present sequences tools.completion help.vocabs generic fonts
definitions.icons ui.images ui.commands ui.operations ui.gadgets ui.gadgets.colors definitions.icons ui.images ui.commands ui.operations ui.gadgets
ui.gadgets.editors ui.gadgets.glass ui.gadgets.scrollers ui.gadgets.editors ui.gadgets.glass ui.gadgets.scrollers
ui.gadgets.tables ui.gadgets.tracks ui.gadgets.labeled ui.gadgets.tables ui.gadgets.tracks ui.gadgets.labeled ui.gadgets.theme
ui.gadgets.worlds ui.gadgets.wrappers ui.gestures ui.pens.solid ui.gadgets.worlds ui.gadgets.wrappers ui.gestures ui.pens.solid
ui.tools.listener.history combinators vocabs ui.tools.listener.popups ; ui.tools.listener.history combinators vocabs ui.tools.listener.popups ;
IN: ui.tools.listener.completion IN: ui.tools.listener.completion

4
basis/ui/tools/listener/listener.factor
View File

@ -7,10 +7,10 @@ documents.elements fry hashtables help help.markup help.tips io
io.styles kernel lexer listener locals make math models io.styles kernel lexer listener locals make math models
models.arrow models.delay namespaces parser prettyprint models.arrow models.delay namespaces parser prettyprint
quotations sequences source-files.errors strings system threads quotations sequences source-files.errors strings system threads
tools.errors.model ui ui.commands ui.gadgets ui.gadgets.buttons ui.gadgets.colors tools.errors.model ui ui.commands ui.gadgets ui.gadgets.buttons
ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled
ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar
ui.gadgets.tracks ui.gadgets.toolbar ui.gadgets.tracks ui.gadgets.toolbar ui.gadgets.theme
ui.gestures ui.operations ui.pens.solid ui.gestures ui.operations ui.pens.solid
ui.tools.browser ui.tools.common ui.tools.debugger ui.tools.browser ui.tools.common ui.tools.debugger
ui.tools.error-list ui.tools.listener.completion ui.tools.error-list ui.tools.listener.completion

5
basis/ui/tools/traceback/traceback.factor
View File

@ -2,9 +2,10 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays colors.constants continuations fonts fry inspector USING: accessors arrays colors.constants continuations fonts fry inspector
kernel models models.arrow prettyprint sequences ui.commands kernel models models.arrow prettyprint sequences ui.commands
ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.colors ui.gadgets ui.gadgets.borders ui.gadgets.buttons
ui.gadgets.labeled ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.labeled ui.gadgets.panes ui.gadgets.scrollers
ui.gadgets.status-bar ui.gadgets.tables ui.gadgets.toolbar ui.gadgets.tracks ui.gadgets.status-bar ui.gadgets.tables ui.gadgets.toolbar
ui.gadgets.theme ui.gadgets.tracks
ui.gestures ui.tools.common ; ui.gestures ui.tools.common ;
QUALIFIED-WITH: ui.tools.inspector i QUALIFIED-WITH: ui.tools.inspector i
IN: ui.tools.traceback IN: ui.tools.traceback

5
basis/ui/tools/walker/walker.factor
View File

@ -1,8 +1,9 @@
! Copyright (C) 2006, 2009 Slava Pestov. ! Copyright (C) 2006, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors colors kernel concurrency.messaging colors.constants inspector formatting USING: accessors colors kernel concurrency.messaging colors.constants inspector formatting
ui.tools.listener ui.tools.traceback ui.gadgets.buttons ui.gadgets.colors ui.tools.listener ui.tools.traceback ui.gadgets.buttons
ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.tracks ui.commands ui.gadgets ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.theme ui.gadgets.tracks
ui.commands ui.gadgets
models models.arrow ui.tools.browser ui.tools.common ui.gestures models models.arrow ui.tools.browser ui.tools.common ui.gestures
ui.gadgets.labels ui.pens.solid ui threads namespaces make tools.walker assocs ui.gadgets.labels ui.pens.solid ui threads namespaces make tools.walker assocs
combinators fry ; combinators fry ;