changed metadata formatting menu

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

1 files changed, 7 insertions, 3 deletions

diff --git a/src/qmmpui/metadataformattermenu.cpp b/src/qmmpui/metadataformattermenu.cpp
index ca411d1cc..6fd5bb1c3 100644
--- a/src/qmmpui/metadataformattermenu.cpp
+++ b/src/qmmpui/metadataformattermenu.cpp
@@ -36,15 +36,19 @@ MetaDataFormatterMenu::MetaDataFormatterMenu(Type type, QWidget *parent) :
     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)
     {
         addAction(tr("Duration"))->setData("%l");
         addAction(tr("File Name"))->setData("%f");
         addAction(tr("File Path"))->setData("%F");
+        addAction(tr("Artist - Title"))->setData("%if(%p,%p - %t,%t)");
+        addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
+    }
+    else if(type == GROUP_MENU)
+    {
+        addAction(tr("Artist - [Year] Album"))->setData("%p%if(%p&%a, - %if(%y,[%y] ,),)%a");
     }
-    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)");
     addSeparator();
     addAction(tr("Bitrate"))->setData("%{bitrate}");