fixed dialog layouts

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

5 files changed, 53 insertions, 30 deletions

diff --git a/src/plugins/Effect/srconverter/settingsdialog.ui b/src/plugins/Effect/srconverter/settingsdialog.ui
index 197cd504d..44c638833 100644
--- a/src/plugins/Effect/srconverter/settingsdialog.ui
+++ b/src/plugins/Effect/srconverter/settingsdialog.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>357</width>
+    <width>338</width>
     <height>99</height>
    </rect>
   </property>
@@ -20,7 +20,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
+   <item row="0" column="1" colspan="2" >
     <widget class="QSpinBox" name="srSpinBox" >
      <property name="maximum" >
       <number>96000</number>
@@ -40,7 +40,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
+   <item row="1" column="1" colspan="2" >
     <widget class="QComboBox" name="engineComboBox" >
      <item>
       <property name="text" >
@@ -70,28 +70,30 @@
     </widget>
    </item>
    <item row="2" column="0" colspan="2" >
-    <layout class="QHBoxLayout" name="horizontalLayout" >
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>228</width>
-         <height>24</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox" >
-       <property name="standardButtons" >
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>228</width>
+       <height>24</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
diff --git a/src/plugins/General/notifier/settingsdialog.ui b/src/plugins/General/notifier/settingsdialog.ui
index 8b2df2d37..b64a389e1 100644
--- a/src/plugins/General/notifier/settingsdialog.ui
+++ b/src/plugins/General/notifier/settingsdialog.ui
@@ -227,6 +227,12 @@
    </item>
    <item row="2" column="1" >
     <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="standardButtons" >
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
diff --git a/src/plugins/General/statusicon/settingsdialog.ui b/src/plugins/General/statusicon/settingsdialog.ui
index 7ffbb20db..048614ada 100644
--- a/src/plugins/General/statusicon/settingsdialog.ui
+++ b/src/plugins/General/statusicon/settingsdialog.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>267</width>
-    <height>127</height>
+    <width>278</width>
+    <height>126</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -68,6 +68,12 @@
    </item>
    <item row="3" column="2" >
     <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="standardButtons" >
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
diff --git a/src/plugins/Input/modplug/settingsdialog.ui b/src/plugins/Input/modplug/settingsdialog.ui
index 63b517f8d..1c68b4623 100644
--- a/src/plugins/Input/modplug/settingsdialog.ui
+++ b/src/plugins/Input/modplug/settingsdialog.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>465</width>
-    <height>380</height>
+    <width>468</width>
+    <height>382</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -786,6 +786,9 @@ too high may cause clipping!</string>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Preferred</enum>
+     </property>
      <property name="sizeHint" stdset="0" >
       <size>
        <width>211</width>
@@ -796,6 +799,12 @@ too high may cause clipping!</string>
    </item>
    <item row="1" column="1" >
     <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="standardButtons" >
       <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
diff --git a/src/plugins/Output/alsa/settingsdialog.ui b/src/plugins/Output/alsa/settingsdialog.ui
index 461c671fd..de5a648f1 100644
--- a/src/plugins/Output/alsa/settingsdialog.ui
+++ b/src/plugins/Output/alsa/settingsdialog.ui
@@ -221,7 +221,7 @@
    <item row="1" column="1" >
     <widget class="QDialogButtonBox" name="buttonBox" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>