weld InsertErrorBarsDialog and ErrorBarsTabPage

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

2 files changed, 96 insertions, 130 deletions

diff --git a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
index 12dcc100fcbf..1513129f2b96 100644
--- a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
+++ b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
@@ -1,8 +1,13 @@
 <?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"/>
-  <object class="GtkAdjustment" id="adjustmentPOS_NEG">
+  <object class="GtkAdjustment" id="adjustmentNEG">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentPOS">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
@@ -10,44 +15,24 @@
   <object class="GtkImage" id="imageRANGE_SELECT_NEG">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">chart2/res/selectrange.png</property>
+    <property name="icon_name">chart2/res/selectrange.png</property>
   </object>
   <object class="GtkImage" id="imageRANGE_SELECT_POSITIVE">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">chart2/res/selectrange.png</property>
-  </object>
-  <object class="GtkListStore" id="liststoreFUNCTION">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Error</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Deviation</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Variance</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Error Margin</col>
-        <col id="1">3</col>
-      </row>
-    </data>
+    <property name="icon_name">chart2/res/selectrange.png</property>
   </object>
   <object class="GtkDialog" id="dlg_InsertErrorBars">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="dlg_InsertErrorBars|dlg_InsertErrorBars">Legend</property>
+    <property name="modal">True</property>
+    <property name="default_width">0</property>
+    <property name="default_height">0</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>
@@ -145,12 +130,11 @@
                               <object class="GtkRadioButton" id="RB_NONE">
                                 <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NONE">_None</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>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">RB_CONST</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -162,12 +146,12 @@
                               <object class="GtkRadioButton" id="RB_CONST">
                                 <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_CONST">_Constant Value</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>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">RB_PERCENT</property>
+                                <property name="group">RB_NONE</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -179,12 +163,12 @@
                               <object class="GtkRadioButton" id="RB_PERCENT">
                                 <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_PERCENT">_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>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">RB_FUNCTION</property>
+                                <property name="group">RB_NONE</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -200,12 +184,12 @@
                                 <child>
                                   <object class="GtkRadioButton" id="RB_FUNCTION">
                                     <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>
                                     <property name="draw_indicator">True</property>
-                                    <property name="group">RB_RANGE</property>
+                                    <property name="group">RB_NONE</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -214,10 +198,15 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkComboBox" id="LB_FUNCTION">
+                                  <object class="GtkComboBoxText" id="LB_FUNCTION">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="model">liststoreFUNCTION</property>
+                                    <items>
+                                      <item id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Error</item>
+                                      <item id="1" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Deviation</item>
+                                      <item id="2" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Variance</item>
+                                      <item id="3" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Error Margin</item>
+                                    </items>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -236,7 +225,7 @@
                               <object class="GtkRadioButton" id="RB_RANGE">
                                 <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_RANGE">Cell _Range</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>
@@ -292,12 +281,11 @@
                               <object class="GtkRadioButton" id="RB_BOTH">
                                 <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_BOTH">Positive _and Negative</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>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">RB_POSITIVE</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -308,12 +296,12 @@
                               <object class="GtkRadioButton" id="RB_POSITIVE">
                                 <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_POSITIVE">Pos_itive</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>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">RB_NEGATIVE</property>
+                                <property name="group">RB_BOTH</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -324,7 +312,7 @@
                               <object class="GtkRadioButton" id="RB_NEGATIVE">
                                 <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NEGATIVE">Ne_gative</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>
@@ -377,8 +365,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_InsertErrorBars|label2">Error Indicator</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -427,7 +415,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_POSITIVE">P_ositive (+)</property>
                                 <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">MF_POSITIVE:0</property>
+                                <property name="mnemonic_widget">MF_POSITIVE</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -436,9 +424,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSpinButton" id="MF_POSITIVE:0">
+                              <object class="GtkSpinButton" id="MF_POSITIVE">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">adjustmentPOS</property>
                                 <property name="digits">2</property>
                               </object>
                               <packing>
