added MetaDataFormatterMenu class

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

6 files changed, 28 insertions, 73 deletions

diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index 164d592dd..97ac12699 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2011-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -31,6 +31,7 @@
 #include <qmmpui/metadataformatter.h>
 #include <qmmpui/filedialog.h>
 #include <qmmp/metadatamanager.h>
+#include <qmmpui/metadataformattermenu.h>
 #include "converter.h"
 #include "preseteditor.h"
 #include "converterdialog.h"
@@ -186,25 +187,10 @@ void ConverterDialog::reject()
 
 void ConverterDialog::createMenus()
 {
-    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("%if(%p&%t,%p - %t,%f)");
+    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)));
 
     QMenu *presetMenu = new QMenu(this);
     presetMenu->addAction(tr("Create"), this, SLOT(createPreset()));
@@ -215,12 +201,12 @@ void ConverterDialog::createMenus()
     m_ui.presetButton->setPopupMode(QToolButton::InstantPopup);
 }
 
-void ConverterDialog::addTitleString(QAction *a)
+void ConverterDialog::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 ConverterDialog::createPreset()
diff --git a/src/plugins/General/converter/converterdialog.h b/src/plugins/General/converter/converterdialog.h
index c8cb59838..23c7384d9 100644
--- a/src/plugins/General/converter/converterdialog.h
+++ b/src/plugins/General/converter/converterdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2011-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,7 +26,6 @@
 #include <QCloseEvent>
 #include "ui_converterdialog.h"
 
-class QAction;
 class PlayListTrack;
 class ConverterPreset;
 class Converter;
@@ -50,7 +49,7 @@ private slots:
     void on_stopButton_clicked();
     void onStateChanged(int row, QString message);
     void onConvertFinished(Converter *c);
-    void addTitleString(QAction *a);
+    void addTitleString(const QString &str);
     void createPreset();
     void editPreset();
     void copyPreset();
diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp
index 475949d33..1f0f7db8b 100644
--- a/src/plugins/General/fileops/settingsdialog.cpp
+++ b/src/plugins/General/fileops/settingsdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2015 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,7 +18,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 #include <QSettings>
-#include <QMenu>
 #include <QHeaderView>
 #include <QApplication>
 #include <QCheckBox>
@@ -26,6 +25,7 @@
 #include <QDesktopServices>
 #include <qmmp/qmmp.h>
 #include <qmmpui/filedialog.h>
+#include <qmmpui/metadataformattermenu.h>
 #include "fileops.h"
 #include "hotkeydialog.h"
 #include "settingsdialog.h"
@@ -216,30 +216,15 @@ void SettingsDialog::on_patternEdit_textChanged(QString pattern)
 
 void SettingsDialog::createMenus()
 {
-    QMenu *menu = new QMenu(this);
-    menu->addAction(tr("Artist"))->setData("%p");
-    menu->addAction(tr("Album"))->setData("%a");
-    menu->addAction(tr("Album Artist"))->setData("%aa");
-    menu->addAction(tr("Title"))->setData("%t");
-    menu->addAction(tr("Track Number"))->setData("%n");
-    menu->addAction(tr("Two-digit Track Number"))->setData("%NN");
-    menu->addAction(tr("Genre"))->setData("%g");
-    menu->addAction(tr("Comment"))->setData("%c");
-    menu->addAction(tr("Composer"))->setData("%C");
-    menu->addAction(tr("Duration"))->setData("%l");
-    menu->addAction(tr("Disc Number"))->setData("%D");
-    menu->addAction(tr("File Name"))->setData("%f");
-    menu->addAction(tr("File Path"))->setData("%F");
-    menu->addAction(tr("Year"))->setData("%y");
-    menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
+    MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
     m_ui.patternButton->setMenu(menu);
     m_ui.patternButton->setPopupMode(QToolButton::InstantPopup);
-    connect(menu, SIGNAL(triggered (QAction *)), SLOT(addTitleString( QAction *)));
+    connect(menu, SIGNAL(patternSelected(QString)), SLOT(addTitleString(QString)));
 }
 
-void SettingsDialog::addTitleString(QAction *a)
+void SettingsDialog::addTitleString(const QString &str)
 {
-    m_ui.patternEdit->insert(a->data().toString());
+    m_ui.patternEdit->insert(str);
 }
 
 void SettingsDialog::on_destButton_clicked()
