diff --git a/panels/network/connection-editor/8021x-security-page.ui b/panels/network/connection-editor/8021x-security-page.ui index 6ae7ce4bb..6da8ce3db 100644 --- a/panels/network/connection-editor/8021x-security-page.ui +++ b/panels/network/connection-editor/8021x-security-page.ui @@ -19,13 +19,13 @@ 10 6 - + True False 1 802.1x _Security True - 8021x_switch + enable_8021x_switch 0 @@ -35,7 +35,7 @@ - + True True start @@ -49,7 +49,7 @@ - + True False vertical diff --git a/panels/network/connection-editor/ce-page-8021x-security.c b/panels/network/connection-editor/ce-page-8021x-security.c index 072a7692a..33b2379e6 100644 --- a/panels/network/connection-editor/ce-page-8021x-security.c +++ b/panels/network/connection-editor/ce-page-8021x-security.c @@ -59,8 +59,8 @@ finish_setup (CEPage8021xSecurity *page, gpointer unused, GError *error, gpointe if (error) return; - vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "vbox")); - heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_sec")); + vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "box")); + heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "security_label")); page->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); @@ -102,7 +102,7 @@ ce_page_8021x_security_new (NMConnection *connection, if (nm_connection_get_setting_802_1x (connection)) page->initial_have_8021x = TRUE; - page->enabled = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "8021x_switch")); + page->enabled = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "enable_8021x_switch")); g_signal_connect (page, "initialized", G_CALLBACK (finish_setup), NULL); @@ -137,7 +137,7 @@ validate (CEPage *cepage, NMConnection *connection, GError **error) s_con = nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); nm_connection_add_setting (tmp_connection, nm_setting_duplicate (s_con)); - ws_802_1x_fill_connection (GTK_COMBO_BOX (gtk_builder_get_object (page->security->builder, "wpa_eap_auth_combo")), tmp_connection); + ws_802_1x_fill_connection (GTK_COMBO_BOX (gtk_builder_get_object (page->security->builder, "auth_combo")), tmp_connection); s_8021x = nm_connection_get_setting (tmp_connection, NM_TYPE_SETTING_802_1X); nm_connection_add_setting (connection, NM_SETTING (g_object_ref (s_8021x))); diff --git a/panels/network/connection-editor/ce-page-details.c b/panels/network/connection-editor/ce-page-details.c index a3c04632e..dc30807b0 100644 --- a/panels/network/connection-editor/ce-page-details.c +++ b/panels/network/connection-editor/ce-page-details.c @@ -110,8 +110,8 @@ update_last_used (CEPageDetails *page, NMConnection *connection) else last_used = g_strdup_printf (ngettext ("%i day ago", "%i days ago", days), days); out: - heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_last_used")); - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_last_used")); + heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "last_used_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "last_used_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), last_used); } @@ -224,8 +224,8 @@ connect_details_page (CEPageDetails *page) } if (speed > 0) speed_label = g_strdup_printf (_("%d Mb/s"), speed); - heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_speed")); - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_speed")); + heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "speed_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "speed_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), speed_label); if (NM_IS_DEVICE_WIFI (page->device)) @@ -233,14 +233,14 @@ connect_details_page (CEPageDetails *page) else if (NM_IS_DEVICE_ETHERNET (page->device)) hw_address = nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (page->device)); - heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_mac")); - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_mac")); + heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "mac_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "mac_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), hw_address); if (device_is_active && active_ap) security_string = get_ap_security_string (active_ap); - heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_security")); - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_security")); + heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "security_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "security_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), security_string); strength = 0; @@ -259,26 +259,26 @@ connect_details_page (CEPageDetails *page) strength_label = C_("Signal strength", "Good"); else strength_label = C_("Signal strength", "Excellent"); - heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_strength")); - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_strength")); + heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "strength_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "strength_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), strength_label); /* set IP entries */ - panel_set_device_widgets (GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_ipv4")), - GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "label_ipv4")), - GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_ipv6")), - GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "label_ipv6")), - GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_dns")), - GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "label_dns")), - GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_route")), - GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "label_route")), + panel_set_device_widgets (GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "ipv4_heading_label")), + GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "ipv4_label")), + GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "ipv6_heading_label")), + GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "ipv6_label")), + GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "dns_heading_label")), + GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "dns_label")), + GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "route_heading_label")), + GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "route_label")), device_is_active ? page->device : NULL); if (!device_is_active && CE_PAGE (page)->connection) update_last_used (page, CE_PAGE (page)->connection); else { - heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_last_used")); - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_last_used")); + heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "last_used_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "last_used_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), NULL); } @@ -307,7 +307,7 @@ connect_details_page (CEPageDetails *page) update_restrict_data (page); /* Forget button */ - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "button_forget")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "forget_button")); g_signal_connect_swapped (widget, "clicked", G_CALLBACK (forget_cb), page); if (g_str_equal (type, NM_SETTING_WIRELESS_SETTING_NAME)) diff --git a/panels/network/connection-editor/ce-page-ethernet.c b/panels/network/connection-editor/ce-page-ethernet.c index ccaa25d3e..45e01c3c3 100644 --- a/panels/network/connection-editor/ce-page-ethernet.c +++ b/panels/network/connection-editor/ce-page-ethernet.c @@ -186,11 +186,11 @@ ce_page_ethernet_new (NMConnection *connection, "/org/gnome/control-center/network/ethernet-page.ui", _("Identity"))); - page->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_name")); - page->device_mac = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_mac")); - page->cloned_mac = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_cloned_mac")); - page->mtu = GTK_SPIN_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "spin_mtu")); - page->mtu_label = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_mtu")); + page->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "name_entry")); + page->device_mac = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder, "mac_combo")); + page->cloned_mac = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder, "cloned_mac_combo")); + page->mtu = GTK_SPIN_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "mtu_spin")); + page->mtu_label = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "mtu_label")); page->setting_connection = nm_connection_get_setting_connection (connection); page->setting_wired = nm_connection_get_setting_wired (connection); diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c index 9cf694313..76726adb4 100644 --- a/panels/network/connection-editor/ce-page-ip4.c +++ b/panels/network/connection-editor/ce-page-ip4.c @@ -60,17 +60,17 @@ method_changed (CEPageIP4 *page) gboolean routes_enabled; GtkWidget *widget; - if (RADIO_IS_ACTIVE ("radio_disabled")) { + if (RADIO_IS_ACTIVE ("disabled_radio")) { addr_enabled = FALSE; dns_enabled = FALSE; routes_enabled = FALSE; } else { - addr_enabled = RADIO_IS_ACTIVE ("radio_manual"); - dns_enabled = !RADIO_IS_ACTIVE ("radio_local"); - routes_enabled = !RADIO_IS_ACTIVE ("radio_local"); + addr_enabled = RADIO_IS_ACTIVE ("manual_radio"); + dns_enabled = !RADIO_IS_ACTIVE ("local_radio"); + routes_enabled = !RADIO_IS_ACTIVE ("local_radio"); } - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_box")); gtk_widget_set_visible (widget, addr_enabled); gtk_widget_set_sensitive (page->dns_entry, dns_enabled); gtk_widget_set_sensitive (page->routes_list, routes_enabled); @@ -275,13 +275,13 @@ ensure_empty_address_row (CEPageIP4 *page) } static void -add_address_section (CEPageIP4 *page) +add_address_box (CEPageIP4 *page) { GtkWidget *widget; GtkWidget *list; gint i; - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_box")); page->address_list = list = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE); @@ -446,13 +446,13 @@ ensure_empty_routes_row (CEPageIP4 *page) } static void -add_routes_section (CEPageIP4 *page) +add_routes_box (CEPageIP4 *page) { GtkWidget *widget; GtkWidget *list; gint i; - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_section")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_box")); page->routes_list = list = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE); @@ -506,17 +506,17 @@ connect_ip4_page (CEPageIP4 *page) gboolean disabled; guint method, i; - add_address_section (page); + add_address_box (page); add_dns_section (page); - add_routes_section (page); + add_routes_box (page); - page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_disabled")); + page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "disabled_radio")); str_method = nm_setting_ip_config_get_method (page->setting); disabled = g_strcmp0 (str_method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED) == 0; gtk_toggle_button_set_active (page->disabled, disabled); g_signal_connect_swapped (page->disabled, "notify::active", G_CALLBACK (ce_page_changed), page); - content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "page_content")); + content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "content_box")); g_object_bind_property (page->disabled, "active", content, "sensitive", G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN); @@ -538,9 +538,9 @@ connect_ip4_page (CEPageIP4 *page) g_signal_connect_swapped (page->never_default, "toggled", G_CALLBACK (ce_page_changed), page); /* Connect radio buttons */ - radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_automatic")); - radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_local")); - radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_manual")); + radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "automatic_radio")); + radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "local_radio")); + radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "manual_radio")); radios[RADIO_DISABLED] = page->disabled; for (i = RADIO_AUTOMATIC; i < RADIO_DISABLED; i++) @@ -612,11 +612,11 @@ ui_to_setting (CEPageIP4 *page) if (gtk_toggle_button_get_active (page->disabled)) { method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED; } else { - if (RADIO_IS_ACTIVE ("radio_automatic")) + if (RADIO_IS_ACTIVE ("automatic_radio")) method = NM_SETTING_IP4_CONFIG_METHOD_AUTO; - else if (RADIO_IS_ACTIVE ("radio_local")) + else if (RADIO_IS_ACTIVE ("local_radio")) method = NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL; - else if (RADIO_IS_ACTIVE ("radio_manual")) + else if (RADIO_IS_ACTIVE ("manual_radio")) method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL; } diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c index a76df6bdc..ab07166cb 100644 --- a/panels/network/connection-editor/ce-page-ip6.c +++ b/panels/network/connection-editor/ce-page-ip6.c @@ -61,17 +61,17 @@ method_changed (CEPageIP6 *page) gboolean routes_enabled; GtkWidget *widget; - if (RADIO_IS_ACTIVE ("radio_disabled")) { + if (RADIO_IS_ACTIVE ("disabled_radio")) { addr_enabled = FALSE; dns_enabled = FALSE; routes_enabled = FALSE; } else { - addr_enabled = RADIO_IS_ACTIVE ("radio_manual"); - dns_enabled = !RADIO_IS_ACTIVE ("radio_local"); - routes_enabled = !RADIO_IS_ACTIVE ("radio_local"); + addr_enabled = RADIO_IS_ACTIVE ("manual_radio"); + dns_enabled = !RADIO_IS_ACTIVE ("local_radio"); + routes_enabled = !RADIO_IS_ACTIVE ("local_radio"); } - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_box")); gtk_widget_set_visible (widget, addr_enabled); gtk_widget_set_sensitive (page->dns_entry, dns_enabled); gtk_widget_set_sensitive (page->routes_list, routes_enabled); @@ -253,13 +253,13 @@ ensure_empty_address_row (CEPageIP6 *page) } static void -add_address_section (CEPageIP6 *page) +add_address_box (CEPageIP6 *page) { GtkWidget *widget; GtkWidget *list; gint i; - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_box")); page->address_list = list = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE); @@ -420,13 +420,13 @@ add_empty_route_row (CEPageIP6 *page) } static void -add_routes_section (CEPageIP6 *page) +add_routes_box (CEPageIP6 *page) { GtkWidget *widget; GtkWidget *list; gint i; - widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_section")); + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_box")); page->routes_list = list = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE); @@ -475,17 +475,17 @@ connect_ip6_page (CEPageIP6 *page) gboolean disabled; guint method, i; - add_address_section (page); + add_address_box (page); add_dns_section (page); - add_routes_section (page); + add_routes_box (page); - page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_disabled")); + page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "disabled_radio")); str_method = nm_setting_ip_config_get_method (page->setting); disabled = g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) == 0; gtk_toggle_button_set_active (page->disabled, disabled); g_signal_connect_swapped (page->disabled, "notify::active", G_CALLBACK (ce_page_changed), page); - content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "page_content")); + content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "content_box")); g_object_bind_property (page->disabled, "active", content, "sensitive", G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN); @@ -510,10 +510,10 @@ connect_ip6_page (CEPageIP6 *page) /* Connect radio buttons */ - radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_automatic")); - radios[RADIO_DHCP] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_dhcp")); - radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_local")); - radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_manual")); + radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "automatic_radio")); + radios[RADIO_DHCP] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "dhcp_radio")); + radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "local_radio")); + radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "manual_radio")); radios[RADIO_DISABLED] = page->disabled; for (i = RADIO_AUTOMATIC; i < RADIO_DISABLED; i++) @@ -558,13 +558,13 @@ ui_to_setting (CEPageIP6 *page) if (gtk_toggle_button_get_active (page->disabled)) { method = NM_SETTING_IP6_CONFIG_METHOD_IGNORE; } else { - if (RADIO_IS_ACTIVE ("radio_manual")) { + if (RADIO_IS_ACTIVE ("manual_radio")) { method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL; - } else if (RADIO_IS_ACTIVE ("radio_local")) { + } else if (RADIO_IS_ACTIVE ("local_radio")) { method = NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL; - } else if (RADIO_IS_ACTIVE ("radio_dhcp")) { + } else if (RADIO_IS_ACTIVE ("dhcp_radio")) { method = NM_SETTING_IP6_CONFIG_METHOD_DHCP; - } else if (RADIO_IS_ACTIVE ("radio_automatic")) { + } else if (RADIO_IS_ACTIVE ("automatic_radio")) { method = NM_SETTING_IP6_CONFIG_METHOD_AUTO; } } diff --git a/panels/network/connection-editor/ce-page-security.c b/panels/network/connection-editor/ce-page-security.c index 676f4f9ba..9e72f2184 100644 --- a/panels/network/connection-editor/ce-page-security.c +++ b/panels/network/connection-editor/ce-page-security.c @@ -132,7 +132,7 @@ security_combo_changed (CEPageSecurity *page) wsec_size_group_clear (page->group); - vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "vbox")); + vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "box")); children = gtk_container_get_children (GTK_CONTAINER (vbox)); for (l = children; l; l = l->next) { gtk_container_remove (GTK_CONTAINER (vbox), GTK_WIDGET (l->data)); @@ -221,8 +221,8 @@ finish_setup (CEPageSecurity *page) page->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - page->security_heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_sec")); - page->security_combo = combo = GTK_COMBO_BOX (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_sec")); + page->security_heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "security_label")); + page->security_combo = combo = GTK_COMBO_BOX (gtk_builder_get_object (CE_PAGE (page)->builder, "security_combo")); dev_caps = NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104 diff --git a/panels/network/connection-editor/ce-page-vpn.c b/panels/network/connection-editor/ce-page-vpn.c index 36bed019c..f8f20c099 100644 --- a/panels/network/connection-editor/ce-page-vpn.c +++ b/panels/network/connection-editor/ce-page-vpn.c @@ -186,7 +186,7 @@ ce_page_vpn_new (NMConnection *connection, "/org/gnome/control-center/network/vpn-page.ui", _("Identity"))); - page->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_name")); + page->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "name_entry")); page->box = GTK_BOX (gtk_builder_get_object (CE_PAGE (page)->builder, "page")); g_signal_connect (page, "initialized", G_CALLBACK (finish_setup), NULL); diff --git a/panels/network/connection-editor/ce-page-wifi.c b/panels/network/connection-editor/ce-page-wifi.c index b16364955..50ca048f9 100644 --- a/panels/network/connection-editor/ce-page-wifi.c +++ b/panels/network/connection-editor/ce-page-wifi.c @@ -48,7 +48,7 @@ connect_wifi_page (CEPageWifi *page) gint i; widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, - "entry_ssid")); + "ssid_entry")); ssid = nm_setting_wireless_get_ssid (page->setting); if (ssid) @@ -60,7 +60,7 @@ connect_wifi_page (CEPageWifi *page) g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, - "combo_bssid")); + "bssid_combo")); bssid_array = g_ptr_array_new (); for (i = 0; i < nm_setting_wireless_get_num_seen_bssids (page->setting); i++) { @@ -74,7 +74,7 @@ connect_wifi_page (CEPageWifi *page) g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, - "combo_mac")); + "mac_combo")); mac_list = ce_page_get_mac_list (CE_PAGE (page)->client, NM_TYPE_DEVICE_WIFI, NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS); s_mac_str = nm_setting_wireless_get_mac_address (page->setting); @@ -84,7 +84,7 @@ connect_wifi_page (CEPageWifi *page) widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, - "combo_cloned_mac")); + "cloned_mac_combo")); cloned_mac = nm_setting_wireless_get_cloned_mac_address (page->setting); ce_page_setup_cloned_mac_combo (GTK_COMBO_BOX_TEXT (widget), cloned_mac); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); @@ -100,20 +100,20 @@ ui_to_setting (CEPageWifi *page) g_autofree gchar *device_mac = NULL; g_autofree gchar *cloned_mac = NULL; - entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_ssid")); + entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "ssid_entry")); utf8_ssid = gtk_entry_get_text (GTK_ENTRY (entry)); if (!utf8_ssid || !*utf8_ssid) ssid = NULL; else { ssid = g_bytes_new_static (utf8_ssid, strlen (utf8_ssid)); } - entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_bssid"))); + entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder, "bssid_combo"))); bssid = gtk_entry_get_text (GTK_ENTRY (entry)); if (*bssid == '\0') bssid = NULL; - entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_mac"))); + entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder, "mac_combo"))); device_mac = ce_page_trim_address (gtk_entry_get_text (GTK_ENTRY (entry))); - combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_cloned_mac")); + combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder, "cloned_mac_combo")); cloned_mac = ce_page_cloned_mac_get (combo); g_object_set (page->setting, @@ -133,7 +133,7 @@ validate (CEPage *page, GtkComboBoxText *combo; gboolean ret = TRUE; - entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "combo_bssid"))); + entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "bssid_combo"))); if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (entry)))) { widget_set_error (entry); ret = FALSE; @@ -141,7 +141,7 @@ validate (CEPage *page, widget_unset_error (entry); } - entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "combo_mac"))); + entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "mac_combo"))); if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (entry)))) { widget_set_error (entry); ret = FALSE; @@ -149,7 +149,7 @@ validate (CEPage *page, widget_unset_error (entry); } - combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (page->builder, "combo_cloned_mac")); + combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (page->builder, "cloned_mac_combo")); if (!ce_page_cloned_mac_combo_valid (combo)) { widget_set_error (gtk_bin_get_child (GTK_BIN (combo))); ret = FALSE; diff --git a/panels/network/connection-editor/details-page.ui b/panels/network/connection-editor/details-page.ui index 44f1e7450..af7ffc76f 100644 --- a/panels/network/connection-editor/details-page.ui +++ b/panels/network/connection-editor/details-page.ui @@ -11,12 +11,12 @@ 12 12 - + True False 1 Signal Strength - label_strength + strength_label @@ -29,7 +29,7 @@ - + True True True @@ -45,12 +45,12 @@ - + True False 1 Link speed - label_speed + speed_label @@ -63,7 +63,7 @@ - + True True 0 @@ -79,12 +79,12 @@ - + True False 1 Security - label_security + security_label @@ -97,12 +97,12 @@ - + True False 1 IPv4 Address - label_ipv4 + ipv4_label @@ -115,12 +115,12 @@ - + True False 1 IPv6 Address - label_ipv6 + ipv6_label @@ -133,12 +133,12 @@ - + True False 1 Hardware Address - label_mac + mac_label @@ -151,12 +151,12 @@ - + True False 1 Default Route - label_route + route_label @@ -169,13 +169,13 @@ - + True False 1 0 DNS - label_dns + dns_label @@ -188,12 +188,12 @@ - + True False 1 Last Used - label_last_used + last_used_label @@ -206,7 +206,7 @@ - + True True 0 @@ -222,7 +222,7 @@ - + True True 0 @@ -238,7 +238,7 @@ - + True True 0 @@ -254,7 +254,7 @@ - + True True 0 @@ -270,7 +270,7 @@ - + True True 0 @@ -286,7 +286,7 @@ - + True True 0 @@ -304,7 +304,7 @@ - + True True 0 @@ -408,7 +408,7 @@ - + True True True diff --git a/panels/network/connection-editor/ethernet-page.ui b/panels/network/connection-editor/ethernet-page.ui index 1b707e8c2..57c7a3023 100644 --- a/panels/network/connection-editor/ethernet-page.ui +++ b/panels/network/connection-editor/ethernet-page.ui @@ -1,7 +1,7 @@ - + 10000 1 10 @@ -24,7 +24,7 @@ 1 _Name True - entry_name + name_entry 0 @@ -34,7 +34,7 @@ - + True True ● @@ -53,7 +53,7 @@ 1 _MAC Address True - combo_mac + mac_combo 0 @@ -63,7 +63,7 @@ - + True False True @@ -78,7 +78,7 @@ - + True False True @@ -104,7 +104,7 @@ 1 M_TU True - spin_mtu + mtu_spin 0 @@ -121,7 +121,7 @@ 1 _Cloned Address True - combo_cloned_mac + cloned_mac_combo 0 @@ -131,7 +131,7 @@ - + True False bytes @@ -144,12 +144,12 @@ - + True True ● True - adjustment1 + mtu_adjustment 1 diff --git a/panels/network/connection-editor/ip4-page.ui b/panels/network/connection-editor/ip4-page.ui index de9e94dfa..232a0072c 100644 --- a/panels/network/connection-editor/ip4-page.ui +++ b/panels/network/connection-editor/ip4-page.ui @@ -26,7 +26,7 @@ False IPv_4 Method True - radio_disabled + disabled_radio 0.0 @@ -38,7 +38,7 @@ - + Automatic (DHCP) True True @@ -51,13 +51,13 @@ - + Link-Local Only True True False True - radio_automatic + automatic_radio 0 @@ -65,13 +65,13 @@ - + Manual True True False True - radio_automatic + automatic_radio 1 @@ -79,13 +79,13 @@ - + Disable True True False True - radio_automatic + automatic_radio 1 @@ -93,13 +93,13 @@ - + True False vertical 6 - + True False vertical @@ -189,7 +189,7 @@ 24 6 - + True False True @@ -296,7 +296,7 @@ - + True False vertical diff --git a/panels/network/connection-editor/ip6-page.ui b/panels/network/connection-editor/ip6-page.ui index c9110a872..991f2f0c3 100644 --- a/panels/network/connection-editor/ip6-page.ui +++ b/panels/network/connection-editor/ip6-page.ui @@ -26,7 +26,7 @@ False IPv_6 Method True - radio_disabled + disabled_radio 0.0 @@ -38,7 +38,7 @@ - + Automatic True True @@ -51,13 +51,13 @@ - + Automatic, DHCP only True True False True - radio_automatic + automatic_radio 0 @@ -65,13 +65,13 @@ - + Link-Local Only True True False True - radio_automatic + automatic_radio 1 @@ -79,13 +79,13 @@ - + Manual True True False True - radio_automatic + automatic_radio 1 @@ -93,13 +93,13 @@ - + Disable True True False True - radio_automatic + automatic_radio 2 @@ -107,13 +107,13 @@ - + True False vertical 6 - + True False vertical @@ -203,7 +203,7 @@ 24 6 - + True False True @@ -310,7 +310,7 @@ - + True False vertical diff --git a/panels/network/connection-editor/security-page.ui b/panels/network/connection-editor/security-page.ui index 4e274d0c7..8dedfa856 100644 --- a/panels/network/connection-editor/security-page.ui +++ b/panels/network/connection-editor/security-page.ui @@ -19,13 +19,13 @@ 10 6 - + True False 1 S_ecurity True - combo_sec + security_combo 0 @@ -35,7 +35,7 @@ - + True False True @@ -48,7 +48,7 @@ - + True False vertical diff --git a/panels/network/connection-editor/vpn-page.ui b/panels/network/connection-editor/vpn-page.ui index 676be5acd..5ed822cf8 100644 --- a/panels/network/connection-editor/vpn-page.ui +++ b/panels/network/connection-editor/vpn-page.ui @@ -22,7 +22,7 @@ 1 _Name True - entry_name + name_entry False @@ -31,7 +31,7 @@ - + True True ● diff --git a/panels/network/connection-editor/wifi-page.ui b/panels/network/connection-editor/wifi-page.ui index 4ed37bf10..0532f5c43 100644 --- a/panels/network/connection-editor/wifi-page.ui +++ b/panels/network/connection-editor/wifi-page.ui @@ -19,7 +19,7 @@ 1 _SSID True - entry_ssid + ssid_entry 0 @@ -35,7 +35,7 @@ 1 _BSSID True - combo_bssid + bssid_combo 0 @@ -45,7 +45,7 @@ - + True True True @@ -66,7 +66,7 @@ 1 _MAC Address True - combo_mac + mac_combo 0 @@ -76,7 +76,7 @@ - + True False True @@ -101,7 +101,7 @@ False _Cloned Address True - combo_cloned_mac + cloned_mac_combo 0 @@ -111,7 +111,7 @@ - + True False True @@ -126,7 +126,7 @@ - + True False True diff --git a/panels/network/net-device-ethernet.c b/panels/network/net-device-ethernet.c index 5d471ae85..2e84e46ae 100644 --- a/panels/network/net-device-ethernet.c +++ b/panels/network/net-device-ethernet.c @@ -77,7 +77,7 @@ device_ethernet_add_to_stack (NetObject *object, NetDeviceEthernet *device = NET_DEVICE_ETHERNET (object); GtkWidget *vbox; - vbox = GTK_WIDGET (gtk_builder_get_object (device->builder, "vbox6")); + vbox = GTK_WIDGET (gtk_builder_get_object (device->builder, "box")); gtk_stack_add_named (stack, vbox, net_object_get_id (object)); return vbox; } @@ -209,7 +209,7 @@ device_ethernet_refresh_ui (NetDeviceEthernet *device) nm_device = net_device_get_nm_device (NET_DEVICE (device)); - widget = GTK_WIDGET (gtk_builder_get_object (device->builder, "label_device")); + widget = GTK_WIDGET (gtk_builder_get_object (device->builder, "device_label")); gtk_label_set_label (GTK_LABEL (widget), net_object_get_title (NET_OBJECT (device))); widget = GTK_WIDGET (gtk_builder_get_object (device->builder, "device_off_switch")); @@ -521,7 +521,7 @@ device_ethernet_constructed (GObject *object) g_signal_connect_swapped (widget, "notify::active", G_CALLBACK (device_off_toggled), device); - device->scrolled_window = swin = GTK_WIDGET (gtk_builder_get_object (device->builder, "list")); + device->scrolled_window = swin = GTK_WIDGET (gtk_builder_get_object (device->builder, "scrolled_window")); device->list = list = GTK_WIDGET (gtk_list_box_new ()); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE); gtk_list_box_set_header_func (GTK_LIST_BOX (list), cc_list_box_update_header_func, NULL, NULL); @@ -530,7 +530,7 @@ device_ethernet_constructed (GObject *object) G_CALLBACK (connection_activated), device); gtk_widget_show (list); - device->details = GTK_WIDGET (gtk_builder_get_object (device->builder, "details")); + device->details = GTK_WIDGET (gtk_builder_get_object (device->builder, "details_frame")); device->details_button = GTK_WIDGET (gtk_builder_get_object (device->builder, "details_button")); g_signal_connect_swapped (device->details_button, "clicked", diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c index 48dfa86d3..7c00d0c78 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c @@ -76,14 +76,14 @@ device_mobile_proxy_add_to_stack (NetObject *object, /* add widgets to size group */ widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, - "heading_imei")); + "imei_heading_label")); gtk_size_group_add_widget (heading_size_group, widget); widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, - "heading_network")); + "network_label")); gtk_size_group_add_widget (heading_size_group, widget); widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, - "vbox7")); + "box")); gtk_stack_add_named (stack, widget, net_object_get_id (object)); return widget; } @@ -259,8 +259,8 @@ device_mobile_refresh_equipment_id (NetDeviceMobile *device_mobile) "ControlCenter::EquipmentIdentifier"); } - heading = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "heading_imei")); - widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "label_imei")); + heading = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "imei_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "imei_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), equipment_id); } @@ -308,8 +308,8 @@ device_mobile_refresh_operator_name (NetDeviceMobile *device_mobile) { GtkWidget *heading, *widget; - heading = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "heading_provider")); - widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "label_provider")); + heading = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "provider_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "provider_label")); if (device_mobile->mm_object != NULL) { g_autofree gchar *operator_name = NULL; @@ -384,7 +384,7 @@ nm_device_mobile_refresh_ui (NetDeviceMobile *device_mobile) nm_device = net_device_get_nm_device (NET_DEVICE (device_mobile)); /* set device kind */ - widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "label_device")); + widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "device_label")); g_object_bind_property (device_mobile, "title", widget, "label", 0); /* set up the device on/off switch */ @@ -393,13 +393,13 @@ nm_device_mobile_refresh_ui (NetDeviceMobile *device_mobile) mobilebb_enabled_toggled (device_mobile); /* set device state, with status */ - widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "label_status")); + widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "status_label")); status = panel_device_status_to_localized_string (nm_device, NULL); gtk_label_set_label (GTK_LABEL (widget), status); /* sensitive for other connection types if the device is currently connected */ widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, - "button_options")); + "options_button")); is_connected = net_device_get_find_connection (NET_DEVICE (device_mobile)) != NULL; gtk_widget_set_sensitive (widget, is_connected); @@ -413,22 +413,22 @@ nm_device_mobile_refresh_ui (NetDeviceMobile *device_mobile) /* add possible connections to device */ liststore = GTK_LIST_STORE (gtk_builder_get_object (device_mobile->builder, - "liststore_mobile_connections")); - widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "combobox_network")); + "mobile_connections_list_store")); + widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "network_combo")); device_add_device_connections (device_mobile, nm_device, liststore, GTK_COMBO_BOX (widget)); /* set IP entries */ - panel_set_device_widgets (GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "heading_ipv4")), - GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "label_ipv4")), - GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "heading_ipv6")), - GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "label_ipv6")), - GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "heading_dns")), - GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "label_dns")), - GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "heading_route")), - GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "label_route")), + panel_set_device_widgets (GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "ipv4_heading_label")), + GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "ipv4_label")), + GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "ipv6_heading_label")), + GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "ipv6_label")), + GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "dns_heading_label")), + GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "dns_label")), + GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "route_heading_label")), + GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "route_label")), nm_device); } @@ -890,7 +890,7 @@ net_device_mobile_init (NetDeviceMobile *device_mobile) /* setup mobile combobox model */ combobox = GTK_COMBO_BOX (gtk_builder_get_object (device_mobile->builder, - "combobox_network")); + "network_combo")); g_signal_connect_swapped (combobox, "changed", G_CALLBACK (mobile_connection_changed_cb), device_mobile); @@ -908,7 +908,7 @@ net_device_mobile_init (NetDeviceMobile *device_mobile) G_CALLBACK (device_off_toggled), device_mobile); widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, - "button_options")); + "options_button")); g_signal_connect_swapped (widget, "clicked", G_CALLBACK (edit_connection), device_mobile); } diff --git a/panels/network/net-device-simple.c b/panels/network/net-device-simple.c index fce761c9a..18749647c 100644 --- a/panels/network/net-device-simple.c +++ b/panels/network/net-device-simple.c @@ -62,7 +62,7 @@ device_simple_proxy_add_to_stack (NetObject *object, /* add widgets to size group */ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, - "vbox6")); + "box")); gtk_stack_add_named (stack, widget, net_object_get_id (object)); return widget; } @@ -101,7 +101,7 @@ nm_device_simple_refresh_ui (NetDeviceSimple *device_simple) nm_device = net_device_get_nm_device (NET_DEVICE (device_simple)); /* set device kind */ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_device")); + widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_label")); g_object_bind_property (device_simple, "title", widget, "label", 0); /* set up the device on/off switch */ @@ -113,7 +113,7 @@ nm_device_simple_refresh_ui (NetDeviceSimple *device_simple) update_off_switch_from_device_state (GTK_SWITCH (widget), state, device_simple); /* set up the Options button */ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_options")); + widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "options_button")); gtk_widget_set_visible (widget, state != NM_DEVICE_STATE_UNMANAGED); } @@ -237,7 +237,7 @@ net_device_simple_init (NetDeviceSimple *device_simple) G_CALLBACK (device_off_toggled), device_simple); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, - "button_options")); + "options_button")); g_signal_connect_swapped (widget, "clicked", G_CALLBACK (edit_connection), device_simple); } diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c index f009bd24f..ce1126725 100644 --- a/panels/network/net-device-wifi.c +++ b/panels/network/net-device-wifi.c @@ -106,7 +106,7 @@ device_wifi_proxy_add_to_stack (NetObject *object, nmdevice = net_device_get_nm_device (NET_DEVICE (object)); widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, - "notebook_view")); + "notebook")); gtk_stack_add_titled (stack, widget, net_object_get_id (object), nm_device_get_description (nmdevice)); @@ -319,17 +319,17 @@ nm_device_wifi_refresh_hotspot (NetDeviceWifi *device_wifi) g_debug ("Refreshing hotspot labels to name: '%s', security key: '%s', security: '%s'", hotspot_ssid, hotspot_secret, hotspot_security); - heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_hotspot_network_name")); - widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "label_hotspot_network_name")); + heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_network_name_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_network_name_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), hotspot_ssid); - heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_hotspot_security_key")); - widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "label_hotspot_security_key")); + heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_security_key_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_security_key_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), hotspot_secret); - heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_hotspot_security")); - widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "label_hotspot_security")); + heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_security_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_security_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), hotspot_security); - heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_hotspot_connected")); - widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "label_hotspot_connected")); + heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_connected_heading_label")); + widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_connected_label")); panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), NULL); } @@ -422,7 +422,7 @@ nm_device_wifi_refresh_ui (NetDeviceWifi *device_wifi) /* keep this in sync with the signal handler setup in cc_network_panel_init */ wireless_enabled_toggled (device_wifi); - widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_status")); + widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "status_label")); status = panel_device_status_to_localized_string (nm_device, NULL); gtk_label_set_label (GTK_LABEL (widget), status); @@ -671,7 +671,7 @@ show_hotspot_ui (NetDeviceWifi *device_wifi) GtkWidget *widget; /* show hotspot tab */ - widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "notebook_view")); + widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "notebook")); gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 1); /* force switch to on as this succeeded */ @@ -910,7 +910,7 @@ static void show_wifi_list (NetDeviceWifi *device_wifi) { GtkWidget *widget; - widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "notebook_view")); + widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "notebook")); gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 0); } @@ -963,7 +963,7 @@ net_device_wifi_constructed (GObject *object) } else gtk_widget_set_sensitive (widget, TRUE); - widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_list")); + widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "title_label")); g_object_bind_property (device_wifi, "title", widget, "label", 0); nm_device_wifi_refresh_ui (device_wifi); @@ -1425,7 +1425,7 @@ net_device_wifi_init (NetDeviceWifi *device_wifi) /* setup view */ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, - "notebook_view")); + "notebook")); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 0); @@ -1445,7 +1445,7 @@ net_device_wifi_init (NetDeviceWifi *device_wifi) G_CALLBACK (open_history), device_wifi); widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, - "switch_hotspot_off")); + "hotspot_off_switch")); device_wifi->hotspot_switch = GTK_SWITCH (widget); g_signal_connect_swapped (widget, "notify::active", G_CALLBACK (switch_hotspot_changed_cb), device_wifi); diff --git a/panels/network/net-proxy.c b/panels/network/net-proxy.c index 5796d1afc..362789399 100644 --- a/panels/network/net-proxy.c +++ b/panels/network/net-proxy.c @@ -111,7 +111,7 @@ check_wpad_warning (NetProxy *proxy) g_string_append (string, ""); out: widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder, - "label_proxy_warning")); + "proxy_warning_label")); gtk_label_set_markup (GTK_LABEL (widget), string->str); gtk_widget_set_visible (widget, (string->len > 0)); @@ -312,7 +312,7 @@ net_proxy_init (NetProxy *proxy) /* bind the proxy values */ widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder, - "entry_proxy_url")); + "proxy_url_entry")); g_settings_bind (proxy->settings, "autoconfig-url", widget, "text", G_SETTINGS_BIND_DEFAULT); @@ -320,12 +320,12 @@ net_proxy_init (NetProxy *proxy) /* bind the HTTP proxy values */ http_settings = g_settings_get_child (proxy->settings, "http"); widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder, - "entry_proxy_http")); + "proxy_http_entry")); g_settings_bind (http_settings, "host", widget, "text", G_SETTINGS_BIND_DEFAULT); adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (proxy->builder, - "adjustment_proxy_port_http")); + "proxy_port_http_adjustment")); g_settings_bind (http_settings, "port", adjustment, "value", G_SETTINGS_BIND_DEFAULT); @@ -333,12 +333,12 @@ net_proxy_init (NetProxy *proxy) /* bind the HTTPS proxy values */ https_settings = g_settings_get_child (proxy->settings, "https"); widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder, - "entry_proxy_https")); + "proxy_https_entry")); g_settings_bind (https_settings, "host", widget, "text", G_SETTINGS_BIND_DEFAULT); adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (proxy->builder, - "adjustment_proxy_port_https")); + "proxy_port_https_adjustment")); g_settings_bind (https_settings, "port", adjustment, "value", G_SETTINGS_BIND_DEFAULT); @@ -346,12 +346,12 @@ net_proxy_init (NetProxy *proxy) /* bind the FTP proxy values */ ftp_settings = g_settings_get_child (proxy->settings, "ftp"); widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder, - "entry_proxy_ftp")); + "proxy_ftp_entry")); g_settings_bind (ftp_settings, "host", widget, "text", G_SETTINGS_BIND_DEFAULT); adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (proxy->builder, - "adjustment_proxy_port_ftp")); + "proxy_port_ftp_adjustment")); g_settings_bind (ftp_settings, "port", adjustment, "value", G_SETTINGS_BIND_DEFAULT); @@ -359,19 +359,19 @@ net_proxy_init (NetProxy *proxy) /* bind the SOCKS proxy values */ socks_settings = g_settings_get_child (proxy->settings, "socks"); widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder, - "entry_proxy_socks")); + "proxy_socks_entry")); g_settings_bind (socks_settings, "host", widget, "text", G_SETTINGS_BIND_DEFAULT); adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (proxy->builder, - "adjustment_proxy_port_socks")); + "proxy_port_socks_adjustment")); g_settings_bind (socks_settings, "port", adjustment, "value", G_SETTINGS_BIND_DEFAULT); /* bind the proxy ignore hosts */ widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder, - "entry_proxy_ignore")); + "proxy_ignore_entry")); g_settings_bind_with_mapping (proxy->settings, "ignore-hosts", widget, "text", G_SETTINGS_BIND_DEFAULT, get_ignore_hosts, set_ignore_hosts, @@ -379,11 +379,11 @@ net_proxy_init (NetProxy *proxy) /* radio buttons */ proxy->mode_radios[MODE_DISABLED] = - GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "radio_none")); + GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "none_radio")); proxy->mode_radios[MODE_MANUAL] = - GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "radio_manual")); + GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "manual_radio")); proxy->mode_radios[MODE_AUTOMATIC] = - GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "radio_automatic")); + GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "automatic_radio")); /* setup the radio before connecting to the :toggled signal */ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (proxy->mode_radios[value]), TRUE); diff --git a/panels/network/net-vpn.c b/panels/network/net-vpn.c index 199633be0..0b8e0c31d 100644 --- a/panels/network/net-vpn.c +++ b/panels/network/net-vpn.c @@ -137,7 +137,7 @@ vpn_proxy_add_to_stack (NetObject *object, /* add widgets to size group */ widget = GTK_WIDGET (gtk_builder_get_object (vpn->builder, - "vbox9")); + "box")); gtk_stack_add_named (stack, widget, net_object_get_id (object)); return widget; } @@ -156,7 +156,7 @@ nm_device_refresh_vpn_ui (NetVpn *vpn) /* update title */ widget = GTK_WIDGET (gtk_builder_get_object (vpn->builder, - "label_device")); + "device_label")); /* Translators: this is the title of the connection details * window for vpn connections, it is also used to display * vpn connections in the device list. @@ -276,7 +276,7 @@ vpn_proxy_edit (NetObject *object) g_autofree gchar *title = NULL; button = GTK_WIDGET (gtk_builder_get_object (vpn->builder, - "button_options")); + "options_button")); window = gtk_widget_get_toplevel (button); client = net_object_get_client (object); @@ -420,7 +420,7 @@ net_vpn_init (NetVpn *vpn) G_CALLBACK (device_off_toggled), vpn); widget = GTK_WIDGET (gtk_builder_get_object (vpn->builder, - "button_options")); + "options_button")); g_signal_connect_swapped (widget, "clicked", G_CALLBACK (edit_connection), vpn); } diff --git a/panels/network/network-ethernet.ui b/panels/network/network-ethernet.ui index 6f9c8af3a..690484c31 100644 --- a/panels/network/network-ethernet.ui +++ b/panels/network/network-ethernet.ui @@ -1,7 +1,7 @@ - + True False 6 @@ -11,7 +11,7 @@ True False - + True False True @@ -48,7 +48,7 @@ vertical 6 - + True True True @@ -60,7 +60,7 @@ - + True False True diff --git a/panels/network/network-mobile.ui b/panels/network/network-mobile.ui index c8f7fae4c..3e9602242 100644 --- a/panels/network/network-mobile.ui +++ b/panels/network/network-mobile.ui @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + True False 12 @@ -23,12 +23,12 @@ 10 6 - + True False 1 IMEI - label_imei + imei_label @@ -41,12 +41,12 @@ - + True False 1 Provider - label_provider + provider_label @@ -59,7 +59,7 @@ - + True False 0 @@ -74,7 +74,7 @@ - + True False 0 @@ -89,7 +89,7 @@ - + True False 0 @@ -104,7 +104,7 @@ - + True False 0 @@ -118,7 +118,7 @@ - + True False 0 @@ -132,7 +132,7 @@ - + True False 0 @@ -165,7 +165,7 @@ - + True False 1 @@ -182,7 +182,7 @@ - + True False 1 @@ -199,7 +199,7 @@ - + True False 1 @@ -216,7 +216,7 @@ - + True False 1 @@ -234,7 +234,7 @@ - + True False 1 @@ -251,10 +251,10 @@ - + True False - liststore_mobile_connections + mobile_connections_list_store 1 @@ -295,7 +295,7 @@ 3 vertical - + True False 0 @@ -313,7 +313,7 @@ - + True False 0 @@ -373,7 +373,7 @@ 0 12 - + True True True diff --git a/panels/network/network-proxy.ui b/panels/network/network-proxy.ui index dd139b91d..b3a764488 100644 --- a/panels/network/network-proxy.ui +++ b/panels/network/network-proxy.ui @@ -1,19 +1,19 @@ - + 65535 1 - + 65535 1 - + 65535 1 - + 65535 1 @@ -100,27 +100,27 @@ 0 6 - + True True Automatic False True - radio_none + none_radio - + True True Manual False True - radio_none + none_radio - + True True Disabled @@ -175,7 +175,7 @@ 1 _HTTP Proxy True - entry_proxy_http + proxy_http_entry @@ -194,7 +194,7 @@ 1 H_TTPS Proxy True - entry_proxy_https + proxy_https_entry @@ -213,7 +213,7 @@ 1 _FTP Proxy True - entry_proxy_ftp + proxy_ftp_entry @@ -232,7 +232,7 @@ 1 _Socks Host True - entry_proxy_socks + proxy_socks_entry @@ -251,7 +251,7 @@ 1 _Ignore Hosts True - entry_proxy_ignore + proxy_ignore_entry @@ -264,7 +264,7 @@ - + True True ● @@ -284,7 +284,7 @@ ● 1 True - adjustment_proxy_port_http + proxy_port_http_adjustment HTTP proxy port @@ -299,7 +299,7 @@ - + True True ● @@ -313,7 +313,7 @@ - + True True ● @@ -327,7 +327,7 @@ - + True True ● @@ -341,7 +341,7 @@ - + True True ● @@ -361,7 +361,7 @@ ● 1 True - adjustment_proxy_port_https + proxy_port_https_adjustment HTTPS proxy port @@ -382,7 +382,7 @@ ● 1 True - adjustment_proxy_port_ftp + proxy_port_ftp_adjustment FTP proxy port @@ -403,7 +403,7 @@ ● 1 True - adjustment_proxy_port_socks + proxy_port_socks_adjustment Socks proxy port @@ -437,7 +437,7 @@ 1 _Configuration URL True - entry_proxy_url + proxy_url_entry @@ -448,7 +448,7 @@ - + True True ● @@ -460,7 +460,7 @@ - + False False 0 diff --git a/panels/network/network-simple.ui b/panels/network/network-simple.ui index a6172c7ce..dec1c7038 100644 --- a/panels/network/network-simple.ui +++ b/panels/network/network-simple.ui @@ -1,7 +1,7 @@ - + True False vertical @@ -31,7 +31,7 @@ 12 12 - + True False True @@ -53,7 +53,7 @@ - + True True True diff --git a/panels/network/network-vpn.ui b/panels/network/network-vpn.ui index b4150ff5c..35f85c78f 100644 --- a/panels/network/network-vpn.ui +++ b/panels/network/network-vpn.ui @@ -1,7 +1,7 @@ - + True False True @@ -37,7 +37,7 @@ 12 12 - + True False 0 @@ -59,7 +59,7 @@ - + True True True diff --git a/panels/network/network-wifi.ui b/panels/network/network-wifi.ui index 00bb1d8b1..4322f3e18 100644 --- a/panels/network/network-wifi.ui +++ b/panels/network/network-wifi.ui @@ -1,7 +1,7 @@ - + True True False @@ -72,7 +72,7 @@ - + True True end @@ -101,12 +101,12 @@ 6 True - + True False 1 Network Name - label_hotspot_network_name + hotspot_network_name_label @@ -119,12 +119,12 @@ - + True False 1 Connected Devices - label_hotspot_connected + hotspot_connected_label @@ -137,12 +137,12 @@ - + True False 1 Security type - label_hotspot_security + hotspot_security_label @@ -155,7 +155,7 @@ - + True False 0 @@ -170,7 +170,7 @@ - + True False 0 @@ -185,7 +185,7 @@ - + True False 0 @@ -200,12 +200,12 @@ - + True False 1 Password - label_hotspot_security_key + hotspot_security_key_label @@ -218,7 +218,7 @@ - + True False 0 @@ -257,7 +257,7 @@ center center - + True False Wi-Fi @@ -267,7 +267,7 @@ - + True False