gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00
Code Issues Projects Releases Wiki Activity

apply patch to use gtkbuilder instead of libglade

Browse Source
This commit is contained in:
Adam Blackburn
2010-05-17 21:51:43 -05:00
parent b276a93bda
commit 6bcae3ad97
3 changed files with 40 additions and 1712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1670
data/wicd.glade
View File

File diff suppressed because it is too large Load Diff

33
gtk/gui.py
View File

@@ -29,7 +29,6 @@ import time
import gobject import gobject
import pango import pango
import gtk import gtk
import gtk.glade
from itertools import chain from itertools import chain
from dbus import DBusException from dbus import DBusException
@@ -148,10 +147,10 @@ class appGui(object):
self.tray = tray self.tray = tray
gladefile = os.path.join(wpath.gtk, "wicd.glade") gladefile = os.path.join(wpath.gtk, "wicd.ui")
self.wTree = gtk.glade.XML(gladefile) self.wTree = gtk.Builder()
self.window = self.wTree.get_widget("window1") self.wTree.add_from_file(gladefile)
self.window.set_icon_name("wicd-gtk") self.window = self.wTree.get_object("window1")
size = daemon.ReadWindowSize("main") size = daemon.ReadWindowSize("main")
width = size[0] width = size[0]
height = size[1] height = size[1]
@@ -173,16 +172,16 @@ class appGui(object):
"about_clicked" : self.about_dialog, "about_clicked" : self.about_dialog,
"create_adhoc_clicked" : self.create_adhoc_network, "create_adhoc_clicked" : self.create_adhoc_network,
} }
self.wTree.signal_autoconnect(dic) self.wTree.connect_signals(dic)
# Set some strings in the GUI - they may be translated # Set some strings in the GUI - they may be translated
label_instruct = self.wTree.get_widget("label_instructions") label_instruct = self.wTree.get_object("label_instructions")
label_instruct.set_label(language['select_a_network']) label_instruct.set_label(language['select_a_network'])
probar = self.wTree.get_widget("progressbar") probar = self.wTree.get_object("progressbar")
probar.set_text(language['connecting']) probar.set_text(language['connecting'])
self.all_network_list = self.wTree.get_widget("network_list_vbox") self.all_network_list = self.wTree.get_object("network_list_vbox")
self.all_network_list.show_all() self.all_network_list.show_all()
self.wired_network_box = gtk.VBox(False, 0) self.wired_network_box = gtk.VBox(False, 0)
self.wired_network_box.show_all() self.wired_network_box.show_all()
@@ -190,9 +189,9 @@ class appGui(object):
self.all_network_list.pack_start(self.wired_network_box, False, False) self.all_network_list.pack_start(self.wired_network_box, False, False)
self.all_network_list.pack_start(self.network_list, True, True) self.all_network_list.pack_start(self.network_list, True, True)
self.network_list.show_all() self.network_list.show_all()
self.status_area = self.wTree.get_widget("connecting_hbox") self.status_area = self.wTree.get_object("connecting_hbox")
self.status_bar = self.wTree.get_widget("statusbar") self.status_bar = self.wTree.get_object("statusbar")
menu = self.wTree.get_widget("menu1") menu = self.wTree.get_object("menu1")
self.status_area.hide_all() self.status_area.hide_all()
@@ -351,7 +350,7 @@ class appGui(object):
""" Alerts the daemon to cancel the connection process. """ """ Alerts the daemon to cancel the connection process. """
#should cancel a connection if there #should cancel a connection if there
#is one in progress #is one in progress
cancel_button = self.wTree.get_widget("cancel_button") cancel_button = self.wTree.get_object("cancel_button")
cancel_button.set_sensitive(False) cancel_button.set_sensitive(False)
daemon.CancelConnect() daemon.CancelConnect()
# Prevents automatic reconnecting if that option is enabled # Prevents automatic reconnecting if that option is enabled
@@ -364,7 +363,7 @@ class appGui(object):
if not self.is_visible: if not self.is_visible:
return True return True
try: try:
gobject.idle_add(self.wTree.get_widget("progressbar").pulse) gobject.idle_add(self.wTree.get_object("progressbar").pulse)
except: except:
pass pass
return True return True
@@ -551,7 +550,7 @@ class appGui(object):
if self._wired_showing: if self._wired_showing:
printLine = True printLine = True
num_networks = wireless.GetNumberOfNetworks() num_networks = wireless.GetNumberOfNetworks()
instruct_label = self.wTree.get_widget("label_instructions") instruct_label = self.wTree.get_object("label_instructions")
if num_networks > 0: if num_networks > 0:
instruct_label.show() instruct_label.show()
for x in range(0, num_networks): for x in range(0, num_networks):
@@ -683,7 +682,7 @@ class appGui(object):
return True return True
def _wait_for_connect_thread_start(self): def _wait_for_connect_thread_start(self):
self.wTree.get_widget("progressbar").pulse() self.wTree.get_object("progressbar").pulse()
if not self._connect_thread_started: if not self._connect_thread_started:
return True return True
else: else:
@@ -697,7 +696,7 @@ class appGui(object):
self._connect_thread_started = True self._connect_thread_started = True
def setup_interface_for_connection(): def setup_interface_for_connection():
cancel_button = self.wTree.get_widget("cancel_button") cancel_button = self.wTree.get_object("cancel_button")
cancel_button.set_sensitive(True) cancel_button.set_sensitive(True)
self.all_network_list.set_sensitive(False) self.all_network_list.set_sensitive(False)
if self.statusID: if self.statusID:

49
gtk/prefs.py
View File

@@ -28,7 +28,6 @@ import gtk
import gobject import gobject
#import pango #import pango
import os import os
import gtk.glade
from wicd import misc from wicd import misc
from wicd import wpath from wicd import wpath
@@ -162,9 +161,9 @@ class PreferencesDialog(object):
if wpath.no_use_notifications: if wpath.no_use_notifications:
self.notificationscheckbox.set_active(False) self.notificationscheckbox.set_active(False)
self.notificationscheckbox.hide() self.notificationscheckbox.hide()
self.wTree.get_widget('label2').hide() self.wTree.get_object('label2').hide()
self.wTree.get_widget("notebook2").set_current_page(0) self.wTree.get_object("notebook2").set_current_page(0)
def run(self): def run(self):
""" Runs the preferences dialog window. """ """ Runs the preferences dialog window. """
@@ -266,14 +265,14 @@ class PreferencesDialog(object):
def set_label(self, glade_str, label): def set_label(self, glade_str, label):
""" Sets the label for the given widget in wicd.glade. """ """ Sets the label for the given widget in wicd.glade. """
self.wTree.get_widget(glade_str).set_label(label) self.wTree.get_object(glade_str).set_label(label)
def prep_settings_diag(self): def prep_settings_diag(self):
""" Set up anything that doesn't have to be persisted later. """ """ Set up anything that doesn't have to be persisted later. """
def build_combobox(lbl): def build_combobox(lbl):
""" Sets up a ComboBox using the given widget name. """ """ Sets up a ComboBox using the given widget name. """
liststore = gtk.ListStore(gobject.TYPE_STRING) liststore = gtk.ListStore(gobject.TYPE_STRING)
combobox = self.wTree.get_widget(lbl) combobox = self.wTree.get_object(lbl)
combobox.clear() combobox.clear()
combobox.set_model(liststore) combobox.set_model(liststore)
cell = gtk.CellRendererText() cell = gtk.CellRendererText()
@@ -283,7 +282,7 @@ class PreferencesDialog(object):
def setup_label(name, lbl=""): def setup_label(name, lbl=""):
""" Sets up a label for the given widget name. """ """ Sets up a label for the given widget name. """
widget = self.wTree.get_widget(name) widget = self.wTree.get_object(name)
# if lbl: # if lbl:
# widget.set_label(language[lbl]) # widget.set_label(language[lbl])
if widget is None: if widget is None:
@@ -291,14 +290,14 @@ class PreferencesDialog(object):
return widget return widget
# External Programs tab # External Programs tab
# self.wTree.get_widget("gen_settings_label").set_label(language["gen_settings"]) # self.wTree.get_object("gen_settings_label").set_label(language["gen_settings"])
# self.wTree.get_widget("ext_prog_label").set_label(language["ext_programs"]) # self.wTree.get_object("ext_prog_label").set_label(language["ext_programs"])
# self.wTree.get_widget("dhcp_client_label").set_label(language["dhcp_client"]) # self.wTree.get_object("dhcp_client_label").set_label(language["dhcp_client"])
# self.wTree.get_widget("wired_detect_label").set_label(language["wired_detect"]) # self.wTree.get_object("wired_detect_label").set_label(language["wired_detect"])
# self.wTree.get_widget("route_flush_label").set_label(language["route_flush"]) # self.wTree.get_object("route_flush_label").set_label(language["route_flush"])
# self.wTree.get_widget("pref_backend_label").set_label(language["backend"] + ":") # self.wTree.get_object("pref_backend_label").set_label(language["backend"] + ":")
# entryWiredAutoMethod = self.wTree.get_widget("pref_wired_auto_label") # entryWiredAutoMethod = self.wTree.get_object("pref_wired_auto_label")
# entryWiredAutoMethod.set_label('Wired Autoconnect Setting:') # entryWiredAutoMethod.set_label('Wired Autoconnect Setting:')
# entryWiredAutoMethod.set_alignment(0, 0) # entryWiredAutoMethod.set_alignment(0, 0)
# atrlist = pango.AttrList() # atrlist = pango.AttrList()
@@ -313,7 +312,7 @@ class PreferencesDialog(object):
# self.set_label("pref_wired_label", "%s:" % language['wired_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_driver_label", "%s:" % language['wpa_supplicant_driver'])
self.dialog = self.wTree.get_widget("pref_dialog") self.dialog = self.wTree.get_object("pref_dialog")
self.dialog.set_title(language['preferences']) self.dialog.set_title(language['preferences'])
if os.path.exists(os.path.join(wpath.images, "wicd.png")): if os.path.exists(os.path.join(wpath.images, "wicd.png")):
self.dialog.set_icon_from_file(os.path.join(wpath.images, "wicd.png")) self.dialog.set_icon_from_file(os.path.join(wpath.images, "wicd.png"))
@@ -354,10 +353,10 @@ class PreferencesDialog(object):
# DHCP Clients # DHCP Clients
self.dhcpautoradio = setup_label("dhcp_auto_radio", "wicd_auto_config") self.dhcpautoradio = setup_label("dhcp_auto_radio", "wicd_auto_config")
self.dhclientradio = self.wTree.get_widget("dhclient_radio") self.dhclientradio = self.wTree.get_object("dhclient_radio")
self.pumpradio = self.wTree.get_widget("pump_radio") self.pumpradio = self.wTree.get_object("pump_radio")
self.dhcpcdradio = self.wTree.get_widget("dhcpcd_radio") self.dhcpcdradio = self.wTree.get_object("dhcpcd_radio")
self.udhcpcradio = self.wTree.get_widget("udhcpc_radio") self.udhcpcradio = self.wTree.get_object("udhcpc_radio")
# Wired Link Detection Apps # Wired Link Detection Apps
self.linkautoradio = setup_label("link_auto_radio", 'wicd_auto_config') self.linkautoradio = setup_label("link_auto_radio", 'wicd_auto_config')
@@ -385,17 +384,17 @@ class PreferencesDialog(object):
for x in self.wpadrivers: for x in self.wpadrivers:
self.wpadrivercombo.append_text(x) self.wpadrivercombo.append_text(x)
self.entryWirelessInterface = self.wTree.get_widget("pref_wifi_entry") self.entryWirelessInterface = self.wTree.get_object("pref_wifi_entry")
self.entryWiredInterface = self.wTree.get_widget("pref_wired_entry") self.entryWiredInterface = self.wTree.get_object("pref_wired_entry")
# Set up global DNS stuff # Set up global DNS stuff
self.useGlobalDNSCheckbox = setup_label("pref_global_check", self.useGlobalDNSCheckbox = setup_label("pref_global_check",
'use_global_dns') 'use_global_dns')
self.searchDomEntry = self.wTree.get_widget("pref_search_dom_entry") self.searchDomEntry = self.wTree.get_object("pref_search_dom_entry")
self.dnsDomEntry = self.wTree.get_widget("pref_dns_dom_entry") self.dnsDomEntry = self.wTree.get_object("pref_dns_dom_entry")
self.dns1Entry = self.wTree.get_widget("pref_dns1_entry") self.dns1Entry = self.wTree.get_object("pref_dns1_entry")
self.dns2Entry = self.wTree.get_widget("pref_dns2_entry") self.dns2Entry = self.wTree.get_object("pref_dns2_entry")
self.dns3Entry = self.wTree.get_widget("pref_dns3_entry") self.dns3Entry = self.wTree.get_object("pref_dns3_entry")
self.backendcombo = build_combobox("pref_backend_combobox") self.backendcombo = build_combobox("pref_backend_combobox")
self.backendcombo.connect("changed", self.be_combo_changed) self.backendcombo.connect("changed", self.be_combo_changed)