Update trendline dlg according to UX mockup

Change-Id: I0b544f15776a641b39704bbe2ec848c687ae55bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111103
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>

1 files changed, 318 insertions, 319 deletions

diff --git a/chart2/uiconfig/ui/tp_Trendline.ui b/chart2/uiconfig/ui/tp_Trendline.ui
index 486d67e57994..9b16231f7b46 100644
--- a/chart2/uiconfig/ui/tp_Trendline.ui
+++ b/chart2/uiconfig/ui/tp_Trendline.ui
@@ -1,87 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.20"/>
+  <object class="GtkSizeGroup"/>
   <object class="GtkAdjustment" id="adjustmentDegree">
     <property name="lower">2</property>
     <property name="upper">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustmentForwardBackward">
     <property name="lower">-10000</property>
     <property name="upper">10000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustmentForwardBackward1">
     <property name="lower">-10000</property>
     <property name="upper">10000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustmentForwardBackward2">
     <property name="lower">-10000</property>
     <property name="upper">10000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustmentPeriod">
-    <property name="lower">2</property>
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkListStore" id="liststore_moving_type">
-    <columns>
-      <!-- column-name moving_type -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="tp_Trendline|liststore_moving_type">Prior</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_Trendline|liststore_moving_type">Central</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_Trendline|liststore_moving_type">Averaged Abscissa</col>
-      </row>
-    </data>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkBox" id="TP_TRENDLINE">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="border_width">6</property>
-    <property name="orientation">vertical</property>
+    <property name="border-width">6</property>
     <property name="spacing">12</property>
     <child>
       <object class="GtkFrame" id="frame1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="can-focus">False</property>
+        <property name="label-xalign">0</property>
+        <property name="shadow-type">none</property>
         <child>
+          <!-- n-columns=3 n-rows=9 -->
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="halign">start</property>
-            <property name="margin_start">12</property>
-            <property name="margin_top">6</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">6</property>
-            <property name="row_homogeneous">True</property>
+            <property name="margin-start">12</property>
+            <property name="margin-top">6</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">6</property>
+            <property name="row-homogeneous">True</property>
             <child>
               <object class="GtkRadioButton" id="linear">
                 <property name="label" translatable="yes" context="tp_Trendline|linear">_Linear</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
                 <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="draw-indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="linear-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|linear">A linear trend line is shown.</property>
@@ -89,19 +67,19 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="logarithmic">
                 <property name="label" translatable="yes" context="tp_Trendline|logarithmic">L_ogarithmic</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
                 <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="draw-indicator">True</property>
                 <property name="group">linear</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="logarithmic-atkobject">
@@ -110,19 +88,19 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="exponential">
                 <property name="label" translatable="yes" context="tp_Trendline|exponential">_Exponential</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
                 <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="draw-indicator">True</property>
                 <property name="group">linear</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="exponential-atkobject">
@@ -131,19 +109,19 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="power">
                 <property name="label" translatable="yes" context="tp_Trendline|power">Po_wer</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
                 <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="draw-indicator">True</property>
                 <property name="group">linear</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="power-atkobject">
@@ -152,19 +130,73 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="imageLinear">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="icon-name">missing-image</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="imageLogarithmic">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="icon-name">missing-image</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="imageExponential">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="icon-name">missing-image</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="imagePower">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="icon-name">missing-image</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="imagePolynomial">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="icon-name">missing-image</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="polynomial">
                 <property name="label" translatable="yes" context="tp_Trendline|polynomial">_Polynomial</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
                 <property name="group">linear</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="polynomial-atkobject">
@@ -173,190 +205,163 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="movingAverage">
-                <property name="label" translatable="yes" context="tp_Trendline|movingAverage">_Moving Average</property>
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">linear</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="tp_Trendline|label3">Degree</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">degree</property>
                 <child internal-child="accessible">
