Skip to content

add Shuffle action to track table header menu #13392

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

Merged
acolombier merged 3 commits into from
Feb 21, 2025
Merged

add Shuffle action to track table header menu #13392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adc66e5
WTrackTableView/~Header: get sorting capability from track model
ronso0 Dec 18, 2024
5e6c0f6
Track table header: add Shuffle tracks action to column menu
ronso0 Jun 20, 2024
c4b8959
Merge remote-tracking branch 'mixxx/main' into sort-random
ronso0 Feb 21, 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
2 changes: 2 additions & 0 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,6 +2049,7 @@ QToolTip,
WLibrarySidebar QMenu,
WLibrarySidebar QMenu::item,
WTrackTableViewHeader QMenu,
WTrackTableViewHeader QMenu::item,
WTrackTableViewHeader QMenu QCheckBox,
WLibraryTextBrowser QMenu,
WLibraryTextBrowser QMenu::item,
Expand Down Expand Up @@ -2105,6 +2106,7 @@ WSearchLineEdit QAbstractScrollArea,
#MainMenu QMenu::indicator:unchecked:selected,
WLibrarySidebar QMenu::item:selected,
WLibrarySidebar QMenu::indicator:unchecked:selected,
WTrackTableViewHeader QMenu::item:selected,
WTrackTableViewHeader QMenu QCheckBox:selected,
WTrackTableViewHeader QMenu QCheckBox:focus,
WTrackTableViewHeader QMenu QCheckBox:hover,
Expand Down
3 changes: 0 additions & 3 deletions res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ WSearchLineEdit::item:selected,
}

