[network-manager-openvpn/jk/ovpn-ui-fixes-1-0: 3/3] ui: fix widgets alignment



commit 070648c853f3091179edd7a440a5beffe4566461
Author: Jiří Klimeš <jklimes redhat com>
Date:   Tue Mar 31 13:39:02 2015 +0200

    ui: fix widgets alignment
    
    Fixes commit 0452c7cbbe9f44d0ea312aee739ec4c76c604bd1.
    
    (cherry picked from commit 8bd6219e1cf1a3186220a69a6d16a58750c3e1c9)

 properties/nm-openvpn-dialog.ui |  261 ++++++++------------------------------
 1 files changed, 55 insertions(+), 206 deletions(-)
---
diff --git a/properties/nm-openvpn-dialog.ui b/properties/nm-openvpn-dialog.ui
index ddc2384..58a3dbf 100644
--- a/properties/nm-openvpn-dialog.ui
+++ b/properties/nm-openvpn-dialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -113,16 +113,14 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="xscale">0</property>
+                    <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
                     <child>
                       <object class="GtkEntry" id="gateway_entry">
                         <property name="visible">True</property>
@@ -136,8 +134,6 @@ config: remote</property>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -201,8 +197,6 @@ config: remote</property>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -222,8 +216,7 @@ config: remote</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkEntry" id="tls_private_key_password_entry">
                                 <property name="visible">True</property>
@@ -236,8 +229,6 @@ config: remote</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -250,8 +241,6 @@ config: remote</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -259,22 +248,20 @@ config: remote</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0.019999999552965164</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkFileChooserButton" id="tls_private_key_chooser">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="tooltip_text" translatable="yes">Local peer's private key in 
.pem format.
 config: key</property>
+                                <property name="hexpand">True</property>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -287,8 +274,6 @@ config: key</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -296,8 +281,7 @@ config: key</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkFileChooserButton" id="tls_ca_cert_chooser">
                                 <property name="visible">True</property>
@@ -310,8 +294,6 @@ config: ca</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -324,8 +306,6 @@ config: ca</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -338,8 +318,6 @@ config: ca</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -347,8 +325,7 @@ config: ca</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkFileChooserButton" id="tls_user_cert_chooser">
                                 <property name="visible">True</property>
@@ -361,8 +338,6 @@ config: cert</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
@@ -387,8 +362,7 @@ config: cert</property>
                           <object class="GtkAlignment" id="alignment20">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkEntry" id="pw_password_entry">
                                 <property name="visible">True</property>
@@ -403,16 +377,13 @@ config: auth-user-pass</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkFileChooserButton" id="pw_ca_cert_chooser">
                                 <property name="visible">True</property>
@@ -426,7 +397,6 @@ config: ca</property>
                             <property name="left_attach">1</property>
                             <property name="top_attach">2</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -439,8 +409,6 @@ config: ca</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -453,8 +421,6 @@ config: ca</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -467,16 +433,14 @@ config: ca</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="hexpand">True</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkEntry" id="pw_username_entry">
                                 <property name="visible">True</property>
@@ -491,7 +455,6 @@ config: auth-user-pass</property>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -509,8 +472,6 @@ config: auth-user-pass</property>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
@@ -539,8 +500,7 @@ config: auth-user-pass</property>
                           <object class="GtkAlignment" id="alignment23">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkEntry" id="pw_tls_private_key_password_entry">
                                 <property name="visible">True</property>
@@ -555,7 +515,6 @@ config: auth-user-pass</property>
                             <property name="left_attach">1</property>
                             <property name="top_attach">5</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -568,16 +527,13 @@ config: auth-user-pass</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">5</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment12">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkFileChooserButton" id="pw_tls_private_key_chooser">
                                 <property name="visible">True</property>
@@ -591,7 +547,6 @@ config: key</property>
                             <property name="left_attach">1</property>
                             <property name="top_attach">4</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -604,8 +559,6 @@ config: key</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">4</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -618,16 +571,13 @@ config: key</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment21">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkEntry" id="pw_tls_password_entry">
                                 <property name="visible">True</property>
