From 502ede40ec21cbf5d34b6b03b9c6f6e78ee8619d Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 26 Oct 2018 19:09:18 +0000 Subject: added %I to playlist column menu git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8401 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/columneditor.cpp | 4 ++-- src/qmmpui/metadataformattermenu.cpp | 10 +++++++--- src/qmmpui/metadataformattermenu.h | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/qmmpui/columneditor.cpp b/src/qmmpui/columneditor.cpp index 144dd6914..c24239007 100644 --- a/src/qmmpui/columneditor.cpp +++ b/src/qmmpui/columneditor.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2017 by Ilya Kotov * + * Copyright (C) 2015-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -75,7 +75,7 @@ void ColumnEditor::on_formatLineEdit_textChanged(const QString &text) void ColumnEditor::createMenu() { - MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this); + MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::COLUMN_MENU, this); m_ui->formatButton->setMenu(menu); connect(menu, SIGNAL(patternSelected(QString)), SLOT(insertExpression(QString))); } diff --git a/src/qmmpui/metadataformattermenu.cpp b/src/qmmpui/metadataformattermenu.cpp index 6fd5bb1c3..11b236e48 100644 --- a/src/qmmpui/metadataformattermenu.cpp +++ b/src/qmmpui/metadataformattermenu.cpp @@ -26,18 +26,22 @@ MetaDataFormatterMenu::MetaDataFormatterMenu(Type type, QWidget *parent) : addAction(tr("Artist"))->setData("%p"); addAction(tr("Album"))->setData("%a"); addAction(tr("Album Artist"))->setData("%aa"); - if(type == TITLE_MENU) + if(type == TITLE_MENU || type == COLUMN_MENU) { addAction(tr("Title"))->setData("%t"); addAction(tr("Track Number"))->setData("%n"); addAction(tr("Two-digit Track Number"))->setData("%NN"); } + if(type == COLUMN_MENU) + { + addAction(tr("Track Index"))->setData("%I"); + } addAction(tr("Genre"))->setData("%g"); addAction(tr("Comment"))->setData("%c"); addAction(tr("Composer"))->setData("%C"); addAction(tr("Disc Number"))->setData("%D"); addAction(tr("Year"))->setData("%y"); - if(type == TITLE_MENU) + if(type == TITLE_MENU || type == COLUMN_MENU) { addAction(tr("Duration"))->setData("%l"); addAction(tr("File Name"))->setData("%f"); @@ -57,7 +61,7 @@ MetaDataFormatterMenu::MetaDataFormatterMenu(Type type, QWidget *parent) : addAction(tr("Sample Size"))->setData("%{samplesize}"); addAction(tr("Format"))->setData("%{format}"); addAction(tr("Decoder"))->setData("%{decoder}"); - if(type == TITLE_MENU) + if(type == TITLE_MENU || type == COLUMN_MENU) { addAction(tr("File Size"))->setData("%{filesize}"); } diff --git a/src/qmmpui/metadataformattermenu.h b/src/qmmpui/metadataformattermenu.h index 0ac76e661..fa9b7fcf1 100644 --- a/src/qmmpui/metadataformattermenu.h +++ b/src/qmmpui/metadataformattermenu.h @@ -34,7 +34,8 @@ public: enum Type { TITLE_MENU = 0, - GROUP_MENU + GROUP_MENU, + COLUMN_MENU }; explicit MetaDataFormatterMenu(Type type, QWidget *parent = 0); -- cgit v1.2.3-13-gbd6f