added MetaDataFormatterMenu class

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

1 files changed, 6 insertions, 21 deletions

diff --git a/src/plugins/Effect/filewriter/settingsdialog.cpp b/src/plugins/Effect/filewriter/settingsdialog.cpp
index 424c1dc91..ec4393ceb 100644
--- a/src/plugins/Effect/filewriter/settingsdialog.cpp
+++ b/src/plugins/Effect/filewriter/settingsdialog.cpp
@@ -20,9 +20,9 @@
 
 #include <QSettings>
 #include <QDesktopServices>
-#include <QMenu>
 #include <qmmp/qmmp.h>
 #include <qmmpui/filedialog.h>
+#include <qmmpui/metadataformattermenu.h>
 #include "settingsdialog.h"
 
 SettingsDialog::SettingsDialog(QWidget *parent)
@@ -31,25 +31,10 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     m_ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose, true);
 
-    QMenu *fileNameMenu = new QMenu(this);
-    fileNameMenu->addAction(tr("Artist"))->setData("%p");
-    fileNameMenu->addAction(tr("Album"))->setData("%a");
-    fileNameMenu->addAction(tr("Album Artist"))->setData("%aa");
-    fileNameMenu->addAction(tr("Title"))->setData("%t");
-    fileNameMenu->addAction(tr("Track Number"))->setData("%n");
-    fileNameMenu->addAction(tr("Two-digit Track Number"))->setData("%NN");
-    fileNameMenu->addAction(tr("Genre"))->setData("%g");
-    fileNameMenu->addAction(tr("Comment"))->setData("%c");
-    fileNameMenu->addAction(tr("Composer"))->setData("%C");
-    fileNameMenu->addAction(tr("Duration"))->setData("%l");
-    fileNameMenu->addAction(tr("Disc Number"))->setData("%D");
-    fileNameMenu->addAction(tr("File Name"))->setData("%f");
-    fileNameMenu->addAction(tr("File Path"))->setData("%F");
-    fileNameMenu->addAction(tr("Year"))->setData("%y");
-    fileNameMenu->addAction(tr("Condition"))->setData("%p%if(%p&%t, - ,)%t");
+    MetaDataFormatterMenu *fileNameMenu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
     m_ui.fileNameButton->setMenu(fileNameMenu);
     m_ui.fileNameButton->setPopupMode(QToolButton::InstantPopup);
-    connect(fileNameMenu, SIGNAL(triggered(QAction *)), SLOT(addTitleString(QAction *)));
+    connect(fileNameMenu, SIGNAL(patternSelected(QString)), SLOT(addTitleString(QString)));
 
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QString outDir = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
@@ -71,12 +56,12 @@ void SettingsDialog::accept()
     QDialog::accept();
 }
 
-void SettingsDialog::addTitleString(QAction *a)
+void SettingsDialog::addTitleString(const QString &str)
 {
     if (m_ui.outFileEdit->cursorPosition () < 1)
-        m_ui.outFileEdit->insert(a->data().toString());
+        m_ui.outFileEdit->insert(str);
     else
-        m_ui.outFileEdit->insert(" - "+a->data().toString());
+        m_ui.outFileEdit->insert(" - "+str);
 }
 
 void SettingsDialog::on_dirButton_clicked()