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.

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

Make Hotcue RGB colors configurable #2530

Merged
merged 31 commits into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
78f79ab
preferences/colorpalettesettings: Prevent built-in palette name colli…
Holzhaus Mar 5, 2020
816732c
util/color/colorpalette: Add additional predefined color palettes
Holzhaus Mar 3, 2020
5d121a5
util/color/predefinedcolorpalettes: Add Serato DJ Pro/Lite Hotcue pal…
Holzhaus Mar 3, 2020
4c333f2
preferences: Add colors dialog to preferences menu
Holzhaus Mar 3, 2020
c2396c8
preferences/dialog/dlgprefcolors: Show custom palettes in comboboxes
Holzhaus Mar 5, 2020
67005e3
preferences/dialog: Move auto_hotcue_colors from deck to colors page
Holzhaus Mar 5, 2020
3b4c892
preferences: Add Color Palette Editor
Holzhaus Mar 5, 2020
21daf6d
preferences/colorpalettesettings: Fix loading predefined color palettes
Holzhaus Mar 5, 2020
848e303
util/color/colorpalette: Add support for special hotcue color indices
Holzhaus Mar 5, 2020
e46441c
util/color/predefinedcolorpalettes: Add Serato DJ Pro hotcue indices
Holzhaus Mar 5, 2020
053ccdf
preferences/colorpalettesettings: Read/Write hotcue indices from/to c…
Holzhaus Mar 5, 2020
314d8d9
preferences/colorpaletteeditor: Add support for hotcue color indices
Holzhaus Mar 6, 2020
968af43
preferences/colorpaletteeditor: Get rid of ColorPaletteEditorTableView
Holzhaus Mar 6, 2020
b58bd11
preferences/colorpaletteeditormodel: Remove unused function
Holzhaus Mar 6, 2020
eaee78e
preferences/colorpaletteeditor: Improve button update code
Holzhaus Mar 6, 2020
d797ebd
preferences/colorpaletteeditor: Use nicer buttons
Holzhaus Mar 6, 2020
db9ec58
util/color/predefinedcolorpalettes: Add comments
Holzhaus Mar 6, 2020
41ea7ca
util/color/predefinedcolorpalettes: Add Serato DJ Intro Hotcue Palette
Holzhaus Mar 6, 2020
1dd2769
add brush icon for Preferences > Colors
ronso0 Mar 13, 2020
99922a6
res/mixxx.qrc: Add ic_preferences_colors.svg to QRC file
Holzhaus Mar 14, 2020
fb16cd6
preferences/colorpaletteeditor: Move lambda functions to private slots
Holzhaus Mar 17, 2020
9cb30ed
preferences/colorpaletteeditor: Replace foreach() with for (x : y)
Holzhaus Mar 17, 2020
b90de93
preferences/colorpaletteeditor(model): Add class comments to headers
Holzhaus Mar 17, 2020
da2d65e
preferences/colorpaletteeditormodel: Make isDirty/isEmpty const
Holzhaus Mar 19, 2020
6955377
preferences/colorpalettesettings: Use range-based for loops
Holzhaus Mar 19, 2020
6c365bf
preferences/dialog/dlgprefcolors: Fixed name and constness of config ptr
Holzhaus Mar 19, 2020
bdfde5e
preferences/colorpaletteeditor: Improve widget initialization
Holzhaus Mar 19, 2020
14b9e4d
preferences/colorpalettesettings: Print debug message when skipping w…
Holzhaus Mar 19, 2020
de013aa
preferences/colorpaletteeditor: Don't use parented_ptr for model
Holzhaus Mar 19, 2020
ce88ef1
Revert "preferences/colorpaletteeditor: Don't use parented_ptr for mo…
Holzhaus Mar 20, 2020
a3b356a
preferences/colorpaletteeditor: Pass m_pTableView to model
Holzhaus Mar 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
preferences/colorpaletteeditor(model): Add class comments to headers
  • Loading branch information
Holzhaus committed Mar 17, 2020
commit b90de93e8a9fbbb7c5be6251a85a782d22910d29
2 changes: 2 additions & 0 deletions src/preferences/colorpaletteeditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include "preferences/usersettings.h"
#include "util/parented_ptr.h"

// Widget for viewing, adding, editing and removing color palettes that can be
// used for track/hotcue colors.
class ColorPaletteEditor : public QWidget {
Q_OBJECT
public:
Expand Down
3 changes: 3 additions & 0 deletions src/preferences/colorpaletteeditormodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

#include "util/color/colorpalette.h"

// Model that is used by the QTableView of the ColorPaletteEditor.
// Takes of displaying palette colors and provides a getter/setter for
// ColorPalette instances.
class ColorPaletteEditorModel : public QStandardItemModel {
Holzhaus marked this conversation as resolved.
Show resolved Hide resolved
Q_OBJECT
public:
Expand Down