From: Michal MalĂ˝ Date: Thu, 1 Aug 2013 11:26:51 +0000 (+0200) Subject: - Clear periodic waveforms cbox before adding new entries X-Git-Tag: 0.2d~9 X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=a9edb8a0a02bb4c4096642bcb8ffd88ded55f4aa;p=FFBChecker.git - Clear periodic waveforms cbox before adding new entries - Check the effect status upon device selection --- diff --git a/mainwindow.cpp b/mainwindow.cpp index a5f1b0c..5b72e71 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -79,8 +79,7 @@ void MainWindow::onDeviceSelected(const QString& id) fillEffectTypesList(m_activeDevice->availableEffectsList()); m_conditionEffSet->fillAvailableSubtypesList(m_activeDevice->availableConditionSubtypesList()); m_periodicEffSet->fillAvailableWaveformsList(m_activeDevice->availableWaveformsList()); - ui->cbox_effectTypes->setCurrentIndex(0); - ui->qstw_effectSpecifics->setCurrentWidget(effectSettingsByType(m_activeDevice->effectTypeFromSelectionIdx(0))); + onEffectSlotSelected(0); } void MainWindow::onEffectSlotSelected(const int idx) diff --git a/periodiceffectsettings.cpp b/periodiceffectsettings.cpp index 4637200..d5d474c 100644 --- a/periodiceffectsettings.cpp +++ b/periodiceffectsettings.cpp @@ -15,6 +15,7 @@ const EnvelopeSettings* PeriodicEffectSettings::envelopeSettings() const void PeriodicEffectSettings::fillAvailableWaveformsList(const QStringList& list) { + ui->cbox_waveform->clear(); ui->cbox_waveform->addItems(list); }