[gnome-control-center/wip/networking2: 36/36] networking: Cosmetics

[Dan Winship <danw src gnome org>]

commit 96dc57a2e24c67e5ffcdf585f21a0237330d357f
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jan 7 00:11:05 2013 -0500

    networking: Cosmetics
    
    Make the headings on the wifi and wired pages line up
    more closely.

 panels/network/network-ethernet.ui |   49 ++++++++++++++---------------------
 panels/network/network-wifi.ui     |   21 +++++++++------
 2 files changed, 32 insertions(+), 38 deletions(-)
---
diff --git a/panels/network/network-ethernet.ui b/panels/network/network-ethernet.ui
index fcb4108..58abe65 100644
--- a/panels/network/network-ethernet.ui
+++ b/panels/network/network-ethernet.ui
@@ -13,13 +13,11 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">12</property>
-        <property name="spacing">6</property>
         <child>
           <object class="GtkGrid" id="grid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
-            <property name="row_spacing">10</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkImage" id="image_device">
@@ -43,9 +41,9 @@
               <object class="GtkVBox" id="vbox4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="valign">start</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
-                <property name="spacing">3</property>
                 <child>
                   <object class="GtkLabel" id="label_device">
                     <property name="visible">True</property>
@@ -86,32 +84,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="alignment_switch">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="valign">start</property>
-                <child>
-                  <object class="GtkSwitch" id="device_off_switch">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">start</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkScrolledWindow" id="list">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="margin_top">20</property>
+                <property name="margin_top">12</property>
                 <property name="hexpand">True</property>
                 <property name="hscrollbar_policy">never</property>
                 <property name="shadow_type">in</property>
@@ -130,7 +106,7 @@
               <object class="GtkGrid" id="details">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_top">20</property>
+                <property name="margin_top">12</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="row_spacing">10</property>
@@ -170,6 +146,21 @@
                 <property name="height">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkSwitch" id="device_off_switch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="halign">end</property>
+                <property name="valign">center</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -181,7 +172,7 @@
           <object class="GtkBox" id="actions">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_top">20</property>
+            <property name="margin_top">18</property>
             <child>
               <object class="GtkButton" id="add_profile_button">
                 <property name="label" translatable="yes">_Add Profileâ</property>
diff --git a/panels/network/network-wifi.ui b/panels/network/network-wifi.ui
index 9e76ac8..fa3a055 100644
--- a/panels/network/network-wifi.ui
+++ b/panels/network/network-wifi.ui
@@ -88,7 +88,6 @@
                         <child>
                           <object class="GtkCellRendererText" id="padding_cell">
                             <property name="xpad">20</property>
-                            <property name="text"></property>
                           </object>
                         </child>
                       </object>
@@ -689,7 +688,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
@@ -698,12 +696,12 @@
                           <object class="GtkBox" id="box2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin_left">20</property>
+                            <property name="margin_right">20</property>
+                            <property name="margin_top">10</property>
+                            <property name="margin_bottom">10</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">10</property>
-                            <property name="margin-left">20</property>
-                            <property name="margin-right">20</property>
-                            <property name="margin-top">10</property>
-                            <property name="margin-bottom">10</property>
                             <child>
                               <object class="GtkBox" id="box5">
                                 <property name="visible">True</property>
@@ -1601,6 +1599,8 @@ here</property>
       <object class="GtkNotebook" id="notebook_view">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="show_tabs">False</property>
+        <property name="show_border">False</property>
         <child>
           <object class="GtkBox" id="box3">
             <property name="visible">True</property>
@@ -1610,7 +1610,7 @@ here</property>
               <object class="GtkBox" id="box_list">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_bottom">12</property>
+                <property name="margin_bottom">18</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="box_list_heading">
@@ -1620,6 +1620,7 @@ here</property>
                     <property name="margin_right">12</property>
                     <property name="margin_top">12</property>
                     <property name="margin_bottom">12</property>
+                    <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="heading_image">
                         <property name="visible">True</property>
@@ -1637,12 +1638,13 @@ here</property>
                       <object class="GtkBox" id="box4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkLabel" id="heading_list">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Wi-Fi</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -1659,7 +1661,7 @@ here</property>
                           <object class="GtkLabel" id="heading_status">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
                             <property name="label">Connected</property>
                           </object>
                           <packing>
@@ -1681,6 +1683,7 @@ here</property>
                         <property name="can_focus">True</property>
                         <property name="halign">end</property>
                         <property name="valign">center</property>
+                        <property name="hexpand">True</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>