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, 29 insertions, 70 deletions

diff --git a/src/plugins/Ui/skinned/popupsettings.cpp b/src/plugins/Ui/skinned/popupsettings.cpp
index e057f72ec..c6ceef853 100644
--- a/src/plugins/Ui/skinned/popupsettings.cpp
+++ b/src/plugins/Ui/skinned/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,22 +19,22 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QMenu>
 #include <qmmp/qmmp.h>
+#include <qmmpui/metadataformattermenu.h>
 #include "popupwidget.h"
 #include "popupsettings.h"
 
 PopupSettings::PopupSettings(QWidget *parent)
         : QDialog(parent)
 {
-    ui.setupUi(this);
+    m_ui.setupUi(this);
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Skinned");
-    ui.transparencySlider->setValue(100 - settings.value("popup_opacity", 1.0).toDouble()*100);
-    ui.coverSizeSlider->setValue(settings.value ("popup_cover_size", 48).toInt());
-    ui.textEdit->setPlainText(settings.value ("popup_template", DEFAULT_TEMPLATE).toString());
-    ui.delaySpinBox->setValue(settings.value("popup_delay", 2500).toInt());
-    ui.coverCheckBox->setChecked(settings.value("popup_show_cover",true).toBool());
+    m_ui.transparencySlider->setValue(100 - settings.value("popup_opacity", 1.0).toDouble()*100);
+    m_ui.coverSizeSlider->setValue(settings.value ("popup_cover_size", 48).toInt());
+    m_ui.textEdit->setPlainText(settings.value ("popup_template", DEFAULT_TEMPLATE).toString());
+    m_ui.delaySpinBox->setValue(settings.value("popup_delay", 2500).toInt());
+    m_ui.coverCheckBox->setChecked(settings.value("popup_show_cover",true).toBool());
     settings.endGroup();
     createMenu();
 }
@@ -47,43 +47,23 @@ void PopupSettings::accept()
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Skinned");
-    settings.setValue("popup_opacity", 1.0 -  (double)ui.transparencySlider->value()/100);
-    settings.setValue("popup_cover_size", ui.coverSizeSlider->value());
-    settings.setValue("popup_template", ui.textEdit->toPlainText());
-    settings.setValue("popup_delay",  ui.delaySpinBox->value());
-    settings.setValue("popup_show_cover", ui.coverCheckBox->isChecked());
+    settings.setValue("popup_opacity", 1.0 -  (double)m_ui.transparencySlider->value()/100);
+    settings.setValue("popup_cover_size", m_ui.coverSizeSlider->value());
+    settings.setValue("popup_template", m_ui.textEdit->toPlainText());
+    settings.setValue("popup_delay",  m_ui.delaySpinBox->value());
+    settings.setValue("popup_show_cover", m_ui.coverCheckBox->isChecked());
     settings.endGroup();
     QDialog::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)");
-    ui.insertButton->setMenu(menu);
-    connect(menu, SIGNAL(triggered (QAction *)), SLOT(insertExpression(QAction *)));
-}
-
-void PopupSettings::insertExpression(QAction *a)
-{
-    ui.textEdit->insertPlainText(a->data().toString());
+    MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
+    m_ui.insertButton->setMenu(menu);
+    connect(menu, SIGNAL(patternSelected(QString)), m_ui.textEdit, SLOT(insertPlainText(QString)));
 }
 
 void PopupSettings::on_resetButton_clicked()
 {
-    ui.textEdit->setPlainText(DEFAULT_TEMPLATE);
+    m_ui.textEdit->setPlainText(DEFAULT_TEMPLATE);
 }
diff --git a/src/plugins/Ui/skinned/popupsettings.h b/src/plugins/Ui/skinned/popupsettings.h
index ae60e89a2..84af1e7a5 100644
--- a/src/plugins/Ui/skinned/popupsettings.h
+++ b/src/plugins/Ui/skinned/popupsettings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 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,10 +23,8 @@
 #include <QDialog>
 #include "ui_popupsettings.h"
 
-class Action;
-
 /**
-	@author Ilya Kotov <forkotov02@hotmail.ru>
+    @author Ilya Kotov <forkotov02@hotmail.ru>
 */
 class PopupSettings : public QDialog
 {
@@ -35,17 +33,15 @@ public:
     PopupSettings(QWidget *parent = 0);
     ~PopupSettings();
 
-
 public slots:
     virtual void accept();
 
 private slots:
-    void insertExpression(QAction *);
     void on_resetButton_clicked();
 
 private:
     void createMenu();
-    Ui::PopupSettings ui;
+    Ui::PopupSettings m_ui;
     QMap<uint, QPushButton*> m_buttons;
 };
 
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index b068e2e80..dbcab3ccb 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.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 "skinreader.h"
 #include "skin.h"
 #include "popupsettings.h"
@@ -179,27 +179,10 @@ void SkinnedSettings::findSkins(const QString &path)
 
 void SkinnedSettings::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 SkinnedSettings::loadSkins()
@@ -245,12 +228,12 @@ void SkinnedSettings::on_popupTemplateButton_clicked()
     p->deleteLater();
 }
 
-void SkinnedSettings::addWindowTitleString(QAction *a)
+void SkinnedSettings::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);
 }
 
 void SkinnedSettings::readSettings()
diff --git a/src/plugins/Ui/skinned/skinnedsettings.h b/src/plugins/Ui/skinned/skinnedsettings.h
index 756019981..4fa2de9ab 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.h
+++ b/src/plugins/Ui/skinned/skinnedsettings.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  *
@@ -45,7 +45,7 @@ private slots:
     void on_skinInstallButton_clicked();
     void loadSkins();
     void on_popupTemplateButton_clicked();
-    void addWindowTitleString(QAction *a);
+    void addWindowTitleString(const QString &str);