From 0dd2cb5f1559c480a7bbfa9984f765c74da623e0 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 3 Aug 2012 15:46:57 +0200
Subject: [PATCH 1/3] Don't let the Settings dialog be shrunk too much.

---
 src/SettingsDialog.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index d516a8dee..9e449a387 100644
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -193,6 +193,7 @@ SettingsDialog::SettingsDialog( QWidget *parent )
     {
         ui->dirTree->checkPath( dir, Qt::Checked );
     }
+    ui->advancedPage->setMinimumSize( ui->advancedPage->sizeHint() );
 
     // NOW PLAYING
 // #ifdef Q_WS_MAC

From afba38f9ff0f9da5df916d43d4d46593af19c2d6 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 3 Aug 2012 16:03:15 +0200
Subject: [PATCH 2/3] Fixed alignment in Settings dialog, advanced page.

---
 src/SettingsDialog.cpp       |  6 ++++++
 src/StackedSettingsDialog.ui | 31 ++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index 9e449a387..7c5a8f964 100644
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -195,6 +195,12 @@ SettingsDialog::SettingsDialog( QWidget *parent )
     }
     ui->advancedPage->setMinimumSize( ui->advancedPage->sizeHint() );
 
+    int buttonsWidth = qMax( ui->proxyButton->sizeHint().width(),
+                             ui->aclEntryClearButton->sizeHint().width() );
+    ui->proxyButton->setFixedWidth( buttonsWidth );
+    ui->aclEntryClearButton->setFixedWidth( buttonsWidth );
+
+
     // NOW PLAYING
 // #ifdef Q_WS_MAC
 //     ui->checkBoxEnableAdium->setChecked( s->nowPlayingEnabled() );
diff --git a/src/StackedSettingsDialog.ui b/src/StackedSettingsDialog.ui
index e260416d4..70d0c49fc 100644
--- a/src/StackedSettingsDialog.ui
+++ b/src/StackedSettingsDialog.ui
@@ -22,7 +22,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>0</number>
+        <number>2</number>
        </property>
        <widget class="QWidget" name="accountsPage">
         <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -318,8 +318,30 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <spacer name="horizontalSpacer_3">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::Expanding</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
                <item>
                 <widget class="QPushButton" name="proxyButton">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
                  <property name="text">
                   <string>Proxy Settings...</string>
                  </property>
@@ -353,7 +375,7 @@
                <item>
                 <widget class="QCheckBox" name="checkBoxHttp">
                  <property name="layoutDirection">
-                  <enum>Qt::RightToLeft</enum>
+                  <enum>Qt::LeftToRight</enum>
                  </property>
                  <property name="text">
                   <string>Allow web browsers to interact with Tomahawk (recommended)</string>
@@ -366,7 +388,7 @@
                <item>
                 <widget class="QCheckBox" name="checkBoxReporter">
                  <property name="layoutDirection">
-                  <enum>Qt::RightToLeft</enum>
+                  <enum>Qt::LeftToRight</enum>
                  </property>
                  <property name="text">
                   <string>Send reports after Tomahawk crashed</string>
@@ -383,6 +405,9 @@
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
+                   <property name="sizeType">
+                    <enum>QSizePolicy::Expanding</enum>
+                   </property>
                    <property name="sizeHint" stdset="0">
                     <size>
                      <width>40</width>

From 5d54f20becd654db39beac661ef295789e6584a0 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 3 Aug 2012 16:08:54 +0200
Subject: [PATCH 3/3] Back to page 0.

---
 src/StackedSettingsDialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/StackedSettingsDialog.ui b/src/StackedSettingsDialog.ui
index 70d0c49fc..af3cfe49d 100644
--- a/src/StackedSettingsDialog.ui
+++ b/src/StackedSettingsDialog.ui
@@ -22,7 +22,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>2</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="accountsPage">
         <layout class="QVBoxLayout" name="verticalLayout_11">