Pref > Deck: consolidate pitch bend setup

1 files changed, 48 insertions, 47 deletions

diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index 00344868d6..87a29c9bfd 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -284,53 +284,6 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent,
     }
 
     //
-    // Rate buttons configuration
-    //
-    connect(spinBoxTemporaryRateCoarse,
-            QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-            this,
-            &DlgPrefDeck::slotRateTempCoarseSpinbox);
-    connect(spinBoxTemporaryRateFine,
-            QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-            this,
-            &DlgPrefDeck::slotRateTempFineSpinbox);
-    connect(spinBoxPermanentRateCoarse,
-            QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-            this,
-            &DlgPrefDeck::slotRatePermCoarseSpinbox);
-    connect(spinBoxPermanentRateFine,
-            QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-            this,
-            &DlgPrefDeck::slotRatePermFineSpinbox);
-
-    m_dRateTempCoarse = m_pConfig->getValue(ConfigKey("[Controls]", "RateTempLeft"),
-            kDefaultTemporaryRateChangeCoarse);
-    m_dRateTempFine = m_pConfig->getValue(ConfigKey("[Controls]", "RateTempRight"),
-            kDefaultTemporaryRateChangeFine);
-    m_dRatePermCoarse = m_pConfig->getValue(ConfigKey("[Controls]", "RatePermLeft"),
-            kDefaultPermanentRateChangeCoarse);
-    m_dRatePermFine = m_pConfig->getValue(ConfigKey("[Controls]", "RatePermRight"),
-            kDefaultPermanentRateChangeFine);
-
-    spinBoxTemporaryRateCoarse->setValue(m_dRateTempCoarse);
-    spinBoxTemporaryRateFine->setValue(m_dRateTempFine);
-    spinBoxPermanentRateCoarse->setValue(m_dRatePermCoarse);
-    spinBoxPermanentRateFine->setValue(m_dRatePermFine);
-
-    RateControl::setTemporaryRateChangeCoarseAmount(m_dRateTempCoarse);
-    RateControl::setTemporaryRateChangeFineAmount(m_dRateTempFine);
-    RateControl::setPermanentRateChangeCoarseAmount(m_dRatePermCoarse);
-    RateControl::setPermanentRateChangeFineAmount(m_dRatePermFine);
-
-    // Rate Ramp Sensitivity
-    m_iRateRampSensitivity = m_pConfig->getValue(ConfigKey("[Controls]", "RateRampSensitivity"), kDefaultRateRampSensitivity);
-    SliderRateRampSensitivity->setValue(m_iRateRampSensitivity);
-    connect(SliderRateRampSensitivity,
-            &QSlider::valueChanged,
-            this,
-            &DlgPrefDeck::slotRateRampSensitivitySlider);
-
-    //
     // Cue Mode
     //
 
@@ -366,6 +319,7 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent,
     // Ramping Temporary Rate Change configuration
     //
 
+    // Rate Ramp Sensitivity slider & spinbox
     connect(SliderRateRampSensitivity,
             QOverload<int>::of(&QAbstractSlider::valueChanged),
             SpinBoxRateRampSensitivity,
@@ -374,6 +328,16 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent,
             QOverload<int>::of(&QSpinBox::valueChanged),
             SliderRateRampSensitivity,
             QOverload<int>::of(&QAbstractSlider::setValue));
+
+    m_iRateRampSensitivity =
+            m_pConfig->getValue(ConfigKey("[Controls]", "RateRampSensitivity"),
+                    kDefaultRateRampSensitivity);
+    SliderRateRampSensitivity->setValue(m_iRateRampSensitivity);
+    connect(SliderRateRampSensitivity,
+            &QSlider::valueChanged,
+            this,
+            &DlgPrefDeck::slotRateRampSensitivitySlider);
+
     // Enable/disable permanent rate spinboxes when smooth ramping is selected
     connect(radioButtonRateRampModeLinear,
             &QRadioButton::toggled,
@@ -414,6 +378,43 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent,
         radioButtonRateRampModeStepping->setChecked(true);
     }
 
+    // Rate buttons configuration
+    connect(spinBoxTemporaryRateCoarse,
+            QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this,
+            &DlgPrefDeck::slotRateTempCoarseSpinbox);
+    connect(spinBoxTemporaryRateFine,
+            QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this,
+            &DlgPrefDeck::slotRateTempFineSpinbox);
+    connect(spinBoxPermanentRateCoarse,
+            QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this,
+            &DlgPrefDeck::slotRatePermCoarseSpinbox);
+    connect(spinBoxPermanentRateFine,
+            QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+            this,
+            &DlgPrefDeck::slotRatePermFineSpinbox);
+
+    m_dRateTempCoarse = m_pConfig->getValue(ConfigKey("[Controls]", "RateTempLeft"),
+            kDefaultTemporaryRateChangeCoarse);
+    m_dRateTempFine = m_pConfig->getValue(ConfigKey("[Controls]", "RateTempRight"),
+            kDefaultTemporaryRateChangeFine);
+    m_dRatePermCoarse = m_pConfig->getValue(ConfigKey("[Controls]", "RatePermLeft"),
+            kDefaultPermanentRateChangeCoarse);
+    m_dRatePermFine = m_pConfig->getValue(ConfigKey("[Controls]", "RatePermRight"),
+            kDefaultPermanentRateChangeFine);
+
+    spinBoxTemporaryRateCoarse->setValue(m_dRateTempCoarse);
+    spinBoxTemporaryRateFine->setValue(m_dRateTempFine);
+    spinBoxPermanentRateCoarse->setValue(m_dRatePermCoarse);
+    spinBoxPermanentRateFine->setValue(m_dRatePermFine);
+
+    RateControl::setTemporaryRateChangeCoarseAmount(m_dRateTempCoarse);
+    RateControl::setTemporaryRateChangeFineAmount(m_dRateTempFine);
+    RateControl::setPermanentRateChangeCoarseAmount(m_dRatePermCoarse);
+    RateControl::setPermanentRateChangeFineAmount(m_dRatePermFine);
+
     slotUpdate();
 }