diff --git a/data/wicd.glade b/data/wicd.glade deleted file mode 100644 index 56021d2..0000000 --- a/data/wicd.glade +++ /dev/null @@ -1,1670 +0,0 @@ - - - - - - 450 - 400 - True - Wicd Network Manager - center - 550 - center - - - True - - - True - both-horiz - 0 - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - True - - - gtk-network - True - True - True - - - True - - - Create an ad-hoc network - True - False - - - - True - gtk-add - - - - - - - Find a hidden network - True - Enter a hidden network to try to locate. - False - - - - True - gtk-find - - - - - - - - - - - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - _Disconnect All - True - gtk-disconnect - - - - False - True - - - - - True - True - _Refresh - True - gtk-refresh - - - - False - True - - - - - True - True - _Preferences - True - gtk-preferences - - - - False - True - - - - - True - True - _About - True - gtk-about - - - - False - True - - - - - True - GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK - True - _Quit - True - gtk-quit - - - - False - True - - - - - False - 0 - - - - - True - 0 - 10 - 10 - Choose from the networks below: - True - - - False - 1 - - - - - True - False - automatic - automatic - - - True - none - - - True - 3 - - - - - - - - - - 2 - - - - - 4 - - - Connecting... - True - Connecting... - - - 3 - 0 - - - - - gtk-cancel - True - False - False - Cancel the current connection attempt - True - - - - False - 3 - 1 - - - - - False - 3 - - - - - True - - - False - 4 - - - - - - - 416 - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - Configure Scripts - center-on-parent - dialog - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Configure scripts to run for this network: - - - False - False - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Pre-connection Script: - - - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - False - False - 5 - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Post-connection Script: - - - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - False - False - 5 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Pre-disconnection Script: - - - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - False - False - 5 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Post-disconnection Script: - - - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - False - False - 5 - 4 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - 1 - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - - 5 - center-on-parent - dialog - False - - - True - 2 - - - True - True - - - True - 12 - 12 - 12 - 12 - - - True - True - automatic - automatic - - - True - queue - none - - - True - 20 - 2 - 4 - 4 - - - True - - - Always switch to a wired connection when available - True - True - False - True - If selected, wicd will automatically connect to a wired network -as soon as a cable is plugged in, even if a wireless connection -is already active. - True - - - - - 2 - 4 - 5 - - 24 - - - - - True - 24 - - - True - 0 - DNS domain: - - - - - 7 - 8 - - - - - - True - True - - - 1 - 2 - 7 - 8 - GTK_FILL - - - - - True - 12 - - - Automatically reconnect on network connection loss - True - True - False - True - - - - - 2 - 17 - 18 - - - - - - True - 0 - <b>Automatic Reconnection</b> - True - - - 2 - 16 - 17 - - - - - - True - 12 - - - Use last wired network profile - True - True - False - True - True - - - - - 2 - 15 - 16 - - - - - - True - 12 - - - Prompt for wired network profile - True - True - False - True - True - pref_use_last_radio - - - - - 2 - 14 - 15 - - - - - - True - 12 - - - Use default wired network profile - True - True - False - True - True - pref_use_last_radio - - - - - 2 - 13 - 14 - - - - - - True - 0 - <b>Wired automatic connection</b> - True - - - 2 - 12 - 13 - - - - - - True - 12 - - - True - 0 - Wired interface: - - - - - 2 - 3 - - - - - - True - 12 - - - True - 0 - Wireless interface: - - - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - <b>Network Interfaces</b> - True - - - 2 - - - - - - True - 24 - - - True - 0 - DNS server 3: - - - - - 11 - 12 - - - - - - True - True - - - 1 - 2 - 11 - 12 - - - - - - True - 24 - - - True - 0 - DNS server 2: - - - - - 10 - 11 - - - - - - True - 24 - - - True - 0 - DNS server 1: - - - - - 9 - 10 - - - - - - True - 24 - - - True - 0 - Search domain: - - - - - 8 - 9 - - - - - - True - 12 - - - Use global DNS servers - True - True - False - True - - - - - 2 - 6 - 7 - - - - - - True - 0 - <b>Global DNS Servers</b> - True - - - 2 - 5 - 6 - - - - - - True - True - - - 1 - 2 - 10 - 11 - - - - - - True - True - - - 1 - 2 - 9 - 10 - - - - - - True - True - - - 1 - 2 - 8 - 9 - - - - - - True - 24 - - - Always show wired interface - True - True - False - If enabled, the wired network interface will always be displayed in the main window. This can be useful if your wired network card does not detect when the interface is connected to a cable. - True - - - - - 2 - 3 - 4 - - - - - - True - 0 - <b>Notifications</b> - True - - - 2 - 18 - 19 - - - - - - True - 12 - - - Display notifications about connection status - True - True - False - True - - - - - 2 - 19 - 20 - - - - - - - - - - - - - - True - General Settings - - - False - tab - - - - - True - 12 - 12 - 12 - 12 - - - True - True - automatic - automatic - - - True - queue - none - - - True - 8 - - - True - 0 - <b>Route Table Flushing</b> - True - - - 4 - 5 - - - - - - True - 0 - <b>Wired Link Detection</b> - True - - - 2 - 3 - - - - - - True - 12 - - - True - - - Automatic (recommended) - True - True - False - True - True - - - False - 0 - - - - - ip - True - True - False - True - True - flush_auto_radio - - - False - 1 - - - - - route - True - True - False - True - True - flush_auto_radio - - - False - 2 - - - - - - - 5 - 6 - - - - - - True - 12 - - - True - - - Automatic (recommended) - True - True - False - True - True - - - False - 0 - - - - - ethtool - True - True - False - True - True - link_auto_radio - - - False - 1 - - - - - mii-tool - True - True - False - True - True - link_auto_radio - - - False - 2 - - - - - - - 3 - 4 - - - - - - True - 12 - - - True - - - Automatic (recommended) - True - True - False - True - True - dhclient_radio - - - False - 0 - - - - - dhcpcd - True - True - False - True - True - dhclient_radio - - - False - 1 - - - - - pump - True - True - False - True - True - dhclient_radio - - - False - 2 - - - - - dhclient - True - True - False - True - True - - - False - 3 - - - - - udhcpc - True - True - False - True - True - dhclient_radio - - - False - 4 - - - - - - - 1 - 2 - - - - - - True - 0 - <b>DHCP Client</b> - True - - - - - - - - True - 0 - <b>Graphical Sudo Application</b> - True - - - 6 - 7 - - - - - - True - 12 - - - True - - - Automatic (recommended) - True - True - False - True - True - - - False - 0 - - - - - gksudo - True - True - False - True - True - sudo_auto_radio - - - False - 1 - - - - - kdesu - True - True - False - True - True - sudo_auto_radio - - - False - 2 - - - - - ktsuss - True - True - False - True - True - sudo_auto_radio - - - False - 3 - - - - - - - 7 - 8 - - - - - - - - - - - 1 - - - - - True - External Programs - - - 1 - False - tab - - - - - True - 12 - 12 - 12 - 12 - - - True - 11 - 2 - - - True - 0 - Hover your mouse over the selected backend -to read its description. - True - - - 1 - 2 - 5 - 6 - - - - - - True - - - True - - - False - 0 - - - - - 1 - 2 - 1 - 2 - - - - - - True - - - 2 - 3 - GTK_FILL - - - - - - True - 12 - - - True - 0 - Driver: - - - - - 1 - 2 - - - - - - True - 12 - - - Use dBm to measure signal strength - True - True - False - True - - - - - 2 - 9 - 10 - - - - - - True - 12 - - - Enable debug mode - True - True - False - True - - - - - 2 - 7 - 8 - - - - - - True - 0 - <b>Wireless Interface</b> - True - - - 2 - 8 - 9 - - - - - - True - 0 - <b>WPA Supplicant</b> - True - - - 2 - - - - - - True - 0 - <b>Debugging</b> - True - - - 2 - 6 - 7 - - - - - - True - 12 - - - True - 0 - Backend: - - - - - 4 - 5 - - - - - - True - True - - - 1 - 2 - 4 - 5 - - - - - - True - 0 - <b>Backend</b> - True - - - 2 - 3 - 4 - - - - - - True - 0 - You should almost always use wext as the -WPA supplicant driver. - True - - - 1 - 2 - 2 - 3 - - - - - - True - - - 5 - 6 - GTK_FILL - - - - - - True - 12 - - - Ping static gateways after connecting to verify association - True - True - False - True - - - - - 2 - 10 - 11 - - - - - - - - 2 - - - - - True - Advanced Settings - - - 2 - False - tab - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - 1 - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - diff --git a/gtk/gui.py b/gtk/gui.py index 0dc9bdc..2e52d1c 100644 --- a/gtk/gui.py +++ b/gtk/gui.py @@ -29,7 +29,6 @@ import time import gobject import pango import gtk -import gtk.glade from itertools import chain from dbus import DBusException @@ -148,10 +147,10 @@ class appGui(object): self.tray = tray - gladefile = os.path.join(wpath.gtk, "wicd.glade") - self.wTree = gtk.glade.XML(gladefile) - self.window = self.wTree.get_widget("window1") - self.window.set_icon_name("wicd-gtk") + gladefile = os.path.join(wpath.gtk, "wicd.ui") + self.wTree = gtk.Builder() + self.wTree.add_from_file(gladefile) + self.window = self.wTree.get_object("window1") size = daemon.ReadWindowSize("main") width = size[0] height = size[1] @@ -173,16 +172,16 @@ class appGui(object): "about_clicked" : self.about_dialog, "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 - label_instruct = self.wTree.get_widget("label_instructions") + label_instruct = self.wTree.get_object("label_instructions") 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']) - 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.wired_network_box = gtk.VBox(False, 0) 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.network_list, True, True) self.network_list.show_all() - self.status_area = self.wTree.get_widget("connecting_hbox") - self.status_bar = self.wTree.get_widget("statusbar") - menu = self.wTree.get_widget("menu1") + self.status_area = self.wTree.get_object("connecting_hbox") + self.status_bar = self.wTree.get_object("statusbar") + menu = self.wTree.get_object("menu1") self.status_area.hide_all() @@ -351,7 +350,7 @@ class appGui(object): """ Alerts the daemon to cancel the connection process. """ #should cancel a connection if there #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) daemon.CancelConnect() # Prevents automatic reconnecting if that option is enabled @@ -364,7 +363,7 @@ class appGui(object): if not self.is_visible: return True try: - gobject.idle_add(self.wTree.get_widget("progressbar").pulse) + gobject.idle_add(self.wTree.get_object("progressbar").pulse) except: pass return True @@ -551,7 +550,7 @@ class appGui(object): if self._wired_showing: printLine = True num_networks = wireless.GetNumberOfNetworks() - instruct_label = self.wTree.get_widget("label_instructions") + instruct_label = self.wTree.get_object("label_instructions") if num_networks > 0: instruct_label.show() for x in range(0, num_networks): @@ -683,7 +682,7 @@ class appGui(object): return True 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: return True else: @@ -697,7 +696,7 @@ class appGui(object): self._connect_thread_started = True 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) self.all_network_list.set_sensitive(False) if self.statusID: diff --git a/gtk/prefs.py b/gtk/prefs.py index 7b2d356..4921ef5 100644 --- a/gtk/prefs.py +++ b/gtk/prefs.py @@ -28,7 +28,6 @@ import gtk import gobject #import pango import os -import gtk.glade from wicd import misc from wicd import wpath @@ -162,9 +161,9 @@ class PreferencesDialog(object): if wpath.no_use_notifications: self.notificationscheckbox.set_active(False) 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): """ Runs the preferences dialog window. """ @@ -266,14 +265,14 @@ class PreferencesDialog(object): def set_label(self, glade_str, label): """ 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): """ Set up anything that doesn't have to be persisted later. """ def build_combobox(lbl): """ Sets up a ComboBox using the given widget name. """ liststore = gtk.ListStore(gobject.TYPE_STRING) - combobox = self.wTree.get_widget(lbl) + combobox = self.wTree.get_object(lbl) combobox.clear() combobox.set_model(liststore) cell = gtk.CellRendererText() @@ -283,7 +282,7 @@ class PreferencesDialog(object): def setup_label(name, lbl=""): """ Sets up a label for the given widget name. """ - widget = self.wTree.get_widget(name) + widget = self.wTree.get_object(name) # if lbl: # widget.set_label(language[lbl]) if widget is None: @@ -291,14 +290,14 @@ class PreferencesDialog(object): 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_object("gen_settings_label").set_label(language["gen_settings"]) + # self.wTree.get_object("ext_prog_label").set_label(language["ext_programs"]) + # self.wTree.get_object("dhcp_client_label").set_label(language["dhcp_client"]) + # self.wTree.get_object("wired_detect_label").set_label(language["wired_detect"]) + # self.wTree.get_object("route_flush_label").set_label(language["route_flush"]) + # 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_alignment(0, 0) # atrlist = pango.AttrList() @@ -313,7 +312,7 @@ class PreferencesDialog(object): # 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 = self.wTree.get_object("pref_dialog") self.dialog.set_title(language['preferences']) if os.path.exists(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 self.dhcpautoradio = setup_label("dhcp_auto_radio", "wicd_auto_config") - self.dhclientradio = self.wTree.get_widget("dhclient_radio") - self.pumpradio = self.wTree.get_widget("pump_radio") - self.dhcpcdradio = self.wTree.get_widget("dhcpcd_radio") - self.udhcpcradio = self.wTree.get_widget("udhcpc_radio") + self.dhclientradio = self.wTree.get_object("dhclient_radio") + self.pumpradio = self.wTree.get_object("pump_radio") + self.dhcpcdradio = self.wTree.get_object("dhcpcd_radio") + self.udhcpcradio = self.wTree.get_object("udhcpc_radio") # Wired Link Detection Apps self.linkautoradio = setup_label("link_auto_radio", 'wicd_auto_config') @@ -385,17 +384,17 @@ class PreferencesDialog(object): for x in self.wpadrivers: self.wpadrivercombo.append_text(x) - self.entryWirelessInterface = self.wTree.get_widget("pref_wifi_entry") - self.entryWiredInterface = self.wTree.get_widget("pref_wired_entry") + self.entryWirelessInterface = self.wTree.get_object("pref_wifi_entry") + self.entryWiredInterface = self.wTree.get_object("pref_wired_entry") # Set up global DNS stuff self.useGlobalDNSCheckbox = setup_label("pref_global_check", 'use_global_dns') - self.searchDomEntry = self.wTree.get_widget("pref_search_dom_entry") - self.dnsDomEntry = self.wTree.get_widget("pref_dns_dom_entry") - self.dns1Entry = self.wTree.get_widget("pref_dns1_entry") - self.dns2Entry = self.wTree.get_widget("pref_dns2_entry") - self.dns3Entry = self.wTree.get_widget("pref_dns3_entry") + self.searchDomEntry = self.wTree.get_object("pref_search_dom_entry") + self.dnsDomEntry = self.wTree.get_object("pref_dns_dom_entry") + self.dns1Entry = self.wTree.get_object("pref_dns1_entry") + self.dns2Entry = self.wTree.get_object("pref_dns2_entry") + self.dns3Entry = self.wTree.get_object("pref_dns3_entry") self.backendcombo = build_combobox("pref_backend_combobox") self.backendcombo.connect("changed", self.be_combo_changed)