From 816732cf96bd581260d97b19bcf822fe8cf7eeec Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 3 Mar 2020 15:32:12 +0100 Subject: util/color/colorpalette: Add additional predefined color palettes --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ec3eb023f..e0637eb4fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -562,6 +562,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/util/cmdlineargs.cpp src/util/color/color.cpp src/util/color/colorpalette.cpp + src/util/color/predefinedcolorpalettes.cpp src/util/console.cpp src/util/db/dbconnection.cpp src/util/db/dbconnectionpool.cpp -- cgit v1.2.3 From 4c333f2e082ae6717b5fdfc1f036804b0a7b91b3 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 3 Mar 2020 15:57:52 +0100 Subject: preferences: Add colors dialog to preferences menu --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e0637eb4fd..b208cfa389 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -466,6 +466,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/preferences/dialog/dlgprefautodjdlg.ui src/preferences/dialog/dlgprefbeats.cpp src/preferences/dialog/dlgprefbeatsdlg.ui + src/preferences/dialog/dlgprefcolors.cpp + src/preferences/dialog/dlgprefcolorsdlg.ui src/preferences/dialog/dlgprefcrossfader.cpp src/preferences/dialog/dlgprefcrossfaderdlg.ui src/preferences/dialog/dlgprefdeck.cpp -- cgit v1.2.3 From 3b4c89293da1bc08ce6bc5c486168f2e35947749 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Thu, 5 Mar 2020 11:00:32 +0100 Subject: preferences: Add Color Palette Editor --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b208cfa389..05644d8435 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -500,6 +500,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/preferences/dialog/dlgprefwaveformdlg.ui src/preferences/dlgpreferencepage.cpp src/preferences/effectsettingsmodel.cpp + src/preferences/colorpaletteeditor.cpp + src/preferences/colorpaletteeditortableview.cpp src/preferences/colorpalettesettings.cpp src/preferences/replaygainsettings.cpp src/preferences/settingsmanager.cpp -- cgit v1.2.3 From 314d8d9cab2d23afa36ac68afb2ee4b62c0698be Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 6 Mar 2020 13:12:37 +0100 Subject: preferences/colorpaletteeditor: Add support for hotcue color indices --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 05644d8435..b807f001f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -501,6 +501,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/preferences/dlgpreferencepage.cpp src/preferences/effectsettingsmodel.cpp src/preferences/colorpaletteeditor.cpp + src/preferences/colorpaletteeditormodel.cpp src/preferences/colorpaletteeditortableview.cpp src/preferences/colorpalettesettings.cpp src/preferences/replaygainsettings.cpp -- cgit v1.2.3 From 968af436f84fe04e74aecdf3458f6c2fe5344f70 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 6 Mar 2020 15:19:02 +0100 Subject: preferences/colorpaletteeditor: Get rid of ColorPaletteEditorTableView --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b807f001f4..d88175b587 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -502,7 +502,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/preferences/effectsettingsmodel.cpp src/preferences/colorpaletteeditor.cpp src/preferences/colorpaletteeditormodel.cpp - src/preferences/colorpaletteeditortableview.cpp src/preferences/colorpalettesettings.cpp src/preferences/replaygainsettings.cpp src/preferences/settingsmanager.cpp -- cgit v1.2.3