optimized settings dialog

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

1 files changed, 145 insertions, 167 deletions

diff --git a/src/ui/forms/configdialog.ui b/src/ui/forms/configdialog.ui
index 78823091f..6ad7c2517 100644
--- a/src/ui/forms/configdialog.ui
+++ b/src/ui/forms/configdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>633</width>
-    <height>437</height>
+    <width>659</width>
+    <height>448</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -47,7 +47,7 @@
        </property>
        <property name="maximumSize">
         <size>
-         <width>170</width>
+         <width>180</width>
          <height>16777215</height>
         </size>
        </property>
@@ -662,107 +662,32 @@
           </spacer>
          </item>
          <item row="0" column="0" colspan="3">
-          <widget class="QTabWidget" name="pluginsTab">
-           <property name="tabPosition">
-            <enum>QTabWidget::North</enum>
+          <widget class="QTreeWidget" name="treeWidget">
+           <property name="alternatingRowColors">
+            <bool>true</bool>
            </property>
-           <property name="tabShape">
-            <enum>QTabWidget::Rounded</enum>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
            </property>
-           <property name="currentIndex">
-            <number>0</number>
+           <property name="animated">
+            <bool>true</bool>
            </property>
-           <widget class="QWidget" name="Input">
-            <attribute name="title">
-             <string>Input</string>
-            </attribute>
-            <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <item>
-              <widget class="QTableWidget" name="inputPluginTable">
-               <property name="selectionMode">
-                <enum>QAbstractItemView::SingleSelection</enum>
-               </property>
-               <property name="selectionBehavior">
-                <enum>QAbstractItemView::SelectRows</enum>
-               </property>
-               <property name="rowCount">
-                <number>0</number>
-               </property>
-               <property name="columnCount">
-                <number>0</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="Output">
-            <attribute name="title">
-             <string>Output</string>
-            </attribute>
-            <layout class="QHBoxLayout" name="horizontalLayout">
-             <item>
-              <widget class="QTableWidget" name="outputPluginTable">
-               <property name="selectionMode">
-                <enum>QAbstractItemView::SingleSelection</enum>
-               </property>
-               <property name="selectionBehavior">
-                <enum>QAbstractItemView::SelectRows</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="tab">
-            <attribute name="title">
-             <string>Visualization</string>
-            </attribute>
-            <layout class="QHBoxLayout">
-             <item>
-              <widget class="QTableWidget" name="visualPluginTable">
-               <property name="selectionMode">
-                <enum>QAbstractItemView::SingleSelection</enum>
-               </property>
-               <property name="selectionBehavior">
-                <enum>QAbstractItemView::SelectRows</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="tab_2">
-            <attribute name="title">
-             <string>Effects</string>
-            </attribute>
-            <layout class="QVBoxLayout">
-             <item>
-              <widget class="QTableWidget" name="effectPluginTable">
-               <property name="selectionMode">
-                <enum>QAbstractItemView::SingleSelection</enum>
-               </property>
-               <property name="selectionBehavior">
-                <enum>QAbstractItemView::SelectRows</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="tab_3">
-            <attribute name="title">
-             <string>General</string>
-            </attribute>
-            <layout class="QVBoxLayout">
-             <item>
-              <widget class="QTableWidget" name="generalPluginTable">
-               <property name="selectionMode">
-                <enum>QAbstractItemView::SingleSelection</enum>
-               </property>
-               <property name="selectionBehavior">
-                <enum>QAbstractItemView::SelectRows</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
+           <property name="allColumnsShowFocus">
+            <bool>false</bool>
+           </property>
+           <property name="columnCount">
+            <number>2</number>
+           </property>
+           <column>
+            <property name="text">
+             <string>Description</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Filename</string>
+            </property>
+           </column>
           </widget>
          </item>
         </layout>
@@ -1183,15 +1108,52 @@
            <property name="title">
             <string>Audio</string>
            </property>
-           <layout class="QVBoxLayout" name="_2">
-            <item>
+           <layout class="QGridLayout" name="gridLayout_8">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_19">
+              <property name="text">
+               <string>Output:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QComboBox" name="outputComboBox"/>
+            </item>
+            <item row="0" column="2">
+             <widget class="QPushButton" name="outputPreferencesButton">
+              <property name="text">
+               <string>Preferences</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="3">
+             <widget class="QPushButton" name="outputInformationButton">
+              <property name="text">
+               <string>Information</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="4">
+             <spacer name="horizontalSpacer_5">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>110</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="1" column="0" colspan="5">
              <widget class="QCheckBox" name="softVolumeCheckBox">
               <property name="text">
                <string>Use software volume control</string>
               </property>
              </widget>
             </item>
