converter: added presets support, fixed flac preset, enabled 'cancel'

button


git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2381 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 13 insertions, 16 deletions

diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index 8a54a1885..e4938afe6 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -71,6 +71,18 @@ QStringList ConverterDialog::selectedUrls() const
     return out;
 }
 
+QVariantMap ConverterDialog::preset() const
+{
+    if(ui.presetComboBox->currentIndex() == -1)
+        return QVariantMap();
+    int index = ui.presetComboBox->currentIndex();
+    //aditional parameters
+    QVariantMap preset = ui.presetComboBox->itemData(index).toMap();
+    preset["out_dir"] = ui.outDirEdit->text();
+    preset["file_name"] = ui.outFileEdit->text();
+    return preset;
+}
+
 void ConverterDialog::on_dirButton_clicked()
 {
     QString dir = FileDialog::getExistingDirectory(this, tr("Choose a directory"),
@@ -86,22 +98,6 @@ void ConverterDialog::accept()
     settings.setValue("out_dir", ui.outDirEdit->text());
     settings.value("file_name", ui.outFileEdit->text());
     settings.endGroup();
-
-    /*QSettings preset_settings(QDir::homePath() + "/.qmmp/converterrc", QSettings::IniFormat);
-    preset_settings.clear();
-    for(int i = 0; i < ui.presetComboBox->count(); ++i)
-    {
-        QString name = ui.presetComboBox->itemText(i);
-        QVariantMap data = ui.presetComboBox->itemData(i).toMap();
-        if(data["read_only"].toBool())
-            continue;
-        preset_settings.beginGroup(name);
-        preset_settings.setValue("ext", data["ext"].toString());
-        preset_settings.setValue("command", data["command"].toString());
-        preset_settings.setValue("use_16bit", data["use_16bit"].toBool());
-        preset_settings.setValue("tags", data["tags"].toBool());
-        preset_settings.endGroup();
-    }*/
     QDialog::accept();
 }
 
@@ -184,6 +180,7 @@ void ConverterDialog::copyPreset()
     int index = ui.presetComboBox->currentIndex();
     QVariantMap data = ui.presetComboBox->itemData(index).toMap();
     data["name"] = uniqueName(data["name"].toString());
+    data["read_only"] = false;
     ui.presetComboBox->addItem (data["name"].toString(), data);
 }