fileops plugin: fixed settings

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

12 files changed, 106 insertions, 198 deletions

diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp
index 05bc1e7c2..feadafb8c 100644
--- a/src/plugins/General/fileops/settingsdialog.cpp
+++ b/src/plugins/General/fileops/settingsdialog.cpp
@@ -23,7 +23,7 @@
 #include <QComboBox>
 #include <QMenu>
 #include <QHeaderView>
-
+#include <QApplication>
 #include <qmmp/qmmp.h>
 #include <qmmpui/filedialog.h>
 #include "fileops.h"
diff --git a/src/plugins/General/fileops/settingsdialog.ui b/src/plugins/General/fileops/settingsdialog.ui
index 8e1d5c5f0..dfa72b9ed 100644
--- a/src/plugins/General/fileops/settingsdialog.ui
+++ b/src/plugins/General/fileops/settingsdialog.ui
@@ -68,7 +68,7 @@
    <item row="1" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QToolButton" name="newButton">
+      <widget class="QPushButton" name="newButton">
        <property name="minimumSize">
         <size>
          <width>26</width>
@@ -76,12 +76,12 @@
         </size>
        </property>
        <property name="text">
-        <string>+</string>
+        <string>Add</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="deleteButton">
+      <widget class="QPushButton" name="deleteButton">
        <property name="minimumSize">
         <size>
          <width>26</width>
@@ -89,39 +89,7 @@
         </size>
        </property>
        <property name="text">
-        <string>-</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="toolButton">
-       <property name="minimumSize">
-        <size>
-         <width>26</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="arrowType">
-        <enum>Qt::UpArrow</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="toolButton_3">
-       <property name="minimumSize">
-        <size>
-         <width>26</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="arrowType">
-        <enum>Qt::DownArrow</enum>
+        <string>Remove</string>
        </property>
       </widget>
      </item>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_cs.ts b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts
index 11f9fe5af..371aa65ea 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_cs.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts
@@ -99,6 +99,7 @@
         <translation>Přejmenovat</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -210,30 +211,23 @@
         <translation>Zkratka</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>Cíl:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</source>
         <translation>Vzor jména:</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 2dd867060..26fdd0b10 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_de.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_de.ts
@@ -98,6 +98,7 @@
         <translation>Umbenennen</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -209,30 +210,23 @@
         <translation>Kurzbefehl</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation>−</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>Zielort:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</source>
         <translation>Dateinamensmuster:</translation>
     </message>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_it.ts b/src/plugins/General/fileops/translations/fileops_plugin_it.ts
index 5a8377b02..d4c10c076 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_it.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_it.ts
@@ -97,6 +97,7 @@
         <translation>Rinomina</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -208,30 +209,23 @@
         <translation>Scorciatoia</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>Destinazione:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</source>
         <translation>Schema nome del file</translation>
     </message>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_lt.ts b/src/plugins/General/fileops/translations/fileops_plugin_lt.ts
index 34a7fa9b4..c0aff6f9c 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_lt.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_lt.ts
@@ -99,6 +99,7 @@
         <translation>Pervadinti</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -210,30 +211,23 @@
         <translation>Mygtuko nuoroda</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>Paskirtis:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</source>
         <translation>Bylos plėtinys:</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 89794e7b5..7ada8692e 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_pl.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_pl.ts
@@ -99,6 +99,7 @@
         <translation>Zmień nazwę</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -210,30 +211,23 @@
         <translation>Skróŧ klawiszowy</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>Cel:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</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 4c08c6e29..546da3359 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_ru.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_ru.ts
@@ -99,6 +99,7 @@
         <translation>Переименовать</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -210,30 +211,23 @@
         <translation>Сочетание клавиш</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>Назначение:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation>Добавить</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</source>
         <translation>Формат имени файла:</translation>
     </message>
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts
index 724388ace..a17a60a9c 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts
@@ -97,6 +97,7 @@
         <translation></translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -208,30 +209,23 @@
         <translation>Kısayol</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>Hedef:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</source>
         <translation>Dosya adı deseni:</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 6cfe5cf55..d3cb64edb 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts
@@ -99,6 +99,7 @@
         <translation>Переіменувати</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -210,30 +211,23 @@
         <translation>Комбінація клавіш</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>Призначення:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</source>
         <translation>Формат імені файла:</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 2fecbd7eb..c36eb4df7 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts
@@ -97,6 +97,7 @@
         <translation>重命名</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -208,30 +209,23 @@
         <translation>快捷键</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>目标目录：</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</source>
         <translation>文件名方案：</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 cbda84314..d9f4e661a 100644
--- a/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts
+++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts
@@ -97,6 +97,7 @@
         <translation>重命名</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="92"/>
         <location filename="../settingsdialog.cpp" line="55"/>
         <location filename="../settingsdialog.cpp" line="135"/>
         <source>Remove</source>
@@ -208,30 +209,23 @@
         <translation>熱鍵</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="79"/>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="92"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../settingsdialog.ui" line="105"/>
-        <location filename="../settingsdialog.ui" line="121"/>
-        <location filename="../settingsdialog.ui" line="158"/>
-        <location filename="../settingsdialog.ui" line="175"/>
+        <location filename="../settingsdialog.ui" line="126"/>
+        <location filename="../settingsdialog.ui" line="143"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="148"/>
+        <location filename="../settingsdialog.ui" line="116"/>
         <source>Destination:</source>
         <translation>目標目錄</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="165"/>
+        <location filename="../settingsdialog.ui" line="79"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="133"/>
         <source>File name pattern:</source>
         <translation>檔名方案：</translation>
     </message>