weld DataLabelsDialog and DataLabelsTabPage

Change-Id: I509d58b2677b5e8f0db476e2650661cb128a5279
Reviewed-on: https://gerrit.libreoffice.org/61723
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 123 insertions, 238 deletions

diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 3cf3618e0aff..ad6424771569 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -1,106 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentDEGREE">
     <property name="upper">359</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="liststorePLACEMENT">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Best fit</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Center</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Above</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top left</col>
-        <col id="1">3</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Left</col>
-        <col id="1">4</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom left</col>
-        <col id="1">5</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Below</col>
-        <col id="1">6</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom right</col>
-        <col id="1">7</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Right</col>
-        <col id="1">8</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top right</col>
-        <col id="1">9</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Inside</col>
-        <col id="1">10</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Outside</col>
-        <col id="1">11</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Near origin</col>
-        <col id="1">12</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststoreSEPARATOR">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Space</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Comma</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Semicolon</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">New line</col>
-        <col id="1">3</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkDialog" id="dlg_DataLabels">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="dlg_DataLabel|dlg_DataLabels">Data Labels for all Data Series</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
@@ -193,7 +107,7 @@
                           <object class="GtkCheckButton" id="CB_VALUE_AS_NUMBER">
                             <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
@@ -208,7 +122,7 @@
                           <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
                             <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
@@ -223,7 +137,7 @@
                           <object class="GtkCheckButton" id="CB_CATEGORY">
                             <property name="label" translatable="yes" context="dlg_DataLabel|CB_CATEGORY">Show _category</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
@@ -238,7 +152,7 @@
                           <object class="GtkCheckButton" id="CB_SYMBOL">
                             <property name="label" translatable="yes" context="dlg_DataLabel|CB_SYMBOL">Show _legend key</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
@@ -253,7 +167,7 @@
                           <object class="GtkCheckButton" id="CB_WRAP_TEXT">
                             <property name="label" translatable="yes" context="dlg_DataLabel|CB_WRAP_TEXT">Auto text _wrap</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
@@ -268,7 +182,7 @@
                           <object class="GtkButton" id="PB_NUMBERFORMAT">
                             <property name="label" translatable="yes" context="dlg_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="use_underline">True</property>
@@ -282,7 +196,7 @@
                           <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
                             <property name="label" translatable="yes" context="dlg_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="use_underline">True</property>
@@ -315,10 +229,10 @@
                               <object class="GtkLabel" id="FT_TEXT_SEPARATOR">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes" context="dlg_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -327,11 +241,16 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="LB_TEXT_SEPARATOR">
+                              <object class="GtkComboBoxText" id="LB_TEXT_SEPARATOR">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="model">liststoreSEPARATOR</property>
+                                <items>
+                                  <item id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Space</item>
+                                  <item id="1" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Comma</item>
+                                  <item id="2" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Semicolon</item>
+                                  <item id="3" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">New line</item>
+                                </items>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -355,10 +274,10 @@
                               <object class="GtkLabel" id="FT_LABEL_PLACEMENT">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -367,11 +286,25 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="LB_LABEL_PLACEMENT">
+                              <object class="GtkComboBoxText" id="LB_LABEL_PLACEMENT">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="model">liststorePLACEMENT</property>
+                                <items>
+                                  <item id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Best fit</item>
+                                  <item id="1" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Center</item>
+                                  <item id="2" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Above</item>
+                                  <item id="3" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top left</item>
+                                  <item id="4" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Left</item>
+                                  <item id="5" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom left</item>
+                                  <item id="6" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Below</item>
+                                  <item id="7" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom right</item>
+                                  <item id="8" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Right</item>
+                                  <item id="9" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top right</item>
+                                  <item id="10" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Inside</item>
+                                  <item id="11" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Outside</item>
+                                  <item id="12" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Near origin</item>
+                                </items>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -396,6 +329,9 @@
                             <property name="top_attach">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -404,8 +340,8 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="dlg_DataLabel|label1">Text Attributes</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -442,9 +378,25 @@
                             <property name="can_focus">False</property>
                             <property name="spacing">12</property>
                             <child>
-                              <object class="svxlo-DialControl" id="CT_DIAL">
+                              <object class="GtkScrolledWindow">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">never</property>
+                                <property name="vscrollbar_policy">never</property>
+                                <property name="shadow_type">in</property>
+                                <child>
+                                  <object class="GtkViewport">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkDrawingArea" id="CT_DIAL">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -455,8 +407,9 @@
                             <child>
                               <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can_focus">True</property>
                                 <property name="valign">center</property>
+                                <property name="activates_default">True</property>
                                 <property name="adjustment">adjustmentDEGREE</property>
                                 <property name="wrap">True</property>
                               </object>
@@ -506,9 +459,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="chartcontrollerlo-TextDirectionListBox" id="LB_LABEL_TEXTDIR">
+                              <object class="GtkComboBoxText" id="LB_LABEL_TEXTDIR">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="no_show_all">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -531,8 +485,8 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="dlg_DataLabel|label2">Rotate Text</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui b/chart2/uiconfig/ui/tp_DataLabel.ui
index bc884d204f2d..f5de4af731a1 100644
--- a/chart2/uiconfig/ui/tp_DataLabel.ui
+++ b/chart2/uiconfig/ui/tp_DataLabel.ui
@@ -1,101 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.18"/>
-  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustmentDEGREE">
     <property name="upper">359</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="liststorePLACEMENT">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Best fit</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Center</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Above</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top left</col>