WLibrarySidebar QMenu::indicator,
WTrackTableViewHeader QMenu::indicator,
WTrackMenu QMenu QCheckBox::indicator,
WEffectChainPresetButton QMenu QCheckBox::indicator {
/* Note that the border is added to the base size of 0.7em x 0.7em
Expand Down Expand Up @@ -205,8 +204,6 @@ WSearchLineEdit::item:selected,
background-color: transparent;
}

WSearchRelatedTracksMenu #SearchSelectedAction::indicator {
}
WSearchRelatedTracksMenu #SearchSelectedAction::indicator:disabled {
image: url(skins:LateNight/palemoon/buttons/btn__search_disabled.svg);
}
Expand Down
4 changes: 3 additions & 1 deletion res/skins/LateNight/style_classic.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2580,6 +2580,7 @@ QToolTip,
WLibrarySidebar QMenu,
WLibrarySidebar QMenu::item,
WTrackTableViewHeader QMenu,
/*WTrackTableViewHeader QMenu::item,*/
WTrackTableViewHeader QMenu QCheckBox,
WLibraryTextBrowser QMenu,
WLibraryTextBrowser QMenu::item,
Expand Down Expand Up @@ -2623,8 +2624,9 @@ WEffectSelector,
/* ::indicator:!checked won't work. use 'unchecked' */
#MainMenu QMenu::indicator:unchecked:selected,
WLibrarySidebar QMenu::item:selected,
WTrackTableViewHeader QMenu QCheckBox:selected,
WTrackTableViewHeader QMenu::item:selected,
WTrackTableViewHeader QMenu QCheckBox:focus,
WTrackTableViewHeader QMenu QCheckBox:selected,
WTrackTableViewHeader QMenu QCheckBox:hover,
WTrackMenu::item:selected,
WTrackMenu QMenu::item:selected,
Expand Down
2 changes: 2 additions & 0 deletions res/skins/LateNight/style_palemoon.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3055,6 +3055,7 @@ QToolTip,
WLibrarySidebar QMenu,
WLibrarySidebar QMenu::item,
WTrackTableViewHeader QMenu,
WTrackTableViewHeader QMenu::item,
WTrackTableViewHeader QMenu QCheckBox,
WLibraryTextBrowser QMenu,
WLibraryTextBrowser QMenu::item,
Expand Down Expand Up @@ -3094,6 +3095,7 @@ WSearchLineEdit::item {
/* ::indicator:!checked won't work. use 'unchecked' */
#MainMenu QMenu::indicator:unchecked:selected,
WLibrarySidebar QMenu::item:selected,
WTrackTableViewHeader QMenu::item:selected,
WTrackTableViewHeader QMenu QCheckBox:selected,
WTrackTableViewHeader QMenu QCheckBox:focus,
WTrackTableViewHeader QMenu QCheckBox:hover,
Expand Down
2 changes: 2 additions & 0 deletions res/skins/Shade/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ QToolTip,
WLibrarySidebar QMenu,
WLibrarySidebar QMenu::item,
WTrackTableViewHeader QMenu,
WTrackTableViewHeader QMenu::item,
WTrackTableViewHeader QMenu QCheckBox,
WLibraryTextBrowser QMenu,
WTrackMenu,
Expand Down Expand Up @@ -154,6 +155,7 @@ WBeatSpinBox,
#MainMenu QMenu::indicator:unchecked:selected,
WLibrarySidebar QMenu::item:selected,
WLibrarySidebar QMenu::indicator:unchecked:selected,
WTrackTableViewHeader QMenu::item:selected,
WTrackTableViewHeader QMenu QCheckBox:selected,
WTrackTableViewHeader QMenu QCheckBox:focus,
WTrackTableViewHeader QMenu QCheckBox:hover,
Expand Down
8 changes: 5 additions & 3 deletions res/skins/Shade/style_dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ QToolTip,
WLibrarySidebar QMenu,
WLibrarySidebar QMenu::item,
WTrackTableViewHeader QMenu,
WTrackTableViewHeader QMenu::item,
WTrackTableViewHeader QMenu QCheckBox,
WLibraryTextBrowser QMenu,
WLibraryTextBrowser QMenu::item,
Expand Down Expand Up @@ -55,9 +56,10 @@ WEffectSelector::indicator:unchecked,
#MainMenu QMenu::indicator:unchecked:selected,
WLibrarySidebar QMenu::item:selected,
WLibrarySidebar QMenu::indicator:unchecked:selected,
WTrackTableViewHeader QMenu:selected,
WTrackTableViewHeader QMenu:focus,
WTrackTableViewHeader QMenu:hover,
WTrackTableViewHeader QMenu::item:selected,
WTrackTableViewHeader QMenu QCheckBox:selected,
WTrackTableViewHeader QMenu QCheckBox:focus,
WTrackTableViewHeader QMenu QCheckBox:hover,
WLibraryTextBrowser QMenu::item:selected,
WTrackMenu::item:selected,
WTrackMenu QMenu::item:selected,
Expand Down
2 changes: 2 additions & 0 deletions res/skins/Shade/style_summer_sunset.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ QToolTip,
WLibrarySidebar QMenu,
WLibrarySidebar QMenu::item,
WTrackTableViewHeader QMenu,
WTrackTableViewHeader QMenu::item,
WTrackTableViewHeader QMenu QCheckBox,
QTextBrowser QMenu,
QTextBrowser QMenu::item,
Expand Down Expand Up @@ -65,6 +66,7 @@ WBeatSpinBox,
#MainMenu QMenu::indicator:unchecked:selected,
WLibrarySidebar QMenu::item:selected,
WLibrarySidebar QMenu::indicator:unchecked:selected,
WTrackTableViewHeader QMenu::item:selected,
WTrackTableViewHeader QMenu QCheckBox:selected,
WTrackTableViewHeader QMenu QCheckBox:focus,
WTrackTableViewHeader QMenu QCheckBox:hover,
Expand Down
2 changes: 2 additions & 0 deletions res/skins/Tango/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2307,6 +2307,7 @@ QToolTip,
WLibrarySidebar QMenu,
WLibrarySidebar QMenu::item,
WTrackTableViewHeader QMenu,
WTrackTableViewHeader QMenu::item,
WTrackTableViewHeader QMenu QCheckBox,
WLibraryTextBrowser QMenu,
WLibraryTextBrowser QMenu::item,
Expand Down Expand Up @@ -2377,6 +2378,7 @@ WSearchLineEdit QAbstractScrollArea,
/* ::indicator:!checked won't work. use 'unchecked' */
#MainMenu QMenu::indicator:unchecked:selected,
WLibrarySidebar QMenu::item:selected,
WTrackTableViewHeader QMenu::item:selected,
WTrackTableViewHeader QMenu QCheckBox:selected,
WTrackTableViewHeader QMenu QCheckBox:focus,
WTrackTableViewHeader QMenu QCheckBox:hover,
Expand Down
4 changes: 0 additions & 4 deletions res/skins/default.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,6 @@ WLibraryTextBrowser QMenu::icon {
padding: 0em 0em 0em 2em;
}

/* Column checkboxes in the table header menu */
WTrackTableViewHeader QMenu::indicator {
margin: 0 -1em 0 0.25em;
}

/* Column checkboxes in the table header menu */
WTrackTableViewHeader QMenu QCheckBox,
Expand Down
3 changes: 1 addition & 2 deletions src/library/autodj/dlgautodj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ DlgAutoDJ::DlgAutoDJ(WLibrary* parent,
m_pTrackTableView(new WTrackTableView(this,
m_pConfig,
pLibrary,
parent->getTrackTableBackgroundColorOpacity(),
/*no sorting*/ false)),
parent->getTrackTableBackgroundColorOpacity())),
m_bShowButtonText(parent->getShowButtonText()),
m_pAutoDJTableModel(nullptr) {
setupUi(this);
Expand Down
3 changes: 2 additions & 1 deletion src/library/baseexternalplaylistmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ TrackModel::Capabilities BaseExternalPlaylistModel::getCapabilities() const {
Capability::AddToAutoDJ |
Capability::LoadToDeck |
Capability::LoadToPreviewDeck |
Capability::LoadToSampler;
Capability::LoadToSampler |
Capability::Sorting;
}

QString BaseExternalPlaylistModel::modelKey(bool noSearch) const {
Expand Down
3 changes: 2 additions & 1 deletion src/library/baseexternaltrackmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,6 @@ TrackModel::Capabilities BaseExternalTrackModel::getCapabilities() const {
Capability::AddToAutoDJ |
Capability::LoadToDeck |
Capability::LoadToPreviewDeck |
Capability::LoadToSampler;
Capability::LoadToSampler |
Capability::Sorting;
}
3 changes: 1 addition & 2 deletions src/library/library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,7 @@ void Library::bindLibraryWidget(
WTrackTableView* pTrackTableView = new WTrackTableView(m_pLibraryWidget,
m_pConfig,
this,
m_pLibraryWidget->getTrackTableBackgroundColorOpacity(),
true);
m_pLibraryWidget->getTrackTableBackgroundColorOpacity());
pTrackTableView->installEventFilter(pKeyboard);
connect(this,
&Library::showTrackModel,
Expand Down
3 changes: 2 additions & 1 deletion src/library/librarytablemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,6 @@ TrackModel::Capabilities LibraryTableModel::getCapabilities() const {
Capability::ResetPlayed |
Capability::RemoveFromDisk |
Capability::Analyze |
Capability::Properties;
Capability::Properties |
Capability::Sorting;
}
3 changes: 1 addition & 2 deletions src/library/missing_hidden/dlghidden.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ DlgHidden::DlgHidden(
this,
pConfig,
pLibrary,
parent->getTrackTableBackgroundColorOpacity(),
true)) {
parent->getTrackTableBackgroundColorOpacity())) {
setupUi(this);
m_pTrackTableView->installEventFilter(pKeyboard);

Expand Down
3 changes: 1 addition & 2 deletions src/library/missing_hidden/dlgmissing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ DlgMissing::DlgMissing(
this,
pConfig,
pLibrary,
parent->getTrackTableBackgroundColorOpacity(),
true)) {
parent->getTrackTableBackgroundColorOpacity())) {
setupUi(this);
m_pTrackTableView->installEventFilter(pKeyboard);

Expand Down
3 changes: 2 additions & 1 deletion src/library/missing_hidden/hiddentablemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ TrackModel::Capabilities HiddenTableModel::getCapabilities() const {
Capability::LoadToPreviewDeck |
Capability::ResetPlayed |
Capability::Analyze |
Capability::Properties;
Capability::Properties |
Capability::Sorting;
}

QString HiddenTableModel::modelKey(bool noSearch) const {
Expand Down
4 changes: 3 additions & 1 deletion src/library/missing_hidden/missingtablemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ Qt::ItemFlags MissingTableModel::flags(const QModelIndex &index) const {
}

TrackModel::Capabilities MissingTableModel::getCapabilities() const {
return Capability::Purge | Capability::Properties;
return Capability::Purge |
Capability::Properties |
Capability::Sorting;
}

QString MissingTableModel::modelKey(bool noSearch) const {
Expand Down
5 changes: 3 additions & 2 deletions src/library/playlisttablemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,9 @@ TrackModel::Capabilities PlaylistTableModel::getCapabilities() const {
m_pTrackCollectionManager->internalCollection()
->getPlaylistDAO()
.getPlaylistIdFromName(AUTODJ_TABLE)) {
// Only allow Add to AutoDJ if we aren't currently showing the AutoDJ queue.
caps |= Capability::AddToAutoDJ | Capability::RemovePlaylist;
// Only allow Add to AutoDJ and sorting if we aren't currently showing
// the AutoDJ queue.
caps |= Capability::AddToAutoDJ | Capability::RemovePlaylist | Capability::Sorting;
} else {
caps |= Capability::Remove;
}
Expand Down
3 changes: 1 addition & 2 deletions src/library/recording/dlgrecording.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ DlgRecording::DlgRecording(
this,
pConfig,
pLibrary,
parent->getTrackTableBackgroundColorOpacity(),
true)),
parent->getTrackTableBackgroundColorOpacity())),
m_browseModel(this, pLibrary->trackCollectionManager(), pRecordingManager),
m_proxyModel(&m_browseModel, true),
m_bytesRecordedStr("--"),
Expand Down
1 change: 1 addition & 0 deletions src/library/trackmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class TrackModel {
RemoveFromDisk = 1u << 16u,
Analyze = 1u << 17u,
Properties = 1u << 18u,
Sorting = 1u << 19u,
};
Q_DECLARE_FLAGS(Capabilities, Capability)

Expand Down
3 changes: 2 additions & 1 deletion src/library/trackset/crate/cratetablemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ TrackModel::Capabilities CrateTableModel::getCapabilities() const {
Capability::Hide |
Capability::RemoveFromDisk |
Capability::Analyze |
Capability::Properties;
Capability::Properties |
Capability::Sorting;

if (m_selectedCrate.isValid()) {
Crate crate;
Expand Down
3 changes: 1 addition & 2 deletions src/widget/wanalysislibrarytableview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ WAnalysisLibraryTableView::WAnalysisLibraryTableView(
: WTrackTableView(parent,
pConfig,
pLibrary,
trackTableBackgroundColorOpacity,
true) {
trackTableBackgroundColorOpacity) {
setDragDropMode(QAbstractItemView::DragOnly);
setDragEnabled(true); //Always enable drag for now (until we have a model that doesn't support this.)
}
Expand Down
Loading