From cd5734bbe93aa7a0292bb75bb47886584b484e77 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 21 Feb 2013 15:48:08 +0000 Subject: wildmidi plugin: improved config search; updated linguist files git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3276 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/wildmidi/settingsdialog.cpp | 28 +++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'src/plugins/Input/wildmidi/settingsdialog.cpp') diff --git a/src/plugins/Input/wildmidi/settingsdialog.cpp b/src/plugins/Input/wildmidi/settingsdialog.cpp index e9ad96080..14825984a 100644 --- a/src/plugins/Input/wildmidi/settingsdialog.cpp +++ b/src/plugins/Input/wildmidi/settingsdialog.cpp @@ -27,17 +27,21 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { - ui.setupUi(this); + m_ui.setupUi(this); setAttribute(Qt::WA_DeleteOnClose); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Midi"); - ui.confPathComboBox->setEditText(settings.value("conf_path", "/etc/timidity/timidity.cfg").toString()); - ui.sampleRateComboBox->addItem(tr("44100 Hz"), 44100); - ui.sampleRateComboBox->addItem(tr("48000 Hz"), 48000); - int i = ui.sampleRateComboBox->findData(settings.value("sample_rate", 44100).toInt()); - ui.sampleRateComboBox->setCurrentIndex(i); - ui.enhancedResamplingCheckBox->setChecked(settings.value("enhanced_resampling", false).toBool()); - ui.reverbCheckBox->setChecked(settings.value("reverberation", false).toBool()); + QStringList files = WildMidiHelper::instance()->configFiles(); + QString conf_path = files.isEmpty() ? QString() : files.first(); + m_ui.confPathComboBox->addItems(files); + m_ui.confPathComboBox->setEditText(settings.value("conf_path", conf_path).toString()); + m_ui.sampleRateComboBox->addItem(tr("44100 Hz"), 44100); + m_ui.sampleRateComboBox->addItem(tr("48000 Hz"), 48000); + int i = m_ui.sampleRateComboBox->findData(settings.value("sample_rate", 44100).toInt()); + m_ui.sampleRateComboBox->setCurrentIndex(i); + m_ui.enhancedResamplingCheckBox->setChecked(settings.value("enhanced_resampling", false).toBool()); + m_ui.reverbCheckBox->setChecked(settings.value("reverberation", false).toBool()); settings.endGroup(); } @@ -49,11 +53,11 @@ void SettingsDialog::accept() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Midi"); - settings.setValue("conf_path", ui.confPathComboBox->currentText()); + settings.setValue("conf_path", m_ui.confPathComboBox->currentText()); settings.setValue("sample_rate", - ui.sampleRateComboBox->itemData(ui.sampleRateComboBox->currentIndex())); - settings.setValue("enhanced_resampling", ui.enhancedResamplingCheckBox->isChecked()); - settings.setValue("reverberation", ui.reverbCheckBox->isChecked()); + m_ui.sampleRateComboBox->itemData(m_ui.sampleRateComboBox->currentIndex())); + settings.setValue("enhanced_resampling", m_ui.enhancedResamplingCheckBox->isChecked()); + settings.setValue("reverberation", m_ui.reverbCheckBox->isChecked()); settings.endGroup(); WildMidiHelper::instance()->readSettings(); QDialog::accept(); -- cgit v1.2.3-13-gbd6f