From 264ac4e7067c4a1298c41d7faac1bd1362d23f2e Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 5 Dec 2010 17:46:03 +0000
Subject: [PATCH] Improve torrent addition from URL dialog

---
 src/downloadfromurldlg.ui  |  4 ++--
 src/mainwindow.ui          | 18 +++++++++---------
 src/preferences/options.ui | 12 ++++++++++++
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/downloadfromurldlg.ui b/src/downloadfromurldlg.ui
index 34be19bcc..2dae05dd8 100644
--- a/src/downloadfromurldlg.ui
+++ b/src/downloadfromurldlg.ui
@@ -61,7 +61,7 @@
         </font>
        </property>
        <property name="text">
-        <string>Download Torrents from URLs</string>
+        <string>Add torrent links</string>
        </property>
       </widget>
      </item>
@@ -94,7 +94,7 @@
       </font>
      </property>
      <property name="text">
-      <string>Only one URL per line</string>
+      <string>Both HTTP and Magnet links are supported</string>
      </property>
     </widget>
    </item>
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index f280a2f7b..8111be4bd 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -146,7 +146,7 @@
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionOpen">
    <property name="text">
-    <string>&amp;Add File...</string>
+    <string>&amp;Add torrent file...</string>
    </property>
   </action>
   <action name="actionExit">
@@ -199,7 +199,7 @@
   </action>
   <action name="actionDownload_from_URL">
    <property name="text">
-    <string>Add &amp;URL...</string>
+    <string>Add &amp;link to torrent...</string>
    </property>
   </action>
   <action name="actionCreate_torrent">
@@ -249,7 +249,7 @@
   </action>
   <action name="actionDecreasePriority">
    <property name="icon">
-    <iconset resource="../icons.qrc">
+    <iconset resource="icons.qrc">
      <normaloff>:/Icons/skin/decrease.png</normaloff>:/Icons/skin/decrease.png</iconset>
    </property>
    <property name="text">
@@ -261,7 +261,7 @@
   </action>
   <action name="actionIncreasePriority">
    <property name="icon">
-    <iconset resource="../icons.qrc">
+    <iconset resource="icons.qrc">
      <normaloff>:/Icons/skin/increase.png</normaloff>:/Icons/skin/increase.png</iconset>
    </property>
    <property name="text">
@@ -273,7 +273,7 @@
   </action>
   <action name="actionShow_console">
    <property name="icon">
-    <iconset resource="../icons.qrc">
+    <iconset resource="icons.qrc">
      <normaloff>:/Icons/oxygen/log.png</normaloff>:/Icons/oxygen/log.png</iconset>
    </property>
    <property name="text">
@@ -364,11 +364,11 @@
   </action>
   <action name="action_Import_Torrent">
    <property name="icon">
-    <iconset resource="../icons.qrc">
+    <iconset resource="icons.qrc">
      <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
    </property>
    <property name="text">
-    <string>Import torrent...</string>
+    <string>Import existing torrent...</string>
    </property>
    <property name="toolTip">
     <string>Import torrent...</string>
@@ -376,7 +376,7 @@
   </action>
   <action name="actionDonate_money">
    <property name="icon">
-    <iconset resource="../icons.qrc">
+    <iconset resource="icons.qrc">
      <normaloff>:/Icons/oxygen/emblem-favorite.png</normaloff>:/Icons/oxygen/emblem-favorite.png</iconset>
    </property>
    <property name="text">
@@ -388,7 +388,7 @@
   </action>
  </widget>
  <resources>
-  <include location="../icons.qrc"/>
+  <include location="icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/preferences/options.ui b/src/preferences/options.ui
index 9cb29457e..b62393b95 100644
--- a/src/preferences/options.ui
+++ b/src/preferences/options.ui
@@ -803,6 +803,12 @@ QGroupBox {
                </item>
                <item>
                 <widget class="QGroupBox" name="checkExportDir">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
                  <property name="styleSheet">
                   <string notr="true">QGroupBox::title {
 font-weight: normal;
@@ -876,6 +882,9 @@ QGroupBox {
               <property name="checkable">
                <bool>true</bool>
               </property>
+              <property name="checked">
+               <bool>false</bool>
+              </property>
               <layout class="QGridLayout" name="gridLayout_15">
                <item row="0" column="0">
                 <widget class="QLabel" name="label_2">
@@ -908,6 +917,9 @@ QGroupBox {
               <property name="checkable">
                <bool>true</bool>
               </property>
+              <property name="checked">
+               <bool>false</bool>
+              </property>
               <layout class="QVBoxLayout" name="verticalLayout_19">
                <item>
                 <widget class="QLineEdit" name="autoRun_txt"/>