1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 12:58:07 +01:00

Merge fix from Joe MacMahon

This commit is contained in:
David Paleino
2012-02-11 21:32:10 +01:00
2 changed files with 6 additions and 7 deletions

View File

@@ -180,8 +180,12 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
self.set_net_prop('dhcphostname',self.dhcp_h.get_edit_text())
self.set_net_prop('usedhcphostname',self.use_dhcp_h.get_state())
# Prevent comboboxes from dying.
def ready_widgets(self,ui,body):
pass
self.ui = ui
self.body = body
self.encryption_combo.build_combobox(body,ui,14)
self.change_encrypt_method()
def combo_on_change(self,combobox,new_index,user_data=None):
self.change_encrypt_method()
@@ -489,9 +493,3 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
wireless.SaveWirelessNetworkProfile(self.networkid)
return True
def ready_widgets(self,ui,body):
self.ui = ui
self.body = body
self.encryption_combo.build_combobox(body,ui,14)
self.change_encrypt_method()

View File

@@ -828,6 +828,7 @@ class appGUI():
self.frame.set_footer(urwid.Pile([self.confCols,self.footer2]))
if focus == self.wiredCB:
self.diag = WiredSettingsDialog(self.wiredCB.get_body().get_selected_profile(),self.frame)
self.diag.ready_widgets(ui,self.frame)
self.frame.set_body(self.diag)
else:
# wireless list only other option