@@ -450,8 +439,9 @@
                             <child>
                               <object class="GtkEntry" id="ED_RANGE_POSITIVE">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can_focus">True</property>
                                 <property name="hexpand">True</property>
+                                <property name="activates_default">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -462,7 +452,7 @@
                             <child>
                               <object class="GtkButton" id="IB_RANGE_POSITIVE">
                                 <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="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property>
                                 <property name="image">imageRANGE_SELECT_POSITIVE</property>
@@ -491,7 +481,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_NEGATIVE">_Negative (-)</property>
                                 <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">MF_NEGATIVE:0</property>
+                                <property name="mnemonic_widget">MF_NEGATIVE</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -500,9 +490,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSpinButton" id="MF_NEGATIVE:0">
+                              <object class="GtkSpinButton" id="MF_NEGATIVE">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">adjustmentNEG</property>
                                 <property name="digits">2</property>
                               </object>
                               <packing>
@@ -514,8 +505,9 @@
                             <child>
                               <object class="GtkEntry" id="ED_RANGE_NEGATIVE">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can_focus">True</property>
                                 <property name="hexpand">True</property>
+                                <property name="activates_default">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -526,7 +518,7 @@
                             <child>
                               <object class="GtkButton" id="IB_RANGE_NEGATIVE">
                                 <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="has_tooltip">True</property>
                                 <property name="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property>
@@ -549,7 +541,7 @@
                           <object class="GtkCheckButton" id="CB_SYN_POS_NEG">
                             <property name="label" translatable="yes" context="dlg_InsertErrorBars|CB_SYN_POS_NEG">Same value for both</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>
@@ -569,8 +561,8 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="dlg_InsertErrorBars|label3">Parameters</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/chart2/uiconfig/ui/tp_ErrorBars.ui b/chart2/uiconfig/ui/tp_ErrorBars.ui
index 2884f10afe01..368bc975ae03 100644
--- a/chart2/uiconfig/ui/tp_ErrorBars.ui
+++ b/chart2/uiconfig/ui/tp_ErrorBars.ui
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface domain="chart">
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAdjustment" id="adjustmentPOS_NEG">
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkAdjustment" id="adjustmentNEG">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentPOS">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
@@ -9,38 +15,12 @@
   <object class="GtkImage" id="imageRANGE_SELECT_NEG">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">chart2/res/selectrange.png</property>
+    <property name="icon_name">chart2/res/selectrange.png</property>
   </object>
   <object class="GtkImage" id="imageRANGE_SELECT_POSITIVE">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">chart2/res/selectrange.png</property>
-  </object>
-  <object class="GtkListStore" id="liststoreFUNCTION">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Error</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Deviation</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Variance</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Error Margin</col>
-        <col id="1">3</col>
-      </row>
-    </data>
+    <property name="icon_name">chart2/res/selectrange.png</property>
   </object>
   <object class="GtkBox" id="tp_ErrorBars">
     <property name="visible">True</property>
@@ -76,13 +56,12 @@
                       <object class="GtkRadioButton" id="RB_NONE">
                         <property name="label" translatable="yes" context="tp_ErrorBars|RB_NONE">_None</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>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">RB_CONST</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -94,13 +73,13 @@
                       <object class="GtkRadioButton" id="RB_CONST">
                         <property name="label" translatable="yes" context="tp_ErrorBars|RB_CONST">_Constant Value</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>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">RB_PERCENT</property>
+                        <property name="group">RB_NONE</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -112,13 +91,13 @@
                       <object class="GtkRadioButton" id="RB_PERCENT">
                         <property name="label" translatable="yes" context="tp_ErrorBars|RB_PERCENT">_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>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">RB_FUNCTION</property>
+                        <property name="group">RB_NONE</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -134,13 +113,13 @@
                         <child>
                           <object class="GtkRadioButton" id="RB_FUNCTION">
                             <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>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">RB_RANGE</property>
