diff --git a/gajim/gtk/preferences.py b/gajim/gtk/preferences.py index 75edbe6f7..2e4ce0366 100644 --- a/gajim/gtk/preferences.py +++ b/gajim/gtk/preferences.py @@ -1017,7 +1017,7 @@ class Preferences(Gtk.ApplicationWindow): if active == -1: return proxy = widget.get_model()[active][0] - if proxy == _('None'): + if proxy == _('No Proxy'): proxy = '' app.config.set('global_proxy', proxy) @@ -1030,11 +1030,11 @@ class Preferences(Gtk.ApplicationWindow): def update_proxy_list(self): our_proxy = app.config.get('global_proxy') if not our_proxy: - our_proxy = _('None') + our_proxy = _('No Proxy') model = self._ui.proxies_combobox.get_model() model.clear() proxies = app.config.get_per('proxies') - proxies.insert(0, _('None')) + proxies.insert(0, _('No Proxy')) for index, proxy in enumerate(proxies): model.append([proxy]) if our_proxy == proxy: diff --git a/gajim/gtk/proxies.py b/gajim/gtk/proxies.py index 63c5f2502..ce1d2db4d 100644 --- a/gajim/gtk/proxies.py +++ b/gajim/gtk/proxies.py @@ -16,7 +16,6 @@ from gi.repository import Gdk from gi.repository import Gtk from gajim.common import app -from gajim.common.i18n import _ from gajim.gtk.util import get_builder @@ -57,8 +56,6 @@ class ManageProxies: def fill_proxies_treeview(self): model = self._ui.proxies_treeview.get_model() model.clear() - iter_ = model.append() - model.set(iter_, 0, _('None')) for proxy in app.config.get_per('proxies'): iter_ = model.append() model.set(iter_, 0, proxy) @@ -96,8 +93,6 @@ class ManageProxies: if not iter_: return proxy = model[iter_][0] - if proxy == _('None'): - return model.remove(iter_) app.config.del_per('proxies', proxy) self._ui.remove_proxy_button.set_sensitive(False) @@ -149,50 +144,43 @@ class ManageProxies: proxy = model[iter_][0] self._ui.proxyname_entry.set_text(proxy) - if proxy == _('None'): # special proxy None - self.show_bosh_fields(False) - self._ui.proxyname_entry.set_editable(False) - self._ui.proxyname_entry.set_sensitive(False) - self._ui.remove_proxy_button.set_sensitive(False) - self._ui.proxytype_combobox.set_sensitive(False) - self._ui.proxy_table.set_sensitive(False) - else: - proxytype = app.config.get_per('proxies', proxy, 'type') + proxytype = app.config.get_per('proxies', proxy, 'type') - self.show_bosh_fields(proxytype == 'bosh') + self.show_bosh_fields(proxytype == 'bosh') - self._ui.proxyname_entry.set_editable(True) - self._ui.proxyname_entry.set_sensitive(True) - self._ui.remove_proxy_button.set_sensitive(True) - self._ui.proxytype_combobox.set_sensitive(True) - self._ui.proxy_table.set_sensitive(True) + self._ui.proxyname_entry.set_editable(True) + self._ui.proxyname_entry.set_sensitive(True) + self._ui.remove_proxy_button.set_sensitive(True) + self._ui.proxytype_combobox.set_sensitive(True) + self._ui.proxy_table.set_sensitive(True) - self._ui.boshuri_entry.set_text( - app.config.get_per('proxies', proxy, 'bosh_uri')) - self._ui.boshuseproxy_checkbutton.set_active( - app.config.get_per('proxies', proxy, 'bosh_useproxy')) - if proxytype == 'bosh': - act = self._ui.boshuseproxy_checkbutton.get_active() - self._ui.proxyhost_entry.set_sensitive(act) - self._ui.proxyport_entry.set_sensitive(act) + self._ui.boshuri_entry.set_text( + app.config.get_per('proxies', proxy, 'bosh_uri')) + self._ui.boshuseproxy_checkbutton.set_active( + app.config.get_per('proxies', proxy, 'bosh_useproxy')) + if proxytype == 'bosh': + act = self._ui.boshuseproxy_checkbutton.get_active() + self._ui.proxyhost_entry.set_sensitive(act) + self._ui.proxyport_entry.set_sensitive(act) - self._ui.proxyhost_entry.set_text( - app.config.get_per('proxies', proxy, 'host')) - self._ui.proxyport_entry.set_text( - str(app.config.get_per('proxies', proxy, 'port'))) - self._ui.proxyuser_entry.set_text( - app.config.get_per('proxies', proxy, 'user')) - self._ui.proxypass_entry.set_text( - app.config.get_per('proxies', proxy, 'pass')) + self._ui.proxyhost_entry.set_text( + app.config.get_per('proxies', proxy, 'host')) + self._ui.proxyport_entry.set_text( + str(app.config.get_per('proxies', proxy, 'port'))) + self._ui.proxyuser_entry.set_text( + app.config.get_per('proxies', proxy, 'user')) + self._ui.proxypass_entry.set_text( + app.config.get_per('proxies', proxy, 'pass')) - types = ['http', 'socks5', 'bosh'] - self._ui.proxytype_combobox.set_active(types.index(proxytype)) + types = ['http', 'socks5', 'bosh'] + self._ui.proxytype_combobox.set_active(types.index(proxytype)) + + self._ui.useauth_checkbutton.set_active( + app.config.get_per('proxies', proxy, 'useauth')) + act = self._ui.useauth_checkbutton.get_active() + self._ui.proxyuser_entry.set_sensitive(act) + self._ui.proxypass_entry.set_sensitive(act) - self._ui.useauth_checkbutton.set_active( - app.config.get_per('proxies', proxy, 'useauth')) - act = self._ui.useauth_checkbutton.get_active() - self._ui.proxyuser_entry.set_sensitive(act) - self._ui.proxypass_entry.set_sensitive(act) self.block_signal = False def on_proxies_treeview_key_press_event(self, widget, event): diff --git a/gajim/options_dialog.py b/gajim/options_dialog.py index c623a7779..c78026bac 100644 --- a/gajim/options_dialog.py +++ b/gajim/options_dialog.py @@ -492,7 +492,7 @@ class ProxyComboOption(GenericOption): def update_values(self): proxies = app.config.get_per('proxies') - proxies.insert(0, _('None')) + proxies.insert(0, _('No Proxy')) self.combo.remove_all() for index, value in enumerate(proxies): self.combo.insert_text(-1, value)