added MetaDataFormatterMenu class

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

10 files changed, 141 insertions, 86 deletions

diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt
index 83ec1d1a2..6846265bd 100644
--- a/src/qmmpui/CMakeLists.txt
+++ b/src/qmmpui/CMakeLists.txt
@@ -45,6 +45,7 @@ SET(libqmmpui_SRCS
     tageditor.cpp
     playlistmanager.cpp
     metadataformatter.cpp
+    metadataformattermenu.cpp
     templateeditor.cpp
     uiloader.cpp
     jumptotrackdialog.cpp
@@ -78,6 +79,7 @@ SET(libqmmpui_HDRS
     normalcontainer_p.h
     groupedcontainer_p.h
     metadataformatter.h
+    metadataformattermenu.h
     uiloader.h
     uifactory.h
     pluginitem_p.h
@@ -98,6 +100,7 @@ SET(libqmmpui_DEVEL_HDRS
     general.h
     mediaplayer.h
     metadataformatter.h
+    metadataformattermenu.h
     playlistdownloader.h
     playlistformat.h
     playlistitem.h
@@ -140,8 +143,8 @@ install(TARGETS qmmpui LIBRARY DESTINATION ${LIB_DIR}
                        RUNTIME DESTINATION bin
                        ARCHIVE DESTINATION ${LIB_DIR})
 IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES Darwin)
-	install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmpui)
+    install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmpui)
 
-	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmpui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc @ONLY)
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc DESTINATION ${LIB_DIR}/pkgconfig)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmpui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc DESTINATION ${LIB_DIR}/pkgconfig)
 ENDIF()
diff --git a/src/qmmpui/columneditor.cpp b/src/qmmpui/columneditor.cpp
index ecb131dcf..8c5664088 100644
--- a/src/qmmpui/columneditor.cpp
+++ b/src/qmmpui/columneditor.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2015 by Ilya Kotov                                      *
+ *   Copyright (C) 2015-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,6 +20,7 @@
 
 #include <QMenu>
 #include "columneditor_p.h"
+#include "metadataformattermenu.h"
 #include "ui_columneditor.h"
 
 ColumnEditor::ColumnEditor(const QString &name, const QString &patt, QWidget *parent) :
@@ -50,12 +51,12 @@ QString ColumnEditor::pattern() const
     return m_ui->formatLineEdit->text();
 }
 
-void ColumnEditor::insertExpression(QAction *a)
+void ColumnEditor::insertExpression(const QString &str)
 {
     if (m_ui->formatLineEdit->cursorPosition () < 1)
-        m_ui->formatLineEdit->insert(a->data().toString());
+        m_ui->formatLineEdit->insert(str);
     else
-        m_ui->formatLineEdit->insert(" - "+a->data().toString());
+        m_ui->formatLineEdit->insert(" - "+str);
 }
 
 void ColumnEditor::on_comboBox_activated(int index)
@@ -74,25 +75,9 @@ void ColumnEditor::on_formatLineEdit_textChanged(const QString &text)
 
 void ColumnEditor::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("Track Index"))->setData("%I");
-    menu->addAction(tr("Condition"))->setData("%if(%p,%p - %t,%t)");
+    MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
     m_ui->formatButton->setMenu(menu);
-    connect(menu, SIGNAL(triggered (QAction *)), SLOT(insertExpression(QAction *)));
+    connect(menu, SIGNAL(patternSelected(QString)), SLOT(insertExpression(QString)));
 }
 
 void ColumnEditor::fillTypes()
@@ -114,5 +99,6 @@ void ColumnEditor::fillTypes()
     m_ui->comboBox->addItem(tr("File Path"),"%F");
     m_ui->comboBox->addItem(tr("Track Index"), "%I");
     m_ui->comboBox->addItem(tr("Year"),"%y");
+    m_ui->comboBox->addItem(tr("Parent Directory"),"%dir(0)");
     m_ui->comboBox->addItem(tr("Custom"),"custom");
 }
diff --git a/src/qmmpui/columneditor_p.h b/src/qmmpui/columneditor_p.h
index dc6a2815c..931b65955 100644
--- a/src/qmmpui/columneditor_p.h
+++ b/src/qmmpui/columneditor_p.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2015 by Ilya Kotov                                      *
+ *   Copyright (C) 2015-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -41,7 +41,7 @@ public:
     QString pattern() const;
 
 private slots:
-    void insertExpression(QAction *a);
+    void insertExpression(const QString &str);
     void on_comboBox_activated(int index);
     void on_formatLineEdit_textChanged(const QString &text);
 
diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index 423c1aae9..98e7135c3 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,12 +21,6 @@
 #include <QSettings>
 #include <QFontDialog>
 #include <QTreeWidgetItem>
