From 19df8ecbca7847c30e998215c460062f2bc6af99 Mon Sep 17 00:00:00 2001 From: Adam Blackburn Date: Mon, 22 Dec 2008 23:08:12 -0600 Subject: [PATCH] Updated Preferences dialog to conform to the GNOME HIG better --- data/wicd.glade | 1462 ++++++++++++++++++++++++++--------------------- 1 file changed, 810 insertions(+), 652 deletions(-) diff --git a/data/wicd.glade b/data/wicd.glade index ad4e02f..5542c38 100644 --- a/data/wicd.glade +++ b/data/wicd.glade @@ -1,6 +1,6 @@ - + 450 @@ -391,735 +391,893 @@ - Preferences - 125 - 560 + 5 + GTK_WIN_POS_CENTER_ON_PARENT GDK_WINDOW_TYPE_HINT_DIALOG + False - + True + 2 - + True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_RESIZE_QUEUE + 12 + 12 + 12 + 12 - + True True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 + GTK_RESIZE_QUEUE + GTK_SHADOW_NONE - + True + 16 + 2 + 4 + 4 - - 260 + True - Wireless Interface: - - - - - 200 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 24 + + + True + True + 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. + Always show wired interface + 0 + True + + - False - False - 1 - - - - - False - False - - - - - True - - - 260 - True - Wired Interface: - - - - - 200 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - False - 1 - - - - - False - False - 1 - - - - - True - True - Use global DNS servers - True - 0 - True - - - False - 2 - - - - - True - - - 170 - True - Search Domain - - - False - False + 2 + 3 + 4 + - 200 True True - False - False - 1 - - - - - False - False - 3 - - - - - True - - - 170 - True - DNS 1 - - - False - False + 1 + 2 + 6 + 7 + - 200 True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - False - 1 - - - - - False - False - 4 - - - - - True - - - 170 - True - DNS 2 - - - False - False + 1 + 2 + 7 + 8 + - 200 True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - False - 1 + 1 + 2 + 8 + 9 + - - - False - False - 5 - - - - - True - - 170 + True - DNS 3 + 0 + <b>Global DNS Servers</b> + True - False - False + 2 + 4 + 5 + + + + + + True + 12 + + + True + True + Use global DNS servers + 0 + True + + + + + 2 + 5 + 6 + + + + + + True + 24 + + + True + 0 + Search domain: + + + + + 6 + 7 + + + + + + True + 24 + + + True + 0 + DNS server 1: + + + + + 7 + 8 + + + + + + True + 24 + + + True + 0 + DNS server 2: + + + + + 8 + 9 + - 200 True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - False - 1 + 1 + 2 + 9 + 10 + + + + + + True + 24 + + + True + 0 + DNS server 3: + + + + + 9 + 10 + + + + + + True + 0 + <b>Network Interfaces</b> + True + + + 2 + + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + 1 + 2 + 2 + 3 + + + + + + True + 12 + + + True + 0 + Wireless interface: + + + + + 1 + 2 + + + + + + True + 12 + + + True + 0 + Wired interface: + + + + + 2 + 3 + + + + + + True + 0 + <b>Wired automatic connection</b> + True + + + 2 + 10 + 11 + + + + + + True + 12 + + + True + True + Use default wired network profile + 0 + True + True + pref_use_last_radio + + + + + 2 + 11 + 12 + + + + + + True + 12 + + + True + True + Prompt for wired network profile + 0 + True + True + pref_use_last_radio + + + + + 2 + 12 + 13 + + + + + + True + 12 + + + True + True + Use last wired network profile + 0 + True + True + + + + + 2 + 13 + 14 + + + + + + True + 0 + <b>Wireless automatic connection</b> + True + + + 2 + 14 + 15 + + + + + + True + 12 + + + True + True + Automatically reconnect on wireless network connection loss + 0 + True + + + + + 2 + 15 + 16 + - - False - 6 - - - - - True - True - Always show wired interface - True - 0 - True - - - False - False - 7 - - - - - True - True - Automatically reconnect on connection loss - True - 0 - True - - - False - False - 8 - - - - - True - True - Use dBm to measure signal strength - True - 0 - True - - - False - False - 9 - - - - - 2 - 8 - True - - - False - 10 - - - - - True - Wired Autoconnect Setting: - True - - - False - False - 11 - - - - - True - True - Use default profile on wired autoconnect - True - 0 - True - True - - - False - 12 - - - - - True - True - Prompt for profile on wired autoconnect - True - 0 - True - True - pref_use_def_radio - - - False - 13 - - - - - True - True - Use last profile on wired autoconnect - True - 0 - True - True - pref_use_def_radio - - - False - 14 - - - - True - General Settings - - - tab - False - - - - - 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 - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - DHCP Client: - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Automatic (recommended) - 0 - True - True - - - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - dhclient - 0 - True - True - dhcp_auto_radio - - - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - dhcpcd - 0 - True - True - dhcp_auto_radio - - - 3 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - pump - 0 - True - True - dhcp_auto_radio - - - 4 - - - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - 4 - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Wired Link Detection: - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Automatic (recommended) - 0 - True - True - - - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ethtool - 0 - True - True - link_auto_radio - - - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - mii-tool - 0 - True - True - link_auto_radio - - - 3 - - - - - False - False - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - 4 - 3 - - - - - 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 - Route Table Flushing: - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Automatic (recommended) - 0 - True - True - - - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ip - 0 - True - True - flush_auto_radio - - - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - route - 0 - True - True - flush_auto_radio - - - 3 - - - - - False - False - 4 - - - - - 1 - - - - - True - External Programs - - - tab - 1 - False - - - - - True - - - True - - - 75 - True - Sets the wpa_supplicant driver. In almost every case the correct choice is wext. Only consider switching if you're having trouble with encrypted networks. - WPA Supplicant Driver: - - - - - True - Sets the wpa_supplicant driver. In almost every case the correct choice is wext. Only consider switching if you're having trouble with encrypted networks. - - - 1 - - - - - False - False - 1 - - - - - True - - - True - Backend: - - - - - True - - - 1 - - - - - False - False - 3 - 1 - - - - - True - True - Enable Debug Mode - True - 0 - True - - - False - False - 3 - 2 - - - - - 2 - - - - - True - Advanced Settings - - - tab - 2 - False - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - + True - True - True - gtk-cancel - True - 0 + General Settings + + tab + False + - + True - True - True - gtk-ok - True - 1 + 12 + 12 + 12 + 12 + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + GTK_RESIZE_QUEUE + GTK_SHADOW_NONE + + + True + 6 + + + True + 0 + <b>DHCP Client</b> + True + + + + + + + + True + 12 + + + True + + + True + True + Automatic (recommended) + 0 + True + True + dhclient_radio + + + False + + + + + True + True + dhclient + 0 + True + True + + + False + 1 + + + + + True + True + dhcpcd + 0 + True + True + dhclient_radio + + + False + 2 + + + + + True + True + pump + 0 + True + True + dhclient_radio + + + False + 3 + + + + + + + 1 + 2 + + + + + + True + 12 + + + True + + + True + True + Automatic (recommended) + 0 + True + True + + + False + + + + + True + True + ethtool + 0 + True + True + radiobutton8 + + + False + 1 + + + + + True + True + mii-tool + 0 + True + True + radiobutton8 + + + False + 2 + + + + + + + 3 + 4 + + + + + + True + 12 + + + True + + + True + True + Automatic (recommended) + 0 + True + True + + + False + + + + + True + True + ip + 0 + True + True + flush_auto_radio + + + False + 1 + + + + + True + True + route + 0 + True + True + flush_auto_radio + + + False + 2 + + + + + + + 5 + 6 + + + + + + True + 0 + <b>Wired Link Detection</b> + True + + + 2 + 3 + + + + + + True + 0 + <b>Route Table Flushing</b> + True + + + 4 + 5 + + + + + + + + + 1 + + + True + External Programs + + + tab + 1 + False + + + + + True + 12 + 12 + 12 + 12 + + + True + 7 + 2 + + + True + + + 2 + 3 + + + + + + True + 0 + You should almost always use wext as the WPA supplicant driver. + True + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + Driver: + + + 1 + 2 + + + + + + True + + + True + + + False + + + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + <b>Backend</b> + True + + + 2 + 3 + 4 + + + + + + True + + + 1 + 2 + 4 + 5 + + + + + + True + 12 + + + True + 0 + Backend: + + + + + 4 + 5 + + + + + + True + 0 + <b>Debugging</b> + True + + + 2 + 5 + 6 + + + + + + True + True + Enable debug mode + 0 + True + + + 2 + 6 + 7 + + + + + + True + 0 + <b>WPA Supplicant</b> + True + + + 2 + + + + + + + + 2 + + + + + True + Advanced Settings + + + tab + 2 + False + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + + + + False