diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2020-09-29 23:05:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 23:05:42 +0200 |
| commit | 8c90972a98dba24e32dba10895ed6f8d907fad10 (patch) | |
| tree | 4e3da99b9af0d9471767dde8c6af21ae3ecaa0d9 /src | |
| parent | abc9d0aae1e67eacaabd6f90a414554067570ff0 (diff) | |
| parent | 50b107a9322adc14b0c7ed63cb016c7fee6a4239 (diff) | |
Merge pull request #3141 from ronso0/pref-waveform-default-renderer
Waveform preferences: apply renderer when resetting to defaults
Diffstat (limited to 'src')
| -rw-r--r-- | src/preferences/dialog/dlgprefwaveform.cpp | 128 |
1 files changed, 85 insertions, 43 deletions
diff --git a/src/preferences/dialog/dlgprefwaveform.cpp b/src/preferences/dialog/dlgprefwaveform.cpp index f8ff29549f..1e5fa917d6 100644 --- a/src/preferences/dialog/dlgprefwaveform.cpp +++ b/src/preferences/dialog/dlgprefwaveform.cpp @@ -39,49 +39,91 @@ DlgPrefWaveform::DlgPrefWaveform(QWidget* pParent, MixxxMainWindow* pMixxx, // slotUpdate can generate rebootMixxxView calls. // TODO(XXX): Improve this awkwardness. slotUpdate(); - connect(frameRateSpinBox, SIGNAL(valueChanged(int)), - this, SLOT(slotSetFrameRate(int))); - connect(endOfTrackWarningTimeSpinBox, SIGNAL(valueChanged(int)), - this, SLOT(slotSetWaveformEndRender(int))); - connect(beatGridAlphaSpinBox, SIGNAL(valueChanged(int)), - this, SLOT(slotSetBeatGridAlpha(int))); - connect(frameRateSlider, SIGNAL(valueChanged(int)), - frameRateSpinBox, SLOT(setValue(int))); - connect(frameRateSpinBox, SIGNAL(valueChanged(int)), - frameRateSlider, SLOT(setValue(int))); - connect(endOfTrackWarningTimeSlider, SIGNAL(valueChanged(int)), - endOfTrackWarningTimeSpinBox, SLOT(setValue(int))); - connect(endOfTrackWarningTimeSpinBox, SIGNAL(valueChanged(int)), - endOfTrackWarningTimeSlider, SLOT(setValue(int))); - connect(beatGridAlphaSlider, SIGNAL(valueChanged(int)), - beatGridAlphaSpinBox, SLOT(setValue(int))); - connect(beatGridAlphaSpinBox, SIGNAL(valueChanged(int)), - beatGridAlphaSlider, SLOT(setValue(int))); - - connect(waveformTypeComboBox, SIGNAL(activated(int)), - this, SLOT(slotSetWaveformType(int))); - connect(defaultZoomComboBox, SIGNAL(currentIndexChanged(int)), - this, SLOT(slotSetDefaultZoom(int))); - connect(synchronizeZoomCheckBox, SIGNAL(clicked(bool)), - this, SLOT(slotSetZoomSynchronization(bool))); - connect(allVisualGain, SIGNAL(valueChanged(double)), - this, SLOT(slotSetVisualGainAll(double))); - connect(lowVisualGain, SIGNAL(valueChanged(double)), - this, SLOT(slotSetVisualGainLow(double))); - connect(midVisualGain, SIGNAL(valueChanged(double)), - this, SLOT(slotSetVisualGainMid(double))); - connect(highVisualGain, SIGNAL(valueChanged(double)), - this, SLOT(slotSetVisualGainHigh(double))); - connect(normalizeOverviewCheckBox, SIGNAL(toggled(bool)), - this, SLOT(slotSetNormalizeOverview(bool))); - connect(factory, SIGNAL(waveformMeasured(float,int)), - this, SLOT(slotWaveformMeasured(float,int))); - connect(waveformOverviewComboBox, SIGNAL(currentIndexChanged(int)), - this, SLOT(slotSetWaveformOverviewType(int))); - connect(clearCachedWaveforms, SIGNAL(clicked()), - this, SLOT(slotClearCachedWaveforms())); - connect(playMarkerPositionSlider, SIGNAL(valueChanged(int)), - this, SLOT(slotSetPlayMarkerPosition(int))); + connect(frameRateSpinBox, + SIGNAL(valueChanged(int)), + this, + SLOT(slotSetFrameRate(int))); + connect(endOfTrackWarningTimeSpinBox, + SIGNAL(valueChanged(int)), + this, + SLOT(slotSetWaveformEndRender(int))); + connect(beatGridAlphaSpinBox, + SIGNAL(valueChanged(int)), + this, + SLOT(slotSetBeatGridAlpha(int))); + connect(frameRateSlider, + SIGNAL(valueChanged(int)), + frameRateSpinBox, + SLOT(setValue(int))); + connect(frameRateSpinBox, + SIGNAL(valueChanged(int)), + frameRateSlider, + SLOT(setValue(int))); + connect(endOfTrackWarningTimeSlider, + SIGNAL(valueChanged(int)), + endOfTrackWarningTimeSpinBox, + SLOT(setValue(int))); + connect(endOfTrackWarningTimeSpinBox, + SIGNAL(valueChanged(int)), + endOfTrackWarningTimeSlider, + SLOT(setValue(int))); + connect(beatGridAlphaSlider, + SIGNAL(valueChanged(int)), + beatGridAlphaSpinBox, + SLOT(setValue(int))); + connect(beatGridAlphaSpinBox, + SIGNAL(valueChanged(int)), + beatGridAlphaSlider, + SLOT(setValue(int))); + + connect(waveformTypeComboBox, + SIGNAL(currentIndexChanged(int)), + this, + SLOT(slotSetWaveformType(int))); + connect(defaultZoomComboBox, + SIGNAL(currentIndexChanged(int)), + this, + SLOT(slotSetDefaultZoom(int))); + connect(synchronizeZoomCheckBox, + SIGNAL(clicked(bool)), + this, + SLOT(slotSetZoomSynchronization(bool))); + connect(allVisualGain, + SIGNAL(valueChanged(double)), + this, + SLOT(slotSetVisualGainAll(double))); + connect(lowVisualGain, + SIGNAL(valueChanged(double)), + this, + SLOT(slotSetVisualGainLow(double))); + connect(midVisualGain, + SIGNAL(valueChanged(double)), + this, + SLOT(slotSetVisualGainMid(double))); + connect(highVisualGain, + SIGNAL(valueChanged(double)), + this, + SLOT(slotSetVisualGainHigh(double))); + connect(normalizeOverviewCheckBox, + SIGNAL(toggled(bool)), + this, + SLOT(slotSetNormalizeOverview(bool))); + connect(factory, + SIGNAL(waveformMeasured(float, int)), + this, + SLOT(slotWaveformMeasured(float, int))); + connect(waveformOverviewComboBox, + SIGNAL(currentIndexChanged(int)), + this, + SLOT(slotSetWaveformOverviewType(int))); + connect(clearCachedWaveforms, + SIGNAL(clicked()), + this, + SLOT(slotClearCachedWaveforms())); + connect(playMarkerPositionSlider, + SIGNAL(valueChanged(int)), + this, + SLOT(slotSetPlayMarkerPosition(int))); } DlgPrefWaveform::~DlgPrefWaveform() { |