Skip to content
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.

Sign up for GitHub

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

Jump to bottom

use QColor for cue colors #2345

Closed
wants to merge 26 commits into from
Closed

use QColor for cue colors #2345

wants to merge 26 commits into from

Commits on Feb 13, 2020

  1. Create HotcueColorPalette class

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    463135f View commit details
    Browse the repository at this point in the history

  2. Add methods to store QColor in the config

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    2de7846 View commit details
    Browse the repository at this point in the history

  3. Add class to store HotcueColorPalette in userconfig

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    be29b77 View commit details
    Browse the repository at this point in the history

  4. Add tests for color config methods

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    4e2da2d View commit details
    Browse the repository at this point in the history

  5. Make Cue related code use QColor instead of PredefinedColorPointer 

    COs and the database now hold the color hex int representation instead
of a color id.

# Conflicts:
#	src/engine/controls/cuecontrol.cpp
#	src/library/dlgtrackinfo.cpp
#	src/widget/wcolorpicker.cpp
    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    5c31b98 View commit details
    Browse the repository at this point in the history

  6. Migrate hotcue color id to RGBA in DB

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    3e9aca8 View commit details
    Browse the repository at this point in the history

  7. Remove PredefinedColorRepresentation

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    9498f16 View commit details
    Browse the repository at this point in the history

  8. Make UserSettings available in ControllerEngine

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    b60f292 View commit details
    Browse the repository at this point in the history

  9. Remove PredefinedColors from controller scripts 

    ... and use QColor instead.
    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    37541e9 View commit details
    Browse the repository at this point in the history

  10. Remove PredefinedColor 

    # Conflicts:
#	src/util/color/predefinedcolorsset.h
    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    37d5da1 View commit details
    Browse the repository at this point in the history

  11. Update midi-components library 

    and change cue color CO name

# Conflicts:
#	res/controllers/Roland_DJ-505-scripts.js
#	res/controllers/midi-components-0.0.js
    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    aff6995 View commit details
    Browse the repository at this point in the history

  12. Avoid constructing HotcueColorPaletteSettings every time its used

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    c756053 View commit details
    Browse the repository at this point in the history

  13. Change test names

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    40825c4 View commit details
    Browse the repository at this point in the history

  14. Reorder constructor parameters

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    b2c7c16 View commit details
    Browse the repository at this point in the history

  15. Rename member variable

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    f72a679 View commit details
    Browse the repository at this point in the history

  16. Rename some color related classes

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    1cadfea View commit details
    Browse the repository at this point in the history

  17. Remove cues tab on TrackInfo 

    # Conflicts:
#	src/library/dlgtrackinfo.cpp
    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    d07b672 View commit details
    Browse the repository at this point in the history

  18. Set hotcue color to the first predefined color

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    438b1c9 View commit details
    Browse the repository at this point in the history

  19. Set hotcue color CO to -1 when no hotcue is loaded

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    f6da0dd View commit details
    Browse the repository at this point in the history

  20. Make hotcue skin buttons use the cue color 

    Shade still does not work
    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    606091c View commit details
    Browse the repository at this point in the history

  21. Allow skins to configure text color depending on background

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    9047343 View commit details
    Browse the repository at this point in the history

  22. Highlight hotcue buttons when hovered

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    ced08e2 View commit details
    Browse the repository at this point in the history

  23. Fix Shade hotcue buttons color

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    cd3555e View commit details
    Browse the repository at this point in the history

  24. Make hotcue button hover highlighting configurable

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    525cd85 View commit details
    Browse the repository at this point in the history

  25. Fix auto_hotcue_colors not assigning first color

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    8e574d9 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'master' into new_colors_impl

    @ferranpujolcamins
    ferranpujolcamins committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    df545bf View commit details
    Browse the repository at this point in the history