file operations: fixed settings

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

9 files changed, 21 insertions, 58 deletions

diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index f116f7602..692033db2 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -195,7 +195,6 @@ QString FileOps::generateFileName(PlayListItem *item, QString pattern)
     fname = printTag(fname, "%n", QString("%1").arg(item->track()), pattern);
     fname = printTag(fname, "%g", item->genre(), pattern);
     fname = printTag(fname, "%f", item->url().section('/',-1), pattern);
-    fname = printTag(fname, "%F", item->url(), pattern);
     fname = printTag(fname, "%y", QString("%1").arg(item->year ()), pattern);
     fname.replace(" ", "_");
     if (fname.isEmpty())
diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp
index b8604f290..d81865fb6 100644
--- a/src/plugins/General/fileops/settingsdialog.cpp
+++ b/src/plugins/General/fileops/settingsdialog.cpp
@@ -194,7 +194,6 @@ void SettingsDialog::createMenus()
     menu->addAction(tr("Tracknumber"))->setData("%n");
     menu->addAction(tr("Genre"))->setData("%g");
     menu->addAction(tr("Filename"))->setData("%f");
-    menu->addAction(tr("Filepath"))->setData("%F");
     menu->addAction(tr("Date"))->setData("%d");
     menu->addAction(tr("Year"))->setData("%y");
     menu->addAction(tr("Comment"))->setData("%c");
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_cs.ts b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts
index 51843a1a5..b06a8d8f6 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_cs.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts
@@ -132,26 +132,21 @@
     </message>
     <message>
         <location filename="../settingsdialog.cpp" line="197"/>
-        <source>Filepath</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="199"/>
+        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="200"/>
+        <location filename="../settingsdialog.cpp" line="199"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="216"/>
+        <location filename="../settingsdialog.cpp" line="215"/>
         <source>Choose a directory</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_de.ts b/src/plugins/General/fileops/translations/fileops_plugin_de.ts
index 51843a1a5..b06a8d8f6 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_de.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_de.ts
@@ -132,26 +132,21 @@
     </message>
     <message>
         <location filename="../settingsdialog.cpp" line="197"/>
-        <source>Filepath</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="199"/>
+        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="200"/>
+        <location filename="../settingsdialog.cpp" line="199"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="216"/>
+        <location filename="../settingsdialog.cpp" line="215"/>
         <source>Choose a directory</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_pl.ts b/src/plugins/General/fileops/translations/fileops_plugin_pl.ts
index 51843a1a5..b06a8d8f6 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_pl.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_pl.ts
@@ -132,26 +132,21 @@
     </message>
     <message>
         <location filename="../settingsdialog.cpp" line="197"/>
-        <source>Filepath</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="199"/>
+        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="200"/>
+        <location filename="../settingsdialog.cpp" line="199"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="216"/>
+        <location filename="../settingsdialog.cpp" line="215"/>
         <source>Choose a directory</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_ru.ts b/src/plugins/General/fileops/translations/fileops_plugin_ru.ts
index d9a432288..df74b210d 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_ru.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_ru.ts
@@ -132,26 +132,21 @@
     </message>
     <message>
         <location filename="../settingsdialog.cpp" line="197"/>
-        <source>Filepath</source>
-        <translation>Путь к файлу</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="199"/>
+        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Year</source>
         <translation>Год</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="200"/>
+        <location filename="../settingsdialog.cpp" line="199"/>
         <source>Comment</source>
         <translation>Комментарий</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="216"/>
+        <location filename="../settingsdialog.cpp" line="215"/>
         <source>Choose a directory</source>
         <translation>Выберите директорию</translation>
     </message>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts b/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts
index 51843a1a5..b06a8d8f6 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts
@@ -132,26 +132,21 @@
     </message>
     <message>
         <location filename="../settingsdialog.cpp" line="197"/>
-        <source>Filepath</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="199"/>
+        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="200"/>
+        <location filename="../settingsdialog.cpp" line="199"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="216"/>
+        <location filename="../settingsdialog.cpp" line="215"/>
         <source>Choose a directory</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts b/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts
index 51843a1a5..b06a8d8f6 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts
@@ -132,26 +132,21 @@
     </message>
     <message>
         <location filename="../settingsdialog.cpp" line="197"/>
-        <source>Filepath</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="199"/>
+        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="200"/>
+        <location filename="../settingsdialog.cpp" line="199"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="216"/>
+        <location filename="../settingsdialog.cpp" line="215"/>
         <source>Choose a directory</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts b/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts
index 51843a1a5..b06a8d8f6 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts
@@ -132,26 +132,21 @@
     </message>
     <message>
         <location filename="../settingsdialog.cpp" line="197"/>
-        <source>Filepath</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="199"/>
+        <location filename="../settingsdialog.cpp" line="198"/>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="200"/>
+        <location filename="../settingsdialog.cpp" line="199"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="216"/>
+        <location filename="../settingsdialog.cpp" line="215"/>
         <source>Choose a directory</source>
         <translation type="unfinished"></translation>
     </message>