Skip to content

Merge changes from 2.6 into main #15099

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
ronso0 merged 3 commits into from
Jul 16, 2025
Merged

Merge changes from 2.6 into main #15099

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
abcc0ba
Library: make scan report optional (opt-out)
ronso0 Jul 12, 2025
6d10977
Merge pull request #15089 from ronso0/scan-summary-optional
daschuer Jul 16, 2025
eb3e168
Merge branch '2.6' into 'main'
mixxxbot Jul 16, 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
5 changes: 5 additions & 0 deletions src/library/library_prefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ const ConfigKey mixxx::library::prefs::kRescanOnStartupConfigKey =
mixxx::library::prefs::kConfigGroup,
QStringLiteral("RescanOnStartup")};

const ConfigKey mixxx::library::prefs::kShowScanSummaryConfigKey =
ConfigKey{
mixxx::library::prefs::kConfigGroup,
QStringLiteral("show_library_scan_summary")};

const ConfigKey mixxx::library::prefs::kKeyNotationConfigKey =
ConfigKey{
mixxx::library::prefs::kConfigGroup,
Expand Down
2 changes: 2 additions & 0 deletions src/library/library_prefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ extern const QString kConfigGroup;

extern const ConfigKey kRescanOnStartupConfigKey;

extern const ConfigKey kShowScanSummaryConfigKey;

extern const ConfigKey kKeyNotationConfigKey;

extern const ConfigKey kTrackDoubleClickActionConfigKey;
Expand Down
6 changes: 6 additions & 0 deletions src/mixxxmainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#ifdef __ENGINEPRIME__
#include "library/export/libraryexporter.h"
#endif
#include "library/library_prefs.h"
#include "library/overviewcache.h"
#include "library/trackcollectionmanager.h"
#include "mixer/playerinfo.h"
Expand Down Expand Up @@ -1227,6 +1228,11 @@ void MixxxMainWindow::slotHelpAbout() {
}

void MixxxMainWindow::slotLibraryScanSummaryDlg(const LibraryScanResultSummary& result) {
if (!m_pCoreServices->getSettings()->getValue<bool>(
mixxx::library::prefs::kShowScanSummaryConfigKey, true)) {
return;
}

// Don't show the report dialog when the scan is run during startup and no
// noteworthy changes have been detected.
if (result.autoscan &&
Expand Down
5 changes: 5 additions & 0 deletions src/preferences/dialog/dlgpreflibrary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ void DlgPrefLibrary::slotUpdate() {
populateDirList();
checkBox_library_scan->setChecked(m_pConfig->getValue(
kRescanOnStartupConfigKey, false));
checkBox_library_scan_summary->setChecked(m_pConfig->getValue(
kShowScanSummaryConfigKey, true));

spinbox_history_track_duplicate_distance->setValue(m_pConfig->getValue(
kHistoryTrackDuplicateDistanceConfigKey,
Expand Down Expand Up @@ -509,6 +511,9 @@ void DlgPrefLibrary::slotApply() {
m_pConfig->set(kRescanOnStartupConfigKey,
ConfigValue((int)checkBox_library_scan->isChecked()));

m_pConfig->set(kShowScanSummaryConfigKey,
ConfigValue((int)checkBox_library_scan_summary->isChecked()));

m_pConfig->set(kHistoryTrackDuplicateDistanceConfigKey,
ConfigValue(spinbox_history_track_duplicate_distance->value()));
m_pConfig->set(kHistoryMinTracksToKeepConfigKey,
Expand Down
12 changes: 12 additions & 0 deletions src/preferences/dialog/dlgpreflibrarydlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,17 @@
</widget>
</item>

<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_library_scan_summary">
<property name="text">
<string>Show scan summary dialog</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>

</layout>
</widget>
</item>
Expand Down Expand Up @@ -671,6 +682,7 @@
<tabstop>pushButton_relocate_dir</tabstop>
<tabstop>pushButton_remove_dir</tabstop>
<tabstop>checkBox_library_scan</tabstop>
<tabstop>checkBox_library_scan_summary</tabstop>
<tabstop>checkBox_sync_track_metadata</tabstop>
<tabstop>checkBox_serato_metadata_export</tabstop>
<tabstop>checkBox_use_relative_path</tabstop>
Expand Down
Loading