UI: drop all deprecated elements

1 files changed, 100 insertions, 76 deletions

diff --git a/data/preferences.ui b/data/preferences.ui
index c804392..cd9581d 100644
--- a/data/preferences.ui
+++ b/data/preferences.ui
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.22"/>
   <object class="GtkListStore" id="angle_unit_model">
     <columns>
       <!-- column-name label -->
@@ -10,6 +10,11 @@
       <column type="gint"/>
     </columns>
   </object>
+  <object class="GtkAdjustment" id="decimal_places_adjustment">
+    <property name="upper">9</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
+  </object>
   <object class="GtkListStore" id="number_format_model">
     <columns>
       <!-- column-name label -->
@@ -45,109 +50,143 @@
     </data>
   </object>
   <object class="GtkDialog" id="preferences_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">8</property>
     <property name="title" translatable="yes">Preferences</property>
     <property name="type_hint">normal</property>
-    <signal name="response" handler="preferences_response_cb"/>
-    <signal name="delete_event" handler="preferences_dialog_delete_cb"/>
+    <signal name="delete-event" handler="preferences_dialog_delete_cb" swapped="no"/>
+    <signal name="response" handler="preferences_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
-          <object class="GtkTable" id="preferences_table">
+          <object class="GtkGrid" id="preferences_table">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
-            <property name="n_rows">4</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">6</property>
             <property name="row_spacing">12</property>
+            <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Preferences dialog: Label for angle unit combo box">_Angle units:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">angle_unit_combobox</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Preferences dialog: Label for display format combo box">Number _Format:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">number_format_combobox</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="angle_unit_combobox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="model">angle_unit_model</property>
-                <signal name="changed" handler="angle_unit_combobox_changed_cb"/>
+                <signal name="changed" handler="angle_unit_combobox_changed_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="number_format_combobox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="model">number_format_model</property>
-                <signal name="changed" handler="number_format_combobox_changed_cb"/>
+                <signal name="changed" handler="number_format_combobox_changed_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label11">
+              <object class="GtkComboBox" id="word_size_combobox">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes" comments="Preferences dialog: label for word size combo box">Word _size:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">word_size_combobox</property>
+                <property name="can_focus">False</property>
+                <property name="model">word_size_model</property>
+                <signal name="changed" handler="word_size_combobox_changed_cb" swapped="no"/>
               </object>
               <packing>
+                <property name="left_attach">1</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBox" id="word_size_combobox">
+              <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
-                <property name="model">word_size_model</property>
-                <signal name="changed" handler="word_size_combobox_changed_cb"/>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" comments="Preferences dialog: label for word size combo box">Word _size:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">word_size_combobox</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
+                <property name="left_attach">0</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
               </packing>
             </child>
             <child>
               <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="bottom_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkTable" id="table2">
+                  <object class="GtkGrid" id="table2">
                     <property name="visible">True</property>
-                    <property name="n_rows">3</property>
+                    <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="trailing_zeroes_check">
@@ -155,13 +194,14 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="halign">start</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="trailing_zeroes_check_toggled_cb"/>
+                        <signal name="toggled" handler="trailing_zeroes_check_toggled_cb" swapped="no"/>
                       </object>
                       <packing>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
@@ -170,29 +210,33 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="halign">start</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="thousands_separator_check_toggled_cb"/>
+                        <signal name="toggled" handler="thousands_separator_check_toggled_cb" swapped="no"/>
                       </object>
                       <packing>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+                      <object class="GtkBox" id="hbox1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="decimal_places_label1">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
+                            <property name="can_focus">False</property>
                             <property name="label" comments="Not translated by Gtk+, is translated as one string">Show</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">decimal_places_spin</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -200,66 +244,51 @@
                           <object class="GtkSpinButton" id="decimal_places_spin">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
+                            <property name="invisible_char">●</property>
                             <property name="adjustment">decimal_places_adjustment</property>
-                            <signal name="value_changed" handler="decimal_places_spin_change_value_cb"/>
+                            <signal name="value-changed" handler="decimal_places_spin_change_value_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="decimal_places_label2">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
+                            <property name="can_focus">False</property>
                             <property name="label" comments="Not translated by Gtk+, is translated as one string">decimal _places</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">decimal_places_spin</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="right_attach">2</property>
+                <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="width">2</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
@@ -268,9 +297,4 @@
       <action-widget response="0">button1</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" id="decimal_places_adjustment">
-    <property name="upper">9</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
-  </object>
 </interface>