Merge pull request #100 from Norc/beta

Beta to master

Author: Norc

CHANGELOG.md

@@ -1,11 +1,20 @@
-## COMING VERY SOON!: Version 2.1.0 (2021/04/xx)
-Long overdue bugfix and minor feature improvement in preparation for 0.8.x upgrade.
+## Version 2.1.0 (2021/05/20)
+0.8.x update, a few new features, and misc bugfixes
+* Updates Custom Hotbar for Foundry 0.8.x release branch while maintaining backwards compatibility.
+* NEW FEATURE: Ability for users to disable their own custom hotbar entirely if they don't want it (and core hotbar too, because why not?)
+* NEW FEATURE: keybinding library for a high level of keybinding customization and reliability improvements.
+* Adds color settings library as an official dependency to assist with hotbar customization
+* Portuguese translation (sorry about the delay rinnocenti!!)
+* Changed hotbar coloration to match core foundry (#0000FF60 is the "classic blue" if you want to change back)
+* Firefox compatibility improvements
+* Module is now less talkative in console log
+* Many miscellaneous bugfixes (see changelog).
 
 ## Version 2.0.6 (2020/10/21)
-Marked as compatibile with 0.7.5 after successful testing.
-The weird duplicate custom hotbar issue mysteriously fixed itself in 0.7.5
-Fixed Shift-number keybind (thanks Nihilistkitten and everyone else for the investigation)
-Updated ColorSettings Library by moving to the stub solution.
+* Marked as compatibile with 0.7.5 after successful testing.
+* The weird duplicate custom hotbar issue mysteriously fixed itself in 0.7.5
+* Fixed Shift-number keybind (thanks Nihilistkitten and everyone else for the investigation)
+* Updated ColorSettings Library by moving to the stub solution.
 
 ## Version 2.0.5 (2020/07/27)
 Fixed Z index issue introduced in v2.0.3 that was preventing the right-click context menu of the core Foundry hotbar from being on top of the Custom Hotbar. My attempted fix for the same issue in 2.0.4 was not actually present in the release due to versioning issues. Oops.

README.md

@@ -3,20 +3,15 @@ Foundry VTT module to add an extra, fully functional macro hotbar above the core
 
 ![Image of custom hotbar](https://i.imgur.com/L9QwR9u.png)
 
-Module compatibility is a primary goal of Custom Hotbar, and is compatible with all known modules, including Minor Quality of Life, Better Rolls, The Furnace, Macro Marker, and especially [Stan's Token Hotbar module](https://github.com/janssen-io/foundry-token-hotbar). We encourage you to try the two modules together:
-   
-   <img src="https://github.com/janssen-io/foundry-token-hotbar/blob/master/img/thb-custom-hotbar.gif" width="40%" height = "40%">)
+Module and system compatibility is a primary goal of Custom Hotbar. If Custom Hotbar isn't compatible with a module or system that you think it should be, please let me know as a GitHub issue or ping me on Discord (Norc#5108).
 
-The Custom Hotbar can now be repositioned and recolored as needed, and the same control is also granted over the core Foundry hotbar:
+The Custom Hotbar now matches the core Foundry hotbar styling by default, but it can now be repositioned and recolored as needed, and the same control is also granted over the core Foundry hotbar:
 
 ![Image of customized hotbar](https://imgur.com/EKSjoYf.png)
 
-Lastly, additional keybinds are also available: **Shift-Number** to run a macro on the custom hotbar, and **Ctrl-Shift-1 through 5** to change the core Foundry Hotbar page
+Additionally, players (or GMs I guess!) can disable either hotbar entirely if they don't want it for themselves.
 
-If you encounter an issue or have a suggestion for a feature not currently on the roadmap, please let me know on Discord (Norc#5108) or log an issue here on GitHub.
-
-### Special Thanks
-Special thanks to Ardistristan for his excellent Lib - Color Settings Module and extraordinary support as I implemented it! Further thanks to Stan for his continued support and to the awesome Foundry modding community as a whole.
+Lastly, additional keybinds are also available: **Shift-Number** to run a macro on the custom hotbar, and **Ctrl-Shift-1 through 5** to change the core Foundry Hotbar page
 
 ## Installation
 * **Manifest**: Use this manifest link to install the module (https://raw.githubusercontent.com/Norc/foundry-custom-hotbar/master/module.json)
@@ -35,20 +30,25 @@ Special thanks to Ardistristan for his excellent Lib - Color Settings Module and
 
    <img src="https://github.com/janssen-io/foundry-token-hotbar/blob/master/img/thb-custom-hotbar.gif" width="40%" height = "40%">)
 1. Broad compatibility:
-   1. Closely mimics built-in methods to allow modules like Minor Quality of Life and Better Rolls to use the Custom Hotbar without specific support
+   1. Closely mimics built-in methods to allow modules like Midi QoL and Better Rolls to use the Custom Hotbar without specific support
    1. Does not interfere with the operation of the original Macro Hotbar
 
 ## Changelog
 See the [changelog.](https://github.com/Norc/foundry-custom-hotbar/blob/dev/CHANGELOG.md)
 
 ## Roadmap:
-_Next release (minor cleanup):_
-1. Basic settings for keyboard shortcuts
-2. More minor features and bugfixes that didn't make it into 2.0.
+_Next releases (minor cleanup):_
+1. Ongoing bug/stability/module compat cleanup for 0.8.x as needed.
 
 _Next major version:_
 1. Add ability to create multiple Custom Hotbars, not just one
 
 _Potential Future Features (Undecided)_
 1. Add option to popout hotbars for positioning by dragging and dropping
 1. Add pages 2-4 or more for each Custom Hotbar.
+
+### Special Thanks
+Special thanks to Ardistristan for his excellent Lib - Color Settings Module and extraordinary support as I implemented it! Thanks to DF (flamewave000) for the Library: DF Hotkeys library. Both of these libraries do a better job than I *ever* could.
+
+Further thanks to Stan of Token Hotbar fame for everything he's done and to the awesome Foundry modding community as a whole.
+

css/custom-hotbar.css

@@ -298,4 +298,9 @@ div#keyHintDiv > p {
 
 div#keyHintDiv > div> input {
     display:none;
+}
+
+div.chbSettings > div.colorsplash > input {
+    background-color: white;
+    border: 1px solid black;
 }

lib/colorsettings/colorSettingStub.js

@@ -3,9 +3,9 @@
     "title": "Custom Hotbar",   
     "description": "An extra fully functional hotbar (currently 1 row only) above the first.",   
     "author": "Norc",
-    "version": "2.0.6",
-    "minimumCoreVersion": "0.6.5",
-    "compatibleCoreVersion":"0.7.9",
+    "version": "2.1.0",
+    "minimumCoreVersion": "0.7.9",
+    "compatibleCoreVersion":"0.8.4",
     "esmodules": [
       "index.js"
       , "./lib/colorsettings/colorSettingStub.js"
@@ -25,7 +25,7 @@
     "styles": [
       "./css/custom-hotbar.css"
       ],
-    "manifest": "https://raw.githubusercontent.com/Norc/foundry-custom-hotbar/master/module.json",
-    "download": "https://github.com/Norc/foundry-custom-hotbar/archive/v2.0.6.zip",
+    "manifest": "https://raw.githubusercontent.com/Norc/foundry-custom-hotbar/beta/module.json",
+    "download": "https://github.com/Norc/foundry-custom-hotbar/archive/v2.1.0-beta.zip",
     "url": "https://github.com/Norc/foundry-custom-hotbar"
   }

module.json

@@ -1,7 +1,7 @@
-const customHotbarDebug = true;
+const customHotbarDebug = false;
 
 export function CHBDebug(message) {
   if (customHotbarDebug) { 
     console.debug(message);
   }
-}
+}