-            <item>
+            <item row="2" column="0" colspan="5">
              <widget class="QCheckBox" name="use16BitCheckBox">
               <property name="text">
                <string>16-bit output</string>
@@ -1249,9 +1211,9 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="closeButton">
-       <property name="text">
-        <string>Close</string>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close</set>
        </property>
       </widget>
      </item>
@@ -1264,34 +1226,18 @@
  </resources>
  <connections>
   <connection>
-   <sender>closeButton</sender>
-   <signal>clicked()</signal>
-   <receiver>ConfigDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>625</x>
-     <y>429</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>316</x>
-     <y>340</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
    <sender>enableProxyCheckBox</sender>
    <signal>toggled(bool)</signal>
    <receiver>hostLineEdit</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>472</x>
-     <y>60</y>
+     <x>272</x>
+     <y>40</y>
     </hint>
     <hint type="destinationlabel">
-     <x>581</x>
-     <y>86</y>
+     <x>272</x>
+     <y>40</y>
     </hint>
    </hints>
   </connection>
@@ -1302,12 +1248,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>472</x>
-     <y>60</y>
+     <x>272</x>
+     <y>40</y>
     </hint>
     <hint type="destinationlabel">
-     <x>581</x>
-     <y>112</y>
+     <x>272</x>
+     <y>39</y>
     </hint>
    </hints>
   </connection>
@@ -1318,12 +1264,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>472</x>
-     <y>138</y>
+     <x>272</x>
+     <y>38</y>
     </hint>
     <hint type="destinationlabel">
-     <x>581</x>
-     <y>164</y>
+     <x>272</x>
+     <y>38</y>
     </hint>
    </hints>
   </connection>
@@ -1334,12 +1280,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>472</x>
-     <y>138</y>
+     <x>272</x>
+     <y>38</y>
     </hint>
     <hint type="destinationlabel">
-     <x>581</x>
-     <y>190</y>
+     <x>272</x>
+     <y>37</y>
     </hint>
    </hints>
   </connection>
@@ -1350,12 +1296,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>357</x>
-     <y>287</y>
+     <x>226</x>
+     <y>33</y>
     </hint>
     <hint type="destinationlabel">
-     <x>435</x>
-     <y>290</y>
+     <x>256</x>
+     <y>33</y>
     </hint>
    </hints>
   </connection>
@@ -1366,12 +1312,12 @@
    <slot>setNum(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>296</x>
-     <y>275</y>
+     <x>252</x>
+     <y>90</y>
     </hint>
     <hint type="destinationlabel">
-     <x>296</x>
-     <y>275</y>
+     <x>283</x>
+     <y>90</y>
     </hint>
    </hints>
   </connection>
@@ -1382,12 +1328,12 @@
    <slot>setNum(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>296</x>
-     <y>275</y>
+     <x>252</x>
+     <y>84</y>
     </hint>
     <hint type="destinationlabel">
-     <x>296</x>
-     <y>275</y>
+     <x>274</x>
+     <y>84</y>
     </hint>
    </hints>
   </connection>
@@ -1398,12 +1344,12 @@
    <slot>setNum(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>296</x>
-     <y>275</y>
+     <x>252</x>
+     <y>78</y>
     </hint>
     <hint type="destinationlabel">
-     <x>296</x>
-     <y>275</y>
+     <x>274</x>
+     <y>78</y>
     </hint>
    </hints>
   </connection>
@@ -1414,12 +1360,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>264</x>
-     <y>207</y>
+     <x>263</x>
+     <y>54</y>
     </hint>
     <hint type="destinationlabel">
-     <x>290</x>
-     <y>238</y>
+     <x>263</x>
+     <y>50</y>
     </hint>
    </hints>
   </connection>
@@ -1430,12 +1376,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>232</x>
-     <y>208</y>
+     <x>263</x>
+     <y>54</y>
     </hint>
     <hint type="destinationlabel">
-     <x>292</x>
-     <y>259</y>
+     <x>263</x>
+     <y>45</y>
     </hint>
    </hints>
   </connection>
@@ -1446,12 +1392,44 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>209</x>
-     <y>214</y>
+     <x>263</x>
+     <y>54</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>256</x>
+     <y>41</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ConfigDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>587</x>
+     <y>415</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>225</x>
+     <y>421</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ConfigDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>603</x>
+     <y>422</y>
     </hint>
     <hint type="destinationlabel">
-     <x>360</x>
-     <y>289</y>
+     <x>141</x>
+     <y>414</y>
     </hint>
    </hints>
   </connection>