improve new color scheme preference defaults

In particular, adjust the color scheme preference keys so the new
organization exclusively uses new keys, which lets the value of those
new preferences be determined by the values of the old preferences

Author: rfindler

gui-lib/framework/private/color-prefs.rkt

@@ -758,8 +758,8 @@ on top's background stays in the wrong mode.
    (sort (set->list known-color-names) symbol<?)
    (sort (set->list known-style-names) symbol<?))
   (define preferred-color-scheme (if (white-on-black-color-scheme?)
-                                     (preferences:get 'framework:color-scheme-wob)
-                                     (preferences:get 'framework:color-scheme)))
+                                     (preferences:get 'framework:color-scheme-dark)
+                                     (preferences:get 'framework:color-scheme-light)))
   (for ([dir (in-list (find-relevant-directories '(framework:color-schemes)))])
     (define info (with-handlers ([exn:fail?
                                   (λ (x)
@@ -1033,7 +1033,7 @@ on top's background stays in the wrong mode.
   ;; if some color scheme goes away, we have some
   ;; reasonable backup plan (and, if it comes back
   ;; we don't lose the prefs)
-  (define pref-name (if wob? 'framework:color-scheme-wob 'framework:color-scheme))
+  (define pref-name (if wob? 'framework:color-scheme-dark 'framework:color-scheme-light))
   (define pref-val (preferences:get pref-name))
   (define found-color-scheme (lookup-color-scheme pref-val))
   (cond
@@ -1060,8 +1060,8 @@ on top's background stays in the wrong mode.
                known-color-scheme))
         (car known-color-schemes)))
   (preferences:set (if (color-scheme-white-on-black-base? color-scheme)
-                       'framework:color-scheme-wob
-                       'framework:color-scheme)
+                       'framework:color-scheme-dark
+                       'framework:color-scheme-light)
                    (color-scheme-name color-scheme))
   (when (equal? (color-scheme-white-on-black-base? color-scheme)
                 (white-on-black-color-scheme?))
@@ -1323,8 +1323,8 @@ on top's background stays in the wrong mode.
                       i))))
        (preferences:add-callback pref-sym (λ (sym val) (update-choice val)))
        (update-choice (preferences:get pref-sym)))
-     (setup-color-scheme-choice #f (string-constant light-mode-scheme) 'framework:color-scheme)
-     (setup-color-scheme-choice #t (string-constant dark-mode-scheme) 'framework:color-scheme-wob)
+     (setup-color-scheme-choice #f (string-constant light-color-scheme) 'framework:color-scheme-light)
+     (setup-color-scheme-choice #t (string-constant dark-color-scheme) 'framework:color-scheme-dark)
 
      (define color-scheme-examples-vp
        (new-vertical-panel%

gui-lib/framework/private/main.rkt

@@ -43,15 +43,6 @@
 
 (preferences:set-default 'framework:ascii-art-enlarge #f boolean?)
 
-;; the name of the color scheme that the user prefers when in black-on-white mode
-(preferences:set-default 'framework:color-scheme
-                         'classic
-                         symbol?)
-;; the name of the color scheme that the user prefers when in white-on-black mode
-(preferences:set-default 'framework:color-scheme-wob
-                         'white-on-black
-                         symbol?)
-
 (preferences:set-default 'framework:column-guide-width
                          '(#f 102)
                          (list/c boolean? (and/c exact-integer? (>=/c 2))))
@@ -229,14 +220,75 @@
 
 (set-square-bracket-nonum-pref 'framework:square-bracket:for/fold for/folds)
 
+;; this preference shouldn't be used any more; we keep it here
+;; only so we can access it's old value
+(preferences:set-default 'framework:color-scheme 'classic symbol?)
+
+(define dark-mode-with-previous-preferences-organization?
+  ;; all of the color schemes on the package server with
+  ;; 'white-on-black-base? set to #t
+  (and (member (preferences:get 'framework:color-scheme)
+               '(white-on-black
+                 |Tol's White on Black|
+                 |Catppuccin Frappe|
+                 |Catppuccin Macchiato|
+                 |Catppuccin Mocha|
+                 |Dracula|
+                 |Cyberpunk|
+                 |Everforest Dark Hard|
+                 |Everforest Dark Medium|
+                 |Everforest Dark Low|
+                 |Material|
+                 |One Dark|
+                 |Dark Green - blue style|
+                 |Dark Green - orange style|
+                 |Solarized Dark|
+                 |Sonokai|
+                 |fairyfloss|
+                 |Funktionuckelt Dark|
+
+                 ;; these two have a #f set in the info.rkt file, but
+                 ;; seems to actually intended to be dark color schemes
+                 |ayu mirage|
+                 |Zenburn|
+                 ))
+       #t))
+
+;; the name of the color scheme that the user prefers when in black-on-white mode
+;; the default is based on the previous preferences organization, preserving the
+;; chosen preference if we can.
+(preferences:set-default 'framework:color-scheme-light
+                         (if dark-mode-with-previous-preferences-organization?
+                             'classic
+                             (preferences:get 'framework:color-scheme))
+                         symbol?)
+;; the name of the color scheme that the user prefers when in white-on-black mode
+(preferences:set-default 'framework:color-scheme-dark
+                         (if dark-mode-with-previous-preferences-organization?
+                             (preferences:get 'framework:color-scheme)
+                             'white-on-black)
+                         symbol?)
+
+
 ;; either:
-;;        #t (meaning we always treat it as white-on-black mode)
-;;        #f (meaning we always treat it as black-on-white mode), or
+;;        #t (meaning we always treat it as white-on-black aka dark mode)
+;;        #f (meaning we always treat it as black-on-white aka light mode), or
 ;; 'platform (meaning we use `white-on-black-panel-scheme?` to determine what to do)
 (preferences:set-default 'framework:white-on-black-mode?
+                         ;; in the past, the 'framework:color-scheme preference
+                         ;; determined a single color scheme; use that scheme's
+                         ;; dark/light mode category to determine the default
+                         ;; preference for this preference, preferring 'platform
+                         ;; if 'platform seems to make sense
                          (case (system-type)
-                           [(windows) #f]
-                           [else 'platform])
+                           [(windows)
+                            dark-mode-with-previous-preferences-organization?]
+                           [else
+                            (cond
+                              [(equal? dark-mode-with-previous-preferences-organization?
+                                       (white-on-black-panel-scheme?))
+                               'platform]
+                              [else dark-mode-with-previous-preferences-organization?])])
                          (or/c boolean? 'platform))
 
 ;; this is an old setting that has been replaced with 'framework:white-on-black-mode?
@@ -606,8 +658,8 @@
                  'platform)
      (define pref
        (if (white-on-black-panel-scheme?)
-           'framework:color-scheme-wob
-           'framework:color-scheme))
+           'framework:color-scheme-dark
+           'framework:color-scheme-light))
      (define scheme-name (preferences:get pref))
      (color-prefs:change-colors-to-match-color-scheme
       (or (color-prefs:lookup-color-scheme scheme-name)
@@ -616,15 +668,15 @@
               (color-prefs:built-in-color-scheme)))))))
 
 (preferences:add-callback
- 'framework:color-scheme
+ 'framework:color-scheme-light
  (λ (sym val)
    (unless (color-prefs:white-on-black-color-scheme?)
      (color-prefs:change-colors-to-match-color-scheme
       (or (color-prefs:lookup-color-scheme val)
           (color-prefs:built-in-color-scheme))))))
 
 (preferences:add-callback
- 'framework:color-scheme-wob
+ 'framework:color-scheme-dark
  (λ (sym val)
    (when (color-prefs:white-on-black-color-scheme?)
      (color-prefs:change-colors-to-match-color-scheme
@@ -639,7 +691,7 @@
        ['platform (white-on-black-panel-scheme?)]
        [#t #t]
        [#f #f]))
-   (define pref-name (if wob? 'framework:color-scheme-wob 'framework:color-scheme))
+   (define pref-name (if wob? 'framework:color-scheme-dark 'framework:color-scheme-light))
    (define pref-val (preferences:get pref-name))
    (define found-color-scheme (color-prefs:lookup-color-scheme pref-val))
    (color-prefs:change-colors-to-match-color-scheme