From cc97ee86df20327faad3e4d3a65ee1fb529d070e Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Fri, 21 May 2010 12:30:57 +0000
Subject: [PATCH] FEATURE: Added "No action" setting for double-click action

---
 Changelog                  |  1 +
 src/options_imp.h          |  2 +-
 src/transferlistwidget.cpp |  5 ++--
 src/ui/options.ui          | 50 ++++++++++++++++++--------------------
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/Changelog b/Changelog
index d65344e82..e375c5eda 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,7 @@
     - FEATURE: The user can force listening on a particular network interface
     - FEATURE: Added cookie support for RSS feeds
     - FEATURE: User can force tracker reannounce
+    - FEATURE: Added "No action" setting for double-click action
     - COSMETIC: Display peers country name in tooltip
 
 * Sun Mar 14 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.0
diff --git a/src/options_imp.h b/src/options_imp.h
index cb8a218df..f9639895f 100644
--- a/src/options_imp.h
+++ b/src/options_imp.h
@@ -37,7 +37,7 @@
 enum ProxyType {HTTP=1, SOCKS5=2, HTTP_PW=3, SOCKS5_PW=4, SOCKS4=5};
 
 // actions on double-click on torrents
-enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST};
+enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION};
 
 using namespace libtorrent;
 
diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp
index 18c8bd7fc..1d4d8e1c3 100644
--- a/src/transferlistwidget.cpp
+++ b/src/transferlistwidget.cpp
@@ -568,11 +568,10 @@ void TransferListWidget::torrentDoubleClicked(const QModelIndex& index) {
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
   if(!h.is_valid()) return;
   int action;
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   if(h.is_seed()) {
-    action =  settings.value(QString::fromUtf8("Preferences/Downloads/DblClOnTorFN"), 0).toInt();
+    action = Preferences::getActionOnDblClOnTorrentFn();
   } else {
-    action = settings.value(QString::fromUtf8("Preferences/Downloads/DblClOnTorDl"), 0).toInt();
+    action = Preferences::getActionOnDblClOnTorrentDl();
   }
 
   switch(action) {
diff --git a/src/ui/options.ui b/src/ui/options.ui
index fb2f576d6..2e63fd99f 100644
--- a/src/ui/options.ui
+++ b/src/ui/options.ui
@@ -241,7 +241,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>515</width>
+             <width>506</width>
              <height>543</height>
             </rect>
            </property>
@@ -436,6 +436,11 @@ QGroupBox {
                            <string>Open folder</string>
                           </property>
                          </item>
+                         <item>
+                          <property name="text">
+                           <string>No action</string>
+                          </property>
+                         </item>
                         </widget>
                        </item>
                        <item>
@@ -470,6 +475,11 @@ QGroupBox {
                            <string>Open folder</string>
                           </property>
                          </item>
+                         <item>
+                          <property name="text">
+                           <string>No action</string>
+                          </property>
+                         </item>
                         </widget>
                        </item>
                       </layout>
@@ -555,8 +565,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>658</width>
-             <height>684</height>
+             <width>632</width>
+             <height>686</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_17">
@@ -729,18 +739,6 @@ QGroupBox {
                       <attribute name="verticalHeaderVisible">
                        <bool>false</bool>
                       </attribute>
-                      <attribute name="verticalHeaderVisible">
-                       <bool>false</bool>
-                      </attribute>
-                      <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
-                       <bool>false</bool>
-                      </attribute>
-                      <attribute name="horizontalHeaderStretchLastSection">
-                       <bool>true</bool>
-                      </attribute>
-                      <attribute name="horizontalHeaderDefaultSectionSize">
-                       <number>80</number>
-                      </attribute>
                      </widget>
                     </item>
                     <item>
@@ -1111,8 +1109,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>524</width>
-             <height>398</height>
+             <width>447</width>
+             <height>288</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_28">
@@ -1356,8 +1354,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>524</width>
-             <height>406</height>
+             <width>364</width>
+             <height>328</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_33">
@@ -1771,7 +1769,7 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>482</width>
+             <width>459</width>
              <height>407</height>
             </rect>
            </property>
@@ -2188,7 +2186,7 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>496</width>
+             <width>475</width>
              <height>308</height>
             </rect>
            </property>
@@ -2622,7 +2620,7 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>296</width>
+             <width>287</width>
              <height>124</height>
             </rect>
            </property>
@@ -2719,7 +2717,7 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>226</width>
+             <width>213</width>
              <height>221</height>
             </rect>
            </property>
@@ -2886,7 +2884,7 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>459</width>
+             <width>445</width>
              <height>192</height>
             </rect>
            </property>
@@ -3061,8 +3059,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>62</width>
-             <height>18</height>
+             <width>98</width>
+             <height>28</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_36"/>