diff --git a/src/plugins/General/fileops/settingsdialog.h b/src/plugins/General/fileops/settingsdialog.h
index 00bf112dd..4b538db32 100644
--- a/src/plugins/General/fileops/settingsdialog.h
+++ b/src/plugins/General/fileops/settingsdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2015 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,7 +21,6 @@
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
-
 #include "ui_settingsdialog.h"
 
 /**
@@ -47,7 +46,7 @@ private slots:
     void updateLineEdits();
     void on_destinationEdit_textChanged(QString dest);
     void on_patternEdit_textChanged(QString pattern);
-    void addTitleString(QAction *action);
+    void addTitleString(const QString &str);
     void on_destButton_clicked();
     void on_tableWidget_itemDoubleClicked (QTableWidgetItem *item);
 
diff --git a/src/plugins/General/trackchange/settingsdialog.cpp b/src/plugins/General/trackchange/settingsdialog.cpp
index 5cc8991fb..8c5ca71e0 100644
--- a/src/plugins/General/trackchange/settingsdialog.cpp
+++ b/src/plugins/General/trackchange/settingsdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2015 by Ilya Kotov                                 *
+ *   Copyright (C) 2013-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,6 +21,7 @@
 #include <QSettings>
 #include <QMenu>
 #include <qmmp/qmmp.h>
+#include <qmmpui/metadataformattermenu.h>
 #include "settingsdialog.h"
 
 SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
@@ -53,28 +54,13 @@ void SettingsDialog::accept()
 
 void SettingsDialog::addMenu(QToolButton *button)
 {
-    QMenu *menu = new QMenu(this);
-    menu->addAction(tr("Artist"))->setData("%p");
-    menu->addAction(tr("Album"))->setData("%a");
-    menu->addAction(tr("Album Artist"))->setData("%aa");
-    menu->addAction(tr("Title"))->setData("%t");
-    menu->addAction(tr("Track Number"))->setData("%n");
-    menu->addAction(tr("Two-digit Track Number"))->setData("%NN");
-    menu->addAction(tr("Genre"))->setData("%g");
-    menu->addAction(tr("Comment"))->setData("%c");
-    menu->addAction(tr("Composer"))->setData("%C");
-    menu->addAction(tr("Duration"))->setData("%l");
-    menu->addAction(tr("Disc Number"))->setData("%D");
-    menu->addAction(tr("File Name"))->setData("%f");
-    menu->addAction(tr("File Path"))->setData("%F");
-    menu->addAction(tr("Year"))->setData("%y");
-    menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
+    MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
     button->setMenu(menu);
     button->setPopupMode(QToolButton::InstantPopup);
-    connect(menu, SIGNAL(triggered (QAction *)), SLOT(addTemplateString(QAction *)));
+    connect(menu, SIGNAL(patternSelected(QString)), SLOT(addTemplateString(QString)));
 }
 
-void SettingsDialog::addTemplateString(QAction *a)
+void SettingsDialog::addTemplateString(const QString &str)
 {
     QMenu *menu = qobject_cast<QMenu*> (sender());
     if(!menu)
@@ -82,18 +68,18 @@ void SettingsDialog::addTemplateString(QAction *a)
 
     if(m_ui.newTrackButton->menu() == menu)
     {
-        m_ui.newTrackLineEdit->insert(a->data().toString());
+        m_ui.newTrackLineEdit->insert(str);
     }
     else if(m_ui.endOfTrackButton->menu() == menu)
     {
-        m_ui.endOfTrackLineEdit->insert(a->data().toString());
+        m_ui.endOfTrackLineEdit->insert(str);
     }
     else if(m_ui.endOfPlayListButton->menu() == menu)
     {
-        m_ui.endOfPlayListLineEdit->insert(a->data().toString());
+        m_ui.endOfPlayListLineEdit->insert(str);
     }
     else if(m_ui.titleChangeButton->menu() == menu)
     {
-        m_ui.titleChangeLineEdit->insert(a->data().toString());
+        m_ui.titleChangeLineEdit->insert(str);
     }
 }
diff --git a/src/plugins/General/trackchange/settingsdialog.h b/src/plugins/General/trackchange/settingsdialog.h
index e7e55ef0c..fa0b00e1e 100644
--- a/src/plugins/General/trackchange/settingsdialog.h
+++ b/src/plugins/General/trackchange/settingsdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -41,7 +41,7 @@ public slots:
     void accept();
 
 private slots:
-     void addTemplateString(QAction *);
+     void addTemplateString(const QString &str);
 
 private:
     void addMenu(QToolButton *button);