From 82d14d2731fa0b30aa68f07d7a40d29cf0e7544f Mon Sep 17 00:00:00 2001
From: inpos <inpos@yandex.ru>
Date: Mon, 11 Dec 2017 22:21:28 +0300
Subject: [PATCH] Specify sock ip

---
 Content.py                             | 1 +
 SearcherABC.py                         | 1 +
 resources/language/English/strings.xml | 1 +
 resources/language/Russian/strings.xml | 1 +
 resources/settings.xml                 | 1 +
 5 files changed, 5 insertions(+)

diff --git a/Content.py b/Content.py
index 00f37dc..827b263 100644
--- a/Content.py
+++ b/Content.py
@@ -22,6 +22,7 @@ import abc
 import sys
 proxy = int(sys.modules["__main__"].__settings__.getSetting("cl_proxy"))
 if proxy == 1:
+    socks_ip = sys.modules["__main__"].__settings__.getSetting("socks_ip")
     import socket
     from resources import socks
     socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", 9050)
diff --git a/SearcherABC.py b/SearcherABC.py
index ac18697..d3a9a8f 100644
--- a/SearcherABC.py
+++ b/SearcherABC.py
@@ -29,6 +29,7 @@ import sys
 
 proxy = int(sys.modules["__main__"].__settings__.getSetting("proxy"))
 if proxy == 2:
+    socks_ip = sys.modules["__main__"].__settings__.getSetting("socks_ip")
     from resources import socks
     socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", 9050)
     socket.socket = socks.socksocket
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 18ac13a..b2ea4f8 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -46,6 +46,7 @@
     <string id="30046">Torrent2HTTP (libtorrent via http)</string>
     <string id="30047">Proxy for Search</string>
     <string id="31047">Proxy for Content Lists</string>
+    <string id="32047">SOCKS-proxy IP</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 40acb6f..b612cf3 100644
--- a/resources/language/Russian/strings.xml
+++ b/resources/language/Russian/strings.xml
@@ -46,6 +46,7 @@
     <string id="30046">Torrent2HTTP (libtorrent по http)</string>
     <string id="30047">Прокси для поиска</string>
     <string id="31047">Прокси для списков медиа</string>
+    <string id="32047">IP SOCKS-прокси</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 f480bb7..46f30b2 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -14,6 +14,7 @@
         <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="socks_ip"			type="ipaddress" label="32047" default="127.0.0.1"  visible="eq(-2,2)|eq(-1,1)"/>
         <setting id="debug"             type="bool"     label="30015" default="false"/>
     </category>
     <category label="30102">