-#include <QHeaderView>
-#include <QCheckBox>
-#include <QRadioButton>
-#include <QMenu>
-#include <QMessageBox>
-#include <QTreeWidgetItem>
 #include <qmmp/decoder.h>
 #include <qmmp/output.h>
 #include <qmmp/decoderfactory.h>
@@ -52,6 +46,7 @@
 #include "qmmpuisettings.h"
 #include "playlistmodel.h"
 #include "winfileassocpage_p.h"
+#include "metadataformattermenu.h"
 #include "configdialog.h"
 
 ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent)
@@ -298,23 +293,10 @@ void ConfigDialog::on_informationButton_clicked()
 
 void ConfigDialog::createMenus()
 {
-    QMenu *groupMenu = new QMenu(this);
-
-    groupMenu->addAction(tr("Artist"))->setData("%p");
-    groupMenu->addAction(tr("Album"))->setData("%a");
-    groupMenu->addAction(tr("Album Artist"))->setData("%aa");
-    groupMenu->addAction(tr("Genre"))->setData("%g");
-    groupMenu->addAction(tr("Comment"))->setData("%c");
-    groupMenu->addAction(tr("Composer"))->setData("%C");
-    groupMenu->addAction(tr("Disc Number"))->setData("%D");
-    groupMenu->addAction(tr("Year"))->setData("%y");
-    groupMenu->addAction(tr("Condition"))->setData("%if(%p&%a,%p - %a,%p%a)");
-    groupMenu->addAction(tr("Artist/Album"))->setData("%p%if(%p&%a, - ,)%a");
-    groupMenu->addAction(tr("Artist/Year/Album"))->setData("%p%if(%p&%a, - %if(%y,[%y] ,),)%a");
-
+    MetaDataFormatterMenu *groupMenu = new MetaDataFormatterMenu(MetaDataFormatterMenu::GROUP_MENU, this);
     m_ui->groupButton->setMenu(groupMenu);
     m_ui->groupButton->setPopupMode(QToolButton::InstantPopup);
-    connect(groupMenu, SIGNAL(triggered (QAction *)), SLOT(addGroupString(QAction *)));
+    connect(groupMenu, SIGNAL(patternSelected(QString)), SLOT(addGroupString(QString)));
 
     m_ui->treeWidget->setContextMenuPolicy(Qt::ActionsContextMenu);
     m_preferencesAction = new QAction(QIcon::fromTheme("configure"),tr("Preferences"), m_ui->treeWidget);
@@ -369,12 +351,12 @@ void ConfigDialog::loadLanguages()
     m_ui->langComboBox->setCurrentIndex(index);
 }
 
-void ConfigDialog::addGroupString(QAction *a)
+void ConfigDialog::addGroupString(const QString &str)
 {
     if (m_ui->groupLineEdit->cursorPosition () < 1)
-        m_ui->groupLineEdit->insert(a->data().toString());
+        m_ui->groupLineEdit->insert(str);
     else
-        m_ui->groupLineEdit->insert(" - "+a->data().toString());
+        m_ui->groupLineEdit->insert(" - "+str);
 }
 
 void ConfigDialog::saveSettings()
diff --git a/src/qmmpui/configdialog.h b/src/qmmpui/configdialog.h
index ccbaa43f4..8b05c421c 100644
--- a/src/qmmpui/configdialog.h
+++ b/src/qmmpui/configdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2015 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -62,7 +62,7 @@ private slots:
     void on_contentsWidget_currentItemChanged (QListWidgetItem *current, QListWidgetItem *previous);
     void on_preferencesButton_clicked();
     void on_informationButton_clicked();
-    void addGroupString(QAction *a);
+    void addGroupString(const QString &str);
     void saveSettings();
     void on_treeWidget_itemChanged (QTreeWidgetItem *item, int column);
     void on_treeWidget_currentItemChanged (QTreeWidgetItem *current, QTreeWidgetItem *);
