1 files changed, 72 insertions, 115 deletions
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index a90fe61b7209..79fb1ca1f06a 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="NumberFormatPropertyPanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -14,133 +15,95 @@
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkLabel" id="categorylabel">
+          <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Category:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">category</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="category">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_tooltip">True</property>
-            <property name="tooltip_markup" translatable="yes">Select a category of contents.</property>
-            <property name="tooltip_text" translatable="yes">Select a category of contents.</property>
-            <property name="entry_text_column">0</property>
-            <property name="id_column">1</property>
-            <items>
-              <item translatable="yes">General</item>
-              <item translatable="yes">Number</item>
-              <item translatable="yes">Percent</item>
-              <item translatable="yes">Currency</item>
-              <item translatable="yes">Date </item>
-              <item translatable="yes">Time</item>
-              <item translatable="yes">Scientific</item>
-              <item translatable="yes">Fraction</item>
-              <item translatable="yes">Boolean Value</item>
-              <item translatable="yes">Text</item>
-            </items>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolbar" id="numberformat">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkToolButton" id="numericfield">
-                <property name="use_action_appearance">False</property>
-                <property name="width_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="action_name">.uno:NumericField</property>
-                <property name="label" translatable="no">toolbutton1</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="percent">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="action_name">.uno:NumberFormatPercent</property>
-                <property name="label" translatable="no">toolbutton2</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="currency">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="action_name">.uno:NumberFormatCurrency</property>
-                <property name="label" translatable="no">toolbutton3</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
+            <property name="column_spacing">6</property>
             <child>
-              <object class="GtkToolButton" id="date">
-                <property name="use_action_appearance">False</property>
+              <object class="GtkComboBoxText" id="category">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="action_name">.uno:NumberFormatDate</property>
-                <property name="label" translatable="no">toolbutton4</property>
-                <property name="use_underline">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Select a category of contents.</property>
+                <property name="tooltip_text" translatable="yes">Select a category of contents.</property>
+                <property name="hexpand">True</property>
+                <items>
+                  <item translatable="yes">General</item>
+                  <item translatable="yes">Number</item>
+                  <item translatable="yes">Percent</item>
+                  <item translatable="yes">Currency</item>
+                  <item translatable="yes">Date </item>
+                  <item translatable="yes">Time</item>
+                  <item translatable="yes">Scientific</item>
+                  <item translatable="yes">Fraction</item>
+                  <item translatable="yes">Boolean Value</item>
+                  <item translatable="yes">Text</item>
+                </items>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="insertfixedtext">
-                <property name="use_action_appearance">False</property>
+              <object class="GtkToolbar" id="numberformat">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="action_name">.uno:InsertFixedText</property>
-                <property name="label" translatable="no">toolbutton5</property>
-                <property name="use_underline">True</property>
+                <property name="show_arrow">False</property>
+                <child>
+                  <object class="GtkToolButton" id="currency">
+                    <property name="use_action_appearance">False</property>
+                    <property name="width_request">30</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">.uno:NumberFormatCurrency</property>
+                    <property name="label">toolbutton1</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="percent">
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">.uno:NumberFormatPercent</property>
+                    <property name="label">toolbutton2</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="numericfield">
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">.uno:NumericField</property>
+                    <property name="label">toolbutton3</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -176,7 +139,6 @@
                     <property name="tooltip_markup" translatable="yes">Enter the number of decimal places that you want to display.</property>
                     <property name="tooltip_text" translatable="yes">Enter the number of decimal places that you want to display.</property>
                     <property name="invisible_char">•</property>
-                    <property name="invisible_char_set">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -220,7 +182,6 @@
                     <property name="tooltip_markup" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
                     <property name="tooltip_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
                     <property name="invisible_char">•</property>
-                    <property name="invisible_char_set">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -245,7 +206,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="negativenumbersred">
-            <property name="label" translatable="yes">_Negative numbers red</property>
+            <property name="label" translatable="yes">_Negative numbers in red</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -253,7 +214,6 @@
             <property name="has_tooltip">True</property>
             <property name="tooltip_markup" translatable="yes">Changes the font color of negative numbers to red.</property>
             <property name="tooltip_text" translatable="yes">Changes the font color of negative numbers to red.</property>
-            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
@@ -274,7 +234,6 @@
             <property name="has_tooltip">True</property>
             <property name="tooltip_markup" translatable="yes">Inserts a separator between thousands.</property>
             <property name="tooltip_text" translatable="yes">Inserts a separator between thousands.</property>
-            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
@@ -289,8 +248,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>
   </object>