Options - calc - Calculate Dialog update

Change-Id: Idc82bbbd7d3be045e70fe297a130f7b9197df9c9
Reviewed-on: https://gerrit.libreoffice.org/83146
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
(cherry picked from commit e371baccb4da0d97794f6614c6362bd8e32ee32b)
Reviewed-on: https://gerrit.libreoffice.org/83249
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>

1 files changed, 189 insertions, 145 deletions

diff --git a/sc/uiconfig/scalc/ui/optcalculatepage.ui b/sc/uiconfig/scalc/ui/optcalculatepage.ui
index 272e874524a5..d1e05ead51a0 100644
--- a/sc/uiconfig/scalc/ui/optcalculatepage.ui
+++ b/sc/uiconfig/scalc/ui/optcalculatepage.ui
@@ -17,15 +17,13 @@
   <object class="GtkGrid" id="OptCalculatePage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
     <property name="border_width">6</property>
     <property name="row_spacing">12</property>
-    <property name="column_spacing">18</property>
+    <property name="column_spacing">24</property>
     <child>
       <object class="GtkFrame" id="frame4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
@@ -76,7 +74,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
+        <property name="top_attach">3</property>
         <property name="width">2</property>
       </packing>
     </child>
@@ -84,7 +82,6 @@
       <object class="GtkFrame" id="frame1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
@@ -98,9 +95,6 @@
               <object class="GtkGrid" id="grid3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="case">
                     <property name="label" translatable="yes" context="optcalculatepage|case">Case se_nsitive</property>
@@ -115,7 +109,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
@@ -131,7 +124,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
-                    <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
@@ -148,59 +140,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="formulawildcards">
-                    <property name="label" translatable="yes" context="optcalculatepage|formulawildcards">Enable w_ildcards in formulas</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|formulawildcards|tooltip_text">Enable wildcards for interoperability with Microsoft Excel</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="formularegex">
-                    <property name="label" translatable="yes" context="optcalculatepage|formularegex">Enable r_egular expressions in formulas</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="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">formulawildcards</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">4</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="formulaliteral">
-                    <property name="label" translatable="yes" context="optcalculatepage|formulaliteral">No wildcards or regular expressions in formulas</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="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">formulawildcards</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">5</property>
-                    <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
@@ -215,8 +154,7 @@
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">6</property>
-                    <property name="width">2</property>
+                    <property name="top_attach">3</property>
                   </packing>
                 </child>
                 <child>
@@ -231,47 +169,52 @@
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">7</property>
+                    <property name="top_attach">4</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox" id="box1">
+                  <object class="GtkAlignment">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="hexpand">True</property>
-                    <property name="spacing">12</property>
+                    <property name="left_padding">18</property>
                     <child>
-                      <object class="GtkLabel" id="precft">
+                      <object class="GtkBox" id="box1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="optcalculatepage|precft">_Decimal places:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">prec</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="precft">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes" context="optcalculatepage|precft">_Decimal places:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">prec</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="prec">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
+                            <property name="adjustment">adjustment2</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="prec">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="adjustment">adjustment2</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">7</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
                   </packing>
                 </child>
               </object>
@@ -308,12 +251,11 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="GtkGrid" id="grid1">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
-                <property name="row_homogeneous">True</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">3</property>
                 <child>
                   <object class="GtkCheckButton" id="iterate">
                     <property name="label" translatable="yes" context="optcalculatepage|iterate">_Iterations</property>
