prepare for file determination by content

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

1 files changed, 134 insertions, 139 deletions

diff --git a/src/qmmpui/forms/configdialog.ui b/src/qmmpui/forms/configdialog.ui
index 3aab1881c..a862d79d6 100644
--- a/src/qmmpui/forms/configdialog.ui
+++ b/src/qmmpui/forms/configdialog.ui
@@ -129,56 +129,114 @@
            <property name="spacing">
             <number>6</number>
            </property>
-           <item row="0" column="0">
+           <item row="0" column="0" colspan="3">
             <widget class="QCheckBox" name="metadataCheckBox">
              <property name="text">
               <string>Load metadata from files</string>
              </property>
             </widget>
            </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="groupBox_2">
-          <property name="title">
-           <string>Song Display</string>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_10">
-           <item row="0" column="0">
+           <item row="1" column="0" colspan="3">
+            <widget class="QCheckBox" name="underscoresCheckBox">
+             <property name="text">
+              <string>Convert underscores to blanks</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0" colspan="3">
+            <widget class="QCheckBox" name="per20CheckBox">
+             <property name="text">
+              <string>Convert %20 to blanks</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0">
             <widget class="QLabel" name="label_4">
              <property name="text">
               <string>Title format:</string>
              </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
             </widget>
            </item>
-           <item row="0" column="1">
+           <item row="3" column="1">
             <widget class="QLineEdit" name="formatLineEdit"/>
            </item>
-           <item row="0" column="2">
+           <item row="3" column="2">
             <widget class="QToolButton" name="titleButton">
              <property name="text">
               <string>...</string>
              </property>
             </widget>
            </item>
-           <item row="1" column="0" colspan="3">
-            <widget class="QCheckBox" name="underscoresCheckBox">
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="groupBox_9">
+          <property name="title">
+           <string>Cover Image Retrieve</string>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_6">
+           <item row="0" column="0" colspan="2">
+            <widget class="QCheckBox" name="useCoverFilesCheckBox">
              <property name="text">
-              <string>Convert underscores to blanks</string>
+              <string>Use separate image files</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
              </property>
             </widget>
            </item>
-           <item row="2" column="0" colspan="3">
-            <widget class="QCheckBox" name="per20CheckBox">
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_11">
              <property name="text">
-              <string>Convert %20 to blanks</string>
+              <string>Include files:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="coverIncludeLineEdit"/>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_12">
+             <property name="text">
+              <string>Exclude files:</string>
              </property>
             </widget>
            </item>
+           <item row="2" column="1">
+            <widget class="QLineEdit" name="coverExcludeLineEdit"/>
+           </item>
+           <item row="3" column="0" colspan="2">
+            <layout class="QHBoxLayout" name="horizontalLayout_4">
+             <item>
+              <widget class="QLabel" name="label_13">
+               <property name="text">
+                <string>Recursive search depth:</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QSpinBox" name="coverDepthSpinBox">
+               <property name="maximum">
+                <number>6</number>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_3">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </item>
           </layout>
          </widget>
         </item>
@@ -318,77 +376,7 @@
           </layout>
          </widget>
         </item>
-        <item row="2" column="0" colspan="2">
-         <widget class="QGroupBox" name="groupBox_9">
-          <property name="title">
-           <string>Cover Image Retrieve</string>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_6">
-           <item row="0" column="0" colspan="2">
-            <widget class="QCheckBox" name="useCoverFilesCheckBox">
-             <property name="text">
-              <string>Use separate image files</string>
-             </property>
-             <property name="checked">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_11">
-             <property name="text">
-              <string>Include files:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QLineEdit" name="coverIncludeLineEdit"/>
-           </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_12">
-             <property name="text">
-              <string>Exclude files:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1">
-            <widget class="QLineEdit" name="coverExcludeLineEdit"/>
-           </item>
-           <item row="3" column="0" colspan="2">
-            <layout class="QHBoxLayout" name="horizontalLayout_4">
-             <item>
-              <widget class="QLabel" name="label_13">
-               <property name="text">
-                <string>Recursive search depth:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSpinBox" name="coverDepthSpinBox">
-               <property name="maximum">
-                <number>6</number>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_3">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="4" column="0" colspan="2">
+        <item row="3" column="0" colspan="2">
          <spacer name="verticalSpacer_3">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
@@ -401,7 +389,7 @@
           </property>
          </spacer>
         </item>
-        <item row="3" column="0" colspan="2">
+        <item row="2" column="0" colspan="2">
          <widget class="QGroupBox" name="groupBox_6">
           <property name="title">
            <string>Playback</string>
@@ -414,6 +402,13 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QCheckBox" name="byContentCheckBox">
+             <property name="text">
+              <string>Determine file type by content</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
@@ -852,12 +847,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>286</x>
-     <y>39</y>
+     <x>348</x>
+     <y>38</y>
     </hint>
     <hint type="destinationlabel">
-     <x>286</x>
-     <y>39</y>
+     <x>348</x>
+     <y>38</y>
     </hint>
    </hints>
   </connection>
@@ -868,12 +863,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>286</x>
-     <y>39</y>
+     <x>348</x>
+     <y>38</y>
     </hint>
     <hint type="destinationlabel">
-     <x>272</x>
-     <y>39</y>
+     <x>348</x>
+     <y>38</y>
     </hint>
    </hints>
   </connection>
@@ -910,82 +905,82 @@
    </hints>
   </connection>
   <connection>
-   <sender>useCoverFilesCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>coverIncludeLineEdit</receiver>
-   <slot>setEnabled(bool)</slot>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ConfigDialog</receiver>
+   <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>286</x>
-     <y>39</y>
+     <x>657</x>
+     <y>448</y>
     </hint>
     <hint type="destinationlabel">
-     <x>286</x>
-     <y>39</y>
+     <x>225</x>
+     <y>421</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>useCoverFilesCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>coverExcludeLineEdit</receiver>
-   <slot>setEnabled(bool)</slot>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ConfigDialog</receiver>
+   <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>286</x>
-     <y>39</y>
+     <x>657</x>
+     <y>448</y>
     </hint>
     <hint type="destinationlabel">
-     <x>286</x>
-     <y>39</y>
+     <x>141</x>
+     <y>414</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>useCoverFilesCheckBox</sender>
    <signal>toggled(bool)</signal>
-   <receiver>coverDepthSpinBox</receiver>
+   <receiver>coverIncludeLineEdit</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>286</x>
-     <y>39</y>
+     <x>357</x>
+     <y>177</y>
     </hint>
     <hint type="destinationlabel">
-     <x>286</x>
-     <y>39</y>
+     <x>372</x>
+     <y>200</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>ConfigDialog</receiver>
-   <slot>reject()</slot>
+   <sender>useCoverFilesCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>coverExcludeLineEdit</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>651</x>
-     <y>458</y>
+     <x>327</x>
+     <y>179</y>
     </hint>
     <hint type="destinationlabel">
-     <x>225</x>
-     <y>421</y>
+     <x>354</x>
+     <y>228</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ConfigDialog</receiver>
-   <slot>accept()</slot>
+   <sender>useCoverFilesCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>coverDepthSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>651</x>
-     <y>458</y>
+     <x>301</x>
+     <y>177</y>
     </hint>
     <hint type="destinationlabel">
-     <x>141</x>
-     <y>414</y>
+     <x>419</x>
+     <y>255</y>
     </hint>
    </hints>
   </connection>