kuuko pushed a commit to branch master. http://git.enlightenment.org/apps/epour.git/commit/?id=3cfbcc1841d902d9a4396c68efb3841b052142b3
commit 3cfbcc1841d902d9a4396c68efb3841b052142b3 Author: Kai Huuhko <[email protected]> Date: Thu Jul 10 21:51:36 2014 +0300 Update proxy settings with couple new options --- epour/gui/Preferences.py | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/epour/gui/Preferences.py b/epour/gui/Preferences.py index cd12623..ece7031 100644 --- a/epour/gui/Preferences.py +++ b/epour/gui/Preferences.py @@ -52,6 +52,7 @@ EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0 FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL FILL_HORIZ = EVAS_HINT_FILL, 0.5 ALIGN_LEFT = 0.0, 0.5 +ALIGN_RIGHT = 1.0, 0.5 SCROLL_BOTH = ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_AUTO @@ -314,11 +315,13 @@ class ProxyGroup(Frame): ) t.show() + ps = rfunc() + l = Label(self, text="Proxy type", size_hint_align=ALIGN_LEFT) l.show() ptype = Hoversel(parent, size_hint_align=FILL_HORIZ) - ptype.text = rfunc().type.name - for n in self.proxy_types.iterkeys(): + ptype.text = ps.type.name + for n in lt.proxy_type.names.keys(): ptype.item_add(n, callback=lambda x, y, z=n: ptype.text_set(z)) ptype.show() t.pack(l, 0, 0, 1, 1) @@ -330,7 +333,7 @@ class ProxyGroup(Frame): parent, size_hint_weight=EXPAND_HORIZ, size_hint_align=FILL_HORIZ, single_line=True, scrollable=True ) - phost.entry = rfunc().hostname + phost.entry = ps.hostname phost.show() t.pack(l, 0, 1, 1, 1) t.pack(phost, 1, 1, 1, 1) @@ -338,7 +341,7 @@ class ProxyGroup(Frame): l = Label(self, text="Port", size_hint_align=ALIGN_LEFT) l.show() pport = Spinner(parent, size_hint_align=FILL_HORIZ, min_max=(0, 65535)) - pport.value = rfunc().port + pport.value = ps.port pport.show() t.pack(l, 0, 2, 1, 1) t.pack(pport, 1, 2, 1, 1) @@ -349,7 +352,7 @@ class ProxyGroup(Frame): parent, size_hint_weight=EXPAND_HORIZ, size_hint_align=FILL_HORIZ, single_line=True, scrollable=True ) - puser.entry = rfunc().username + puser.entry = ps.username puser.show() t.pack(l, 0, 3, 1, 1) t.pack(puser, 1, 3, 1, 1) @@ -360,29 +363,51 @@ class ProxyGroup(Frame): parent, size_hint_weight=EXPAND_HORIZ, size_hint_align=FILL_HORIZ, single_line=True, scrollable=True, password=True ) - ppass.entry = rfunc().password + ppass.entry = ps.password ppass.show() t.pack(l, 0, 4, 1, 1) t.pack(ppass, 1, 4, 1, 1) - entries = [ptype, phost, pport, puser, ppass] + l = Label( + self, text="Proxy hostname lookups", size_hint_align=ALIGN_LEFT) + l.show() + phostlu = Check(parent, size_hint_align=ALIGN_RIGHT) + phostlu.state = ps.proxy_hostnames + phostlu.show() + t.pack(l, 0, 5, 1, 1) + t.pack(phostlu, 1, 5, 1, 1) + + l = Label( + self, text="Proxy peer connections", size_hint_align=ALIGN_LEFT) + l.show() + ppeer = Check(parent, size_hint_align=ALIGN_RIGHT) + ppeer.state = ps.proxy_peer_connections + ppeer.show() + t.pack(l, 0, 6, 1, 1) + t.pack(ppeer, 1, 6, 1, 1) + + entries = [ptype, phost, pport, puser, ppass, phostlu, ppeer] save = Button(parent, text="Apply") save.callback_clicked_add(self.save_conf, wfunc, entries) save.show() - t.pack(save, 0, 5, 2, 1) + t.pack(save, 0, 7, 2, 1) self.content = t def save_conf(self, btn, wfunc, entries): - ptype, phost, pport, puser, ppass = entries + ptype, phost, pport, puser, ppass, phostlu, ppeer = entries p = lt.proxy_settings() p.hostname = phost.entry.encode("utf-8") - p.port = int(pport.value) p.username = puser.entry.encode("utf-8") p.password = ppass.entry.encode("utf-8") - p.type = self.proxy_types[ptype.text] + p.type = lt.proxy_type.names[ptype.text] + p.port = int(pport.value) + p.proxy_hostnames = phostlu.state + p.proxy_peer_connections = ppeer.state + + Information(self.top_widget, "%s settings saved" % (ptype)) wfunc(p) --
