From 02b15677233248bdb603ae67bbda9aeb2591b853 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Fri, 13 Jan 2012 16:03:07 +0100
Subject: [PATCH] Some UI cosmetics: Nicer positioning of encoder selection
 radio-buttons.

---
 gui/MainWindow.ui | 160 +++++++++++++++++++++++++++++++++++++++++-----
 src/Config.h      |   2 +-
 2 files changed, 146 insertions(+), 16 deletions(-)

diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 584cefc4..99774b94 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -756,34 +756,27 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="2">
+                 <item row="0" column="3">
                   <widget class="QRadioButton" name="radioButtonEncoderVorbis">
                    <property name="text">
                     <string>Ogg Vorbis</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="3">
+                 <item row="0" column="5">
                   <widget class="QRadioButton" name="radioButtonEncoderAAC">
                    <property name="text">
                     <string>MPEG-4 AAC</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="7">
+                 <item row="0" column="15">
                   <widget class="QRadioButton" name="radioButtonEncoderPCM">
                    <property name="text">
                     <string>Wave (PCM)</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="5">
-                  <widget class="QRadioButton" name="radioButtonEncoderFLAC">
-                   <property name="text">
-                    <string>FLAC</string>
-                   </property>
-                  </widget>
-                 </item>
                  <item row="0" column="0">
                   <spacer name="horizontalSpacer_7">
                    <property name="orientation">
@@ -800,20 +793,118 @@
                    </property>
                   </spacer>
                  </item>
-                 <item row="0" column="4">
+                 <item row="0" column="9">
                   <widget class="QRadioButton" name="radioButtonEncoderAC3">
                    <property name="text">
                     <string>Aften A/52</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="6">
+                 <item row="0" column="13">
                   <widget class="QRadioButton" name="radioButtonEncoderDCA">
                    <property name="text">
                     <string>DCA Enc</string>
                    </property>
                   </widget>
                  </item>
+                 <item row="0" column="2">
+                  <spacer name="horizontalSpacer_45">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="4">
+                  <spacer name="horizontalSpacer_46">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="6">
+                  <spacer name="horizontalSpacer_47">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="12">
+                  <spacer name="horizontalSpacer_49">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="14">
+                  <spacer name="horizontalSpacer_50">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="16">
+                  <spacer name="horizontalSpacer_51">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="7">
+                  <widget class="QRadioButton" name="radioButtonEncoderFLAC">
+                   <property name="text">
+                    <string>FLAC</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="8">
+                  <spacer name="horizontalSpacer_48">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
                 </layout>
                </item>
               </layout>
@@ -849,14 +940,14 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="2">
+                 <item row="0" column="3">
                   <widget class="QRadioButton" name="radioButtonModeAverageBitrate">
                    <property name="text">
                     <string>Average Bitrate (ABR)</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="3">
+                 <item row="0" column="5">
                   <widget class="QRadioButton" name="radioButtonConstBitrate">
                    <property name="text">
                     <string>Constant Bitrate (CBR)</string>
@@ -879,6 +970,45 @@
                    </property>
                   </spacer>
                  </item>
+                 <item row="0" column="2">
+                  <spacer name="horizontalSpacer_52">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="4">
+                  <spacer name="horizontalSpacer_53">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="6">
+                  <spacer name="horizontalSpacer_54">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>1</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
                 </layout>
                </item>
               </layout>
@@ -1106,7 +1236,7 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>604</width>
+               <width>602</width>
                <height>1524</height>
               </rect>
              </property>
diff --git a/src/Config.h b/src/Config.h
index 50396968..943c2da8 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO					4
 #define VER_LAMEXP_TYPE						Alpha
 #define VER_LAMEXP_PATCH					14
-#define VER_LAMEXP_BUILD					872
+#define VER_LAMEXP_BUILD					873
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)