diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py index b74eec4..bdf33ed 100644 --- a/curses/netentry_curses.py +++ b/curses/netentry_curses.py @@ -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())) diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py index bf1eb74..d843705 100644 --- a/curses/prefs_curses.py +++ b/curses/prefs_curses.py @@ -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()) diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 220a635..8aec75a 100755 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -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(), diff --git a/wicd/gui.py b/wicd/gui.py index 2c426f9..6324a27 100644 --- a/wicd/gui.py +++ b/wicd/gui.py @@ -274,7 +274,8 @@ class appGui(object): if response == 1: wireless.CreateAdHocNetwork(essid_entry.entry.get_text(), channel_entry.entry.get_text(), - ip_entry.entry.get_text(), "WEP", + ip_entry.entry.get_text().strip(), + "WEP", self.key_entry.entry.get_text(), self.chkbox_use_encryption.get_active(), False) #chkbox_use_ics.get_active()) @@ -579,6 +580,7 @@ class appGui(object): # Required entries. for lblent in req_entlist: + lblent.set_text(lblent.get_text().strip()) if not misc.IsValidIP(lblent.get_text()): error(self.window, language['invalid_address']. replace('$A', lblent.label.get_label())) @@ -586,6 +588,7 @@ class appGui(object): # Optional entries, only check for validity if they're entered. for lblent in opt_entlist: + lblent.set_text(lblent.get_text().strip()) if lblent.get_text() and not misc.IsValidIP(lblent.get_text()): error(self.window, language['invalid_address']. replace('$A', lblent.label.get_label())) diff --git a/wicd/netentry.py b/wicd/netentry.py index 44bfa10..7bdf99b 100644 --- a/wicd/netentry.py +++ b/wicd/netentry.py @@ -118,6 +118,7 @@ class AdvancedSettingsDialog(gtk.Dialog): def set_defaults(self, widget=None, event=None): """ Put some default values into entries to help the user out. """ + self.txt_ip.set_text(self.txt_ip.get_text().strip()) ipAddress = self.txt_ip.get_text() # For easy typing :) netmask = self.txt_netmask gateway = self.txt_gateway @@ -130,7 +131,7 @@ class AdvancedSettingsDialog(gtk.Dialog): if stringToNone(netmask.get_text()) is None: # Make sure the netmask is blank netmask.set_text('255.255.255.0') # Fill in the most common one elif ipAddress != "": - error(None, "Invalid IP Address Entered.") + error(None, language['invalid_ip_address']) def reset_static_checkboxes(self): # Enable the right stuff diff --git a/wicd/prefs.py b/wicd/prefs.py index 4677463..7d3426e 100644 --- a/wicd/prefs.py +++ b/wicd/prefs.py @@ -183,6 +183,10 @@ class PreferencesDialog(object): def save_results(self): """ Pushes the selected settings to the daemon. """ daemon.SetUseGlobalDNS(self.useGlobalDNSCheckbox.get_active()) + # Strip whitespace from DNS entries + for i in [self.dns1Entry, self.dns2Entry, self.dns3Entry, + self.dnsDomEntry, self.searchDomEntry]: + i.set_text(i.get_text().strip()) daemon.SetGlobalDNS(self.dns1Entry.get_text(), self.dns2Entry.get_text(), self.dns3Entry.get_text(), self.dnsDomEntry.get_text(), self.searchDomEntry.get_text()) diff --git a/wicd/translations.py b/wicd/translations.py index 396bd92..e511bcc 100644 --- a/wicd/translations.py +++ b/wicd/translations.py @@ -44,17 +44,18 @@ def get_gettext(): lc, encoding = locale.getdefaultlocale(envvars=('LC_MESSAGES', 'LC_ALL', 'LANG', 'LANGUAGE')) - langs += [lc] except ValueError, e: print str(e) print "Default locale unavailable, falling back to en_US" + if (lc): + langs += [lc] langs += ["en_US"] lang = gettext.translation('wicd', local_path, languages=langs, fallback=True) _ = lang.gettext return _ -# Generated automatically on Sun, 05 Jul 2009 13:51:18 CDT +# Generated automatically on Thu, 13 Aug 2009 12:10:26 CDT _ = get_gettext() language = {} language['resetting_ip_address'] = _('''Resetting IP address...''') @@ -217,3 +218,6 @@ language['access_denied'] = _('''Unable to contact the Wicd daemon due to an acc language['disconnecting_active'] = _('''Disconnecting active connections...''') language['access_denied_wc'] = _('''ERROR: wicd-curses was denied access to the wicd daemon: please check that your user is in the "$A" group.''') language['post_disconnect_script'] = _('''Run post-disconnect script''') +language['resume_script'] = _('''Resume script''') +language['suspend_script'] = _('''Suspend script''') +language['invalid_ip_address'] = _('''Invalid IP address entered.''')