@@ -325,63 +267,168 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">2</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="stepsft">
+                  <object class="GtkAlignment">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="label" translatable="yes" context="optcalculatepage|stepsft">_Steps:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">steps</property>
-                    <property name="xalign">0</property>
+                    <property name="left_padding">18</property>
+                    <child>
+                      <object class="GtkGrid" id="grid1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="row_spacing">3</property>
+                        <property name="column_spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="stepsft">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes" context="optcalculatepage|stepsft">_Steps:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">steps</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="minchangeft">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes" context="optcalculatepage|minchangeft">_Minimum change:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">minchange</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="steps">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
+                            <property name="adjustment">adjustment1</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="minchange">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
+                            <property name="width_chars">12</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes" context="optcalculatepage|label2">Iterative References</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">2</property>
+        <property name="width">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkGrid" id="grid2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkLabel" id="minchangeft">
+                  <object class="GtkRadioButton" id="datestd">
+                    <property name="label" translatable="yes" context="optcalculatepage|datestd">12/30/1899 (defa_ult)</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="label" translatable="yes" context="optcalculatepage|minchangeft">_Minimum change:</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|datestd|tooltip_text">Value 0 corresponds to 12/30/1899</property>
                     <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">minchange</property>
                     <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSpinButton" id="steps">
+                  <object class="GtkRadioButton" id="datesc10">
+                    <property name="label" translatable="yes" context="optcalculatepage|datesc10">01/01/1900 (Star_Calc 1.0)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="adjustment">adjustment1</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|datesc10|tooltip_text">Value 0 corresponds to 01/01/1900</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">datestd</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
+                    <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="minchange">
+                  <object class="GtkRadioButton" id="date1904">
+                    <property name="label" translatable="yes" context="optcalculatepage|date1904">_01/01/1904</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="valign">center</property>
-                    <property name="activates_default">True</property>
-                    <property name="width_chars">12</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|date1904|tooltip_text">0 corresponds to 01/01/1904</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">datestd</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
+                    <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
                   </packing>
                 </child>
@@ -390,10 +437,10 @@
           </object>
         </child>
         <child type="label">
-          <object class="GtkLabel" id="label2">
+          <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="optcalculatepage|label2">Iterative References</property>
+            <property name="label" translatable="yes" context="optcalculatepage|label3">Date</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -401,34 +448,33 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
+        <property name="left_attach">1</property>
         <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame3">
+      <object class="GtkFrame" id="frame5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
-          <object class="GtkAlignment" id="alignment3">
+          <object class="GtkAlignment" id="alignment5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="GtkGrid" id="grid2">
+              <object class="GtkGrid" id="grid5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="row_homogeneous">True</property>
                 <child>
-                  <object class="GtkRadioButton" id="datestd">
-                    <property name="label" translatable="yes" context="optcalculatepage|datestd">12/30/1899 (defa_ult)</property>
+                  <object class="GtkRadioButton" id="formulawildcards">
+                    <property name="label" translatable="yes" context="optcalculatepage|formulawildcards">Enable w_ildcards in formulas</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|datestd|tooltip_text">Value 0 corresponds to 12/30/1899</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|formulawildcards|tooltip_text">Enable wildcards for interoperability with Microsoft Excel</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
@@ -440,16 +486,15 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="datesc10">
-                    <property name="label" translatable="yes" context="optcalculatepage|datesc10">01/01/1900 (Star_Calc 1.0)</property>
+                  <object class="GtkRadioButton" id="formularegex">
+                    <property name="label" translatable="yes" context="optcalculatepage|formularegex">Enable r_egular expressions in formulas</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|datesc10|tooltip_text">Value 0 corresponds to 01/01/1900</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
-                    <property name="group">datestd</property>
+                    <property name="group">formulawildcards</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -457,16 +502,15 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="date1904">
-                    <property name="label" translatable="yes" context="optcalculatepage|date1904">_01/01/1904</property>
+                  <object class="GtkRadioButton" id="formulaliteral">
+                    <property name="label" translatable="yes" context="optcalculatepage|formulaliteral">No wildcards or regular expressions in formulas</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|date1904|tooltip_text">0 corresponds to 01/01/1904</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
-                    <property name="group">datestd</property>
+                    <property name="group">formulawildcards</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -478,10 +522,10 @@
           </object>
         </child>
         <child type="label">
-          <object class="GtkLabel" id="label3">
+          <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="optcalculatepage|label3">Date</property>
+            <property name="label" translatable="yes" context="optcalculatepage|label5">Formulas wildcards</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -489,7 +533,7 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">1</property>
+        <property name="left_attach">0</property>
         <property name="top_attach">0</property>
       </packing>
     </child>