From 482f592dc134aa94a5b174177dc8e322485c625f Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Fri, 12 Nov 2021 12:31:19 +0100
Subject: [PATCH] reverted to HSV as default pen color model

---
 HISTORY.md     |  2 +-
 snap.html      |  6 +++---
 src/gui.js     | 12 ++++++------
 src/objects.js |  4 ++--
 src/scenes.js  |  4 ++--
 src/store.js   |  6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 3ea951a4..c0b3edd7 100755
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -26,7 +26,6 @@
     * codification and js-func blocks don't appear in search results unless enabled
     * migrated SEND blocks to be BROADCAST TO blocks
     * "when I receive 'any message'" hat scripts are threadsafe (uninterruptable by other messages)
-    * changed the default color model for pen/background colors and graphic effects from HSV to HSL
     * changed the scale of the graphics color effect from 0-200 to 0-100
     * new Birdbrain Technology extensions for Finch and Hummingbird, thanks, Kristina and Bambi!
     * retired Leap Motion library
@@ -57,6 +56,7 @@
 
 ### 2021-11-12
 * store: fixed importing custom categories from libraries, thanks, Eckart, for reporting this!
+* gui, objects, scenes, store: reverted to HSV as default pen color model
 
 ### 2021-11-11
 * German translation update, changed %hsva -> %clrdim
diff --git a/snap.html b/snap.html
index d14289bd..f6c242d4 100755
--- a/snap.html
+++ b/snap.html
@@ -18,9 +18,9 @@
         <script src="src/widgets.js?version=2021-17-09"></script>
         <script src="src/blocks.js?version=2021-11-09"></script>
         <script src="src/threads.js?version=2021-11-11"></script>
-        <script src="src/objects.js?version=2021-11-10"></script>
-        <script src="src/scenes.js?version=2021-11-11"></script>
-        <script src="src/gui.js?version=2021-11-11"></script>
+        <script src="src/objects.js?version=2021-11-12"></script>
+        <script src="src/scenes.js?version=2021-11-12"></script>
+        <script src="src/gui.js?version=2021-11-12"></script>
         <script src="src/paint.js?version=2021-07-05"></script>
         <script src="src/lists.js?version=2021-07-19"></script>
         <script src="src/byob.js?version=2021-11-09"></script>
diff --git a/src/gui.js b/src/gui.js
index 7927f44a..b62fd394 100644
--- a/src/gui.js
+++ b/src/gui.js
@@ -86,7 +86,7 @@ BlockVisibilityDialogMorph, ThreadManager*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.gui = '2021-November-11';
+modules.gui = '2021-November-12';
 
 // Declarations
 
@@ -4234,12 +4234,12 @@ IDE_Morph.prototype.settingsMenu = function () {
     );
 
     addPreference(
-        'HSV pen color model',
+        'HSL pen color model',
         () => SpriteMorph.prototype.penColorModel =
-            SpriteMorph.prototype.penColorModel === 'hsv' ? 'hsl' : 'hsv',
-        SpriteMorph.prototype.penColorModel === 'hsv',
-        'uncheck to switch pen colors\nand graphic effects\nto HSL (default)',
-        'check to switch pen colors\nand graphic effects\nfrom HSL to HSV',
+            SpriteMorph.prototype.penColorModel === 'hsl' ? 'hsv' : 'hsl',
+        SpriteMorph.prototype.penColorModel === 'hsl',
+        'uncheck to switch pen colors\nand graphic effects\nto HSV',
+        'check to switch pen colors\nand graphic effects\nfrom to HSL',
         false
     );
 
diff --git a/src/objects.js b/src/objects.js
index 6a40f73f..10add14a 100644
--- a/src/objects.js
+++ b/src/objects.js
@@ -87,7 +87,7 @@ BlockVisibilityDialogMorph*/
 
 /*jshint esversion: 6*/
 
-modules.objects = '2021-November-10';
+modules.objects = '2021-November-12';
 
 var SpriteMorph;
 var StageMorph;
@@ -185,7 +185,7 @@ SpriteMorph.prototype.enableNesting = true;
 SpriteMorph.prototype.enableFirstClass = true;
 SpriteMorph.prototype.showingExtensions = false;
 SpriteMorph.prototype.useFlatLineEnds = false;
-SpriteMorph.prototype.penColorModel = 'hsl'; // or 'hsv'
+SpriteMorph.prototype.penColorModel = 'hsv'; // or 'hsl'
 SpriteMorph.prototype.highlightColor = new Color(250, 200, 130);
 SpriteMorph.prototype.highlightBorder = 8;
 
diff --git a/src/scenes.js b/src/scenes.js
index 0ba99fdb..b71beeb5 100644
--- a/src/scenes.js
+++ b/src/scenes.js
@@ -53,7 +53,7 @@ normalizeCanvas, SnapSerializer, Costume, ThreadManager*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.scenes = '2021-November-11';
+modules.scenes = '2021-November-12';
 
 // Projecct /////////////////////////////////////////////////////////
 
@@ -140,7 +140,7 @@ function Scene(aStageMorph) {
     this.enableLiveCoding = false;
     this.enableHyperOps = true;
     this.disableClickToRun = false;
-    this.penColorModel = 'hsl'; // can also bei 'hsv'
+    this.penColorModel = 'hsv'; // can also bei 'hsl'
 
     // for deserializing - do not persist
     this.spritesDict = {};
diff --git a/src/store.js b/src/store.js
index f1803ef7..6fcf484f 100644
--- a/src/store.js
+++ b/src/store.js
@@ -381,8 +381,8 @@ SnapSerializer.prototype.loadScene = function (xmlNode, remixID) {
     scene.unifiedPalette = model.scene.attributes.palette === 'single';
     scene.showCategories = model.scene.attributes.categories !== 'false';
     scene.disableClickToRun = model.scene.attributes.clickrun === 'false';
-    scene.penColorModel = model.scene.attributes.colormodel === 'hsv' ?
-        'hsv' : 'hsl';
+    scene.penColorModel = model.scene.attributes.colormodel === 'hsl' ?
+        'hsl' : 'hsv';
     model.notes = model.scene.childNamed('notes');
     if (model.notes) {
         scene.notes = model.notes.contents;
@@ -1753,7 +1753,7 @@ Scene.prototype.toXML = function (serializer) {
         this.unifiedPalette && !this.showCategories ?
             ' categories="false"' : '',
         this.disableClickToRun ? ' clickrun="false"' : '',
-        this.penColorModel === 'hsv' ? ' colormodel="hsv"' : '',
+        this.penColorModel === 'hsl' ? ' colormodel="hsl"' : '',
         this.notes || '',
         serializer.paletteToXML(this.customCategories),
         Object.keys(this.hiddenPrimitives).reduce(