[gnome-control-center] power: Expand the "Automatic suspend" dialogue's layout

[Bastien Nocera <hadess src gnome org>]

commit 431b89f1761da4519bbaa9a91bbf6af2442bc233
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Feb 18 14:51:54 2013 +0100

    power: Expand the "Automatic suspend" dialogue's layout
    
    The dialog looks rather squashed along the horizontal. The spacing
    should make the connection between the switches and the delay comboboxes
    a bit clearer.
    
    Also make sure that the "Delay" labels don't intersect the labels above.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694042

 panels/power/power.ui |   96 +++++++++++++++++++++++++++---------------------
 1 files changed, 54 insertions(+), 42 deletions(-)
---
diff --git a/panels/power/power.ui b/panels/power/power.ui
index 92c3fb5..4d74c3b 100644
--- a/panels/power/power.ui
+++ b/panels/power/power.ui
@@ -192,40 +192,36 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSwitch" id="suspend_on_ac_switch">
+              <object class="GtkLabel" id="suspend_on_battery_label">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="halign">end</property>
-                <property name="margin_top">12</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">On _Battery Power</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">suspend_on_battery_switch</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <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="GtkLabel" id="suspend_on_ac_delay_label">
+              <object class="GtkSwitch" id="suspend_on_battery_switch">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">20</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Delay</property>
-                <property name="mnemonic_widget">suspend_on_ac_delay_combo</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
+                <property name="can_focus">True</property>
+                <property name="halign">end</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
+                <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="GtkComboBoxText" id="suspend_on_ac_delay_combo">
+              <object class="GtkComboBoxText" id="suspend_on_battery_delay_combo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">4</property>
@@ -235,8 +231,8 @@
                 <property name="model">liststore_time</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
@@ -254,54 +250,70 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">0</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>
-              <object class="GtkComboBoxText" id="suspend_on_battery_delay_combo">
+              <object class="GtkSwitch" id="suspend_on_ac_switch">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">4</property>
-                <property name="margin_right">4</property>
-                <property name="entry_text_column">0</property>
-                <property name="id_column">1</property>
-                <property name="model">liststore_time</property>
+                <property name="can_focus">True</property>
+                <property name="halign">end</property>
+                <property name="margin_top">12</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left_attach">2</property>
+                <property name="top_attach">2</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkSwitch" id="suspend_on_battery_switch">
+              <object class="GtkComboBoxText" id="suspend_on_ac_delay_combo">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="halign">end</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">4</property>
+                <property name="margin_right">4</property>
+                <property name="entry_text_column">0</property>
+                <property name="id_column">1</property>
+                <property name="model">liststore_time</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left_attach">2</property>
+                <property name="top_attach">3</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="suspend_on_battery_label">
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkLabel" id="suspend_on_ac_delay_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">On _Battery Power</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">suspend_on_battery_switch</property>
+                <property name="margin_left">20</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Delay</property>
+                <property name="mnemonic_widget">suspend_on_ac_delay_combo</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>