some fileops plugin improvements

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

2 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index a25d617aa..55fd0bdf3 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -193,21 +193,21 @@ QString FileOps::generateFileName(PlayListItem *item, QString pattern)
     fname = printTag(fname, "%p", item->artist(), pattern);
     fname = printTag(fname, "%a", item->album(), pattern);
     fname = printTag(fname, "%t", item->title(), pattern);
-    fname = printTag(fname, "%n", QString("%1").arg(item->track()), pattern);
+    if(item->track().size() > 1)
+        fname = printTag(fname, "%n", item->track(), pattern);
+    else
+        fname = printTag(fname, "%n", QString("0") + item->track(), pattern);
     fname = printTag(fname, "%g", item->genre(), pattern);
     fname = printTag(fname, "%f", item->url().section('/',-1), pattern);
     fname = printTag(fname, "%y", QString("%1").arg(item->year ()), pattern);
-    //fname.replace(" ", "_");
     if (fname.isEmpty())
     {
         if (item->url().contains('/'))
             fname = item->url().split('/',QString::SkipEmptyParts).takeLast ();
     }
     return fname;
-
 }
 
-
 QString FileOps::printTag(QString str, QString regExp, QString tagStr, QString fmt)
 {
     QString format = fmt;
diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp
index f156d6615..8955a79f3 100644
--- a/src/plugins/General/fileops/settingsdialog.cpp
+++ b/src/plugins/General/fileops/settingsdialog.cpp
@@ -208,7 +208,7 @@ void SettingsDialog::addTitleString(QAction *a)
     if (ui.patternEdit->cursorPosition () < 1)
         ui.patternEdit->insert(a->data().toString());
     else
-        ui.patternEdit->insert("-"+a->data().toString());
+        ui.patternEdit->insert(" - "+a->data().toString());
 }
 
 void SettingsDialog::selectDirectory()