gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-22 06:54:21 +01:00
Code Issues Projects Releases Wiki Activity

merged 1.6-strip-ips and updated translations.py

Browse Source
This commit is contained in:
Adam Blackburn
2009-08-13 12:11:55 -05:00
parent 21a4a0374c 607c103615
commit a98d084dc2
7 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
curses/netentry_curses.py
View File

@@ -128,6 +128,9 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
def save_settings(self):
""" Save settings common to wired and wireless settings dialogs. """
if self.static_ip_cb.get_state():
for i in [self.ip_edit,self.netmask_edit,self.gateway_edit]:
i.set_edit_text(i.get_edit_text().strip())
self.set_net_prop("ip", noneToString(self.ip_edit.get_edit_text()))
self.set_net_prop("netmask", noneToString(self.netmask_edit.get_edit_text()))
self.set_net_prop("gateway", noneToString(self.gateway_edit.get_edit_text()))
@@ -140,6 +143,10 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
not self.global_dns_cb.get_state():
self.set_net_prop('use_static_dns', True)
self.set_net_prop('use_global_dns', False)
# Strip addressses before checking them in the daemon.
for i in [self.dns1, self.dns2,
self.dns3,self.dns_dom_edit, self.search_dom_edit]:
i.set_edit_text(i.get_edit_text().strip())
self.set_net_prop('dns_domain', noneToString(self.dns_dom_edit.get_edit_text()))
self.set_net_prop("search_domain", noneToString(self.search_dom_edit.get_edit_text()))
self.set_net_prop("dns1", noneToString(self.dns1.get_edit_text()))

5
curses/prefs_curses.py
View File

@@ -326,6 +326,11 @@ class PrefsDialog(urwid.WidgetWrap):
""" Pushes the selected settings to the daemon.
This exact order is found in prefs.py"""
daemon.SetUseGlobalDNS(self.global_dns_checkb.get_state())
for i in [self.dns1, self.dns2,
self.dns3,self.dns_dom, self.search_dom, self.dns_dom]:
i.set_edit_text(i.get_edit_text().strip())
daemon.SetGlobalDNS(self.dns1.get_edit_text(), self.dns2.get_edit_text(),
self.dns3.get_edit_text(), self.dns_dom.get_edit_text(),
self.search_dom.get_edit_text())

2
curses/wicd-curses.py
View File

@@ -487,7 +487,7 @@ class AdHocDialog(Dialog2):
self.view.keypress( size, k )
def on_exit(self,exitcode):
data = ( self.essid_edit.get_edit_text(),
self.ip_edit.get_edit_text(),
self.ip_edit.get_edit_text().strip(),
self.channel_edit.get_edit_text(),
self.use_ics_chkb.get_state(),
self.use_encrypt_chkb.get_state(),