From 8e257213e8efb1989f2bb6d041fb276ff1741858 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Wed, 13 May 2015 06:24:10 +0000
Subject: fixed default playlist pattern

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4966 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/qmmpui/columneditor.cpp        | 4 ++--
 src/qmmpui/metadataformatter.cpp   | 4 ++++
 src/qmmpui/playlistheadermodel.cpp | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/qmmpui/columneditor.cpp b/src/qmmpui/columneditor.cpp
index 594a28c85..3808ef69b 100644
--- a/src/qmmpui/columneditor.cpp
+++ b/src/qmmpui/columneditor.cpp
@@ -89,7 +89,7 @@ void ColumnEditor::createMenu()
     menu->addAction(tr("File Name"))->setData("%f");
     menu->addAction(tr("File Path"))->setData("%F");
     menu->addAction(tr("Year"))->setData("%y");
-    menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
+    menu->addAction(tr("Condition"))->setData("%if(%p,%p - %t,%t)");
     m_ui->formatButton->setMenu(menu);
     connect(menu, SIGNAL(triggered (QAction *)), SLOT(insertExpression(QAction *)));
 }
@@ -99,7 +99,7 @@ void ColumnEditor::fillTypes()
     m_ui->comboBox->addItem(tr("Artist"),"%p");
     m_ui->comboBox->addItem(tr("Album"),"%a");
     m_ui->comboBox->addItem(tr("Artist - Album"),"%if(%p&%a,%p - %a,)");
-    m_ui->comboBox->addItem(tr("Artist - Title"),"%if(%p&%t,%p - %t,%f)");
+    m_ui->comboBox->addItem(tr("Artist - Title"),"%if(%p,%p - %t,%t)");
     m_ui->comboBox->addItem(tr("Album Artist"),"%aa");
     m_ui->comboBox->addItem(tr("Title"),"%t");
     m_ui->comboBox->addItem(tr("Track Number"),"%n");
diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp
index e0fb450a4..817c2028d 100644
--- a/src/qmmpui/metadataformatter.cpp
+++ b/src/qmmpui/metadataformatter.cpp
@@ -372,6 +372,10 @@ QString MetaDataFormatter::printField(int field, const QMap<Qmmp::MetaData, QStr
                 title = metaData->value(Qmmp::URL).section('/',-1);
                 title = title.left(title.lastIndexOf('.'));
             }
+
+            if(title.isEmpty()) //using full path if file name is empty
+                title = metaData->value(Qmmp::URL);
+
             return title;
         }
         return metaData->value((Qmmp::MetaData) field);
diff --git a/src/qmmpui/playlistheadermodel.cpp b/src/qmmpui/playlistheadermodel.cpp
index 92b342c0b..ef69f601f 100644
--- a/src/qmmpui/playlistheadermodel.cpp
+++ b/src/qmmpui/playlistheadermodel.cpp
@@ -35,7 +35,7 @@ PlayListHeaderModel::PlayListHeaderModel(QObject *parent) :
         s.beginGroup(QString("column%1").arg(i));
         Column col;
         col.name = s.value("name", tr("Album - Title")).toString();
-        col.pattern = s.value("pattern", "%p%if(%p&%t, - ,)%t").toString();
+        col.pattern = s.value("pattern", "%if(%p,%p - %t,%t)").toString();
         col.size = s.value("size", 150).toInt();
         col.titleFormatter = new MetaDataFormatter(col.pattern);
         col.autoResize = s.value("autoresize", false).toBool();
-- 
cgit v1.2.3-13-gbd6f