diff --git a/panels/network/wireless-security/eap-method-fast.c b/panels/network/wireless-security/eap-method-fast.c index 38734b61f..31206f146 100644 --- a/panels/network/wireless-security/eap-method-fast.c +++ b/panels/network/wireless-security/eap-method-fast.c @@ -342,7 +342,7 @@ eap_method_fast_new (WirelessSecurity *ws_parent, update_secrets, destroy, "/org/gnome/ControlCenter/network/eap-method-fast.ui", - "eap_fast_notebook", + "eap_fast_table", "eap_fast_anon_identity_entry", FALSE); if (!parent) diff --git a/panels/network/wireless-security/eap-method-fast.ui b/panels/network/wireless-security/eap-method-fast.ui index 784f19150..af1fc2ad8 100644 --- a/panels/network/wireless-security/eap-method-fast.ui +++ b/panels/network/wireless-security/eap-method-fast.ui @@ -29,166 +29,158 @@ - + True False - False - False + 5 + 2 + 6 + 6 - + True False - 5 - 2 - 6 - 6 + 1 + Anony_mous identity + True + eap_fast_anon_identity_entry + + + GTK_FILL + + + + + + True + True + True + + + 1 + 2 + + + + + + True + False + 1 + PAC _file + True + eap_fast_pac_file_button + + + 2 + 3 + GTK_FILL + + + + + + True + False + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + False + vertical - - True - False - 1 - Anony_mous identity - True - eap_fast_anon_identity_entry - - - GTK_FILL - - - - - - True - True - True - - - 1 - 2 - - - - - - True - False - 1 - PAC _file - True - eap_fast_pac_file_button - - - 2 - 3 - GTK_FILL - - - - - - True - False - - - 1 - 2 - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - False - vertical - - - - - - 2 - 4 - 5 - GTK_FILL - - - - - True - False - 1 - _Inner authentication - True - eap_fast_inner_auth_combo - - - 3 - 4 - GTK_FILL - - - - - - True - False - model8 - - - - 0 - - - - - 1 - 2 - 3 - 4 - GTK_FILL - GTK_FILL - - - - - Allow automatic PAC pro_visioning - True - True - False - True - True - - - 1 - 2 - GTK_FILL - - - - - - True - False - model9 - - - - 0 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - + + + 2 + 4 + 5 + GTK_FILL + + + + + True + False + 1 + _Inner authentication + True + eap_fast_inner_auth_combo + + + 3 + 4 + GTK_FILL + + + + + + True + False + model8 + + + + 0 + + + + + 1 + 2 + 3 + 4 + GTK_FILL + GTK_FILL + + + + + Allow automatic PAC pro_visioning + True + True + False + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + False + model9 + + + + 0 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + diff --git a/panels/network/wireless-security/eap-method-leap.c b/panels/network/wireless-security/eap-method-leap.c index 57d8759b9..5af38eba8 100644 --- a/panels/network/wireless-security/eap-method-leap.c +++ b/panels/network/wireless-security/eap-method-leap.c @@ -174,7 +174,7 @@ destroy (EAPMethod *parent) EAPMethodLEAP *method = (EAPMethodLEAP *) parent; GtkWidget *widget; - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_notebook")); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_table")); g_assert (widget); g_signal_handlers_disconnect_by_data (widget, method); @@ -200,7 +200,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent, update_secrets, destroy, "/org/gnome/ControlCenter/network/eap-method-leap.ui", - "eap_leap_notebook", + "eap_leap_table", "eap_leap_username_entry", FALSE); if (!parent) @@ -211,7 +211,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent, method->editing_connection = secrets_only ? FALSE : TRUE; method->ws_parent = ws_parent; - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_notebook")); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_table")); g_assert (widget); g_signal_connect (G_OBJECT (widget), "realize", (GCallback) widgets_realized, diff --git a/panels/network/wireless-security/eap-method-leap.ui b/panels/network/wireless-security/eap-method-leap.ui index ffcd71245..fe677de4f 100644 --- a/panels/network/wireless-security/eap-method-leap.ui +++ b/panels/network/wireless-security/eap-method-leap.ui @@ -1,98 +1,90 @@ - + True False - False - False + start + 3 + 2 + 6 + 6 - + + + + True False - start - 3 - 2 - 6 - 6 - - - - - - True - False - 1 - _Username - True - eap_leap_username_entry - - - GTK_FILL - - - - - - True - False - 1 - _Password - True - eap_leap_password_entry - - - 1 - 2 - GTK_FILL - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - Sho_w password - True - True - False - True - True - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - + 1 + _Username + True + eap_leap_username_entry + + GTK_FILL + + + + + + True + False + 1 + _Password + True + eap_leap_password_entry + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + Sho_w password + True + True + False + True + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + True + + + 1 + 2 + + diff --git a/panels/network/wireless-security/eap-method-peap.c b/panels/network/wireless-security/eap-method-peap.c index 095c8de3b..e350c66c5 100644 --- a/panels/network/wireless-security/eap-method-peap.c +++ b/panels/network/wireless-security/eap-method-peap.c @@ -338,7 +338,7 @@ eap_method_peap_new (WirelessSecurity *ws_parent, update_secrets, destroy, "/org/gnome/ControlCenter/network/eap-method-peap.ui", - "eap_peap_notebook", + "eap_peap_grid", "eap_peap_anon_identity_entry", FALSE); if (!parent) diff --git a/panels/network/wireless-security/eap-method-peap.ui b/panels/network/wireless-security/eap-method-peap.ui index 3ad70c250..26b14d3c4 100644 --- a/panels/network/wireless-security/eap-method-peap.ui +++ b/panels/network/wireless-security/eap-method-peap.ui @@ -29,163 +29,155 @@ - + True False - False - False + 6 + 6 - + True False - 6 - 6 + 1 + Anony_mous identity + True + eap_peap_anon_identity_entry + + + 0 + 0 + + + + + True + True + True + True + + + 1 + 0 + + + + + True + False + 1 + C_A certificate + True + eap_peap_ca_cert_button + + + 0 + 1 + + + + + True + False + True + + + 1 + 1 + + + + + No CA certificate is _required + True + True + True + False + True + True + + + 1 + 2 + + + + + True + False + 1 + PEAP _version + True + eap_peap_version_combo + + + 0 + 3 + + + + + True + False + True + model9 - - True - False - 1 - Anony_mous identity - True - eap_peap_anon_identity_entry - - - 0 - 0 - - - - - True - True - True - True - - - 1 - 0 - - - - - True - False - 1 - C_A certificate - True - eap_peap_ca_cert_button - - - 0 - 1 - - - - - True - False - True - - - 1 - 1 - - - - - No CA certificate is _required - True - True - True - False - True - True - - - 1 - 2 - - - - - True - False - 1 - PEAP _version - True - eap_peap_version_combo - - - 0 - 3 - - - - - True - False - True - model9 - - - - 0 - - - - - 1 - 3 - - - - - True - False - 1 - _Inner authentication - True - eap_peap_inner_auth_combo - - - 0 - 4 - - - - - True - False - True - model8 - - - - 0 - - - - - 1 - 4 - - - - - True - False - vertical - - - - - - 0 - 5 - 2 - + + + 0 + + + 1 + 3 + + + + + True + False + 1 + _Inner authentication + True + eap_peap_inner_auth_combo + + + 0 + 4 + + + + + True + False + True + model8 + + + + 0 + + + + + 1 + 4 + + + + + True + False + vertical + + + + + + 0 + 5 + 2 + diff --git a/panels/network/wireless-security/eap-method-simple.c b/panels/network/wireless-security/eap-method-simple.c index 271ce007c..abcf330d1 100644 --- a/panels/network/wireless-security/eap-method-simple.c +++ b/panels/network/wireless-security/eap-method-simple.c @@ -266,7 +266,7 @@ destroy (EAPMethod *parent) EAPMethodSimple *method = (EAPMethodSimple *) parent; GtkWidget *widget; - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_notebook")); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_table")); g_assert (widget); g_signal_handlers_disconnect_by_data (widget, method); @@ -296,7 +296,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent, update_secrets, destroy, "/org/gnome/ControlCenter/network/eap-method-simple.ui", - "eap_simple_notebook", + "eap_simple_table", "eap_simple_username_entry", flags & EAP_METHOD_SIMPLE_FLAG_PHASE2); if (!parent) @@ -309,7 +309,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent, method->type = type; g_assert (type < EAP_METHOD_SIMPLE_TYPE_LAST); - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_notebook")); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_table")); g_assert (widget); g_signal_connect (G_OBJECT (widget), "realize", (GCallback) widgets_realized, diff --git a/panels/network/wireless-security/eap-method-simple.ui b/panels/network/wireless-security/eap-method-simple.ui index f73fd0d6d..d6a17a117 100644 --- a/panels/network/wireless-security/eap-method-simple.ui +++ b/panels/network/wireless-security/eap-method-simple.ui @@ -1,112 +1,104 @@ - + True False - False - False + start + 3 + 2 + 6 + 6 - + + + + True False - start - 3 - 2 - 6 - 6 + 1 + _Username + True + eap_simple_username_entry + + + GTK_FILL + + + + + + True + False + 1 + _Password + True + eap_simple_password_entry + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + True + + + 1 + 2 + + + + + + True + False + vertical + + + Sho_w password + True + True + False + True + True + + + True + True + 0 + + - - - True - False - 1 - _Username - True - eap_simple_username_entry - - - GTK_FILL - - - - - - True - False - 1 - _Password - True - eap_simple_password_entry - - - 1 - 2 - GTK_FILL - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - True - - - 1 - 2 - - - - - - True - False - vertical - - - Sho_w password - True - True - False - True - True - - - True - True - 0 - - - - - - - - 1 - 2 - 2 - 3 - - + + 1 + 2 + 2 + 3 + diff --git a/panels/network/wireless-security/eap-method-tls.c b/panels/network/wireless-security/eap-method-tls.c index 5a5b7e1cf..cd91f1931 100644 --- a/panels/network/wireless-security/eap-method-tls.c +++ b/panels/network/wireless-security/eap-method-tls.c @@ -442,7 +442,7 @@ eap_method_tls_new (WirelessSecurity *ws_parent, update_secrets, NULL, "/org/gnome/ControlCenter/network/eap-method-tls.ui", - "eap_tls_notebook", + "eap_tls_grid", "eap_tls_identity_entry", phase2); if (!parent) diff --git a/panels/network/wireless-security/eap-method-tls.ui b/panels/network/wireless-security/eap-method-tls.ui index 389f399ff..e57135a20 100644 --- a/panels/network/wireless-security/eap-method-tls.ui +++ b/panels/network/wireless-security/eap-method-tls.ui @@ -1,180 +1,172 @@ - + True False - False - False + start + 6 + 6 - + + + + True False - start - 6 - 6 - - - - - - True - False - 1 - I_dentity - True - eap_tls_identity_entry - - - 0 - 0 - - - - - True - True - True - True - - - 1 - 0 - - - - - True - False - 1 - _User certificate - True - eap_tls_user_cert_button - - - 0 - 1 - - - - - True - False - True - - - 1 - 1 - - - - - True - False - 1 - C_A certificate - True - eap_tls_ca_cert_button - - - 0 - 2 - - - - - True - False - True - - - 1 - 2 - - - - - No CA certificate is _required - True - True - True - False - True - True - - - 1 - 3 - - - - - True - False - 1 - Private _key - True - eap_tls_private_key_button - - - 0 - 4 - - - - - True - False - True - - - 1 - 4 - - - - - True - False - 1 - _Private key password - True - eap_tls_private_key_password_entry - - - 0 - 5 - - - - - True - True - True - False - True - - - 1 - 5 - - - - - Sho_w password - True - True - True - False - True - True - - - 1 - 6 - - + 1 + I_dentity + True + eap_tls_identity_entry + + 0 + 0 + + + + + True + True + True + True + + + 1 + 0 + + + + + True + False + 1 + _User certificate + True + eap_tls_user_cert_button + + + 0 + 1 + + + + + True + False + True + + + 1 + 1 + + + + + True + False + 1 + C_A certificate + True + eap_tls_ca_cert_button + + + 0 + 2 + + + + + True + False + True + + + 1 + 2 + + + + + No CA certificate is _required + True + True + True + False + True + True + + + 1 + 3 + + + + + True + False + 1 + Private _key + True + eap_tls_private_key_button + + + 0 + 4 + + + + + True + False + True + + + 1 + 4 + + + + + True + False + 1 + _Private key password + True + eap_tls_private_key_password_entry + + + 0 + 5 + + + + + True + True + True + False + True + + + 1 + 5 + + + + + Sho_w password + True + True + True + False + True + True + + + 1 + 6 + diff --git a/panels/network/wireless-security/eap-method-ttls.c b/panels/network/wireless-security/eap-method-ttls.c index 2f6d6cb09..932f1c282 100644 --- a/panels/network/wireless-security/eap-method-ttls.c +++ b/panels/network/wireless-security/eap-method-ttls.c @@ -393,7 +393,7 @@ eap_method_ttls_new (WirelessSecurity *ws_parent, update_secrets, destroy, "/org/gnome/ControlCenter/network/eap-method-ttls.ui", - "eap_ttls_notebook", + "eap_ttls_grid", "eap_ttls_anon_identity_entry", FALSE); if (!parent) diff --git a/panels/network/wireless-security/eap-method-ttls.ui b/panels/network/wireless-security/eap-method-ttls.ui index 155bdae5f..caecf420a 100644 --- a/panels/network/wireless-security/eap-method-ttls.ui +++ b/panels/network/wireless-security/eap-method-ttls.ui @@ -12,159 +12,151 @@ - + True False - False - False + 6 + 6 - + True False - 6 - 6 + 1 + Anony_mous identity + True + eap_ttls_anon_identity_entry + + + 0 + 0 + + + + + True + True + True + True + + + 1 + 0 + + + + + True + False + _Domain + True + eap_ttls_domain_match_entry + 1 + + + 0 + 1 + + + + + True + True + True + True + + + 1 + 1 + + + + + True + False + C_A certificate + True + eap_ttls_ca_cert_button + 1 + + + 0 + 2 + + + + + True + False + True + + + 1 + 2 + + + + + No CA certificate is _required + True + True + False + start + True + True + True + + + 1 + 3 + + + + + True + False + _Inner authentication + True + eap_ttls_inner_auth_combo + 1 + + + 0 + 4 + + + + + True + False + True + model6 - - True - False - 1 - Anony_mous identity - True - eap_ttls_anon_identity_entry - - - 0 - 0 - - - - - True - True - True - True - - - 1 - 0 - - - - - True - False - _Domain - True - eap_ttls_domain_match_entry - 1 - - - 0 - 1 - - - - - True - True - True - True - - - 1 - 1 - - - - - True - False - C_A certificate - True - eap_ttls_ca_cert_button - 1 - - - 0 - 2 - - - - - True - False - True - - - 1 - 2 - - - - - No CA certificate is _required - True - True - False - start - True - True - True - - - 1 - 3 - - - - - True - False - _Inner authentication - True - eap_ttls_inner_auth_combo - 1 - - - 0 - 4 - - - - - True - False - True - model6 - - - - 0 - - - - - 1 - 4 - - - - - True - False - vertical - 6 - - - - - - 0 - 5 - 2 - + + + 0 + + + 1 + 4 + + + + + True + False + vertical + 6 + + + + + + 0 + 5 + 2 + diff --git a/panels/network/wireless-security/ws-dynamic-wep.c b/panels/network/wireless-security/ws-dynamic-wep.c index c267cac4d..2bb3df21b 100644 --- a/panels/network/wireless-security/ws-dynamic-wep.c +++ b/panels/network/wireless-security/ws-dynamic-wep.c @@ -110,7 +110,7 @@ ws_dynamic_wep_new (NMConnection *connection, update_secrets, destroy, "/org/gnome/ControlCenter/network/ws-dynamic-wep.ui", - "dynamic_wep_notebook", + "dynamic_wep_table", NULL); if (!parent) return NULL; diff --git a/panels/network/wireless-security/ws-dynamic-wep.ui b/panels/network/wireless-security/ws-dynamic-wep.ui index 9f151a9c0..c8ec44c19 100644 --- a/panels/network/wireless-security/ws-dynamic-wep.ui +++ b/panels/network/wireless-security/ws-dynamic-wep.ui @@ -12,75 +12,67 @@ - + True False - False - False + 3 + 2 + 6 + 6 - + + + + + + + True False - 3 - 2 - 6 - 6 + 1 + Au_thentication + True + dynamic_wep_auth_combo + + + GTK_FILL + + + + + + True + False + model7 - - - - - - - - True - False - 1 - Au_thentication - True - dynamic_wep_auth_combo - - - GTK_FILL - - - - - - True - False - model7 - - - - 0 - - - - - 1 - 2 - GTK_FILL - - - - - True - False - 6 - vertical - - - - - - 2 - 1 - 2 - GTK_FILL - + + + 0 + + + 1 + 2 + GTK_FILL + + + + + True + False + 6 + vertical + + + + + + 2 + 1 + 2 + GTK_FILL + diff --git a/panels/network/wireless-security/ws-leap.c b/panels/network/wireless-security/ws-leap.c index 35b2e034b..6549ea170 100644 --- a/panels/network/wireless-security/ws-leap.c +++ b/panels/network/wireless-security/ws-leap.c @@ -155,7 +155,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only) update_secrets, NULL, "/org/gnome/ControlCenter/network/ws-leap.ui", - "leap_notebook", + "leap_table", "leap_username_entry"); if (!parent) return NULL; diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui index b019af847..40c2cc8b5 100644 --- a/panels/network/wireless-security/ws-leap.ui +++ b/panels/network/wireless-security/ws-leap.ui @@ -1,99 +1,91 @@ - + True False - False - False + start + 3 + 2 + 6 + 6 - + + + + True False - start - 3 - 2 - 6 - 6 - - - - - - True - False - 1 - _Username - True - leap_username_entry - - - GTK_FILL - - - - - - True - False - 1 - _Password - True - leap_password_entry - - - 1 - 2 - GTK_FILL - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - Sho_w password - True - True - False - True - True - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - True - True - - - 1 - 2 - - - + 1 + _Username + True + leap_username_entry + + GTK_FILL + + + + + + True + False + 1 + _Password + True + leap_password_entry + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + Sho_w password + True + True + False + True + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + True + True + + + 1 + 2 + + diff --git a/panels/network/wireless-security/ws-wep-key.c b/panels/network/wireless-security/ws-wep-key.c index 8b78515b1..ff9997377 100644 --- a/panels/network/wireless-security/ws-wep-key.c +++ b/panels/network/wireless-security/ws-wep-key.c @@ -265,7 +265,7 @@ ws_wep_key_new (NMConnection *connection, update_secrets, destroy, "/org/gnome/ControlCenter/network/ws-wep-key.ui", - "wep_key_notebook", + "wep_key_table", "wep_key_entry"); if (!parent) return NULL; diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui index 24a1e0801..66804c703 100644 --- a/panels/network/wireless-security/ws-wep-key.ui +++ b/panels/network/wireless-security/ws-wep-key.ui @@ -35,153 +35,145 @@ - + True False - False - False + 4 + 2 + 6 + 6 - + True False - 4 - 2 - 6 - 6 + 1 + _Key + True + wep_key_entry + + + GTK_FILL + + + + + + True + True + 64 + False + True + + + 1 + 2 + + + + + + True + False + 0 + + + 1 + 2 + GTK_FILL + + + + + + Sho_w key + True + True + False + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + False + 1 + Au_thentication + True + auth_method_combo + + + 3 + 4 + GTK_FILL + + + + + + True + False + model3 - - True - False - 1 - _Key - True - wep_key_entry - - - GTK_FILL - - - - - - True - True - 64 - False - True - - - 1 - 2 - - - - - - True - False - 0 - - - 1 - 2 - GTK_FILL - - - - - - Sho_w key - True - True - False - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - False - 1 - Au_thentication - True - auth_method_combo - - - 3 - 4 - GTK_FILL - - - - - - True - False - model3 - - - - 0 - - - - - 1 - 2 - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - False - 1 - WEP inde_x - True - key_index_combo - - - 2 - 3 - GTK_FILL - - - - - - True - False - model4 - - - - 0 - - - - - 1 - 2 - 2 - 3 - GTK_FILL - GTK_FILL - + + + 0 + + + 1 + 2 + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + False + 1 + WEP inde_x + True + key_index_combo + + + 2 + 3 + GTK_FILL + + + + + + True + False + model4 + + + + 0 + + + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c index f9a9be37e..cac646a15 100644 --- a/panels/network/wireless-security/ws-wpa-eap.c +++ b/panels/network/wireless-security/ws-wpa-eap.c @@ -111,7 +111,7 @@ ws_wpa_eap_new (NMConnection *connection, update_secrets, destroy, "/org/gnome/ControlCenter/network/ws-wpa-eap.ui", - "wpa_eap_notebook", + "wpa_eap_table", NULL); if (!parent) return NULL; diff --git a/panels/network/wireless-security/ws-wpa-eap.ui b/panels/network/wireless-security/ws-wpa-eap.ui index 96656206f..ede859d59 100644 --- a/panels/network/wireless-security/ws-wpa-eap.ui +++ b/panels/network/wireless-security/ws-wpa-eap.ui @@ -12,68 +12,60 @@ - + True False - False - False + 2 + 2 + 6 + 6 - + True False - 2 - 2 - 6 - 6 + 1 + Au_thentication + True + wpa_eap_auth_combo + + + GTK_FILL + + + + + + True + False + model5 - - True - False - 1 - Au_thentication - True - wpa_eap_auth_combo - - - GTK_FILL - - - - - - True - False - model5 - - - - 0 - - - - - 1 - 2 - GTK_FILL - - - - - True - False - vertical - - - - - - 2 - 1 - 2 - GTK_FILL - + + + 0 + + + 1 + 2 + GTK_FILL + + + + + True + False + vertical + + + + + + 2 + 1 + 2 + GTK_FILL + diff --git a/panels/network/wireless-security/ws-wpa-psk.c b/panels/network/wireless-security/ws-wpa-psk.c index 29064f4f3..dbac2099d 100644 --- a/panels/network/wireless-security/ws-wpa-psk.c +++ b/panels/network/wireless-security/ws-wpa-psk.c @@ -183,7 +183,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only) update_secrets, NULL, "/org/gnome/ControlCenter/network/ws-wpa-psk.ui", - "wpa_psk_notebook", + "wpa_psk_table", "wpa_psk_entry"); if (!parent) return NULL; diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui index 7db86fe1b..a4eaf1cc4 100644 --- a/panels/network/wireless-security/ws-wpa-psk.ui +++ b/panels/network/wireless-security/ws-wpa-psk.ui @@ -1,108 +1,100 @@ - + True False - False - False + 3 + 2 + 6 + 6 - + True False - 3 - 2 - 6 - 6 - - - True - False - 1 - _Password - True - wpa_psk_entry - - - GTK_FILL - - - - - - True - True - 64 - False - True - - - 1 - 2 - - - - - - True - False - 1 - _Type - True - wpa_psk_type_combo - - - 2 - 3 - GTK_FILL - - - - - - True - False - 0 - - - 1 - 2 - GTK_FILL - - - - - - Sho_w password - True - True - False - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - False - - - 1 - 2 - 2 - 3 - GTK_FILL - - + 1 + _Password + True + wpa_psk_entry + + GTK_FILL + + + + + + True + True + 64 + False + True + + + 1 + 2 + + + + + + True + False + 1 + _Type + True + wpa_psk_type_combo + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + + + 1 + 2 + GTK_FILL + + + + + + Sho_w password + True + True + False + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + False + + + 1 + 2 + 2 + 3 + GTK_FILL +