diff --git a/src/library/library_prefs.cpp b/src/library/library_prefs.cpp index f734332e92c2..a95e6e951563 100644 --- a/src/library/library_prefs.cpp +++ b/src/library/library_prefs.cpp @@ -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, diff --git a/src/library/library_prefs.h b/src/library/library_prefs.h index 37963947d19a..38d8f9f7139c 100644 --- a/src/library/library_prefs.h +++ b/src/library/library_prefs.h @@ -14,6 +14,8 @@ extern const QString kConfigGroup; extern const ConfigKey kRescanOnStartupConfigKey; +extern const ConfigKey kShowScanSummaryConfigKey; + extern const ConfigKey kKeyNotationConfigKey; extern const ConfigKey kTrackDoubleClickActionConfigKey; diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp index c9045fde498e..e35b53ab5910 100644 --- a/src/mixxxmainwindow.cpp +++ b/src/mixxxmainwindow.cpp @@ -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" @@ -1227,6 +1228,11 @@ void MixxxMainWindow::slotHelpAbout() { } void MixxxMainWindow::slotLibraryScanSummaryDlg(const LibraryScanResultSummary& result) { + if (!m_pCoreServices->getSettings()->getValue( + 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 && diff --git a/src/preferences/dialog/dlgpreflibrary.cpp b/src/preferences/dialog/dlgpreflibrary.cpp index d25f6376c46b..d9c33cfd5029 100644 --- a/src/preferences/dialog/dlgpreflibrary.cpp +++ b/src/preferences/dialog/dlgpreflibrary.cpp @@ -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, @@ -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, diff --git a/src/preferences/dialog/dlgpreflibrarydlg.ui b/src/preferences/dialog/dlgpreflibrarydlg.ui index cb943bc43427..a584305b985c 100644 --- a/src/preferences/dialog/dlgpreflibrarydlg.ui +++ b/src/preferences/dialog/dlgpreflibrarydlg.ui @@ -89,6 +89,17 @@ + + + + Show scan summary dialog + + + true + + + + @@ -671,6 +682,7 @@ pushButton_relocate_dir pushButton_remove_dir checkBox_library_scan + checkBox_library_scan_summary checkBox_sync_track_metadata checkBox_serato_metadata_export checkBox_use_relative_path