From 26e757ac7da225a3b5d5641b060991a54e813ed5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 8 Sep 2014 14:41:59 +0200
Subject: [PATCH] various padding and layout adjustement.

---
 src/glade/sensor-edit.glade | 107 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 92 insertions(+), 15 deletions(-)

diff --git a/src/glade/sensor-edit.glade b/src/glade/sensor-edit.glade
index 19636ae..3d694e4 100644
--- a/src/glade/sensor-edit.glade
+++ b/src/glade/sensor-edit.glade
@@ -23,6 +23,7 @@
     </columns>
   </object>
   <object class="GtkDialog" id="dialog1">
+    <property name="height_request">300</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Edit Sensor Preferences</property>
@@ -81,24 +82,33 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkTreeView" id="sensors_list">
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="model">sensors_liststore</property>
-                <property name="headers_clickable">False</property>
-                <property name="reorderable">True</property>
-                <property name="search_column">1</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection1"/>
-                </child>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="sensor_name_col">
-                    <property name="title" translatable="yes">Name</property>
+                  <object class="GtkTreeView" id="sensors_list">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="model">sensors_liststore</property>
+                    <property name="headers_clickable">False</property>
+                    <property name="reorderable">True</property>
+                    <property name="search_column">1</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection"/>
+                    </child>
                     <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
+                      <object class="GtkTreeViewColumn" id="sensor_name_col">
+                        <property name="title" translatable="yes">Name</property>
+                        <property name="expand">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                     </child>
                   </object>
                 </child>
@@ -142,6 +152,10 @@
                       <object class="GtkLabel" id="label4">
                         <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="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0.49000000953674316</property>
                         <property name="xpad">4</property>
@@ -159,6 +173,10 @@
                       <object class="GtkLabel" id="sensor_type">
                         <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="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">N/A</property>
                       </object>
@@ -173,6 +191,10 @@
                       <object class="GtkLabel" id="chip_name_label">
                         <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="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="xpad">4</property>
                         <property name="label" translatable="yes">Chip:</property>
@@ -188,6 +210,10 @@
                       <object class="GtkLabel" id="chip_name">
                         <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="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">N/A</property>
                       </object>
@@ -217,6 +243,10 @@
                       <object class="GtkLabel" id="label2">
                         <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="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="xpad">4</property>
                         <property name="label" translatable="yes">Id:</property>
@@ -232,11 +262,13 @@
                       <object class="GtkLabel" id="sensor_id">
                         <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="margin_top">4</property>
                         <property name="margin_bottom">4</property>
-                        <property name="hexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">N/A</property>
+                        <property name="ellipsize">end</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -274,6 +306,9 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="ui_sensorpref_draw_toggled_cb" swapped="no"/>
@@ -289,6 +324,10 @@
                       <object class="GtkLabel" id="label7">
                         <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="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="xpad">4</property>
                         <property name="label" translatable="yes">Color:</property>
@@ -306,6 +345,10 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="halign">start</property>
+                        <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <signal name="color-set" handler="ui_sensorpref_color_set_cb" swapped="no"/>
                       </object>
@@ -323,6 +366,9 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="ui_sensorpref_display_toggled_cb" swapped="no"/>
@@ -367,6 +413,9 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="ui_sensorpref_alarm_toggled_cb" swapped="no"/>
@@ -382,6 +431,10 @@
                       <object class="GtkLabel" id="alarm_high_threshold_label">
                         <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="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0.0099999997764825821</property>
                         <property name="xpad">4</property>
                         <property name="label" translatable="yes">High threshold:</property>
@@ -401,6 +454,10 @@
                           <object class="GtkSpinButton" id="sensor_alarm_high_threshold">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="margin_left">4</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_top">4</property>
+                            <property name="margin_bottom">4</property>
                             <property name="invisible_char">•</property>
                             <property name="text" translatable="yes">0</property>
                             <property name="primary_icon_activatable">False</property>
@@ -423,6 +480,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="valign">center</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_top">4</property>
+                            <property name="margin_bottom">4</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">N/A</property>
                           </object>
@@ -448,6 +508,10 @@
                           <object class="GtkSpinButton" id="sensor_alarm_low_threshold">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="margin_left">4</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_top">4</property>
+                            <property name="margin_bottom">4</property>
                             <property name="invisible_char">•</property>
                             <property name="text" translatable="yes">-1</property>
                             <property name="primary_icon_activatable">False</property>
@@ -471,6 +535,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="valign">center</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_top">4</property>
+                            <property name="margin_bottom">4</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">N/A</property>
                           </object>
@@ -492,6 +559,10 @@
                       <object class="GtkLabel" id="alarm_low_threshold_label">
                         <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="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0.0099999997764825821</property>
                         <property name="xpad">4</property>
                         <property name="label" translatable="yes">Low threshold:</property>
@@ -536,6 +607,9 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="ui_sensorpref_appindicator_menu_toggled_cb" swapped="no"/>
@@ -554,6 +628,9 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="ui_sensorpref_appindicator_label_toggled_cb" swapped="no"/>
-- 
2.7.4