-        <col id="1">3</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Left</col>
-        <col id="1">4</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom left</col>
-        <col id="1">5</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Below</col>
-        <col id="1">6</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom right</col>
-        <col id="1">7</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Right</col>
-        <col id="1">8</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top right</col>
-        <col id="1">9</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Inside</col>
-        <col id="1">10</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Outside</col>
-        <col id="1">11</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Near origin</col>
-        <col id="1">12</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststoreSEPARATOR">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Space</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Comma</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Semicolon</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">New line</col>
-        <col id="1">3</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkBox" id="tp_DataLabel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -125,7 +36,7 @@
                   <object class="GtkCheckButton" id="CB_VALUE_AS_NUMBER">
                     <property name="label" translatable="yes" context="tp_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
@@ -134,15 +45,13 @@
                   <packing>
                     <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="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
                     <property name="label" translatable="yes" context="tp_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
@@ -151,15 +60,13 @@
                   <packing>
                     <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="GtkCheckButton" id="CB_CATEGORY">
                     <property name="label" translatable="yes" context="tp_DataLabel|CB_CATEGORY">Show _category</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
@@ -168,15 +75,13 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_SYMBOL">
                     <property name="label" translatable="yes" context="tp_DataLabel|CB_SYMBOL">Show _legend key</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
@@ -185,15 +90,13 @@
                   <packing>
                     <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="GtkCheckButton" id="CB_WRAP_TEXT">
                     <property name="label" translatable="yes" context="tp_DataLabel|CB_WRAP_TEXT">Auto text _wrap</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
@@ -202,15 +105,13 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">4</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="PB_NUMBERFORMAT">
                     <property name="label" translatable="yes" context="tp_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="valign">center</property>
                     <property name="use_underline">True</property>
@@ -218,15 +119,13 @@
                   <packing>
                     <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="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
                     <property name="label" translatable="yes" context="tp_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="valign">center</property>
                     <property name="use_underline">True</property>
@@ -234,8 +133,6 @@
                   <packing>
                     <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>
@@ -250,8 +147,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -263,10 +158,10 @@
                       <object class="GtkLabel" id="FT_TEXT_SEPARATOR">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes" context="tp_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -275,11 +170,16 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="LB_TEXT_SEPARATOR">
+                      <object class="GtkComboBoxText" id="LB_TEXT_SEPARATOR">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
-                        <property name="model">liststoreSEPARATOR</property>
+                        <items>
+                          <item id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Space</item>
+                          <item id="1" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Comma</item>
+                          <item id="2" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Semicolon</item>
+                          <item id="3" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">New line</item>
+                        </items>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -292,7 +192,6 @@
                     <property name="left_attach">0</property>
                     <property name="top_attach">5</property>
                     <property name="width">2</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -304,10 +203,10 @@
                       <object class="GtkLabel" id="FT_LABEL_PLACEMENT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -316,11 +215,25 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="LB_LABEL_PLACEMENT">
+                      <object class="GtkComboBoxText" id="LB_LABEL_PLACEMENT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
-                        <property name="model">liststorePLACEMENT</property>
+                        <items>
+                          <item id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Best fit</item>
+                          <item id="1" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Center</item>
+                          <item id="2" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Above</item>
+                          <item id="3" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top left</item>
+                          <item id="4" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Left</item>
+                          <item id="5" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom left</item>
+                          <item id="6" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Below</item>
+                          <item id="7" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom right</item>
+                          <item id="8" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Right</item>
+                          <item id="9" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top right</item>
+                          <item id="10" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Inside</item>
+                          <item id="11" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Outside</item>
+                          <item id="12" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Near origin</item>
+                        </items>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -333,7 +246,6 @@
                     <property name="left_attach">0</property>
                     <property name="top_attach">6</property>
                     <property name="width">2</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -344,10 +256,11 @@
                   <packing>
                     <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>
+                  <placeholder/>
+                </child>
               </object>
             </child>
           </object>
@@ -356,8 +269,8 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes" context="tp_DataLabel|label1">Text Attributes</property>
+            <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -394,9 +307,25 @@
                     <property name="can_focus">False</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="svxlo-DialControl" id="CT_DIAL">
+                      <object class="GtkScrolledWindow">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <property name="vscrollbar_policy">never</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkViewport">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkDrawingArea" id="CT_DIAL">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -407,8 +336,9 @@
                     <child>
                       <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="valign">center</property>
+                        <property name="activates_default">True</property>
                         <property name="adjustment">adjustmentDEGREE</property>
                         <property name="wrap">True</property>
                       </object>
@@ -458,9 +388,10 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="chartcontrollerlo-TextDirectionListBox" id="LB_LABEL_TEXTDIR">
+                      <object class="GtkComboBoxText" id="LB_LABEL_TEXTDIR">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -483,8 +414,8 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes" context="tp_DataLabel|label2">Rotate Text</property>
+            <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>