-                  <object class="AtkObject" id="movingAverage-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|movingAverage">A moving average trend line is shown with a given period.</property>
+                  <object class="AtkObject" id="label3-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label3">Degree of polynomial trend line.</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkGrid" id="grid2">
+              <object class="GtkSpinButton" id="degree">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes" context="tp_Trendline|label3">Degree</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">degree</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="label3-atkobject">
-                        <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label3">Degree of polynomial trend line.</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="degree">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="truncate_multiline">True</property>
-                    <property name="adjustment">adjustmentDegree</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="degree-atkobject">
-                        <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|degree">Degree of polynomial trend line.</property>
-                      </object>
-                    </child>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
+                <property name="adjustment">adjustmentDegree</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="degree-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|degree">Degree of polynomial trend line.</property>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">2</property>
+                <property name="top-attach">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkGrid" id="grid3">
+              <object class="GtkImage" id="imageMovingAverage">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes" context="tp_Trendline|label4">Period</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">period</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="label4-atkobject">
-                        <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label4">Number of points to calculate average of moving average trend line.</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="period">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="truncate_multiline">True</property>
-                    <property name="adjustment">adjustmentPeriod</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="period-atkobject">
-                        <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|period">Number of points to calculate average of moving average trend line.</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
+                <property name="can-focus">False</property>
+                <property name="icon-name">missing-image</property>
               </object>
               <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">6</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="imageLinear">
+              <object class="GtkRadioButton" id="movingAverage">
+                <property name="label" translatable="yes" context="tp_Trendline|movingAverage">_Moving Average</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">missing-image</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
+                <property name="group">linear</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="movingAverage-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|movingAverage">A moving average trend line is shown with a given period.</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">6</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="imageLogarithmic">
+              <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">missing-image</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="tp_Trendline|label4">Period</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">period</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="label4-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label4">Number of points to calculate average of moving average trend line.</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">7</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="imageExponential">
+              <object class="GtkSpinButton" id="period">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">missing-image</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
+                <property name="adjustment">adjustmentPeriod</property>
+                <property name="value">2</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="period-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|period">Number of points to calculate average of moving average trend line.</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">2</property>
+                <property name="top-attach">7</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="imagePower">
+              <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">missing-image</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" context="tp_Trendline|label10">_Type</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">combo_moving_type</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="label10-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label10">How the trend line is calculated.</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">8</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="imagePolynomial">
+              <object class="GtkComboBox" id="combo_moving_type">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">missing-image</property>
+                <property name="can-focus">False</property>
+                <property name="model">liststore_moving_type</property>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">2</property>
+                <property name="top-attach">8</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="imageMovingAverage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">missing-image</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">2</property>
-              </packing>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
             </child>
             <child>
               <placeholder/>
@@ -369,7 +374,7 @@
         <child type="label">
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="tp_Trendline|label1">Regression Type</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -386,25 +391,26 @@
     <child>
       <object class="GtkFrame" id="frame2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="can-focus">False</property>
+        <property name="label-xalign">0</property>
+        <property name="shadow-type">none</property>
         <child>
+          <!-- n-columns=2 n-rows=9 -->
           <object class="GtkGrid" id="grid5">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_start">12</property>
-            <property name="margin_top">6</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
-            <property name="row_homogeneous">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-start">12</property>
+            <property name="margin-top">6</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">12</property>
+            <property name="row-homogeneous">True</property>
             <child>
               <object class="GtkLabel" id="label7">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="tp_Trendline|label7">Extrapolate Forward</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">extrapolateForward</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">extrapolateForward</property>
                 <property name="xalign">0</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="label7-atkobject">
@@ -413,17 +419,17 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="tp_Trendline|label8">Extrapolate Backward</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">extrapolateBackward</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">extrapolateBackward</property>
                 <property name="xalign">0</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="label8-atkobject">
@@ -432,47 +438,47 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="extrapolateForward">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
-                <property name="truncate_multiline">True</property>
-                <property name="caps_lock_warning">False</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
+                <property name="caps-lock-warning">False</property>
                 <property name="adjustment">adjustmentForwardBackward</property>
                 <property name="digits">2</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="extrapolateBackward">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
