Auto stash before merge of "master" and "origin/master"

2019-08-30 19:30:24 +02:00
parent ff319cc214
commit 4dd39e1ba3
5 changed files with 67 additions and 11 deletions
@@ -30,6 +30,9 @@ MainWindow::MainWindow(QWidget *parent)
        }
    }

+    if (m_ui.comboBoxDevices->count())
+        m_ui.comboBoxDevices->setCurrentIndex(m_audioDevices.count()-1);
+
    for (const auto samplerate : { 44100, 48000, 96000, 192000 })
        m_ui.comboBoxSamplerate->addItem(tr("%0").arg(samplerate), samplerate);

@@ -48,6 +51,10 @@ MainWindow::MainWindow(QWidget *parent)

    connect(m_ui.spinBoxBlend, qOverload<int>(&QSpinBox::valueChanged), m_ui.widget, &OsciWidget::setBlend);

+    m_ui.spinBoxGlow->setValue(m_ui.widget->glow());
+
+    connect(m_ui.spinBoxGlow, qOverload<int>(&QSpinBox::valueChanged), m_ui.widget, &OsciWidget::setGlow);
+
    auto buttonGroup = new QButtonGroup;
    buttonGroup->setExclusive(true);    
    for (auto factor : { .5f, 1.f, 2.f, 4.f, 8.f })