diff --git a/src/qmmpui/metadataformattermenu.cpp b/src/qmmpui/metadataformattermenu.cpp
new file mode 100644
index 000000000..e9d84869a
--- /dev/null
+++ b/src/qmmpui/metadataformattermenu.cpp
@@ -0,0 +1,56 @@
+/***************************************************************************
+ *   Copyright (C) 2017 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#include "metadataformattermenu.h"
+
+MetaDataFormatterMenu::MetaDataFormatterMenu(Type type, QWidget *parent) :
+    QMenu(parent)
+{
+    addAction(tr("Artist"))->setData("%p");
+    addAction(tr("Album"))->setData("%a");
+    addAction(tr("Album Artist"))->setData("%aa");
+    if(type == TITLE_MENU)
+    {
+        addAction(tr("Title"))->setData("%t");
+        addAction(tr("Track Number"))->setData("%n");
+        addAction(tr("Two-digit Track Number"))->setData("%NN");
+    }
+    addAction(tr("Genre"))->setData("%g");
+    addAction(tr("Comment"))->setData("%c");
+    addAction(tr("Composer"))->setData("%C");
+    addAction(tr("Duration"))->setData("%l");
+    addAction(tr("Disc Number"))->setData("%D");
+    if(type == TITLE_MENU)
+    {
+        addAction(tr("File Name"))->setData("%f");
+        addAction(tr("File Path"))->setData("%F");
+    }
+    addAction(tr("Year"))->setData("%y");
+    addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
+    addAction(tr("Artist - Title"))->setData("%if(%p,%p - %t,%t)");
+    addAction(tr("Parent Directory Name"))->setData("%dir(0)");
+
+    connect(this, SIGNAL(triggered (QAction *)), SLOT(onActionTriggered(QAction*)));
+}
+
+void MetaDataFormatterMenu::onActionTriggered(QAction *action)
+{
+    emit patternSelected(action->data().toString());
+}
diff --git a/src/qmmpui/metadataformattermenu.h b/src/qmmpui/metadataformattermenu.h
new file mode 100644
index 000000000..10f30cfad
--- /dev/null
+++ b/src/qmmpui/metadataformattermenu.h
@@ -0,0 +1,49 @@
+/***************************************************************************
+ *   Copyright (C) 2017 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#ifndef METADATAFORMATTERMENU_H
+#define METADATAFORMATTERMENU_H
+
+#include <QMenu>
+
+class QAction;
+
+class MetaDataFormatterMenu : public QMenu
+{
+    Q_OBJECT
+public:
+
+    enum Type
+    {
+        TITLE_MENU = 0,
+        GROUP_MENU
+    };
+
+    explicit MetaDataFormatterMenu(Type type, QWidget *parent = 0);
+
+signals:
+    void patternSelected(const QString &pattern);
+
+private slots:
+    void onActionTriggered(QAction *action);
+
+};
+
+#endif // METADATAFORMATTERMENU_H
diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro
index 91b78321c..7278445b8 100644
--- a/src/qmmpui/qmmpui.pro
+++ b/src/qmmpui/qmmpui.pro
@@ -71,7 +71,8 @@ HEADERS += general.h \
     columneditor_p.h \
     playlistheadermodel.h \
     metadatahelper_p.h \
-    coverviewer_p.h
+    coverviewer_p.h \
+    metadataformattermenu.h
 
 SOURCES += general.cpp \
     playlistparser.cpp \
@@ -109,7 +110,8 @@ SOURCES += general.cpp \
     columneditor.cpp \
     playlistheadermodel.cpp \
     metadatahelper.cpp \
-    coverviewer.cpp
+    coverviewer.cpp \
+    metadataformattermenu.cpp
 
 FORMS += forms/detailsdialog.ui \
     forms/tageditor.ui \
@@ -165,7 +167,8 @@ unix {
     playlistgroup.h \
     playlisttrack.h \
     metadataformatter.h \
-    playlistheadermodel.h
+    playlistheadermodel.h \
+    metadataformattermenu.h
 
     devel.path = /include/qmmpui
     INSTALLS += target \
diff --git a/src/qmmpui/templateeditor.cpp b/src/qmmpui/templateeditor.cpp
index 558c46ac3..1c44a4803 100644
--- a/src/qmmpui/templateeditor.cpp
+++ b/src/qmmpui/templateeditor.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2010-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QMenu>
-#include <QAction>
+#include "metadataformattermenu.h"
 #include "ui_templateeditor.h"
 #include "templateeditor.h"
 
@@ -46,29 +45,9 @@ void TemplateEditor::setDefaultTemplate(const QString &text)
 
 void TemplateEditor::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 TemplateEditor::insertExpression(QAction *a)
-{
-    m_ui->textEdit->insertPlainText(a->data().toString());
+    connect(menu, SIGNAL(patternSelected(QString)), m_ui->textEdit, SLOT(insertPlainText(QString)));
 }
 
 void TemplateEditor::on_resetButton_clicked()
diff --git a/src/qmmpui/templateeditor.h b/src/qmmpui/templateeditor.h
index 04b7bef18..1bf3aac1d 100644
--- a/src/qmmpui/templateeditor.h
+++ b/src/qmmpui/templateeditor.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Ilya Kotov                                      *
+ *   Copyright (C) 2010-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,8 +26,6 @@
 namespace Ui {
     class TemplateEditor;
 }
-class QAction;
-
 
 /*! @brief The TemplateEditor class provides simple template editor dialog.
  * @author Ilya Kotov <forkotov02@hotmail.ru>
@@ -66,7 +64,6 @@ public:
                                 const QString &default_template = QString(), bool *ok = 0);
 
 private slots:
-    void insertExpression(QAction *a);
     void on_resetButton_clicked();
 
 private: