mirror of
https://github.com/gryf/wicd.git
synced 2025-12-24 15:12:31 +01:00
Merged new prefs dialog from mainline experimental
This commit is contained in:
1500
data/wicd.glade
1500
data/wicd.glade
File diff suppressed because it is too large
Load Diff
@@ -71,6 +71,7 @@ class PreferencesDialog(object):
|
||||
dhcp_list = [self.dhcpautoradio, self.dhclientradio, self.dhcpcdradio,
|
||||
self.pumpradio]
|
||||
dhcp_method = daemon.GetDHCPClient()
|
||||
print 'DHCP method is %s' % daemon.GetDHCPClient()
|
||||
dhcp_list[dhcp_method].set_active(True)
|
||||
|
||||
wired_link_list = [self.linkautoradio, self.ethtoolradio,
|
||||
@@ -213,32 +214,34 @@ class PreferencesDialog(object):
|
||||
def setup_label(name, lbl=""):
|
||||
""" Sets up a label for the given widget name. """
|
||||
widget = self.wTree.get_widget(name)
|
||||
if lbl:
|
||||
widget.set_label(language[lbl])
|
||||
# if lbl:
|
||||
# widget.set_label(language[lbl])
|
||||
if widget is None:
|
||||
raise ValueError('widget %s does not exist' % name)
|
||||
return widget
|
||||
|
||||
# External Programs tab
|
||||
self.wTree.get_widget("gen_settings_label").set_label(language["gen_settings"])
|
||||
self.wTree.get_widget("ext_prog_label").set_label(language["ext_programs"])
|
||||
self.wTree.get_widget("dhcp_client_label").set_label(language["dhcp_client"])
|
||||
self.wTree.get_widget("wired_detect_label").set_label(language["wired_detect"])
|
||||
self.wTree.get_widget("route_flush_label").set_label(language["route_flush"])
|
||||
self.wTree.get_widget("pref_backend_label").set_label(language["backend"] + ":")
|
||||
# self.wTree.get_widget("gen_settings_label").set_label(language["gen_settings"])
|
||||
# self.wTree.get_widget("ext_prog_label").set_label(language["ext_programs"])
|
||||
# self.wTree.get_widget("dhcp_client_label").set_label(language["dhcp_client"])
|
||||
# self.wTree.get_widget("wired_detect_label").set_label(language["wired_detect"])
|
||||
# self.wTree.get_widget("route_flush_label").set_label(language["route_flush"])
|
||||
# self.wTree.get_widget("pref_backend_label").set_label(language["backend"] + ":")
|
||||
|
||||
entryWiredAutoMethod = self.wTree.get_widget("pref_wired_auto_label")
|
||||
entryWiredAutoMethod.set_label('Wired Autoconnect Setting:')
|
||||
entryWiredAutoMethod.set_alignment(0, 0)
|
||||
atrlist = pango.AttrList()
|
||||
atrlist.insert(pango.AttrWeight(pango.WEIGHT_BOLD, 0, 50))
|
||||
entryWiredAutoMethod.set_attributes(atrlist)
|
||||
# entryWiredAutoMethod = self.wTree.get_widget("pref_wired_auto_label")
|
||||
# entryWiredAutoMethod.set_label('Wired Autoconnect Setting:')
|
||||
# entryWiredAutoMethod.set_alignment(0, 0)
|
||||
# atrlist = pango.AttrList()
|
||||
# atrlist.insert(pango.AttrWeight(pango.WEIGHT_BOLD, 0, 50))
|
||||
# entryWiredAutoMethod.set_attributes(atrlist)
|
||||
|
||||
self.set_label("pref_dns1_label", "%s %s" % (language['dns'], language['1']))
|
||||
self.set_label("pref_dns2_label", "%s %s" % (language['dns'], language['2']))
|
||||
self.set_label("pref_dns3_label", "%s %s" % (language['dns'], language['3']))
|
||||
self.set_label("pref_search_dom_label", "%s:" % language['search_domain'])
|
||||
self.set_label("pref_wifi_label", "%s:" % language['wireless_interface'])
|
||||
self.set_label("pref_wired_label", "%s:" % language['wired_interface'])
|
||||
self.set_label("pref_driver_label", "%s:" % language['wpa_supplicant_driver'])
|
||||
# self.set_label("pref_dns1_label", "%s %s" % (language['dns'], language['1']))
|
||||
# self.set_label("pref_dns2_label", "%s %s" % (language['dns'], language['2']))
|
||||
# self.set_label("pref_dns3_label", "%s %s" % (language['dns'], language['3']))
|
||||
# self.set_label("pref_search_dom_label", "%s:" % language['search_domain'])
|
||||
# self.set_label("pref_wifi_label", "%s:" % language['wireless_interface'])
|
||||
# self.set_label("pref_wired_label", "%s:" % language['wired_interface'])
|
||||
# self.set_label("pref_driver_label", "%s:" % language['wpa_supplicant_driver'])
|
||||
|
||||
self.dialog = self.wTree.get_widget("pref_dialog")
|
||||
self.dialog.set_title(language['preferences'])
|
||||
@@ -318,4 +321,4 @@ class PreferencesDialog(object):
|
||||
cur_backend = daemon.GetSavedBackend()
|
||||
for x in self.backends:
|
||||
self.backendcombo.append_text(x)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user