[network-manager-openvpn] ui: fix label wrapping (bgo #668161)



commit 53c8fc32f1997eced75222962ae9ebc64ed418bb
Author: JiÅÃ KlimeÅ <jklimes redhat com>
Date:   Tue Jan 24 10:07:27 2012 +0100

    ui: fix label wrapping (bgo #668161)
    
    GTK 3.2 changed handling of label wrapping. Basically, width-chars should be
    specified to force the minimum width and get wrapping right.
    See https://bugzilla.gnome.org/show_bug.cgi?id=662043

 properties/nm-openvpn-dialog.ui |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/properties/nm-openvpn-dialog.ui b/properties/nm-openvpn-dialog.ui
index 41bd828..6c65cce 100644
--- a/properties/nm-openvpn-dialog.ui
+++ b/properties/nm-openvpn-dialog.ui
@@ -566,11 +566,13 @@
                               <object class="GtkLabel" id="label33">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="valign">start</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">&lt;i&gt;Connect only to servers whose certificate matches the given subject.
 Example: /CN=myvpn.company.com&lt;/i&gt;</property>
                                 <property name="use_markup">True</property>
                                 <property name="wrap">True</property>
+                                <property name="width_chars">30</property>
                               </object>
                             </child>
                           </object>
@@ -630,6 +632,7 @@ Example: /CN=myvpn.company.com&lt;/i&gt;</property>
                           <object class="GtkTable" id="table8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="valign">start</property>
                             <property name="n_rows">3</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">12</property>
@@ -656,10 +659,12 @@ Example: /CN=myvpn.company.com&lt;/i&gt;</property>
                                   <object class="GtkLabel" id="tls_dir_help_label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="valign">start</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">&lt;i&gt;If key direction is used, it must be the opposite of that used on the VPN peer.  For example, if the peer uses '1', this connection must use '0'.  If you are unsure what value to use, contact your system administrator.&lt;/i&gt;</property>
                                     <property name="use_markup">True</property>
                                     <property name="wrap">True</property>
+                                    <property name="width_chars">45</property>
                                   </object>
                                 </child>
                               </object>
@@ -804,10 +809,12 @@ Example: /CN=myvpn.company.com&lt;/i&gt;</property>
                       <object class="GtkLabel" id="proxy_desc_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="valign">start</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;i&gt;Select this option if your organization requires the use of a proxy server to access the Internet.&lt;/i&gt;</property>
                         <property name="use_markup">True</property>
                         <property name="wrap">True</property>
+                        <property name="width_chars">35</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1880,10 +1887,12 @@ Example: /CN=myvpn.company.com&lt;/i&gt;</property>
                               <object class="GtkLabel" id="sk_dir_help_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="valign">start</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">&lt;i&gt;If key direction is used, it must be the opposite of that used on the VPN peer.  For example, if the peer uses '1', this connection must use '0'.  If you are unsure what value to use, contact your system administrator.&lt;/i&gt;</property>
                                 <property name="use_markup">True</property>
                                 <property name="wrap">True</property>
+                                <property name="width_chars">38</property>
                               </object>
                             </child>
                           </object>



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