[gnome-control-center] power: Split lines in auto-suspend dialogue

From: Bastien Nocera <hadess src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] power: Split lines in auto-suspend dialogue
Date: Tue, 12 Feb 2013 13:58:11 +0000 (UTC)
commit 430093596897679669fe5e0f6c33419ff02671f2
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Feb 12 14:47:44 2013 +0100

    power: Split lines in auto-suspend dialogue

 panels/power/power.ui |   94 ++++++++++++++++++++++++++----------------------
 1 files changed, 51 insertions(+), 43 deletions(-)
---
diff --git a/panels/power/power.ui b/panels/power/power.ui
index 5eaf336..92c3fb5 100644
--- a/panels/power/power.ui
+++ b/panels/power/power.ui
@@ -175,13 +175,18 @@
             <property name="row_spacing">12</property>
             <property name="column_spacing">6</property>
             <child>
-              <object class="GtkSwitch" id="suspend_on_battery_switch">
+              <object class="GtkLabel" id="suspend_on_ac_label">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">12</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_Plugged In</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">suspend_on_ac_switch</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="top_attach">2</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
@@ -190,42 +195,48 @@
               <object class="GtkSwitch" id="suspend_on_ac_switch">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="halign">end</property>
+                <property name="margin_top">12</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <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>
-              <object class="GtkLabel" id="suspend_on_battery_label">
+              <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">When 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">1</property>
-                <property name="top_attach">0</property>
+                <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>
-              <object class="GtkLabel" id="suspend_on_ac_label">
+              <object class="GtkComboBoxText" id="suspend_on_ac_delay_combo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">When _Plugged In</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">suspend_on_ac_switch</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">1</property>
+                <property name="top_attach">3</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
@@ -234,66 +245,63 @@
               <object class="GtkLabel" id="suspend_on_battery_delay_label">
                 <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="margin-left">20</property>
                 <property name="mnemonic_widget">suspend_on_battery_delay_combo</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">0</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>
-              <object class="GtkLabel" id="suspend_on_ac_delay_label">
+              <object class="GtkComboBoxText" id="suspend_on_battery_delay_combo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Delay</property>
-                <property name="margin-left">20</property>
-                <property name="mnemonic_widget">suspend_on_ac_delay_combo</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
+                <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">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>
-              <object class="GtkComboBoxText" id="suspend_on_battery_delay_combo">
+              <object class="GtkSwitch" id="suspend_on_battery_switch">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="entry_text_column">0</property>
-                <property name="model">liststore_time</property>
-                <property name="margin_left">4</property>
-                <property name="margin_right">4</property>
+                <property name="can_focus">True</property>
+                <property name="halign">end</property>
               </object>
               <packing>
-                <property name="left_attach">3</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>
-              <object class="GtkComboBoxText" id="suspend_on_ac_delay_combo">
+              <object class="GtkLabel" id="suspend_on_battery_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="entry_text_column">0</property>
-                <property name="model">liststore_time</property>
-                <property name="margin_left">4</property>
-                <property name="margin_right">4</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">3</property>
-                <property name="top_attach">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]