move theme protocol into ui.theme; restore using line; ensure bootstrap works.

diff --git a/basis/delegate/delegate.factor b/basis/delegate/delegate.factor
index 5d5ac044a1a92311d5e402e0ae7625a257a2f744..5d0e6e727bb91f2d704d0af9a1ab9ba05e048883 100644 (file)
--- a/basis/delegate/delegate.factor
+++ b/basis/delegate/delegate.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2007, 2008 Daniel Ehrenberg
 ! Portions copyright (C) 2009, 2010 Slava Pestov, Joe Groff
 ! See https://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs classes classes.tuple combinators
-compiler.units definitions effects fry generic generic.hook generic.standard
-hashtables kernel lexer make math namespaces parser sequences sets slots
+USING: accessors arrays assocs classes classes.tuple
+compiler.units definitions effects fry generic generic.standard
+hashtables kernel lexer make math parser sequences sets slots
 words words.symbol ;
 IN: delegate
 

diff --git a/basis/delegate/protocols/protocols.factor b/basis/delegate/protocols/protocols.factor
index d4a62f49bea262805953c3c2f071e0ec639df59e..409307a7d1b4bdb4ca6cee13c84a6d3084bba99b 100644 (file)
--- a/basis/delegate/protocols/protocols.factor
+++ b/basis/delegate/protocols/protocols.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Daniel Ehrenberg
 ! See https://factorcode.org/license.txt for BSD license.
 USING: assocs delegate deques io sequences sequences.private
-sets ui.theme ;
+sets ;
 IN: delegate.protocols
 
 PROTOCOL: sequence-protocol
@@ -28,30 +28,3 @@ stream-readln stream-read-until stream-contents* ;
 
 PROTOCOL: output-stream-protocol
 stream-flush stream-write1 stream-write stream-nl ;
-
-PROTOCOL: theme-protocol
-toolbar-background toolbar-button-pressed-background
-menu-background menu-border-color status-bar-background
-status-bar-foreground button-text-color
-button-clicked-text-color line-color column-title-background
-roll-button-rollover-border roll-button-selected-background
-source-files-color errors-color details-color debugger-color
-completion-color data-stack-color retain-stack-color
-call-stack-color title-bar-gradient popup-color object-color
-contents-color help-header-background
-thread-status-stopped-background
-thread-status-suspended-background
-thread-status-running-background
-thread-status-stopped-foreground
-thread-status-suspended-foreground
-thread-status-running-foreground error-summary-background
-content-background text-color link-color title-color
-heading-color snippet-color output-color
-deprecated-background-color deprecated-border-color
-warning-background-color warning-border-color
-code-background-color code-border-color help-path-border-color
-tip-background-color prompt-background-color dim-color
-highlighted-word-color string-color stack-effect-color
-vocab-background-color vocab-border-color field-border-color
-editor-caret-color selection-color panel-background-color
-focus-border-color labeled-border-color table-border-color ;

diff --git a/basis/ui/theme/theme.factor b/basis/ui/theme/theme.factor
index f08296f3bffdc828bdd4942a23e3cd81a92d3a45..a43aa7fc3639a54a46658ffd92abd11cb58a8258 100644 (file)
--- a/basis/ui/theme/theme.factor
+++ b/basis/ui/theme/theme.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2016 Nicolas Pénet.
 ! See https://factorcode.org/license.txt for BSD license.
-USING: colors namespaces ;
+USING: colors delegate namespaces ;
 IN: ui.theme
 
 SYMBOL: theme
@@ -93,6 +93,37 @@ HOOK: labeled-border-color theme ( -- color )
 
 HOOK: table-border-color theme ( -- color )
 
+! Protocol
+
+PROTOCOL: theme-protocol
+toolbar-background toolbar-button-pressed-background
+menu-background menu-border-color status-bar-background
+status-bar-foreground button-text-color
+button-clicked-text-color line-color column-title-background
+roll-button-rollover-border roll-button-selected-background
+source-files-color errors-color details-color debugger-color
+completion-color data-stack-color retain-stack-color
+call-stack-color title-bar-gradient popup-color object-color
+contents-color help-header-background
+thread-status-stopped-background
+thread-status-suspended-background
+thread-status-running-background
+thread-status-stopped-foreground
+thread-status-suspended-foreground
+thread-status-running-foreground error-summary-background
+content-background text-color link-color title-color
+heading-color snippet-color output-color
+deprecated-background-color deprecated-border-color
+warning-background-color warning-border-color
+code-background-color code-border-color help-path-border-color
+tip-background-color prompt-background-color dim-color
+highlighted-word-color string-color stack-effect-color
+vocab-background-color vocab-border-color field-border-color
+editor-caret-color selection-color panel-background-color
+focus-border-color labeled-border-color table-border-color ;
+
+! Light theme
+
 SINGLETON: light-theme
 theme [ light-theme ] initialize