From ef77358fd6238fb2ee7a21965f8991098468b5cc Mon Sep 17 00:00:00 2001
From: inpos <inpos@yandex.ru>
Date: Sat, 9 Dec 2017 15:01:45 +0300
Subject: [PATCH] Split proxy settings

---
 Content.py                             | 4 ++--
 resources/language/English/strings.xml | 3 ++-
 resources/language/Russian/strings.xml | 3 ++-
 resources/settings.xml                 | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Content.py b/Content.py
index 00e6e30..00f37dc 100644
--- a/Content.py
+++ b/Content.py
@@ -20,8 +20,8 @@
 
 import abc
 import sys
-proxy = int(sys.modules["__main__"].__settings__.getSetting("proxy"))
-if proxy == 2:
+proxy = int(sys.modules["__main__"].__settings__.getSetting("cl_proxy"))
+if proxy == 1:
     import socket
     from resources import socks
     socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", 9050)
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index e34d555..18ac13a 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -44,7 +44,8 @@
     <string id="30044">Save files</string>
     <string id="30045">Ask to save</string>
     <string id="30046">Torrent2HTTP (libtorrent via http)</string>
-    <string id="30047">Proxy</string>
+    <string id="30047">Proxy for Search</string>
+    <string id="31047">Proxy for Content Lists</string>
     <string id="30048">None</string>
     <string id="30049">Anti-zapret</string>
     <string id="31050">Tor</string>
diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml
index 855608c..40acb6f 100644
--- a/resources/language/Russian/strings.xml
+++ b/resources/language/Russian/strings.xml
@@ -44,7 +44,8 @@
     <string id="30044">Сохранять файлы</string>
     <string id="30045">Спросить о сохранении</string>
     <string id="30046">Torrent2HTTP (libtorrent по http)</string>
-    <string id="30047">Прокси</string>
+    <string id="30047">Прокси для поиска</string>
+    <string id="31047">Прокси для списков медиа</string>
     <string id="30048">Не использовать</string>
     <string id="30049">Anti-zapret</string>
     <string id="31050">Tor</string>
diff --git a/resources/settings.xml b/resources/settings.xml
index c169044..f480bb7 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -13,6 +13,7 @@
         <setting id="search_phrase"     type="text"     label="30040"/>
         <setting id="num_threads"       type="slider"   label="30042" default="3" range="1,1,9" option="int"/>
         <setting id="proxy"             type="enum"     lvalues="30048|30049|31050" label="30047" default="0"/>
+		<setting id="cl_proxy"             type="enum"     lvalues="30048|31050" label="31047" default="0"/>
         <setting id="debug"             type="bool"     label="30015" default="false"/>
     </category>
     <category label="30102">