+                            <property name="group">RB_NONE</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -149,10 +128,15 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="LB_FUNCTION">
+                          <object class="GtkComboBoxText" id="LB_FUNCTION">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="model">liststoreFUNCTION</property>
+                            <items>
+                              <item id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Error</item>
+                              <item id="1" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Deviation</item>
+                              <item id="2" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Variance</item>
+                              <item id="3" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Error Margin</item>
+                            </items>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -171,7 +155,7 @@
                       <object class="GtkRadioButton" id="RB_RANGE">
                         <property name="label" translatable="yes" context="tp_ErrorBars|RB_RANGE">Cell _Range</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>
@@ -228,45 +212,40 @@
                       <object class="GtkRadioButton" id="RB_BOTH">
                         <property name="label" translatable="yes" context="tp_ErrorBars|RB_BOTH">Positive _and Negative</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>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">RB_POSITIVE</property>
                       </object>
                       <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="GtkRadioButton" id="RB_POSITIVE">
                         <property name="label" translatable="yes" context="tp_ErrorBars|RB_POSITIVE">Pos_itive</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>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">RB_NEGATIVE</property>
+                        <property name="group">RB_BOTH</property>
                       </object>
                       <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>
                       <object class="GtkRadioButton" id="RB_NEGATIVE">
                         <property name="label" translatable="yes" context="tp_ErrorBars|RB_NEGATIVE">Ne_gative</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>
@@ -277,8 +256,6 @@
                       <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>
@@ -290,8 +267,6 @@
                       <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>
@@ -303,8 +278,6 @@
                       <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>
@@ -316,8 +289,6 @@
                       <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>
                   </object>
@@ -328,8 +299,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_ErrorBars|label2">Error Indicator</property>
+                <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -378,7 +349,7 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes" context="tp_ErrorBars|FT_POSITIVE">P_ositive (+)</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">MF_POSITIVE:0</property>
+                        <property name="mnemonic_widget">MF_POSITIVE</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -387,9 +358,10 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="MF_POSITIVE:0">
+                      <object class="GtkSpinButton" id="MF_POSITIVE">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">adjustmentPOS</property>
                         <property name="digits">2</property>
                       </object>
                       <packing>
@@ -401,8 +373,9 @@
                     <child>
                       <object class="GtkEntry" id="ED_RANGE_POSITIVE">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -413,7 +386,7 @@
                     <child>
                       <object class="GtkButton" id="IB_RANGE_POSITIVE">
                         <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="tooltip_text" translatable="yes" context="tp_ErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property>
                         <property name="image">imageRANGE_SELECT_POSITIVE</property>
@@ -442,7 +415,7 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes" context="tp_ErrorBars|FT_NEGATIVE">_Negative (-)</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">MF_NEGATIVE:0</property>
+                        <property name="mnemonic_widget">MF_NEGATIVE</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -451,9 +424,10 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="MF_NEGATIVE:0">
+                      <object class="GtkSpinButton" id="MF_NEGATIVE">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">adjustmentNEG</property>
                         <property name="digits">2</property>
                       </object>
                       <packing>
@@ -465,7 +439,7 @@
                     <child>
                       <object class="GtkEntry" id="ED_RANGE_NEGATIVE">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="hexpand">True</property>
                       </object>
                       <packing>
@@ -477,7 +451,7 @@
                     <child>
                       <object class="GtkButton" id="IB_RANGE_NEGATIVE">
                         <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="tooltip_text" translatable="yes" context="tp_ErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property>
                         <property name="image">imageRANGE_SELECT_NEG</property>
@@ -499,7 +473,7 @@
                   <object class="GtkCheckButton" id="CB_SYN_POS_NEG">
                     <property name="label" translatable="yes" context="tp_ErrorBars|CB_SYN_POS_NEG">Same value for both</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>
@@ -519,8 +493,8 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes" context="tp_ErrorBars|label3">Parameters</property>
+            <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>