-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Hotcue RGB colors #2520
Merged
Merged
Hotcue RGB colors #2520
Changes from 1 commit
Commits
Show all changes
164 commits
Select commit
Hold shift + click to select a range
75e6e2a
Create HotcueColorPalette class
ferranpujolcamins 393ac12
Add methods to store QColor in the config
ferranpujolcamins 42a22b0
Add class to store HotcueColorPalette in userconfig
ferranpujolcamins 86bda12
Add tests for color config methods
ferranpujolcamins 48b2b02
Make Cue related code use QColor instead of PredefinedColorPointer
ferranpujolcamins fcb4a1d
Migrate hotcue color id to RGBA in DB
ferranpujolcamins c22b737
Remove PredefinedColorRepresentation
ferranpujolcamins f017447
Make UserSettings available in ControllerEngine
ferranpujolcamins f68f28c
Remove PredefinedColors from controller scripts
ferranpujolcamins 66d3ffa
Remove PredefinedColor
ferranpujolcamins 30b82cf
Update midi-components library
ferranpujolcamins 1a3b8aa
Avoid constructing HotcueColorPaletteSettings every time its used
ferranpujolcamins 7a5d13f
Change test names
ferranpujolcamins 23e114f
Reorder constructor parameters
ferranpujolcamins 0ef7da4
Rename member variable
ferranpujolcamins bbc4503
Rename some color related classes
ferranpujolcamins 2259321
Remove cues tab on TrackInfo
ferranpujolcamins e1f92ec
Set hotcue color to the first predefined color
ferranpujolcamins 413c17c
Set hotcue color CO to -1 when no hotcue is loaded
ferranpujolcamins 74b098c
Make hotcue skin buttons use the cue color
ferranpujolcamins 75fdbed
Allow skins to configure text color depending on background
ferranpujolcamins 7702c6c
Highlight hotcue buttons when hovered
ferranpujolcamins 738db3a
Fix Shade hotcue buttons color
ferranpujolcamins 123172c
Make hotcue button hover highlighting configurable
ferranpujolcamins f3153b7
Fix auto_hotcue_colors not assigning first color
ferranpujolcamins 39928d6
Migrate hotcue color logic to mixxx::RgbColor
Holzhaus f259558
engine/controls/cuecontrol: Use constant for no color control value
Holzhaus 5732911
Use *value instead of value.value() for std::optional
Holzhaus fafe58b
Fix RgbColor typecasts and range checks
Holzhaus 37133d9
engine/controls/cuecontrol: Pass RgbColor by value
Holzhaus ac28f21
color/colorpalette: Improve readability by adding names to constants
Holzhaus a477c87
src/controllers/colorjsproxy: Add nearestColorMidiCode function
Holzhaus d803ea8
res/controllers/midi-components: Update HotcueButton to use new API
Holzhaus 78c5101
Roland DJ-505: Update controller script for new color API
Holzhaus 080663c
src/controllers/colorjsproxy: Fix indentation in colorDistance function
Holzhaus 3864c80
src/controllers/colorjsproxy: Add comment to colorDistance algorithm
Holzhaus 16a4778
src/controllers: Add ColorMapper class for controller scripts
Holzhaus b3b9c0d
.eslintrc.json: Add ColorMapper class to globals
Holzhaus d4a0508
res/controllers/midi-components: Add support for ColorMapper class
Holzhaus e1cc9be
Roland DJ-505: Add support for ColorMapper class
Holzhaus f97a15b
controllers/colormapperjsproxy: Add separate getNearestValue method
Holzhaus f8ccbcd
Roland DJ-505: Switch to ControllerMapper::getNearestValue
Holzhaus 8fe1bd2
controllers/midi-components: Remove default value for HotcueButton.co…
Holzhaus f313cc7
controllers/midi-components: Rename HotcueButton.colors to .colorMapper
Holzhaus 1dad294
res/controllers/midi-components-0.0: Fix some eslint issues
Holzhaus 09f6982
Roland DJ-505: Rename Component.colors to .colorMapper
Holzhaus 5da79b0
util/color: Remove obsolete hotcuecolorpalette.h file
Holzhaus 7e90a64
widget/wcolorpicker: Remove use of std::optional::value()
Holzhaus 6c8496f
widget: Add ColorPalette support to WColorPicker
Holzhaus 8a4e87d
preferences: Make HotcuePaletteSettings support other palette types, too
Holzhaus df91a83
util/color/colorpalette: Add support for a dedicated track color palette
Holzhaus dac8810
widget/wcolorpicker: Determine best number of columns for palette size
Holzhaus 0e27925
engine/controls/cuecontrol: Add some debug asserts for color conversions
Holzhaus 327702e
engine/control/cuecontrol: Add helper func to convert RgbColor values
Holzhaus e964345
engine/controls/cuecontrol: Fix wrong color index in hotcueFocusColor…
Holzhaus a2d789c
Roland DJ-505: Fix eslint issues in controller script
Holzhaus 982f7b7
res/skins: Fix trailing whitespace errors in style.qss files
Holzhaus e8ce23e
controllers/controller: Fix end-of-line linter issues
Holzhaus 4938898
preferences/configobject: Replace mixxx::RgbColor::optional_t with op…
Holzhaus ba3b84d
widget/cuemenupopup: Remove usage of std::optional::value()
Holzhaus 11935e2
Do not pass RgbColor/RgbColor::optional_t by reference
Holzhaus 74e884a
preferences/configobject: Use RgbColor conversion functions
Holzhaus d54fd95
widget/wcolorpicker: Add tooltip to color picker
Holzhaus 709cb3f
controllers: Remove obsolete ColorJSProxy
Holzhaus e6a4735
controllers/colormapperjsproxy: Remove alpha channel from JS script c…
Holzhaus 5b846c5
res/controllers: Remove global color constant from .eslint.json
Holzhaus 52062f3
res/controllers/midi-components: Remove references to global color ob…
Holzhaus 6181401
test/controllerengine_test: Remove test for ColorJSProxy
Holzhaus dc9e476
cuecontrol: Remove unnecessary instantiation of ColorPaletteSettings
Holzhaus fcf2401
track/cue: Remove misleading alpha channel
Holzhaus b8ee8d6
util/color/colorpalette: Enclose color consts in anonymous namespace
Holzhaus 26f8c3b
Remove unnecessary const from (optional) RgbColor parameters
Holzhaus a0379dc
engine/controls/cuecontrol: Use emit without braces
Holzhaus dd353e6
library/dao/cuedao: Replace static_cast with RgbColor::toQVariant
Holzhaus 328edfb
engine/controls/cuecontrol: Clean up auto_hotcue_colors logic
Holzhaus bb2f30b
engine/controls/cuecontrol: Improve HotcueControl::setColor code
Holzhaus 129e0e6
engine/controls/cuecontrol: Use kNoColorControlValue const instead of -1
Holzhaus 7022535
preferences/colorpalettesettings: Do not access m_colorList directly
Holzhaus 35e2e79
util/color/colorpalette: Make sure that ColorPalette has at least 1 c…
Holzhaus 8060f91
util/color/colorpalette: Make m_colorList private
Holzhaus d7557ad
util/color/colorpalette: Add nextColor/previousColor methods
Holzhaus 9d1cbf4
test/colorpalette_test: Add tests for ColorPalette methods
Holzhaus b648a5d
library/dao/cuedao: Use RgbColor::fromQVariant in cueFromRow method
Holzhaus c8ad295
Make all single argument constructors explicit
Holzhaus 6841da6
library/dlgtrackinfo: Swap DlgTrackInfo constructor arguments
Holzhaus 8d36723
Merge branch 'master' of github.com:mixxxdj/mixxx into hotcue-rgb-colors
Holzhaus fa6dba8
Merge branch 'master' of github.com:mixxxdj/mixxx into hotcue-rgb-colors
Holzhaus 4180310
controllers/colormapper: Use static_casts instead of C-style casts
Holzhaus 1ef5084
engine/controls/cuecontrol: Use auto to avoid repeating type names
Holzhaus 43cbedb
preferences/colorpalettesettings: Move group constans into anon names…
Holzhaus 287855a
util/color/colorpalette: Simplify ColorPalette::previousColor modulo …
Holzhaus 0621d0a
widget/wcolorpicker: Avoid negation in if (expr) { } else { } conditions
Holzhaus 3f94fd6
Add support for multiple named color palettes
Holzhaus 5b4c695
widget/wcolorpicker: Add support for switching palettes with differen…
Holzhaus 4bc091e
wcolorpickeraction: Use current track color palette when opening menu
Holzhaus dcec320
widget/wcuemenupopup: Use current hotcue color palette when menu is s…
Holzhaus 80eb2ba
res/schema.xml: Fix comment of hotcue color migration (s/RGBA/RGB/)
Holzhaus 9b68234
controllers/colormapper: Do not inherit from QObject
Holzhaus df02dec
engine/controls/cuecontrol: Remove superfluous comment
Holzhaus c4be500
preferences/colorpalettesettings: Use constant for fallback color
Holzhaus 448d1b7
preferences/configobject: Remove key if color value is not set
Holzhaus f1ac5de
util/color/colorpalette: Make class final
Holzhaus 8b222ff
widget/wcolorpicker: Swap order of captured lambda variables
Holzhaus c52f8b3
track/cue: Reuse default cue color constant from ColorPalette
Holzhaus 9e0c651
res/schema.xml: Remove useless alpha channel
Holzhaus abea669
util/color/colorpalette: Use shorter initialization for color constexprs
Holzhaus 67af302
preferences/colorpalettesettings: Fix order of palettes with >=10 colors
Holzhaus ef8e535
util/color/colorpalette: Add colorForHotcueIndex method
Holzhaus fbcea0b
engine/controls/cuecontrol: Use default color if auto_hotcue_colors i…
Holzhaus 5cda96d
Use orange (not in palette) for "no color" schema migration and new cues
Holzhaus e719af5
Roland DJ-505: Remove unnecessary alpha channel from ColorMapper
Holzhaus 74e6cf7
preferences/colorpalettesettings: Replace maxDigits with numDigits
Holzhaus 078e595
Use #FF8C00 instead of #FF8000 as "no color" replacement
Holzhaus 43fc59d
engine/controls/cuecontrol: Remove commented lines
Holzhaus ee5e5e4
controllers/colormapper: Improve constructor and remove destructor
Holzhaus 7fe6f81
controllers/colormapperjsproxy: Add small code style improvements
Holzhaus 0a423a0
res/schema.xml: Add comment regarding hotcue palette to schema
Holzhaus ba01c5f
controllers/colormapper: Replace qDebug() with kLogger.trace()
Holzhaus 9883318
Add/improve comments for new classes and free functions
Holzhaus 3c0a3fe
controllers/colormapperjsproxy: Use auto instead of long type name
Holzhaus b4e9de9
controllers: Use const refs instead of const-by-value for HID/HSS1394
Holzhaus 90b1109
controllers/controllerengine: Declare immutable m_pConfig member as c…
Holzhaus 20ce76f
Merge branch 'master' of github.com:mixxxdj/mixxx into hotcue-rgb-colors
Holzhaus 8ca8003
controllers/colormapperjsproxy: Use script errors instead of assertions
Holzhaus 6eb2124
controllers/colormapperjsproxy: Add comment to slots with return value
Holzhaus be415ba
util/color/colorpalette: Fix swapped green/blue hotcue palette colors
Holzhaus eb2fd28
test/colormapperjsproxy_test: Add tests for ColorMapperJSProxy
Holzhaus 6046abf
controllers/colormapperjsproxy: Use Q_INVOKABLE instead of slots
Holzhaus a538a09
res/controllers/common-controller-scripts.js: Fix eslint errors
Holzhaus 702050f
res/controllers: Add color conv. functions to common-controller-scripts
Holzhaus e859c7d
res/controllers/common-controller-scripts.js: Break long lines
Holzhaus 42f82a3
controllers/colormapper: Split function to avoid using QPair
Holzhaus 9e9a56f
controllers/bulk/bulkenumerator: Use one initialization per line
Holzhaus 2a0608b
controllers/colormapperjsproxy: Add comments that explain the invokab…
Holzhaus a48afde
controllers/colormapperjsproxy: Rename getNearestValue to getValueFor…
Holzhaus 05012ec
res/controllers/common-controller-scripts: Document color conv. funct…
Holzhaus f3a954e
res/controllers/midi-components-0.0.js: Add range change to outputCol…
Holzhaus 2f95d2d
res/controllers/midi-components-0.0.js: Throw error if sendRGB is und…
Holzhaus f50ccbe
res/controllers/midi-components-0.0.js: Add some more comments
Holzhaus 44b8237
res/controllers/midi-components-0.0.js: Add HotcueButton.sendRGB func…
Holzhaus abd663f
preferences/colorpalettesettings: Remove leftover qWarning() statement
Holzhaus e7a3553
test/colorconfig_test: Use literal names for LoadSavePalettes tests
Holzhaus ec11d6b
test/colormapperjsproxy_test: Use raw c++ string literals for JS code
Holzhaus 714f446
util/color/colorpalette: Return last color if color not in palette
Holzhaus 8dca9a6
controllers/colormapper: Simplify and speed up code in getNearestColor
Holzhaus 9130b80
controllers/midi-components: Change comment wording in output()
Holzhaus 4a79af3
controllers/midi-components: Print invalid colorCodes
Holzhaus 7cc0444
Merge branch 'master' of github.com:mixxxdj/mixxx into hotcue-rgb-colors
Holzhaus 92df887
engine/controls/cuecontrol: Prevent segfaults in slotHotcueColorChanged
Holzhaus be48247
widget/wcolorpicker: Simplify (re-)setSelectedColor logic
Holzhaus b4855e0
widget/wwidget: Early exit for error case in getBackgroundColorRgba()
Holzhaus 9712d26
Merge branch 'master' of github.com:mixxxdj/mixxx into hotcue-rgb-colors
Holzhaus 4e943f8
preferences/colorpalettesettings: Use QStringLiteral for regex
Holzhaus 0e18f19
preferences/colorpalettesettings: Use StringBuilder for group names
Holzhaus dac09b2
preferences/colorpalettesettings: Prevent setting empty color palettes
Holzhaus 6499025
widget/wcolorpicker: Use const int for remainder
Holzhaus 5380904
widget/wcolorpicker: Do not use else if after break
Holzhaus 233e99f
Merge branch 'master' of github.com:mixxxdj/mixxx into hotcue-rgb-colors
Holzhaus c0fd0b4
library/dao/cuedao: Fix loading of cue colors from DB
Holzhaus 96ca1d2
preferences/configobject: Make getKeysWithGroup() const
Holzhaus 827f6a0
preferences/colorpalettesettings: Make some methods const
Holzhaus e18f8d5
preferences/colorpalettesettings: Move keyForIndex into anon namespace
Holzhaus 243fb32
res/schema.xml: Fix cue colors from previous schema migrations
Holzhaus 4944594
res/controllers/midi-components: Add check for CO values > 0xFFFFFF
Holzhaus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Make hotcue button hover highlighting configurable
- Loading branch information
commit 123172cbe1f50b5681de9a29f9cca000b62eda7e
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should not introduce another concept of background color for all widgets.
We have already the background property and the BgColor xml element.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To be honest, I'm not really familiar with how our skin system works. That code was written by @ferranpujolcamins. If you want to change it, could you please file a PR to my branch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is the background property?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Its a internal property of QPushButton
https://doc.qt.io/archives/qt-4.8/stylesheet-reference.html
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will do a PR