From 599f956269b33a6b1023f6439d91e3e6dedca7a2 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 16 Oct 2011 10:07:13 +0300
Subject: [PATCH] Torrent addition dialog: Layout fixes (cherry picked from
 commit d81f633d6b592361328a53aa063ed039e07c90d4)

---
 Changelog                  |  1 +
 src/torrentadditiondlg.cpp |  2 +-
 src/torrentadditiondlg.ui  | 46 +++++++++++++-------------------------
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/Changelog b/Changelog
index 371dbb17c..f44b84964 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.9.1
     - BUGFIX: Fix ratio calculation for purely seeded torrents
     - I18N: Update Russian translation
+    - COSMETIC: Torrent addition dialog layout fixes
 
 * Sat Oct 08 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.0
     - FEATURE: Add file association settings to program preferences (Windows)
diff --git a/src/torrentadditiondlg.cpp b/src/torrentadditiondlg.cpp
index ae6661bbd..3dc8dbad6 100644
--- a/src/torrentadditiondlg.cpp
+++ b/src/torrentadditiondlg.cpp
@@ -63,7 +63,7 @@ torrentAdditionDialog::torrentAdditionDialog(QWidget *parent) :
   Preferences pref;
   setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
-  setMinimumSize(0, 0);
+  setMinimumSize(10, 10);
   // Icons
   CancelButton->setIcon(IconProvider::instance()->getIcon("dialog-cancel"));
   OkButton->setIcon(IconProvider::instance()->getIcon("list-add"));
diff --git a/src/torrentadditiondlg.ui b/src/torrentadditiondlg.ui
index 931b1c09e..50d5cfc08 100644
--- a/src/torrentadditiondlg.ui
+++ b/src/torrentadditiondlg.ui
@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>addTorrentDialog</class>
  <widget class="QDialog" name="addTorrentDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>560</width>
-    <height>517</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>Torrent addition dialog</string>
   </property>
@@ -32,12 +24,6 @@
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="savePathLbl">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
        <property name="text">
         <string>Save path:</string>
        </property>
@@ -47,12 +33,6 @@
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
         <widget class="QComboBox" name="savePathTxt">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="editable">
           <bool>true</bool>
          </property>
@@ -93,12 +73,22 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string notr="true"> - </string>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-      </widget>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
      </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
@@ -148,16 +138,10 @@
       <widget class="QComboBox" name="comboLabel">
        <property name="minimumSize">
         <size>
-         <width>180</width>
+         <width>150</width>
          <height>0</height>
         </size>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>26</height>
-        </size>
-       </property>
        <property name="editable">
         <bool>true</bool>
        </property>