diff --git a/src/calibre/gui2/preferences/misc.py b/src/calibre/gui2/preferences/misc.py
index 80bfdffcd8..60a4540b99 100644
--- a/src/calibre/gui2/preferences/misc.py
+++ b/src/calibre/gui2/preferences/misc.py
@@ -10,6 +10,7 @@ from calibre.gui2.preferences import ConfigWidgetBase, test_widget, Setting
from calibre.gui2.preferences.misc_ui import Ui_Form
from calibre.gui2 import error_dialog, config, open_local_file, info_dialog
from calibre.constants import isosx
+from calibre import get_proxies
class WorkersSetting(Setting):
@@ -33,6 +34,13 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.user_defined_device_button.clicked.connect(self.user_defined_device)
self.button_osx_symlinks.clicked.connect(self.create_symlinks)
self.button_osx_symlinks.setVisible(isosx)
+ proxies = get_proxies(debug=False)
+ txt = _('No proxies used')
+ if proxies:
+ lines = ['
%s: %s
'%(t, p) for t, p in
+ proxies.iteritems()]
+ txt = _('Using proxies:') + ''.join(lines)
+ self.proxies.setText(txt)
def debug_device_detection(self, *args):
from calibre.gui2.preferences.device_debug import DebugDevice
diff --git a/src/calibre/gui2/preferences/misc.ui b/src/calibre/gui2/preferences/misc.ui
index 843f0f01b7..dd9b984d48 100644
--- a/src/calibre/gui2/preferences/misc.ui
+++ b/src/calibre/gui2/preferences/misc.ui
@@ -118,7 +118,7 @@
- -
+
-
Qt::Vertical
@@ -131,6 +131,13 @@
+ -
+
+
+
+
+
+