@@ -642,16 +592,13 @@ config: auth-user-pass</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment14">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkFileChooserButton" id="pw_tls_user_cert_chooser">
                                 <property name="visible">True</property>
@@ -665,15 +612,13 @@ config: cert</property>
                             <property name="left_attach">1</property>
                             <property name="top_attach">2</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment13">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkFileChooserButton" id="pw_tls_ca_cert_chooser">
                                 <property name="visible">True</property>
@@ -687,7 +632,6 @@ config: ca</property>
                             <property name="left_attach">1</property>
                             <property name="top_attach">3</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -700,8 +644,6 @@ config: ca</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -714,8 +656,6 @@ config: ca</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -728,16 +668,14 @@ config: ca</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment11">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="hexpand">True</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkEntry" id="pw_tls_username_entry">
                                 <property name="visible">True</property>
@@ -752,7 +690,6 @@ config: auth-user-pass</property>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -770,8 +707,6 @@ config: auth-user-pass</property>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
@@ -800,8 +735,7 @@ config: auth-user-pass</property>
                           <object class="GtkAlignment" id="alignment25">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkEntry" id="sk_local_address_entry">
                                 <property name="visible">True</property>
@@ -815,8 +749,6 @@ config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">4</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -830,8 +762,6 @@ config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -845,16 +775,13 @@ config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">4</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment18">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkEntry" id="sk_remote_address_entry">
                                 <property name="visible">True</property>
@@ -868,8 +795,6 @@ config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -882,8 +807,6 @@ config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -896,16 +819,13 @@ config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment15">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkFileChooserButton" id="sk_key_chooser">
                                 <property name="visible">True</property>
@@ -918,16 +838,13 @@ config: static &lt;file&gt;</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment16">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
+                            <property name="xalign">0</property>
                             <child>
                               <object class="GtkComboBox" id="sk_direction_combo">
                                 <property name="visible">True</property>
@@ -948,12 +865,10 @@ config: static &lt;file&gt; [direction]</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <placeholder />
+                          <placeholder/>
                         </child>
                         <child>
                           <placeholder/>
@@ -979,7 +894,6 @@ config: static &lt;file&gt; [direction]</property>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
                     <property name="width">2</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -992,16 +906,14 @@ config: static &lt;file&gt; [direction]</property>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="xscale">0</property>
+                    <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
                     <child>
                       <object class="GtkComboBox" id="auth_combo">
                         <property name="visible">True</property>
@@ -1020,8 +932,6 @@ config: static &lt;file&gt; [direction]</property>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -1057,7 +967,6 @@ config: static &lt;file&gt; [direction]</property>
             <property name="receives_default">False</property>
             <child>
               <object class="GtkBox" id="hbox2">
-                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -1226,7 +1135,6 @@ config: static &lt;file&gt; [direction]</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkBox" id="hbox1">
-                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
@@ -1274,7 +1182,6 @@ config: port</property>
                 </child>
                 <child>
                   <object class="GtkBox" id="hbox3">
-                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
@@ -1360,7 +1267,6 @@ config: proto tcp-client | udp</property>
                 </child>
                 <child>
                   <object class="GtkBox" id="hbox7">
-                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
@@ -1440,7 +1346,6 @@ config: dev &lt;name&gt;</property>
                 </child>
                 <child>
                   <object class="GtkBox" id="hbox4">
-                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
@@ -1488,7 +1393,6 @@ config: tun-mtu</property>
                 </child>
                 <child>
                   <object class="GtkBox" id="hbox5">
-                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
@@ -1600,8 +1504,8 @@ config: remote-random</property>
                   <object class="GtkGrid" id="table9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">12</property>
                     <property name="row_spacing">12</property>
+                    <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkComboBox" id="cipher_combo">
                         <property name="visible">True</property>
@@ -1619,8 +1523,6 @@ config: cipher</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1639,8 +1541,6 @@ config: keysize &lt;n&gt;</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1656,8 +1556,6 @@ config: keysize &lt;n&gt;</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1677,8 +1575,6 @@ config: auth</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1694,8 +1590,6 @@ config: auth</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1711,8 +1605,6 @@ config: auth</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
@@ -1751,11 +1643,8 @@ config: auth</property>
                       <object class="GtkGrid" id="table10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</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="tls_remote_label">
                             <property name="visible">True</property>
