From 7a028977c448d76c644160ddef0bd2730eb49fc2 Mon Sep 17 00:00:00 2001 From: nicolas-p Date: Sun, 8 May 2016 10:09:44 +0200 Subject: [PATCH] Moved both themes into ui.theme --- basis/help/stylesheet/stylesheet.factor | 2 +- basis/help/tips/tips-docs.factor | 2 +- basis/help/tips/tips.factor | 2 +- basis/listener/listener.factor | 2 +- .../prettyprint/stylesheet/stylesheet.factor | 2 +- basis/ui/gadgets/buttons/buttons.factor | 2 +- basis/ui/gadgets/editors/editors.factor | 2 +- basis/ui/gadgets/labeled/labeled.factor | 2 +- basis/ui/gadgets/theme/dark/dark.factor | 86 ------ basis/ui/gadgets/theme/dark/summary.txt | 1 - basis/ui/gadgets/theme/light/light.factor | 86 ------ basis/ui/gadgets/theme/light/summary.txt | 1 - basis/ui/gadgets/theme/switching/authors.txt | 1 - basis/ui/gadgets/theme/theme.factor | 92 +------ basis/ui/gadgets/toolbar/toolbar.factor | 2 +- .../{gadgets/theme/dark => theme}/authors.txt | 0 basis/ui/theme/summary.txt | 1 + .../light => theme/switching}/authors.txt | 0 .../{gadgets => }/theme/switching/summary.txt | 0 .../theme/switching/switching.factor | 4 +- basis/ui/theme/theme.factor | 255 ++++++++++++++++++ basis/ui/tools/browser/browser.factor | 2 +- basis/ui/tools/common/common.factor | 2 +- basis/ui/tools/debugger/debugger.factor | 2 +- basis/ui/tools/error-list/error-list.factor | 2 +- basis/ui/tools/inspector/inspector.factor | 2 +- basis/ui/tools/listener/listener.factor | 2 +- basis/ui/tools/traceback/traceback.factor | 2 +- basis/ui/tools/walker/walker.factor | 2 +- basis/vocabs/prettyprint/prettyprint.factor | 2 +- 30 files changed, 277 insertions(+), 286 deletions(-) delete mode 100644 basis/ui/gadgets/theme/dark/dark.factor delete mode 100644 basis/ui/gadgets/theme/dark/summary.txt delete mode 100644 basis/ui/gadgets/theme/light/light.factor delete mode 100644 basis/ui/gadgets/theme/light/summary.txt delete mode 100644 basis/ui/gadgets/theme/switching/authors.txt rename basis/ui/{gadgets/theme/dark => theme}/authors.txt (100%) create mode 100644 basis/ui/theme/summary.txt rename basis/ui/{gadgets/theme/light => theme/switching}/authors.txt (100%) rename basis/ui/{gadgets => }/theme/switching/summary.txt (100%) rename basis/ui/{gadgets => }/theme/switching/switching.factor (93%) create mode 100644 basis/ui/theme/theme.factor diff --git a/basis/help/stylesheet/stylesheet.factor b/basis/help/stylesheet/stylesheet.factor index dd2f4f8c6c..2396d2e24a 100644 --- a/basis/help/stylesheet/stylesheet.factor +++ b/basis/help/stylesheet/stylesheet.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2005, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: assocs colors.constants fonts fry io.styles kernel literals -math namespaces sequences ui.gadgets.theme ; +math namespaces sequences ui.theme ; IN: help.stylesheet : wrap-margin-full ( -- n ) diff --git a/basis/help/tips/tips-docs.factor b/basis/help/tips/tips-docs.factor index 9a00ab02a6..b682ed1da0 100644 --- a/basis/help/tips/tips-docs.factor +++ b/basis/help/tips/tips-docs.factor @@ -1,6 +1,6 @@ USING: debugger editors help help.apropos help.markup help.syntax help.vocabs memory see stack-checker -tools.destructors tools.time ui.gadgets.theme.switching ; +tools.destructors tools.time ui.theme.switching ; IN: help.tips TIP: "To look at the most recent error, run " { $link :error } ". To look at the most recent error's callstack, run " { $link :c } "." ; diff --git a/basis/help/tips/tips.factor b/basis/help/tips/tips.factor index 7e6d40d7e9..d85aca9aba 100644 --- a/basis/help/tips/tips.factor +++ b/basis/help/tips/tips.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays colors.constants definitions help.markup help.stylesheet io io.styles kernel literals namespaces parser -random sequences ui.gadgets.theme ; +random sequences ui.theme ; IN: help.tips SYMBOL: tips diff --git a/basis/listener/listener.factor b/basis/listener/listener.factor index 0e21e98068..d256e747e7 100644 --- a/basis/listener/listener.factor +++ b/basis/listener/listener.factor @@ -4,7 +4,7 @@ USING: accessors colors colors.constants combinators.short-circuit compiler.units continuations debugger fry io io.styles kernel lexer literals locals math math.parser namespaces parser parser.notes prettyprint sequences sets -source-files.errors system ui.gadgets.theme vocabs vocabs.loader +source-files.errors system ui.theme vocabs vocabs.loader vocabs.parser ; IN: listener diff --git a/basis/prettyprint/stylesheet/stylesheet.factor b/basis/prettyprint/stylesheet/stylesheet.factor index 225d0e5da9..51544e5b3c 100644 --- a/basis/prettyprint/stylesheet/stylesheet.factor +++ b/basis/prettyprint/stylesheet/stylesheet.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: assocs colors combinators combinators.short-circuit hashtables io.styles kernel literals -namespaces sequences ui.gadgets.theme words words.symbol ; +namespaces sequences ui.theme words words.symbol ; IN: prettyprint.stylesheet change-model ; IN: ui.gadgets.buttons diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor index ba3d077f5a..f14e2b6ed2 100644 --- a/basis/ui/gadgets/editors/editors.factor +++ b/basis/ui/gadgets/editors/editors.factor @@ -8,7 +8,7 @@ math.vectors models models.arrow namespaces opengl sequences sorting splitting timers ui.baseline-alignment ui.clipboards ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.line-support ui.gadgets.menus ui.gadgets.scrollers -ui.gadgets.theme ui.gestures ui.pens.solid ui.render ui.text +ui.theme ui.gestures ui.pens.solid ui.render ui.text unicode ; EXCLUDE: fonts => selection ; IN: ui.gadgets.editors diff --git a/basis/ui/gadgets/labeled/labeled.factor b/basis/ui/gadgets/labeled/labeled.factor index acdaef69ad..3c826c9c9d 100644 --- a/basis/ui/gadgets/labeled/labeled.factor +++ b/basis/ui/gadgets/labeled/labeled.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors colors.constants kernel system ui.gadgets ui.gadgets.borders ui.gadgets.labels ui.gadgets.packs -ui.gadgets.theme ui.gadgets.tracks ui.pens.gradient +ui.theme ui.gadgets.tracks ui.pens.gradient ui.pens.solid ui.tools.common ; IN: ui.gadgets.labeled diff --git a/basis/ui/gadgets/theme/dark/dark.factor b/basis/ui/gadgets/theme/dark/dark.factor deleted file mode 100644 index fcf294fb5f..0000000000 --- a/basis/ui/gadgets/theme/dark/dark.factor +++ /dev/null @@ -1,86 +0,0 @@ -! Copyright (C) 2016 Nicolas Pénet. -! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors colors.constants colors.hex -ui.gadgets.theme ui.pens.solid ; -IN: ui.gadgets.theme.dark - -M: dark-theme toolbar-background COLOR: solarized-base02 ; -M: dark-theme toolbar-button-pressed-background COLOR: solarized-base0 ; - -M: dark-theme menu-background COLOR: solarized-base02 ; -M: dark-theme menu-border-color COLOR: solarized-base01 ; - -M: dark-theme status-bar-background COLOR: FactorDarkSlateBlue ; -M: dark-theme status-bar-foreground COLOR: white ; - -M: dark-theme button-text-color COLOR: solarized-base1 ; -M: dark-theme button-clicked-text-color COLOR: white ; - -M: dark-theme line-color COLOR: solarized-base01 ; - -M: dark-theme column-title-background HEXCOLOR: 2F4D5B ; - -M: dark-theme roll-button-rollover-border COLOR: gray50 ; -M: dark-theme roll-button-selected-background COLOR: dark-gray ; - -M: dark-theme source-files-color COLOR: solarized-green ; -M: dark-theme errors-color COLOR: solarized-red ; -M: dark-theme details-color COLOR: solarized-blue ; - -M: dark-theme debugger-color COLOR: solarized-red ; -M: dark-theme completion-color COLOR: solarized-violet ; - -M: dark-theme data-stack-color COLOR: solarized-blue ; -M: dark-theme retain-stack-color COLOR: solarized-magenta ; -M: dark-theme call-stack-color COLOR: solarized-green ; - -M: dark-theme title-bar-gradient { COLOR: solarized-base01 COLOR: solarized-base02 } ; - -M: dark-theme popup-color COLOR: solarized-yellow ; - -M: dark-theme object-color COLOR: solarized-cyan ; -M: dark-theme contents-color COLOR: solarized-magenta ; - -M: dark-theme help-header-background HEXCOLOR: 2F4D5B ; - -M: dark-theme thread-status-stopped-background HEXCOLOR: 492d33 ; -M: dark-theme thread-status-suspended-background HEXCOLOR: 3c4a24 ; -M: dark-theme thread-status-running-background HEXCOLOR: 2c4f24 ; - -M: dark-theme thread-status-stopped-foreground COLOR: solarized-red ; -M: dark-theme thread-status-suspended-foreground COLOR: solarized-yellow ; -M: dark-theme thread-status-running-foreground COLOR: solarized-green ; - -M: dark-theme error-summary-background HEXCOLOR: 6E2E32 ; - -M: dark-theme content-background COLOR: solarized-base03 ; -M: dark-theme text-color COLOR: grey75 ; - -M: dark-theme link-color COLOR: solarized-blue ; -M: dark-theme url-color COLOR: solarized-blue ; -M: dark-theme title-color COLOR: grey75 ; -M: dark-theme heading-color COLOR: grey75 ; -M: dark-theme snippet-color COLOR: solarized-orange ; -M: dark-theme output-color COLOR: solarized-orange ; -M: dark-theme warning-background-color HEXCOLOR: 6E2E32 ; -M: dark-theme code-background-color HEXCOLOR: 2F4D5B ; - -M: dark-theme tip-background-color HEXCOLOR: 2F4D5B ; - -M: dark-theme prompt-background-color HEXCOLOR: 922f31 ; - -M: dark-theme dim-color COLOR: solarized-cyan ; -M: dark-theme highlighted-word-color COLOR: solarized-green ; -M: dark-theme string-color COLOR: solarized-magenta ; -M: dark-theme stack-effect-color COLOR: solarized-orange ; - -M: dark-theme vocab-background-color COLOR: solarized-base01 ; -M: dark-theme vocab-border-color COLOR: solarized-base01 ; - -M: dark-theme field-border-color COLOR: solarized-base01 ; - -M: dark-theme selection-color COLOR: solarized-base01 ; -M: dark-theme panel-background-color T{ rgba f 0.7843 0.7686 0.7176 1.0 } ; -M: dark-theme focus-border-color COLOR: solarized-base01 ; - -M: dark-theme labeled-border-color COLOR: solarized-base01 ; diff --git a/basis/ui/gadgets/theme/dark/summary.txt b/basis/ui/gadgets/theme/dark/summary.txt deleted file mode 100644 index ab67578e12..0000000000 --- a/basis/ui/gadgets/theme/dark/summary.txt +++ /dev/null @@ -1 +0,0 @@ -Dark-colored theme diff --git a/basis/ui/gadgets/theme/light/light.factor b/basis/ui/gadgets/theme/light/light.factor deleted file mode 100644 index 5cd16fcdf4..0000000000 --- a/basis/ui/gadgets/theme/light/light.factor +++ /dev/null @@ -1,86 +0,0 @@ -! Copyright (C) 2015 Nicolas Pénet. -! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors colors.constants colors.hex -ui.gadgets.theme ui.pens.solid ; -IN: ui.gadgets.theme.light - -M: light-theme toolbar-background COLOR: grey95 ; -M: light-theme toolbar-button-pressed-background COLOR: dark-gray ; - -M: light-theme menu-background COLOR: grey95 ; -M: light-theme menu-border-color COLOR: grey75 ; - -M: light-theme status-bar-background COLOR: FactorDarkSlateBlue ; -M: light-theme status-bar-foreground COLOR: white ; - -M: light-theme button-text-color COLOR: FactorDarkSlateBlue ; -M: light-theme button-clicked-text-color COLOR: white ; - -M: light-theme line-color COLOR: grey75 ; - -M: light-theme column-title-background COLOR: grey95 ; - -M: light-theme roll-button-rollover-border COLOR: gray50 ; -M: light-theme roll-button-selected-background COLOR: dark-gray ; - -M: light-theme source-files-color COLOR: MediumSeaGreen ; -M: light-theme errors-color COLOR: chocolate1 ; -M: light-theme details-color COLOR: SteelBlue3 ; - -M: light-theme debugger-color COLOR: chocolate1 ; -M: light-theme completion-color COLOR: magenta ; - -M: light-theme data-stack-color COLOR: DodgerBlue ; -M: light-theme retain-stack-color COLOR: HotPink ; -M: light-theme call-stack-color COLOR: GreenYellow ; - -M: light-theme title-bar-gradient { COLOR: white COLOR: grey90 } ; - -M: light-theme popup-color COLOR: yellow2 ; - -M: light-theme object-color COLOR: aquamarine2 ; -M: light-theme contents-color COLOR: orchid2 ; - -M: light-theme help-header-background HEXCOLOR: F4EFD9 ; - -M: light-theme thread-status-stopped-background HEXCOLOR: F4D9D9 ; -M: light-theme thread-status-suspended-background HEXCOLOR: F4EAD9 ; -M: light-theme thread-status-running-background HEXCOLOR: EDF4D9 ; - -M: light-theme thread-status-stopped-foreground HEXCOLOR: F42300 ; -M: light-theme thread-status-suspended-foreground HEXCOLOR: F37B00 ; -M: light-theme thread-status-running-foreground HEXCOLOR: 3FCA00 ; - -M: light-theme error-summary-background HEXCOLOR: F4D9D9 ; - -M: light-theme content-background COLOR: white ; -M: light-theme text-color COLOR: black ; - -M: light-theme link-color COLOR: DodgerBlue4 ; -M: light-theme url-color COLOR: DodgerBlue4 ; -M: light-theme title-color COLOR: gray20 ; -M: light-theme heading-color COLOR: FactorDarkSlateBlue ; -M: light-theme snippet-color COLOR: solarized-orange ; -M: light-theme output-color COLOR: solarized-orange ; -M: light-theme warning-background-color T{ rgba f 1 0.7 0.7 1 } ; -M: light-theme code-background-color COLOR: FactorLightTan ; - -M: light-theme tip-background-color COLOR: lavender ; - -M: light-theme prompt-background-color T{ rgba f 1 0.7 0.7 1 } ; - -M: light-theme dim-color COLOR: solarized-cyan ; -M: light-theme highlighted-word-color COLOR: solarized-green ; -M: light-theme string-color COLOR: solarized-magenta ; -M: light-theme stack-effect-color COLOR: solarized-orange ; - -M: light-theme vocab-background-color COLOR: FactorLightTan ; -M: light-theme vocab-border-color COLOR: FactorDarkTan ; - -M: light-theme field-border-color COLOR: gray ; - -M: light-theme selection-color T{ rgba f 0.8 0.8 1.0 1.0 } ; -M: light-theme panel-background-color T{ rgba f 0.7843 0.7686 0.7176 1.0 } ; -M: light-theme focus-border-color COLOR: dark-gray ; - -M: light-theme labeled-border-color COLOR: grey85 ; diff --git a/basis/ui/gadgets/theme/light/summary.txt b/basis/ui/gadgets/theme/light/summary.txt deleted file mode 100644 index 8228018816..0000000000 --- a/basis/ui/gadgets/theme/light/summary.txt +++ /dev/null @@ -1 +0,0 @@ -Light-colored theme diff --git a/basis/ui/gadgets/theme/switching/authors.txt b/basis/ui/gadgets/theme/switching/authors.txt deleted file mode 100644 index 7b5c10d397..0000000000 --- a/basis/ui/gadgets/theme/switching/authors.txt +++ /dev/null @@ -1 +0,0 @@ -Nicolas Pénet diff --git a/basis/ui/gadgets/theme/theme.factor b/basis/ui/gadgets/theme/theme.factor index e36c0144c8..1a764b9828 100644 --- a/basis/ui/gadgets/theme/theme.factor +++ b/basis/ui/gadgets/theme/theme.factor @@ -1,97 +1,7 @@ ! Copyright (C) 2009, 2010 Slava Pestov, Joe Groff. ! See http://factorcode.org/license.txt for BSD license. -USING: io.pathnames sequences ui.images vocabs namespaces ; +USING: io.pathnames sequences ui.images ; IN: ui.gadgets.theme : theme-image ( name -- image-name ) "vocab:ui/gadgets/theme/" prepend-path ".tiff" append ; - -SYMBOL: theme -SINGLETON: light-theme -SINGLETON: dark-theme - -light-theme theme set-global - -HOOK: toolbar-background theme ( -- color ) -HOOK: toolbar-button-pressed-background theme ( -- color ) - -HOOK: menu-background theme ( -- color ) -HOOK: menu-border-color theme ( -- color ) - -HOOK: status-bar-background theme ( -- color ) -HOOK: status-bar-foreground theme ( -- color ) - -HOOK: button-text-color theme ( -- color ) -HOOK: button-clicked-text-color theme ( -- color ) - -HOOK: line-color theme ( -- color ) - -HOOK: column-title-background theme ( -- color ) - -HOOK: roll-button-rollover-border theme ( -- color ) -HOOK: roll-button-selected-background theme ( -- color ) - -HOOK: source-files-color theme ( -- color ) -HOOK: errors-color theme ( -- color ) -HOOK: details-color theme ( -- color ) - -HOOK: debugger-color theme ( -- color ) -HOOK: completion-color theme ( -- color ) - -HOOK: data-stack-color theme ( -- color ) -HOOK: retain-stack-color theme ( -- color ) -HOOK: call-stack-color theme ( -- color ) - -HOOK: title-bar-gradient theme ( -- color ) - -HOOK: popup-color theme ( -- color ) - -HOOK: object-color theme ( -- color ) -HOOK: contents-color theme ( -- color ) - -HOOK: help-header-background theme ( -- color ) - -HOOK: thread-status-stopped-background theme ( -- color ) -HOOK: thread-status-suspended-background theme ( -- color ) -HOOK: thread-status-running-background theme ( -- color ) - -HOOK: thread-status-stopped-foreground theme ( -- color ) -HOOK: thread-status-suspended-foreground theme ( -- color ) -HOOK: thread-status-running-foreground theme ( -- color ) - -HOOK: error-summary-background theme ( -- color ) - -HOOK: content-background theme ( -- color ) -HOOK: text-color theme ( -- color ) - -HOOK: link-color theme ( -- color ) -HOOK: url-color theme ( -- color ) -HOOK: title-color theme ( -- color ) -HOOK: heading-color theme ( -- color ) -HOOK: snippet-color theme ( -- color ) -HOOK: output-color theme ( -- color ) -HOOK: warning-background-color theme ( -- color ) -HOOK: code-background-color theme ( -- color ) - -HOOK: tip-background-color theme ( -- color ) - -HOOK: prompt-background-color theme ( -- color ) - -HOOK: dim-color theme ( -- color ) -HOOK: highlighted-word-color theme ( -- color ) -HOOK: string-color theme ( -- color ) -HOOK: stack-effect-color theme ( -- color ) - -HOOK: vocab-background-color theme ( -- color ) -HOOK: vocab-border-color theme ( -- color ) - -HOOK: field-border-color theme ( -- color ) - -HOOK: selection-color theme ( -- color ) -HOOK: panel-background-color theme ( -- color ) -HOOK: focus-border-color theme ( -- color ) - -HOOK: labeled-border-color theme ( -- color ) - -<< "ui.gadgets.theme.light" require >> -<< "ui.gadgets.theme.dark" require >> diff --git a/basis/ui/gadgets/toolbar/toolbar.factor b/basis/ui/gadgets/toolbar/toolbar.factor index cb37241e5d..991dd324ad 100644 --- a/basis/ui/gadgets/toolbar/toolbar.factor +++ b/basis/ui/gadgets/toolbar/toolbar.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs classes fry kernel locals ui.baseline-alignment ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons -ui.gadgets.buttons.private ui.gadgets.packs ui.gadgets.theme +ui.gadgets.buttons.private ui.gadgets.packs ui.theme ui.gadgets.tracks ui.pens ui.pens.solid ; IN: ui.gadgets.toolbar diff --git a/basis/ui/gadgets/theme/dark/authors.txt b/basis/ui/theme/authors.txt similarity index 100% rename from basis/ui/gadgets/theme/dark/authors.txt rename to basis/ui/theme/authors.txt diff --git a/basis/ui/theme/summary.txt b/basis/ui/theme/summary.txt new file mode 100644 index 0000000000..65c25b9d4d --- /dev/null +++ b/basis/ui/theme/summary.txt @@ -0,0 +1 @@ +Light and dark themes diff --git a/basis/ui/gadgets/theme/light/authors.txt b/basis/ui/theme/switching/authors.txt similarity index 100% rename from basis/ui/gadgets/theme/light/authors.txt rename to basis/ui/theme/switching/authors.txt diff --git a/basis/ui/gadgets/theme/switching/summary.txt b/basis/ui/theme/switching/summary.txt similarity index 100% rename from basis/ui/gadgets/theme/switching/summary.txt rename to basis/ui/theme/switching/summary.txt diff --git a/basis/ui/gadgets/theme/switching/switching.factor b/basis/ui/theme/switching/switching.factor similarity index 93% rename from basis/ui/gadgets/theme/switching/switching.factor rename to basis/ui/theme/switching/switching.factor index 8fb37d5624..0afdad0bc9 100644 --- a/basis/ui/gadgets/theme/switching/switching.factor +++ b/basis/ui/theme/switching/switching.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2016 Nicolas Pénet. ! See http://factorcode.org/license.txt for BSD license. USING: fry hashtables help.stylesheet help.tips io.styles -kernel listener namespaces ui.gadgets.theme ui.tools.listener ; -IN: ui.gadgets.theme.switching +kernel listener namespaces ui.theme ui.tools.listener ; +IN: ui.theme.switching : (update-style) ( style color elt -- ) '[ _ _ rot ?set-at ] change-global ; diff --git a/basis/ui/theme/theme.factor b/basis/ui/theme/theme.factor new file mode 100644 index 0000000000..dbdd5ec37e --- /dev/null +++ b/basis/ui/theme/theme.factor @@ -0,0 +1,255 @@ +! Copyright (C) 2016 Nicolas Pénet. +! See http://factorcode.org/license.txt for BSD license. +USING: colors colors.constants colors.hex namespaces ; +IN: ui.theme + +SYMBOL: theme + +HOOK: toolbar-background theme ( -- color ) +HOOK: toolbar-button-pressed-background theme ( -- color ) + +HOOK: menu-background theme ( -- color ) +HOOK: menu-border-color theme ( -- color ) + +HOOK: status-bar-background theme ( -- color ) +HOOK: status-bar-foreground theme ( -- color ) + +HOOK: button-text-color theme ( -- color ) +HOOK: button-clicked-text-color theme ( -- color ) + +HOOK: line-color theme ( -- color ) + +HOOK: column-title-background theme ( -- color ) + +HOOK: roll-button-rollover-border theme ( -- color ) +HOOK: roll-button-selected-background theme ( -- color ) + +HOOK: source-files-color theme ( -- color ) +HOOK: errors-color theme ( -- color ) +HOOK: details-color theme ( -- color ) + +HOOK: debugger-color theme ( -- color ) +HOOK: completion-color theme ( -- color ) + +HOOK: data-stack-color theme ( -- color ) +HOOK: retain-stack-color theme ( -- color ) +HOOK: call-stack-color theme ( -- color ) + +HOOK: title-bar-gradient theme ( -- color ) + +HOOK: popup-color theme ( -- color ) + +HOOK: object-color theme ( -- color ) +HOOK: contents-color theme ( -- color ) + +HOOK: help-header-background theme ( -- color ) + +HOOK: thread-status-stopped-background theme ( -- color ) +HOOK: thread-status-suspended-background theme ( -- color ) +HOOK: thread-status-running-background theme ( -- color ) + +HOOK: thread-status-stopped-foreground theme ( -- color ) +HOOK: thread-status-suspended-foreground theme ( -- color ) +HOOK: thread-status-running-foreground theme ( -- color ) + +HOOK: error-summary-background theme ( -- color ) + +HOOK: content-background theme ( -- color ) +HOOK: text-color theme ( -- color ) + +HOOK: link-color theme ( -- color ) +HOOK: url-color theme ( -- color ) +HOOK: title-color theme ( -- color ) +HOOK: heading-color theme ( -- color ) +HOOK: snippet-color theme ( -- color ) +HOOK: output-color theme ( -- color ) +HOOK: warning-background-color theme ( -- color ) +HOOK: code-background-color theme ( -- color ) + +HOOK: tip-background-color theme ( -- color ) + +HOOK: prompt-background-color theme ( -- color ) + +HOOK: dim-color theme ( -- color ) +HOOK: highlighted-word-color theme ( -- color ) +HOOK: string-color theme ( -- color ) +HOOK: stack-effect-color theme ( -- color ) + +HOOK: vocab-background-color theme ( -- color ) +HOOK: vocab-border-color theme ( -- color ) + +HOOK: field-border-color theme ( -- color ) + +HOOK: selection-color theme ( -- color ) +HOOK: panel-background-color theme ( -- color ) +HOOK: focus-border-color theme ( -- color ) + +HOOK: labeled-border-color theme ( -- color ) + +SINGLETON: light-theme + +M: light-theme toolbar-background COLOR: grey95 ; +M: light-theme toolbar-button-pressed-background COLOR: dark-gray ; + +M: light-theme menu-background COLOR: grey95 ; +M: light-theme menu-border-color COLOR: grey75 ; + +M: light-theme status-bar-background COLOR: FactorDarkSlateBlue ; +M: light-theme status-bar-foreground COLOR: white ; + +M: light-theme button-text-color COLOR: FactorDarkSlateBlue ; +M: light-theme button-clicked-text-color COLOR: white ; + +M: light-theme line-color COLOR: grey75 ; + +M: light-theme column-title-background COLOR: grey95 ; + +M: light-theme roll-button-rollover-border COLOR: gray50 ; +M: light-theme roll-button-selected-background COLOR: dark-gray ; + +M: light-theme source-files-color COLOR: MediumSeaGreen ; +M: light-theme errors-color COLOR: chocolate1 ; +M: light-theme details-color COLOR: SteelBlue3 ; + +M: light-theme debugger-color COLOR: chocolate1 ; +M: light-theme completion-color COLOR: magenta ; + +M: light-theme data-stack-color COLOR: DodgerBlue ; +M: light-theme retain-stack-color COLOR: HotPink ; +M: light-theme call-stack-color COLOR: GreenYellow ; + +M: light-theme title-bar-gradient { COLOR: white COLOR: grey90 } ; + +M: light-theme popup-color COLOR: yellow2 ; + +M: light-theme object-color COLOR: aquamarine2 ; +M: light-theme contents-color COLOR: orchid2 ; + +M: light-theme help-header-background HEXCOLOR: F4EFD9 ; + +M: light-theme thread-status-stopped-background HEXCOLOR: F4D9D9 ; +M: light-theme thread-status-suspended-background HEXCOLOR: F4EAD9 ; +M: light-theme thread-status-running-background HEXCOLOR: EDF4D9 ; + +M: light-theme thread-status-stopped-foreground HEXCOLOR: F42300 ; +M: light-theme thread-status-suspended-foreground HEXCOLOR: F37B00 ; +M: light-theme thread-status-running-foreground HEXCOLOR: 3FCA00 ; + +M: light-theme error-summary-background HEXCOLOR: F4D9D9 ; + +M: light-theme content-background COLOR: white ; +M: light-theme text-color COLOR: black ; + +M: light-theme link-color COLOR: DodgerBlue4 ; +M: light-theme url-color COLOR: DodgerBlue4 ; +M: light-theme title-color COLOR: gray20 ; +M: light-theme heading-color COLOR: FactorDarkSlateBlue ; +M: light-theme snippet-color COLOR: solarized-orange ; +M: light-theme output-color COLOR: solarized-orange ; +M: light-theme warning-background-color T{ rgba f 1 0.7 0.7 1 } ; +M: light-theme code-background-color COLOR: FactorLightTan ; + +M: light-theme tip-background-color COLOR: lavender ; + +M: light-theme prompt-background-color T{ rgba f 1 0.7 0.7 1 } ; + +M: light-theme dim-color COLOR: solarized-cyan ; +M: light-theme highlighted-word-color COLOR: solarized-green ; +M: light-theme string-color COLOR: solarized-magenta ; +M: light-theme stack-effect-color COLOR: solarized-orange ; + +M: light-theme vocab-background-color COLOR: FactorLightTan ; +M: light-theme vocab-border-color COLOR: FactorDarkTan ; + +M: light-theme field-border-color COLOR: gray ; + +M: light-theme selection-color T{ rgba f 0.8 0.8 1.0 1.0 } ; +M: light-theme panel-background-color T{ rgba f 0.7843 0.7686 0.7176 1.0 } ; +M: light-theme focus-border-color COLOR: dark-gray ; + +M: light-theme labeled-border-color COLOR: grey85 ; + +SINGLETON: dark-theme + +M: dark-theme toolbar-background COLOR: solarized-base02 ; +M: dark-theme toolbar-button-pressed-background COLOR: solarized-base0 ; + +M: dark-theme menu-background COLOR: solarized-base02 ; +M: dark-theme menu-border-color COLOR: solarized-base01 ; + +M: dark-theme status-bar-background COLOR: FactorDarkSlateBlue ; +M: dark-theme status-bar-foreground COLOR: white ; + +M: dark-theme button-text-color COLOR: solarized-base1 ; +M: dark-theme button-clicked-text-color COLOR: white ; + +M: dark-theme line-color COLOR: solarized-base01 ; + +M: dark-theme column-title-background HEXCOLOR: 2F4D5B ; + +M: dark-theme roll-button-rollover-border COLOR: gray50 ; +M: dark-theme roll-button-selected-background COLOR: dark-gray ; + +M: dark-theme source-files-color COLOR: solarized-green ; +M: dark-theme errors-color COLOR: solarized-red ; +M: dark-theme details-color COLOR: solarized-blue ; + +M: dark-theme debugger-color COLOR: solarized-red ; +M: dark-theme completion-color COLOR: solarized-violet ; + +M: dark-theme data-stack-color COLOR: solarized-blue ; +M: dark-theme retain-stack-color COLOR: solarized-magenta ; +M: dark-theme call-stack-color COLOR: solarized-green ; + +M: dark-theme title-bar-gradient { COLOR: solarized-base01 COLOR: solarized-base02 } ; + +M: dark-theme popup-color COLOR: solarized-yellow ; + +M: dark-theme object-color COLOR: solarized-cyan ; +M: dark-theme contents-color COLOR: solarized-magenta ; + +M: dark-theme help-header-background HEXCOLOR: 2F4D5B ; + +M: dark-theme thread-status-stopped-background HEXCOLOR: 492d33 ; +M: dark-theme thread-status-suspended-background HEXCOLOR: 3c4a24 ; +M: dark-theme thread-status-running-background HEXCOLOR: 2c4f24 ; + +M: dark-theme thread-status-stopped-foreground COLOR: solarized-red ; +M: dark-theme thread-status-suspended-foreground COLOR: solarized-yellow ; +M: dark-theme thread-status-running-foreground COLOR: solarized-green ; + +M: dark-theme error-summary-background HEXCOLOR: 6E2E32 ; + +M: dark-theme content-background COLOR: solarized-base03 ; +M: dark-theme text-color COLOR: grey75 ; + +M: dark-theme link-color COLOR: solarized-blue ; +M: dark-theme url-color COLOR: solarized-blue ; +M: dark-theme title-color COLOR: grey75 ; +M: dark-theme heading-color COLOR: grey75 ; +M: dark-theme snippet-color COLOR: solarized-orange ; +M: dark-theme output-color COLOR: solarized-orange ; +M: dark-theme warning-background-color HEXCOLOR: 6E2E32 ; +M: dark-theme code-background-color HEXCOLOR: 2F4D5B ; + +M: dark-theme tip-background-color HEXCOLOR: 2F4D5B ; + +M: dark-theme prompt-background-color HEXCOLOR: 922f31 ; + +M: dark-theme dim-color COLOR: solarized-cyan ; +M: dark-theme highlighted-word-color COLOR: solarized-green ; +M: dark-theme string-color COLOR: solarized-magenta ; +M: dark-theme stack-effect-color COLOR: solarized-orange ; + +M: dark-theme vocab-background-color COLOR: solarized-base01 ; +M: dark-theme vocab-border-color COLOR: solarized-base01 ; + +M: dark-theme field-border-color COLOR: solarized-base01 ; + +M: dark-theme selection-color COLOR: solarized-base01 ; +M: dark-theme panel-background-color T{ rgba f 0.7843 0.7686 0.7176 1.0 } ; +M: dark-theme focus-border-color COLOR: solarized-base01 ; + +M: dark-theme labeled-border-color COLOR: solarized-base01 ; + +light-theme theme set-global diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index 8f284f93e7..e4ad3dae48 100644 --- a/basis/ui/tools/browser/browser.factor +++ b/basis/ui/tools/browser/browser.factor @@ -8,7 +8,7 @@ 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.gadgets.theme ui.gadgets.toolbar ui.gadgets.tracks +ui.theme ui.gadgets.toolbar ui.gadgets.tracks ui.gadgets.viewports ui.gadgets.worlds ui.gestures ui.pens.solid ui.render ui.text ui.tools.browser.history ui.tools.browser.popups ui.tools.common vocabs ; diff --git a/basis/ui/tools/common/common.factor b/basis/ui/tools/common/common.factor index 4a74aca5e9..287539c540 100644 --- a/basis/ui/tools/common/common.factor +++ b/basis/ui/tools/common/common.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs classes classes.mixin kernel namespaces parser ui.gadgets ui.gadgets.borders -ui.pens.solid ui.gadgets.scrollers ui.gadgets.tracks ui.gadgets.theme +ui.pens.solid ui.gadgets.scrollers ui.gadgets.tracks ui.theme combinators.short-circuit ; IN: ui.tools.common diff --git a/basis/ui/tools/debugger/debugger.factor b/basis/ui/tools/debugger/debugger.factor index 10450a4cc8..610aa10b6f 100644 --- a/basis/ui/tools/debugger/debugger.factor +++ b/basis/ui/tools/debugger/debugger.factor @@ -6,7 +6,7 @@ debugger prettyprint help editors fonts ui ui.commands ui.debugger ui.gestures ui.gadgets ui.pens.solid ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons ui.gadgets.labels ui.gadgets.presentations ui.gadgets.panes -ui.gadgets.viewports ui.gadgets.tables ui.gadgets.theme +ui.gadgets.viewports ui.gadgets.tables ui.theme ui.gadgets.tracks ui.gadgets.toolbar ui.gadgets.scrollers ui.gadgets.borders ui.gadgets.status-bar ui.tools.traceback ui.tools.inspector ui.tools.browser ui.tools.common ; diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor index 49ed22ad19..d838eed0bf 100644 --- a/basis/ui/tools/error-list/error-list.factor +++ b/basis/ui/tools/error-list/error-list.factor @@ -9,7 +9,7 @@ namespaces summary locals ui ui.commands ui.gadgets ui.gadgets.panes ui.gadgets.tables ui.gadgets.labeled ui.gadgets.tracks ui.gestures ui.operations ui.tools.browser ui.tools.common ui.gadgets.scrollers ui.tools.inspector ui.gadgets.buttons ui.gadgets.borders ui.gadgets.labels -ui.gadgets.packs ui.gadgets.theme ui.gadgets.toolbar ui.gadgets.status-bar +ui.gadgets.packs ui.theme ui.gadgets.toolbar ui.gadgets.status-bar ui.baseline-alignment ui.images compiler.errors tools.errors tools.errors.model ; IN: ui.tools.error-list diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor index 9c228b3d29..29b5dbce14 100644 --- a/basis/ui/tools/inspector/inspector.factor +++ b/basis/ui/tools/inspector/inspector.factor @@ -5,7 +5,7 @@ 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.gadgets.scrollers ui.gadgets.slots ui.gadgets.tracks ui.gestures -ui.gadgets.buttons ui.gadgets.tables ui.gadgets.theme +ui.gadgets.buttons ui.gadgets.tables ui.theme ui.gadgets.toolbar ui.gadgets.status-bar ui.gadgets.labeled ui.tools.common ui combinators ui.gadgets.worlds ; IN: ui.tools.inspector diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index 1aaf99f693..863e170384 100644 --- a/basis/ui/tools/listener/listener.factor +++ b/basis/ui/tools/listener/listener.factor @@ -9,7 +9,7 @@ math models models.arrow models.delay namespaces parser prettyprint sequences source-files.errors strings system threads tools.errors.model ui ui.commands ui.gadgets ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled ui.gadgets.panes -ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.theme +ui.gadgets.scrollers ui.gadgets.status-bar ui.theme ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.operations ui.pens.solid ui.tools.browser ui.tools.common ui.tools.debugger ui.tools.error-list ui.tools.listener.completion diff --git a/basis/ui/tools/traceback/traceback.factor b/basis/ui/tools/traceback/traceback.factor index 8d092f2928..9341d96ab4 100644 --- a/basis/ui/tools/traceback/traceback.factor +++ b/basis/ui/tools/traceback/traceback.factor @@ -5,7 +5,7 @@ kernel models models.arrow prettyprint sequences ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.labeled ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tables ui.gadgets.toolbar -ui.gadgets.theme ui.gadgets.tracks +ui.theme ui.gadgets.tracks ui.gestures ui.tools.common ; QUALIFIED-WITH: ui.tools.inspector i IN: ui.tools.traceback diff --git a/basis/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor index 1e60de76a7..9e5fa4f679 100644 --- a/basis/ui/tools/walker/walker.factor +++ b/basis/ui/tools/walker/walker.factor @@ -4,7 +4,7 @@ USING: accessors assocs colors colors.constants combinators concurrency.messaging formatting fry inspector kernel make models models.arrow namespaces sequences threads tools.walker ui ui.commands ui.gadgets ui.gadgets.buttons ui.gadgets.labels -ui.gadgets.status-bar ui.gadgets.theme ui.gadgets.toolbar +ui.gadgets.status-bar ui.theme ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.pens.solid ui.tools.browser ui.tools.common ui.tools.listener ui.tools.traceback ; IN: ui.tools.walker diff --git a/basis/vocabs/prettyprint/prettyprint.factor b/basis/vocabs/prettyprint/prettyprint.factor index 480df1a368..a8c2f80631 100644 --- a/basis/vocabs/prettyprint/prettyprint.factor +++ b/basis/vocabs/prettyprint/prettyprint.factor @@ -3,7 +3,7 @@ USING: accessors arrays assocs colors fry io io.styles kernel literals make math.order namespaces parser prettyprint.backend prettyprint.sections prettyprint.stylesheet -sequences sets sorting ui.gadgets.theme vocabs vocabs.parser ; +sequences sets sorting ui.theme vocabs vocabs.parser ; FROM: io.styles => inset ; IN: vocabs.prettyprint