From eac64a0db2c8dc6781e34b54943dc8e44ac71a32 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 13 Oct 2014 17:15:36 +0000 Subject: improved album artist tag support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4572 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/configdialog.cpp | 1 + src/qmmpui/forms/tageditor.ui | 200 +++++++++++++++++++-------------------- src/qmmpui/metadataformatter.cpp | 3 +- src/qmmpui/metadataformatter.h | 3 +- src/qmmpui/tageditor.cpp | 2 +- src/qmmpui/templateeditor.cpp | 3 +- 6 files changed, 106 insertions(+), 106 deletions(-) (limited to 'src') diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp index 06c99fce9..d042628e4 100644 --- a/src/qmmpui/configdialog.cpp +++ b/src/qmmpui/configdialog.cpp @@ -295,6 +295,7 @@ void ConfigDialog::createMenus() titleMenu->addAction(tr("Artist"))->setData("%p"); titleMenu->addAction(tr("Album"))->setData("%a"); + titleMenu->addAction(tr("Album artist"))->setData("%aa"); titleMenu->addAction(tr("Title"))->setData("%t"); titleMenu->addAction(tr("Track number"))->setData("%n"); titleMenu->addAction(tr("Two-digit track number"))->setData("%NN"); diff --git a/src/qmmpui/forms/tageditor.ui b/src/qmmpui/forms/tageditor.ui index 5f5d721b5..976129e6e 100644 --- a/src/qmmpui/forms/tageditor.ui +++ b/src/qmmpui/forms/tageditor.ui @@ -6,8 +6,8 @@ 0 0 - 444 - 312 + 438 + 355 @@ -25,7 +25,33 @@ - + + + + + + 0 + 0 + + + + Title: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + @@ -42,15 +68,18 @@ - - - - false + + + + + 0 + 0 + - - + + 0 @@ -58,15 +87,52 @@ - Genre: + Album: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + 0 + 0 + + + + + + + - + + + Album artist: + + + + + + + + + + Composer: + + + + + + + false + + + + + 0 @@ -74,23 +140,33 @@ - Album: + Genre: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - + + 0 + 0 + + + + + + + + 0 0 - Comment: + Track: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -98,20 +174,6 @@ - - - - - - 0 - 0 - - - - - - - @@ -201,69 +263,23 @@ - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Title: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - + - + 0 0 - Track: + Comment: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - 0 - 0 - - - - - - - - - - - Composer: - - - - + true @@ -281,28 +297,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;"><br /></p></body></html> - - - - - - - - 0 - 0 - - - - - - - - - - - Album Artist +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p></body></html> diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp index 702c0acfe..c19b49674 100644 --- a/src/qmmpui/metadataformatter.cpp +++ b/src/qmmpui/metadataformatter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2013 by Ilya Kotov * + * Copyright (C) 2009-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -23,6 +23,7 @@ Syntax: %p - artist %a - album +%aa - album artist %t - title %n - track, %NN - 2-digit track diff --git a/src/qmmpui/metadataformatter.h b/src/qmmpui/metadataformatter.h index ac33d8282..038c8ba34 100644 --- a/src/qmmpui/metadataformatter.h +++ b/src/qmmpui/metadataformatter.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2013 by Ilya Kotov * + * Copyright (C) 2009-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -38,6 +38,7 @@ public: * Syntax: * %p - artist, * %a - album, + * %aa - album artist, * %t - title, * %n - track number, * %NN - 2-digit track number, diff --git a/src/qmmpui/tageditor.cpp b/src/qmmpui/tageditor.cpp index 1323c046e..1e53d6eae 100644 --- a/src/qmmpui/tageditor.cpp +++ b/src/qmmpui/tageditor.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmpui/templateeditor.cpp b/src/qmmpui/templateeditor.cpp index 66fa3d326..34ac9dd8a 100644 --- a/src/qmmpui/templateeditor.cpp +++ b/src/qmmpui/templateeditor.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * + * Copyright (C) 2010-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -49,6 +49,7 @@ 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"); -- cgit v1.2.3-13-gbd6f