copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove None from list, rename None to No Proxy in combobox

Browse source
This commit is contained in:
Daniel Brötzmann 2018-11-07 21:00:40 +01:00
parent 56f948f56b
commit 02f16d53f4
3 changed files with 35 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gajim/gtk/preferences.py
View file

@ -1017,7 +1017,7 @@ class Preferences(Gtk.ApplicationWindow):
if active == -1: if active == -1:
return return
proxy = widget.get_model()[active][0] proxy = widget.get_model()[active][0]
if proxy == _('None'): if proxy == _('No Proxy'):
proxy = '' proxy = ''
app.config.set('global_proxy', proxy) app.config.set('global_proxy', proxy)
@ -1030,11 +1030,11 @@ class Preferences(Gtk.ApplicationWindow):
def update_proxy_list(self): def update_proxy_list(self):
our_proxy = app.config.get('global_proxy') our_proxy = app.config.get('global_proxy')
if not our_proxy: if not our_proxy:
our_proxy = _('None') our_proxy = _('No Proxy')
model = self._ui.proxies_combobox.get_model() model = self._ui.proxies_combobox.get_model()
model.clear() model.clear()
proxies = app.config.get_per('proxies') proxies = app.config.get_per('proxies')
proxies.insert(0, _('None')) proxies.insert(0, _('No Proxy'))
for index, proxy in enumerate(proxies): for index, proxy in enumerate(proxies):
model.append([proxy]) model.append([proxy])
if our_proxy == proxy: if our_proxy == proxy:

74
gajim/gtk/proxies.py
View file

@ -16,7 +16,6 @@ from gi.repository import Gdk
from gi.repository import Gtk from gi.repository import Gtk
from gajim.common import app from gajim.common import app
from gajim.common.i18n import _
from gajim.gtk.util import get_builder from gajim.gtk.util import get_builder
@ -57,8 +56,6 @@ class ManageProxies:
def fill_proxies_treeview(self): def fill_proxies_treeview(self):
model = self._ui.proxies_treeview.get_model() model = self._ui.proxies_treeview.get_model()
model.clear() model.clear()
iter_ = model.append()
model.set(iter_, 0, _('None'))
for proxy in app.config.get_per('proxies'): for proxy in app.config.get_per('proxies'):
iter_ = model.append() iter_ = model.append()
model.set(iter_, 0, proxy) model.set(iter_, 0, proxy)
@ -96,8 +93,6 @@ class ManageProxies:
if not iter_: if not iter_:
return return
proxy = model[iter_][0] proxy = model[iter_][0]
if proxy == _('None'):
return
model.remove(iter_) model.remove(iter_)
app.config.del_per('proxies', proxy) app.config.del_per('proxies', proxy)
self._ui.remove_proxy_button.set_sensitive(False) self._ui.remove_proxy_button.set_sensitive(False)
@ -149,50 +144,43 @@ class ManageProxies:
proxy = model[iter_][0] proxy = model[iter_][0]
self._ui.proxyname_entry.set_text(proxy) self._ui.proxyname_entry.set_text(proxy)
if proxy == _('None'): # special proxy None proxytype = app.config.get_per('proxies', proxy, 'type')
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')
self.show_bosh_fields(proxytype == 'bosh') self.show_bosh_fields(proxytype == 'bosh')
self._ui.proxyname_entry.set_editable(True) self._ui.proxyname_entry.set_editable(True)
self._ui.proxyname_entry.set_sensitive(True) self._ui.proxyname_entry.set_sensitive(True)
self._ui.remove_proxy_button.set_sensitive(True) self._ui.remove_proxy_button.set_sensitive(True)
self._ui.proxytype_combobox.set_sensitive(True) self._ui.proxytype_combobox.set_sensitive(True)
self._ui.proxy_table.set_sensitive(True) self._ui.proxy_table.set_sensitive(True)
self._ui.boshuri_entry.set_text( self._ui.boshuri_entry.set_text(
app.config.get_per('proxies', proxy, 'bosh_uri')) app.config.get_per('proxies', proxy, 'bosh_uri'))
self._ui.boshuseproxy_checkbutton.set_active( self._ui.boshuseproxy_checkbutton.set_active(
app.config.get_per('proxies', proxy, 'bosh_useproxy')) app.config.get_per('proxies', proxy, 'bosh_useproxy'))
if proxytype == 'bosh': if proxytype == 'bosh':
act = self._ui.boshuseproxy_checkbutton.get_active() act = self._ui.boshuseproxy_checkbutton.get_active()
self._ui.proxyhost_entry.set_sensitive(act) self._ui.proxyhost_entry.set_sensitive(act)
self._ui.proxyport_entry.set_sensitive(act) self._ui.proxyport_entry.set_sensitive(act)
self._ui.proxyhost_entry.set_text( self._ui.proxyhost_entry.set_text(
app.config.get_per('proxies', proxy, 'host')) app.config.get_per('proxies', proxy, 'host'))
self._ui.proxyport_entry.set_text( self._ui.proxyport_entry.set_text(
str(app.config.get_per('proxies', proxy, 'port'))) str(app.config.get_per('proxies', proxy, 'port')))
self._ui.proxyuser_entry.set_text( self._ui.proxyuser_entry.set_text(
app.config.get_per('proxies', proxy, 'user')) app.config.get_per('proxies', proxy, 'user'))
self._ui.proxypass_entry.set_text( self._ui.proxypass_entry.set_text(
app.config.get_per('proxies', proxy, 'pass')) app.config.get_per('proxies', proxy, 'pass'))
types = ['http', 'socks5', 'bosh'] types = ['http', 'socks5', 'bosh']
self._ui.proxytype_combobox.set_active(types.index(proxytype)) 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 self.block_signal = False
def on_proxies_treeview_key_press_event(self, widget, event): def on_proxies_treeview_key_press_event(self, widget, event):

2
gajim/options_dialog.py
View file

@ -492,7 +492,7 @@ class ProxyComboOption(GenericOption):
def update_values(self): def update_values(self):
proxies = app.config.get_per('proxies') proxies = app.config.get_per('proxies')
proxies.insert(0, _('None')) proxies.insert(0, _('No Proxy'))
self.combo.remove_all() self.combo.remove_all()
for index, value in enumerate(proxies): for index, value in enumerate(proxies):
self.combo.insert_text(-1, value) self.combo.insert_text(-1, value)