@@ -1768,8 +1657,6 @@ config: auth</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1795,8 +1682,6 @@ Example: /CN=myvpn.company.com&lt;/i&gt;</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1809,10 +1694,11 @@ config: tls-remote</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -1825,8 +1711,8 @@ config: tls-remote</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
-                        <property name="column_spacing">12</property>
                         <property name="row_spacing">3</property>
+                        <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="remote_cert_tls_checkbutton">
                             <property name="label" translatable="yes">_Verify peer (server) certificate 
usage signature</property>
@@ -1843,7 +1729,6 @@ config: tls-remote</property>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1858,8 +1743,6 @@ config: tls-remote</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1879,8 +1762,6 @@ config: remote-cert-tls client|server</property>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
@@ -1895,11 +1776,8 @@ config: remote-cert-tls client|server</property>
                       <object class="GtkGrid" id="table7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</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="GtkCheckButton" id="tls_auth_checkbutton">
                             <property name="label" translatable="yes">Use additional _TLS 
authentication</property>
@@ -1915,8 +1793,6 @@ config: remote-cert-tls client|server</property>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1924,11 +1800,10 @@ config: remote-cert-tls client|server</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="valign">start</property>
-                            <property name="column_spacing">12</property>
+                            <property name="margin_left">24</property>
+                            <property name="hexpand">True</property>
                             <property name="row_spacing">6</property>
-                            <child>
-                              <placeholder/>
-                            </child>
+                            <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkLabel" id="direction_label">
                                 <property name="visible">True</property>
@@ -1939,27 +1814,21 @@ config: remote-cert-tls client|server</property>
                                 <property name="mnemonic_widget">direction_combo</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
+                                <property name="left_attach">0</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
-                              <placeholder />
-                            </child>
-                            <child>
                               <object class="GtkFileChooserButton" id="tls_auth_chooser">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="tooltip_text" translatable="yes">Add an additional layer of 
HMAC authentication on top of the TLS control channel to protect against DoS attacks.
 config: tls-auth &lt;file&gt; [direction]</property>
+                                <property name="hexpand">True</property>
                               </object>
                               <packing>
-                                <property name="left_attach">2</property>
+                                <property name="left_attach">1</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -1978,10 +1847,8 @@ config: tls-auth &lt;file&gt; [direction]</property>
                                 </child>
                               </object>
                               <packing>
-                                <property name="left_attach">2</property>
+                                <property name="left_attach">1</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -1993,13 +1860,15 @@ config: tls-auth &lt;file&gt; [direction]</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">tls_auth_chooser</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                       </object>
@@ -2042,14 +1911,8 @@ config: tls-auth &lt;file&gt; [direction]</property>
                   <object class="GtkGrid" id="table11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">6</property>
                     <property name="row_spacing">6</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkComboBox" id="proxy_type_combo">
                         <property name="visible">True</property>
@@ -2068,8 +1931,6 @@ config: http-proxy or socks-proxy</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2085,8 +1946,6 @@ config: http-proxy or socks-proxy</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2103,8 +1962,6 @@ config: http-proxy or socks-proxy</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2119,8 +1976,6 @@ config: http-proxy or socks-proxy</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2132,7 +1987,6 @@ config: http-proxy or socks-proxy</property>
                         <property name="xscale">0</property>
                         <child>
                           <object class="GtkBox" id="hbox6">
-                            <property name="orientation">horizontal</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
@@ -2188,8 +2042,6 @@ config: http-proxy or socks-proxy</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2208,8 +2060,6 @@ config: http-proxy-retry or socks-proxy-retry</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2225,8 +2075,6 @@ config: http-proxy-retry or socks-proxy-retry</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">4</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2242,8 +2090,6 @@ config: http-proxy-retry or socks-proxy-retry</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2255,8 +2101,6 @@ config: http-proxy-retry or socks-proxy-retry</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">4</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2269,8 +2113,6 @@ config: http-proxy-retry or socks-proxy-retry</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -2287,10 +2129,17 @@ config: http-proxy-retry or socks-proxy-retry</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">6</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
               </object>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]