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

Smarties (or SmartList or SmartCrate or QueryCrate or QueryList or ...) open for feedback. #14182

Draft
wants to merge 50 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
7c9ee98
added smarties group
evelynnev Oct 18, 2024
8010b26
test ui
evelynnev Oct 19, 2024
23ea845
test ui
evelynnev Oct 19, 2024
faf545e
test ui
evelynnev Oct 19, 2024
1fc8874
smarties
evelynnev Oct 26, 2024
aebc9b0
smarties
evelynnev Oct 26, 2024
8d78946
smarties
evelynnev Oct 26, 2024
1b29572
smarties
evelynnev Oct 26, 2024
cad89e7
smarties
evelynnev Oct 26, 2024
253be58
smarties
evelynnev Oct 27, 2024
0369d71
smarties
evelynnev Oct 27, 2024
7efbd0c
smarties 20241101
evelynnev Nov 2, 2024
9f01bb6
smarties 20241103
evelynnev Nov 3, 2024
84c1d83
smarties 20241103
evelynnev Nov 3, 2024
333fc5a
smarties 20241104
evelynnev Nov 4, 2024
9df1090
smarties 20241104
evelynnev Nov 4, 2024
5700b91
smarties 20241104
evelynnev Nov 4, 2024
18179d9
smarties 20241104
evelynnev Nov 4, 2024
be10880
Delete src/library/trackset/smarties/dlgsmartiesactions.cpp
Eve00000 Nov 4, 2024
190bd7b
Delete src/library/trackset/smarties/dlgsmartiesactions.h
Eve00000 Nov 4, 2024
3151351
smarties 20241104
evelynnev Nov 4, 2024
d2221f8
Merge branch 'Smarties' of github.com:eve00000/mixxx into Smarties
evelynnev Nov 4, 2024
aad4a74
smarties 20241104
evelynnev Nov 4, 2024
5cf4609
smarties 20241104
evelynnev Nov 4, 2024
e006387
smarties 20241104
evelynnev Nov 4, 2024
3ee62f0
duplicate & select
evelynnev Nov 10, 2024
06e5779
whereclause & narrowing operator choice
evelynnev Nov 11, 2024
6a1619e
whereclause & narrowing operator choice
evelynnev Nov 11, 2024
4e8f8dc
whereclause & narrowing operator choice
evelynnev Nov 11, 2024
25b991c
whereclause & narrowing operator choice
evelynnev Nov 11, 2024
7ac9a3e
whereclause & narrowing operator choice
evelynnev Nov 11, 2024
2fbb3d4
whereclause & narrowing operator choice
evelynnev Nov 11, 2024
85124ea
playlists crates insert delete move
evelynnev Nov 27, 2024
227e958
extra validation for between
evelynnev Nov 28, 2024
2b2ebf5
extra validation for between
evelynnev Nov 28, 2024
b1a7a0d
correcting clanzy warnings
evelynnev Nov 28, 2024
81da635
correcting clanzy warnings
evelynnev Nov 28, 2024
1e1622d
correcting clanzy warnings
evelynnev Nov 28, 2024
7ecfe2f
correcting clanzy warnings
evelynnev Nov 28, 2024
a87ffa2
correcting clanzy warnings
evelynnev Nov 28, 2024
d2e5f0a
correcting smartiestest
evelynnev Nov 29, 2024
41feec5
correcting smartiestest
evelynnev Nov 29, 2024
0cec80b
correcting logic combine actions
evelynnev Dec 2, 2024
b8990a5
Merge branch 'Smarties' of github.com:eve00000/mixxx into Smarties
evelynnev Jan 18, 2025
b278ff7
rebase->ReadyForPr
evelynnev Jan 18, 2025
0bb39c9
rebase->ReadyForPr->UbuntuErrors
evelynnev Jan 18, 2025
11405ac
Update dlgsmartiesinfo.cpp conflict pre-commit <---> CI
Eve00000 Jan 18, 2025
f269193
searchbetweenconversionadded
evelynnev Jan 27, 2025
027d7b9
Added2ViewLogicGroupedAndNonGrouped
evelynnev Jan 27, 2025
9e925f1
Added2ViewLogicGroupedAndNonGrouped
evelynnev Jan 27, 2025
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
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,15 @@ add_library(
src/library/trackset/crate/cratefeaturehelper.cpp
src/library/trackset/crate/cratestorage.cpp
src/library/trackset/crate/cratetablemodel.cpp
#EVE
src/library/trackset/smarties/smartiesfeature.cpp
src/library/trackset/smarties/groupedsmartiesfeature.cpp
src/library/trackset/smarties/smartiesfeaturehelper.cpp
src/library/trackset/smarties/smartiesstorage.cpp
src/library/trackset/smarties/smartiestablemodel.cpp
src/library/trackset/smarties/dlgsmartiesinfo.cpp
src/library/trackset/smarties/dlggroupedsmartiesinfo.cpp
src/library/trackset/smarties/dlgsmartiesinfo.ui
src/library/trackset/playlistfeature.cpp
src/library/trackset/setlogfeature.cpp
src/library/trackset/tracksettablemodel.cpp
Expand Down Expand Up @@ -1618,6 +1627,7 @@ set(
src/engine/channelhandle.h
src/engine/engine.h
src/errordialoghandler.h
src/library/trackset/smarties/dlgsmartiesinfo.h
src/track/track.h
src/track/track_decl.h
src/track/trackid.h
Expand Down Expand Up @@ -2418,6 +2428,8 @@ add_executable(
src/test/coverartcache_test.cpp
src/test/coverartutils_test.cpp
src/test/cratestorage_test.cpp
# EVE
src/test/smartiesstorage_test.cpp
src/test/cue_test.cpp
src/test/cuecontrol_test.cpp
src/test/dbconnectionpool_test.cpp
Expand Down
233 changes: 233 additions & 0 deletions res/images/library/ic_library_smarties.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions res/mixxx.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<file>images/library/ic_library_preview_play.svg</file>
<file>images/library/ic_library_recordings.svg</file>
<file>images/library/ic_library_rhythmbox.svg</file>
<file>images/library/ic_library_smarties.svg</file>
<file>images/library/ic_library_traktor.svg</file>
<file>images/library/ic_library_rekordbox.svg</file>
<file>images/library/ic_library_serato.svg</file>
Expand Down
40 changes: 40 additions & 0 deletions res/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -584,4 +584,44 @@ reapplying those migrations.
UPDATE library SET filetype='aiff' WHERE filetype='aif';
</sql>
</revision>
<revision version="40" min_compatible="3">
<description>
Add Smarties Table.
</description>
<sql>
CREATE TABLE IF NOT EXISTS smarties (
id INTEGER PRIMARY KEY AUTOINCREMENT, name varchar(48) UNIQUE NOT NULL,
count INTEGER DEFAULT 0, show INTEGER DEFAULT 1, locked INTEGER DEFAULT 0,
autodj_source INTEGER DEFAULT 0, search_input varchar(255),
search_sql varchar(255),
condition1_field VARCHAR(64), condition1_operator VARCHAR(16),
condition1_value VARCHAR(255), condition1_combiner VARCHAR(4),
condition2_field VARCHAR(64), condition2_operator VARCHAR(16),
condition2_value VARCHAR(255), condition2_combiner VARCHAR(4),
condition3_field VARCHAR(64), condition3_operator VARCHAR(16),
condition3_value VARCHAR(255), condition3_combiner VARCHAR(4),
condition4_field VARCHAR(64), condition4_operator VARCHAR(16),
condition4_value VARCHAR(255), condition4_combiner VARCHAR(4),
condition5_field VARCHAR(64), condition5_operator VARCHAR(16),
condition5_value VARCHAR(255), condition5_combiner VARCHAR(4),
condition6_field VARCHAR(64), condition6_operator VARCHAR(16),
condition6_value VARCHAR(255), condition6_combiner VARCHAR(4),
condition7_field VARCHAR(64), condition7_operator VARCHAR(16),
condition7_value VARCHAR(255), condition7_combiner VARCHAR(4),
condition8_field VARCHAR(64), condition8_operator VARCHAR(16),
condition8_value VARCHAR(255), condition8_combiner VARCHAR(4),
condition9_field VARCHAR(64), condition9_operator VARCHAR(16),
condition9_value VARCHAR(255), condition9_combiner VARCHAR(4),
condition10_field VARCHAR(64), condition10_operator VARCHAR(16),
condition10_value VARCHAR(255), condition10_combiner VARCHAR(4),
condition11_field VARCHAR(64), condition11_operator VARCHAR(16),
condition11_value VARCHAR(255), condition11_combiner VARCHAR(4),
condition12_field VARCHAR(64), condition12_operator VARCHAR(16),
condition12_value VARCHAR(255), condition12_combiner VARCHAR(4));
CREATE TABLE IF NOT EXISTS smarties_tracks (
smarties_id INTEGER NOT NULL REFERENCES smarties(id),
track_id INTEGER NOT NULL REFERENCES "library_old"(id),
UNIQUE (smarties_id, track_id));
</sql>
</revision>
</schema>
1 change: 0 additions & 1 deletion res/skins/LateNight/style.qss
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ QLabel#labelRecStatistics {
font-weight: normal;
font-style: normal;
}

/* It is difficult to achieve identical styles WMainMenuBar #MainMenu
on Windows AND Linux because item and checkbox properties are rendered
slightly different.
Expand Down
18 changes: 16 additions & 2 deletions res/skins/LateNight/style_palemoon.qss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

/**********************************************************************
************** container background colors & borders *****************/
QToolTip {
font-size: 30px;
color: white;
background-color: darkgray;
}
#SkinContainer {
background-color: #080808;
}
Expand Down Expand Up @@ -1115,7 +1120,11 @@ WEffectSelector:!editable:on {


/************** SkinSettings **************************************************/

QToolTip {
font-size: 30px;
color: white;
background-color: darkgray;
}
#SkinSettings {
padding: 3px;
border-top: 1px solid #585858;
Expand Down Expand Up @@ -1236,7 +1245,7 @@ WLibrarySidebar,
#LibraryFeatureControls QPushButton,
#LibraryFeatureControls QRadioButton,
/* Tooltip and menus */
QToolTip,
/* QToolTip,*/
WLibrarySidebar QMenu,
WTrackTableViewHeader QMenu,
WTrackTableViewHeader QMenu QCheckBox,
Expand All @@ -1255,6 +1264,11 @@ WCueMenuPopup QLabel,
WCoverArtMenu {
color: #c2b3a5;
}
QToolTip {
font-size: 30px;
color: white;
background-color: darkgray;
}
/* Override the 'missing' color in Tracks > Missing,
it's not useful there */
#DlgMissing WTrackTableView {
Expand Down
2 changes: 1 addition & 1 deletion src/database/mixxxdb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
const QString MixxxDb::kDefaultSchemaFile(":/schema.xml");

//static
const int MixxxDb::kRequiredSchemaVersion = 39;
const int MixxxDb::kRequiredSchemaVersion = 40;

namespace {

Expand Down
Loading
Loading