From 146d3ec83c45f3ccf131520eece8f75e568a8b53 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 5 Dec 2015 17:49:38 +0100
Subject: [PATCH] Bar Chart Dialog: Remove deprecated widgets

---
 src/ui/gui/barchart.ui | 56 +++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/src/ui/gui/barchart.ui b/src/ui/gui/barchart.ui
index e27e6c35d1..fafff5f62a 100644
--- a/src/ui/gui/barchart.ui
+++ b/src/ui/gui/barchart.ui
@@ -74,19 +74,13 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment2">
+                  <object class="GtkEntry" id="entry1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkEntry" id="entry1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                      </object>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="margin_left">12</property>
+                    <property name="invisible_char">•</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
                   </object>
                 </child>
                 <child type="label">
@@ -116,7 +110,9 @@
                   <object class="GtkGrid" id="table2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="margin_left">5</property>
                     <property name="margin_right">5</property>
+                    <property name="margin_bottom">5</property>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton-count">
                         <property name="label" translatable="yes">_N of cases</property>
@@ -236,19 +232,13 @@
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment3">
+                              <object class="GtkEntry" id="entry2">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="left_padding">12</property>
-                                <child>
-                                  <object class="GtkEntry" id="entry2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">•</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                    <property name="secondary_icon_activatable">False</property>
-                                  </object>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="margin_start">12</property>
+                                <property name="invisible_char">•</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
                               </object>
                             </child>
                             <child type="label">
@@ -312,19 +302,13 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment1">
+                  <object class="GtkEntry" id="entry3">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkEntry" id="entry3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                      </object>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="margin_start">12</property>
+                    <property name="invisible_char">•</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
                   </object>
                 </child>
                 <child type="label">
-- 
2.30.2