summaryrefslogtreecommitdiffstats
path: root/src/preferences
diff options
context:
space:
mode:
authorJan Holthuis <jholthuis@mixxx.org>2021-07-16 13:00:04 +0200
committerJan Holthuis <jholthuis@mixxx.org>2021-07-16 13:00:04 +0200
commit405e165b48122c45baacbc0518a03a48dac80ced (patch)
tree8b60f04eb0f777eaad829ea9ff7c4ca45c2bf493 /src/preferences
parentccf6bb22f6e0811f3464ee61d1958f077c7db2cf (diff)
DlgPrefWaveform: Use signal to request reload of user interface
This is similar to the previous commit, it basically removes the necessity to hold a pointer to the main window.
Diffstat (limited to 'src/preferences')
-rw-r--r--src/preferences/dialog/dlgpreferences.cpp8
-rw-r--r--src/preferences/dialog/dlgprefwaveform.cpp2
-rw-r--r--src/preferences/dialog/dlgprefwaveform.h3
3 files changed, 11 insertions, 2 deletions
diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp
index a2651fc711..9ef77f6c59 100644
--- a/src/preferences/dialog/dlgpreferences.cpp
+++ b/src/preferences/dialog/dlgpreferences.cpp
@@ -154,11 +154,17 @@ DlgPreferences::DlgPreferences(
tr("Interface"),
"ic_preferences_interface.svg");
+ DlgPrefWaveform* pWaveformPage = new DlgPrefWaveform(this, mixxx, m_pConfig, pLibrary);
addPageWidget(PreferencesPage(
- new DlgPrefWaveform(this, mixxx, m_pConfig, pLibrary),
+ pWaveformPage,
new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type)),
tr("Waveforms"),
"ic_preferences_waveforms.svg");
+ connect(pWaveformPage,
+ &DlgPrefWaveform::reloadUserInterface,
+ this,
+ &DlgPreferences::reloadUserInterface,
+ Qt::DirectConnection);
addPageWidget(PreferencesPage(
new DlgPrefColors(this, m_pConfig, pLibrary),
diff --git a/src/preferences/dialog/dlgprefwaveform.cpp b/src/preferences/dialog/dlgprefwaveform.cpp
index 8be6f4ca4e..8a17f4b236 100644
--- a/src/preferences/dialog/dlgprefwaveform.cpp
+++ b/src/preferences/dialog/dlgprefwaveform.cpp
@@ -257,7 +257,7 @@ void DlgPrefWaveform::slotSetWaveformType(int index) {
void DlgPrefWaveform::slotSetWaveformOverviewType(int index) {
m_pConfig->set(ConfigKey("[Waveform]","WaveformOverviewType"), ConfigValue(index));
- m_pMixxx->rebootMixxxView();
+ emit reloadUserInterface();
}
void DlgPrefWaveform::slotSetDefaultZoom(int index) {
diff --git a/src/preferences/dialog/dlgprefwaveform.h b/src/preferences/dialog/dlgprefwaveform.h
index 66a488914a..f4105dd637 100644
--- a/src/preferences/dialog/dlgprefwaveform.h
+++ b/src/preferences/dialog/dlgprefwaveform.h
@@ -42,6 +42,9 @@ class DlgPrefWaveform : public DlgPreferencePage, public Ui::DlgPrefWaveformDlg
void slotSetBeatGridAlpha(int alpha);
void slotSetPlayMarkerPosition(int position);
+ signals:
+ void reloadUserInterface();
+
private:
void initWaveformControl();
void calculateCachedWaveformDiskUsage();