diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2017-02-17 17:39:45 +0000 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-19 21:04:45 +0100 |
commit | e034b682043a94e211489c9f5ae801704cfb17f9 (patch) | |
tree | c465e35d55e15f87f07a96f11366d7aca5dc3488 | |
parent | ee647f86f3260065ca8b12805583378d4dfdd9ed (diff) | |
download | network-manager-applet-e034b682043a94e211489c9f5ae801704cfb17f9.tar.gz |
wireless-security: replace a GtkTable with GtkGrid
Let's modernize the UI file a bit before we extend it.
-rw-r--r-- | src/wireless-security/eap-method-tls.ui | 172 |
1 files changed, 75 insertions, 97 deletions
diff --git a/src/wireless-security/eap-method-tls.ui b/src/wireless-security/eap-method-tls.ui index d4952b41..94bad98f 100644 --- a/src/wireless-security/eap-method-tls.ui +++ b/src/wireless-security/eap-method-tls.ui @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.4"/> <object class="GtkNotebook" id="eap_tls_notebook"> @@ -7,200 +8,177 @@ <property name="show_tabs">False</property> <property name="show_border">False</property> <child> - <object class="GtkTable" id="table8"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="n_rows">6</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> <property name="row_spacing">6</property> - <child> - <placeholder/> - </child> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="eap_tls_identity_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">I_dentity:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">eap_tls_identity_entry</property> + <property name="xalign">0</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkEntry" id="eap_tls_identity_entry"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"/> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="eap_tls_user_cert_label"> + <object class="GtkFileChooserButton" id="eap_tls_ca_cert_button"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_User certificate:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">eap_tls_user_cert_button</property> + <property name="hexpand">True</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="eap_tls_ca_cert_label"> + <object class="GtkCheckButton" id="eap_tls_ca_cert_not_required_checkbox"> + <property name="label" translatable="yes">No CA certificate is _required</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">C_A certificate:</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">eap_tls_ca_cert_button</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkFileChooserButton" id="eap_tls_ca_cert_button"> + <object class="GtkFileChooserButton" id="eap_tls_private_key_button"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="top_attach">4</property> </packing> </child> <child> - <object class="GtkCheckButton" id="eap_tls_ca_cert_not_required_checkbox"> - <property name="label" translatable="yes">No CA certificate is _required</property> + <object class="GtkEntry" id="eap_tls_private_key_password_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="hexpand">True</property> + <property name="visibility">False</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="top_attach">5</property> </packing> </child> <child> - <object class="GtkLabel" id="eap_tls_private_key_label"> + <object class="GtkCheckButton" id="show_checkbutton_eaptls"> + <property name="label" translatable="yes">Sho_w password</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Private _key:</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">eap_tls_private_key_button</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="left_attach">1</property> + <property name="top_attach">6</property> </packing> </child> <child> - <object class="GtkFileChooserButton" id="eap_tls_private_key_button"> + <object class="GtkFileChooserButton" id="eap_tls_user_cert_button"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="eap_tls_private_key_password_label"> + <object class="GtkLabel" id="eap_tls_user_cert_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Private key password:</property> + <property name="label" translatable="yes">_User certificate:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">eap_tls_private_key_password_entry</property> + <property name="mnemonic_widget">eap_tls_user_cert_button</property> + <property name="xalign">0</property> </object> <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkEntry" id="eap_tls_private_key_password_entry"> + <object class="GtkLabel" id="eap_tls_ca_cert_label"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">C_A certificate:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">eap_tls_ca_cert_button</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"/> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkCheckButton" id="show_checkbutton_eaptls"> - <property name="label" translatable="yes">Sho_w password</property> + <object class="GtkLabel" id="eap_tls_private_key_label"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Private _key:</property> <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="mnemonic_widget">eap_tls_private_key_button</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="left_attach">0</property> + <property name="top_attach">4</property> </packing> </child> <child> - <object class="GtkFileChooserButton" id="eap_tls_user_cert_button"> + <object class="GtkLabel" id="eap_tls_private_key_password_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">_Private key password:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">eap_tls_private_key_password_entry</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">5</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </child> <child type="tab"> |