From 12fefde04874839dc300a1a53b1a65422d102a98 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 10 Apr 2017 18:38:41 +0000 Subject: added MetaDataFormatterMenu class git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7114 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/configdialog.cpp | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) (limited to 'src/qmmpui/configdialog.cpp') 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 #include #include -#include -#include -#include -#include -#include -#include #include #include #include @@ -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() -- cgit v1.2.3-13-gbd6f