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

Add Hotcue Color Replace Dialog #2547

Merged
merged 66 commits into from
Apr 21, 2020
Merged

Add Hotcue Color Replace Dialog #2547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
9c719ec
widget/wmainmenubar: Add menu entry for color replacer
Holzhaus Mar 10, 2020
febe1ae
dialog: Add (non-working) replace color dialog
Holzhaus Mar 12, 2020
14c507e
dialog/dlgreplacecolor: Add initial support for replacing hotcue colors
Holzhaus Mar 13, 2020
a05150e
dialog/dlgreplacetrackcolor: Improve user feedback after DB update
Holzhaus Mar 15, 2020
d9872fe
dialog/dlgreplacecuecolor: Use better default colors
Holzhaus Mar 16, 2020
1fece29
dialog/dlgreplacecuecolor: Use color picker for color selection
Holzhaus Mar 16, 2020
f3c66ac
dialog/dlgreplacecuecolor: Add support for hotcue indices
Holzhaus Mar 17, 2020
4c74f27
dialog/dlgreplacecuecolordlg: Check current color checkbox by default
Holzhaus Mar 17, 2020
fd40737
dialog/dlgreplacecuecolor: Use enum class instead of plain enum
Holzhaus Mar 17, 2020
882a2b3
dialog/dlgreplacecuecolor: Make updateCueColors() a private class member
Holzhaus Mar 17, 2020
40cc703
dialog/dlgreplacecuecolor: Select IDs before doing actual update
Holzhaus Mar 17, 2020
b466ce9
dialog/dlgreplacecuecolor: Notify TrackDAO after DB change
Holzhaus Mar 17, 2020
0c5fcf2
dialog/dlgreplacecuecolor: Hide button menus after picking a color
Holzhaus Mar 17, 2020
c2d85eb
dialog/dlgreplacecuecolor: Add space before comment string
Holzhaus Mar 17, 2020
355c2c3
dialog/dlgreplacecuecolor: Add class comment
Holzhaus Mar 17, 2020
8802755
dialog/dlgreplacecuecolor: Don't forward create QVariantLists for query
Holzhaus Mar 17, 2020
badf2e7
dialog/dlgreplacecuecolor: Reword DB pooler comment
Holzhaus Mar 17, 2020
0163061
dialog/dlgreplacecuecolor: Move TrackDAO connection out of dialog class
Holzhaus Mar 17, 2020
abff8d6
dialog/dlgreplacecuecolor: Check that color didn't change between que…
Holzhaus Mar 17, 2020
9b9b14e
dialog/dlgreplacecuecolor: Move all DB operations into the main thread
Holzhaus Mar 18, 2020
9b6f6b4
dialog/dlgreplacecuecolor: Move private type out of header file
Holzhaus Mar 18, 2020
15fe173
dialog/dlgreplacecuecolor: Use ColorPicker for custom colors
Holzhaus Mar 21, 2020
4947400
dialog/dlgreplacecuecolor: Set dialog result depending on DB change
Holzhaus Mar 26, 2020
991668d
dialog/dlgreplacecuecolor: Switch to using PredefinedColorPalettes
Holzhaus Mar 29, 2020
2942034
dialog/dlgreplacecuecolor: Disable apply button if DB change is a no-op
Holzhaus Mar 27, 2020
dd53429
dialog/dlgreplacecuecolor: Don't invoke DBConnectionPooler again
Holzhaus Mar 29, 2020
a33ff49
dialog/dlgreplacecuecolor: Flush track changes to the database
Holzhaus Mar 29, 2020
1304b39
dialog/dlgreplacecuecolor: Update in-memory cue points after DB change
Holzhaus Mar 29, 2020
ed349bf
dialog/dlgreplacecuecolor: Use Color::isDimmColor for buttons
Holzhaus Mar 29, 2020
502dc8a
dialog/dlgreplacecuecolor: Check palette size
Holzhaus Mar 29, 2020
86f60a5
dialog/dlgreplacecuecolor: Acquire track pointer directly after DB ch…
Holzhaus Mar 29, 2020
e9656a6
dialog/dlgreplacecuecolor: Fix dimm color detection
Holzhaus Apr 2, 2020
3aed78c
dialog/dlgreplacecuecolor: Force "fusion" style for colored buttons
Holzhaus Apr 2, 2020
04225aa
dialog/dlgreplacecuecolordlg: Improve labels
Holzhaus Apr 2, 2020
8eef253
dialog/dlgreplacecuecolor: Remove unused lightness threshold constant
Holzhaus Apr 2, 2020
102290d
dialog/dlgreplacecuecolor: Use black text for light color buttons
Holzhaus Apr 2, 2020
7a6b366
dialog/dlgreplacecuecolor: Improve confirmation text
Holzhaus Apr 2, 2020
66298d3
dialog/dlgreplacecuecolor: Check if cue doesn't already new dest color
Holzhaus Apr 3, 2020
47618c7
dialog/dlgreplacecuecolor: Wrap long lines manually
Holzhaus Apr 3, 2020
a020105
dialog/dlgreplacecuecolor: Use parented_ptr for WColorPickerAction
Holzhaus Apr 3, 2020
4e57904
dialog/dlgreplacecuecolor: Close dialog after database update
Holzhaus Apr 3, 2020
62bc3db
Merge branch 'master' of github.com:mixxxdj/mixxx into mass-color-rep…
Holzhaus Apr 5, 2020
3f20479
Move replace cue color dialog from main menu bar to preferences
Holzhaus Apr 5, 2020
6dea4c0
widget/wmainmenubar: Remove "Replace Cue Colors' action from menu
Holzhaus Apr 6, 2020
a76d0ed
dialog/dlgreplacecuecolor: Fix translation issue for progress dialog
Holzhaus Apr 8, 2020
6a92df0
dialog/dlgreplacecuecolordlg: Don't capitalize ALL
Holzhaus Apr 9, 2020
49a8dcf
Merge branch 'master' of github.com:mixxxdj/mixxx into mass-color-rep…
Holzhaus Apr 12, 2020
8959be1
dialog/dlgreplacecuecolor: Use new palette after palette change
Holzhaus Apr 12, 2020
cfbd266
Merge branch 'master' of github.com:mixxxdj/mixxx into mass-color-rep…
Holzhaus Apr 13, 2020
d924fe6
dialog/dlgreplacecuecolordlg: Reorder widgets in Replace dialog
Holzhaus Apr 13, 2020
294f8b5
dialog/dlgreplacecuecolor: Add warning if no condition was selected
Holzhaus Apr 13, 2020
18336aa
dialog/dlgreplacecuecolor: Fix "slotApplyButton" misnomer
Holzhaus Apr 13, 2020
a01675b
dialog/dlgreplacecuecolordlg: Set minimumSize for "replace all" warning
Holzhaus Apr 13, 2020
d256c6b
dialog/dlgreplacecuecolor: Use a separate label for "replace all" icon
Holzhaus Apr 13, 2020
1048c8c
dialog/dlgreplacecuecolordlg: Fix "replace all" text and size policy
Holzhaus Apr 13, 2020
0080967
dialog/dlgreplacecuecolordlg: Set dialog vertical size policy to minimum
Holzhaus Apr 13, 2020
9ea0f26
dialog/dlgreplacecuecolor: Wrap long source lines
Holzhaus Apr 14, 2020
900fb36
preferences/dialog/dlgprefcolorsdlg: Replace "..." with unicode elipsis
Holzhaus Apr 14, 2020
3b1f02f
dialog/dlgreplacecuecolor: Pre-fill some colors
Holzhaus Apr 14, 2020
89c58c0
dialog/dlgreplacecuecolor: Do not overwrite user-selected colors
Holzhaus Apr 14, 2020
415b432
Merge branch 'master' of github.com:mixxxdj/mixxx into mass-color-rep…
Holzhaus Apr 15, 2020
b84825e
dialog/dlgreplacecuecolor: Resize color menus after changing palette
Holzhaus Apr 15, 2020
e8a363e
dialog/dlgreplacecuecolor: Fix show/hide of "replace all" warning label
Holzhaus Apr 16, 2020
c92a823
dialog/dlgreplacecuecolor: Add documentation for slotUpdateWidgets()
Holzhaus Apr 16, 2020
37065cc
dialog/dlgreplacecuecolor: Remove orphaned private method declaration
Holzhaus Apr 16, 2020
b6cfccc
Merge branch 'master' of github.com:mixxxdj/mixxx into mass-color-rep…
Holzhaus Apr 17, 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
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/dialog/dlgaboutdlg.ui
src/dialog/dlgdevelopertools.cpp
src/dialog/dlgdevelopertoolsdlg.ui
src/dialog/dlgreplacecuecolor.cpp
src/dialog/dlgreplacecuecolordlg.ui
src/effects/builtin/autopaneffect.cpp
src/effects/builtin/balanceeffect.cpp
src/effects/builtin/bessel4lvmixeqeffect.cpp
Expand Down
2 changes: 2 additions & 0 deletions build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@ def sources(self, build):
"src/controllers/dlgprefcontrollers.cpp",
"src/dialog/dlgabout.cpp",
"src/dialog/dlgdevelopertools.cpp",
"src/dialog/dlgreplacecuecolor.cpp",

"src/preferences/configobject.cpp",
"src/preferences/dialog/dlgprefautodj.cpp",
Expand Down Expand Up @@ -1346,6 +1347,7 @@ def sources(self, build):
'src/controllers/dlgprefcontrollersdlg.ui',
'src/dialog/dlgaboutdlg.ui',
'src/dialog/dlgdevelopertoolsdlg.ui',
'src/dialog/dlgreplacecuecolordlg.ui',
'src/library/autodj/dlgautodj.ui',
'src/library/dlganalysis.ui',
'src/library/dlgcoverartfullsize.ui',
Expand Down
Loading