added MetaDataFormatterMenu class

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

4 files changed, 14 insertions, 57 deletions

diff --git a/src/plugins/Ui/qsui/popupsettings.cpp b/src/plugins/Ui/qsui/popupsettings.cpp
index 3c57cc0ee..320e9970e 100644
--- a/src/plugins/Ui/qsui/popupsettings.cpp
+++ b/src/plugins/Ui/qsui/popupsettings.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  *
@@ -19,8 +19,8 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QMenu>
 #include <qmmp/qmmp.h>
+#include <qmmpui/metadataformattermenu.h>
 #include "popupwidget.h"
 #include "popupsettings.h"
 
@@ -39,7 +39,6 @@ PopupSettings::PopupSettings(QWidget *parent)
     createMenu();
 }
 
-
 PopupSettings::~PopupSettings()
 {}
 
@@ -58,29 +57,9 @@ void PopupSettings::accept()
 
 void PopupSettings::createMenu()
 {
-    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.insertButton->setMenu(menu);
-    connect(menu, SIGNAL(triggered (QAction *)), SLOT(insertExpression(QAction *)));
-}
-
-void PopupSettings::insertExpression(QAction *a)
-{
-    m_ui.textEdit->insertPlainText(a->data().toString());
+    connect(menu, SIGNAL(patternSelected(QString)), m_ui.textEdit, SLOT(insertPlainText(QString)));
 }
 
 void PopupSettings::on_resetButton_clicked()
diff --git a/src/plugins/Ui/qsui/popupsettings.h b/src/plugins/Ui/qsui/popupsettings.h
index 6c5b7f545..b653b8d3b 100644
--- a/src/plugins/Ui/qsui/popupsettings.h
+++ b/src/plugins/Ui/qsui/popupsettings.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  *
@@ -23,8 +23,6 @@
 #include <QDialog>
 #include "ui_popupsettings.h"
 
-class Action;
-
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
 */
@@ -40,7 +38,6 @@ public slots:
     virtual void accept();
 
 private slots:
-    void insertExpression(QAction *);
     void on_resetButton_clicked();
 
 private:
diff --git a/src/plugins/Ui/qsui/qsuisettings.cpp b/src/plugins/Ui/qsui/qsuisettings.cpp
index d64443f24..dc175e914 100644
--- a/src/plugins/Ui/qsui/qsuisettings.cpp
+++ b/src/plugins/Ui/qsui/qsuisettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2015 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  *
@@ -21,10 +21,10 @@
 #include <QSettings>
 #include <QDir>
 #include <QFontDialog>
-#include <QMenu>
 #include <qmmp/qmmp.h>
 #include <qmmpui/filedialog.h>
 #include <qmmpui/uihelper.h>
+#include <qmmpui/metadataformattermenu.h>
 #include "actionmanager.h"
 #include "shortcutitem.h"
 #include "shortcutdialog.h"
@@ -114,27 +114,10 @@ void QSUISettings::loadFonts()
 
 void QSUISettings::createActions()
 {
-    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)");
-    menu->addAction(tr("Artist - Title"))->setData("%if(%p,%p - %t,%t)");
-
+    MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
     m_ui.windowTitleButton->setMenu(menu);
     m_ui.windowTitleButton->setPopupMode(QToolButton::InstantPopup);
-    connect(menu, SIGNAL(triggered (QAction *)), SLOT(addWindowTitleString(QAction *)));
+    connect(menu, SIGNAL(patternSelected(QString)), SLOT(addWindowTitleString(QString)));
 }
 
 void QSUISettings::on_popupTemplateButton_clicked()
@@ -236,10 +219,10 @@ void QSUISettings::on_resetFontsButton_clicked()
     loadFonts();
 }
 
-void QSUISettings::addWindowTitleString(QAction *a)
+void QSUISettings::addWindowTitleString(const QString &str)
 {
     if (m_ui.windowTitleLineEdit->cursorPosition () < 1)
-        m_ui.windowTitleLineEdit->insert(a->data().toString());
+        m_ui.windowTitleLineEdit->insert(str);
     else
-        m_ui.windowTitleLineEdit->insert(" - "+a->data().toString());
+        m_ui.windowTitleLineEdit->insert(" - "+str);
 }
diff --git a/src/plugins/Ui/qsui/qsuisettings.h b/src/plugins/Ui/qsui/qsuisettings.h
index a6396a5c8..ea052aab1 100644
--- a/src/plugins/Ui/qsui/qsuisettings.h
+++ b/src/plugins/Ui/qsui/qsuisettings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2015 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  *
@@ -25,8 +25,6 @@
 #include <QFileInfo>
 #include "ui_qsuisettings.h"
 
-class QAction;
-
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
 */
@@ -45,7 +43,7 @@ private slots:
     void on_tabsFontButton_clicked();
     void on_popupTemplateButton_clicked();
     void on_resetFontsButton_clicked();
-    void addWindowTitleString(QAction *a);
+    void addWindowTitleString(const QString &str);
 
 private:
     void showEvent(QShowEvent *);