-                <property name="truncate_multiline">True</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
                 <property name="adjustment">adjustmentForwardBackward1</property>
                 <property name="digits">2</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="setIntercept">
                 <property name="label" translatable="yes" context="tp_Trendline|setIntercept">Force _Intercept</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
                 <accessibility>
                   <relation type="label-for" target="interceptValue"/>
                 </accessibility>
@@ -483,18 +489,18 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="showEquation">
                 <property name="label" translatable="yes" context="tp_Trendline|showEquation">Show E_quation</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="showEquation-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|showEquation">Shows the trend line equation next to the trend line.</property>
@@ -502,8 +508,8 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">4</property>
                 <property name="width">2</property>
               </packing>
             </child>
@@ -511,10 +517,10 @@
               <object class="GtkCheckButton" id="showCorrelationCoefficient">
                 <property name="label" translatable="yes" context="tp_Trendline|showCorrelationCoefficient">Show _Coefficient of Determination (R²)</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="showCorrelationCoefficient-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|showCorrelationCoefficient">Shows the coefficient of determination next to the trend line.</property>
@@ -522,18 +528,18 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">5</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">5</property>
                 <property name="width">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="tp_Trendline|label5">Trendline _Name</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_name</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">entry_name</property>
                 <property name="xalign">0</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="label5-atkobject">
@@ -542,16 +548,16 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry_name">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
-                <property name="truncate_multiline">True</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="entry_name-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|entry_name">Name of trend line in legend.</property>
@@ -559,19 +565,19 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="interceptValue">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
                 <property name="text">0</property>
-                <property name="truncate_multiline">True</property>
-                <property name="caps_lock_warning">False</property>
-                <property name="input_purpose">number</property>
+                <property name="truncate-multiline">True</property>
+                <property name="caps-lock-warning">False</property>
+                <property name="input-purpose">number</property>
                 <property name="adjustment">adjustmentForwardBackward2</property>
                 <property name="digits">2</property>
                 <accessibility>
@@ -584,17 +590,17 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="tp_Trendline|label6">_X Variable Name</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_Xname</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">entry_Xname</property>
                 <property name="xalign">0</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="label6-atkobject">
@@ -603,16 +609,16 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">7</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">7</property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry_Xname">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
-                <property name="truncate_multiline">True</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="entry_Xname-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|entry_Xname">Name of X variable in trend line equation.</property>
@@ -620,17 +626,17 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">7</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">7</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="tp_Trendline|label9">_Y Variable Name</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_Yname</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">entry_Yname</property>
                 <property name="xalign">0</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="label9-atkobject">
@@ -639,16 +645,16 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">8</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">8</property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry_Yname">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
-                <property name="truncate_multiline">True</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="entry_Yname-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|entry_Yname">Name of Y variable in trend line equation.</property>
@@ -656,46 +662,22 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">8</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">8</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="tp_Trendline|label10">Moving _Type</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">combo_moving_type</property>
-                <property name="xalign">0</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="label10-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label10">How the trend line is calculated.</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">6</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
-              <object class="GtkComboBox" id="combo_moving_type">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="model">liststore_moving_type</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">6</property>
-              </packing>
+              <placeholder/>
             </child>
           </object>
         </child>
         <child type="label">
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="tp_Trendline|label2">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -710,10 +692,27 @@
       </packing>
     </child>
   </object>
-  <object class="GtkSizeGroup">
-    <widgets>
-      <widget name="label3"/>
-      <widget name="label4"/>
-    </widgets>
+  <object class="GtkAdjustment" id="adjustmentPeriod">
+    <property name="lower">2</property>
+    <property name="upper">100</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+  </object>
+  <object class="GtkListStore" id="liststore_moving_type">
+    <columns>
+      <!-- column-name moving_type -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes" context="tp_Trendline|liststore_moving_type">Prior</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes" context="tp_Trendline|liststore_moving_type">Central</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes" context="tp_Trendline|liststore_moving_type">Averaged Abscissa</col>
+      </row>
+    </data>
   </object>
 </interface>