diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-08-20 08:11:01 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-08-20 08:11:01 +0000 |
| commit | 413765f460fbfcaed4a464be843293326b1f2a65 (patch) | |
| tree | ac0bfa537c528b221363222417807fcec4636ad0 /src | |
| parent | 6607e6712ce8317c121393bdafb1334151d26979 (diff) | |
| download | qmmp-413765f460fbfcaed4a464be843293326b1f2a65.tar.gz qmmp-413765f460fbfcaed4a464be843293326b1f2a65.tar.bz2 qmmp-413765f460fbfcaed4a464be843293326b1f2a65.zip | |
improved default group format
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3628 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmmpui/configdialog.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/qmmpuisettings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp index cc196ca07..df0134906 100644 --- a/src/qmmpui/configdialog.cpp +++ b/src/qmmpui/configdialog.cpp @@ -313,7 +313,7 @@ void ConfigDialog::createMenus() 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"); + groupMenu->addAction(tr("Artist/Year/Album"))->setData("%if(%p,%p -,)%if(%y, [%y],)%if(%a, %a,)"); m_ui->groupButton->setMenu(groupMenu); m_ui->groupButton->setPopupMode(QToolButton::InstantPopup); diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp index 581266242..c8cdf8683 100644 --- a/src/qmmpui/qmmpuisettings.cpp +++ b/src/qmmpui/qmmpuisettings.cpp @@ -31,7 +31,7 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent) m_instance = this; QSettings s (Qmmp::configFile(), QSettings::IniFormat); m_title_format = s.value("PlayList/title_format", "%p%if(%p&%t, - ,)%t").toString(); - m_group_format = s.value("PlayList/group_format", "%p%if(%p&%a, - ,)%a").toString(); + m_group_format = s.value("PlayList/group_format", "%if(%p,%p -,)%if(%y, [%y],)%if(%a, %a,)").toString(); m_convertUnderscore = s.value ("PlayList/convert_underscore", true).toBool(); m_convertTwenty = s.value ("PlayList/convert_twenty", true).toBool(); m_useMetadata = s.value ("PlayList/load_metadata", true).toBool(); |