From d04fe8106737836df46c5419ceb21b070ffec8e4 Mon Sep 17 00:00:00 2001
From: Lynnesbian <lynne@bune.city>
Date: Sun, 24 Oct 2021 03:38:07 +1000
Subject: [PATCH] updated glade files to newer version c:

also some smol cleanup
---
 AboutDialogue.cs  |   4 +-
 buypeeb.csproj    |  20 +-
 ui/add.glade      |  73 ++++---
 ui/main.glade     | 511 ++++++++++++++++++++++++----------------------
 ui/settings.glade | 249 +++++++++++-----------
 5 files changed, 441 insertions(+), 416 deletions(-)

diff --git a/AboutDialogue.cs b/AboutDialogue.cs
index 3838953..fdd71e8 100644
--- a/AboutDialogue.cs
+++ b/AboutDialogue.cs
@@ -3,12 +3,12 @@ using Gtk;
 namespace Buypeeb {
 	public class AboutDialogue : AboutDialog {
 		public AboutDialogue() : this(new Builder("about.glade")) { }
-		
+
 		private AboutDialogue(Builder builder) : base(builder.GetObject("DialogueAbout").Handle) {
 			builder.Autoconnect(this);
 		}
 
-		public void ButtonCloseClicked(object sender, Gtk.ResponseArgs args) {
+		public void ButtonCloseClicked(object sender, ResponseArgs args) {
 			Dispose();
 		}
 	}
diff --git a/buypeeb.csproj b/buypeeb.csproj
index 63ea2e1..d86b57f 100755
--- a/buypeeb.csproj
+++ b/buypeeb.csproj
@@ -7,25 +7,25 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Remove="**\*.glade" />
+		<None Remove="**\*.glade"/>
 		<EmbeddedResource Include="**\*.glade">
 			<LogicalName>%(Filename)%(Extension)</LogicalName>
 		</EmbeddedResource>
-		<None Remove="yahoo.html" />
-		<EmbeddedResource Remove="obj\**" />
-		<None Remove="obj\**" />
-		<EmbeddedResource Remove="out\**" />
-		<None Remove="out\**" />
+		<None Remove="yahoo.html"/>
+		<EmbeddedResource Remove="obj\**"/>
+		<None Remove="obj\**"/>
+		<EmbeddedResource Remove="out\**"/>
+		<None Remove="out\**"/>
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CsvHelper" Version="27.1.1" />
-		<PackageReference Include="GtkSharp" Version="3.24.24.34" />
+		<PackageReference Include="CsvHelper" Version="27.1.1"/>
+		<PackageReference Include="GtkSharp" Version="3.24.24.34"/>
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Compile Remove="obj\**" />
-	  <Compile Remove="out\**" />
+		<Compile Remove="obj\**"/>
+		<Compile Remove="out\**"/>
 	</ItemGroup>
 
 </Project>
diff --git a/ui/add.glade b/ui/add.glade
index e8f8d66..a7ffc6a 100644
--- a/ui/add.glade
+++ b/ui/add.glade
@@ -1,37 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <object class="GtkDialog" id="DialogueAdd">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">320</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
+    <property name="window-position">center-on-parent</property>
+    <property name="default-width">320</property>
+    <property name="destroy-with-parent">True</property>
+    <property name="type-hint">dialog</property>
     <property name="gravity">center</property>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
-        <property name="margin_start">5</property>
-        <property name="margin_end">5</property>
+        <property name="can-focus">False</property>
+        <property name="margin-start">5</property>
+        <property name="margin-end">5</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="margin_bottom">5</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="margin-bottom">5</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="ButtonAddCancel">
                 <property name="label" translatable="yes">Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -43,10 +40,10 @@
               <object class="GtkButton" id="ButtonAddOK">
                 <property name="label" translatable="yes">OK</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -64,15 +61,15 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
+            <property name="can-focus">False</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">5</property>
+                <property name="can-focus">False</property>
+                <property name="margin-bottom">5</property>
                 <property name="label" translatable="yes">Add item</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -88,7 +85,7 @@
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Enter the URL of the item you want to add.</property>
               </object>
@@ -101,12 +98,12 @@
             <child>
               <object class="GtkEntry" id="EntryAddURL">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">10</property>
-                <property name="activates_default">True</property>
-                <property name="placeholder_text" translatable="yes">URL</property>
-                <property name="input_purpose">url</property>
+                <property name="can-focus">True</property>
+                <property name="margin-top">5</property>
+                <property name="margin-bottom">10</property>
+                <property name="activates-default">True</property>
+                <property name="placeholder-text" translatable="yes">URL</property>
+                <property name="input-purpose">url</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -117,7 +114,7 @@
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">You may also enter a custom name below.</property>
               </object>
@@ -130,10 +127,10 @@
             <child>
               <object class="GtkEntry" id="EntryAddName">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="margin_top">5</property>
-                <property name="activates_default">True</property>
-                <property name="placeholder_text" translatable="yes">Name (optional)</property>
+                <property name="can-focus">True</property>
+                <property name="margin-top">5</property>
+                <property name="activates-default">True</property>
+                <property name="placeholder-text" translatable="yes">Name (optional)</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/ui/main.glade b/ui/main.glade
index e262b6f..f213561 100644
--- a/ui/main.glade
+++ b/ui/main.glade
@@ -1,107 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <object class="GtkImage" id="ImageFilter">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-find</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">edit-find</property>
   </object>
   <object class="GtkImage" id="ImageSort">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">view-sort-ascending</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">view-sort-ascending</property>
   </object>
   <object class="GtkRadioMenuItem" id="SortMenu">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="draw_as_radio">True</property>
+    <property name="can-focus">False</property>
+    <property name="draw-as-radio">True</property>
   </object>
   <object class="GtkMenu" id="menu1">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <signal name="selection-done" handler="SortMenuClosed" swapped="no"/>
     <child>
       <object class="GtkRadioMenuItem" id="SortNameAscending">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Name, Ascending</property>
-        <property name="use_underline">True</property>
+        <property name="use-underline">True</property>
         <property name="active">True</property>
-        <property name="draw_as_radio">True</property>
+        <property name="draw-as-radio">True</property>
         <property name="group">SortMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="SortNameDescending">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Name, Descending</property>
-        <property name="use_underline">True</property>
-        <property name="draw_as_radio">True</property>
+        <property name="use-underline">True</property>
+        <property name="draw-as-radio">True</property>
         <property name="group">SortMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="SortPriceAscending">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Price, low to high</property>
-        <property name="use_underline">True</property>
-        <property name="draw_as_radio">True</property>
+        <property name="use-underline">True</property>
+        <property name="draw-as-radio">True</property>
         <property name="group">SortMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="SortPriceDescending">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Price, high to low</property>
-        <property name="use_underline">True</property>
-        <property name="draw_as_radio">True</property>
+        <property name="use-underline">True</property>
+        <property name="draw-as-radio">True</property>
         <property name="group">SortMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="SortEndingAscending">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Ending soonest</property>
-        <property name="use_underline">True</property>
-        <property name="draw_as_radio">True</property>
+        <property name="use-underline">True</property>
+        <property name="draw-as-radio">True</property>
         <property name="group">SortMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="SortEndingDescending">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">Ending latest</property>
-        <property name="use_underline">True</property>
-        <property name="draw_as_radio">True</property>
+        <property name="use-underline">True</property>
+        <property name="draw-as-radio">True</property>
         <property name="group">SortMenu</property>
       </object>
     </child>
   </object>
   <object class="GtkTextBuffer" id="TextBufferSelectedNotes"/>
   <object class="GtkPopover" id="popover1">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_start">5</property>
-        <property name="margin_end">5</property>
-        <property name="margin_top">5</property>
-        <property name="margin_bottom">5</property>
+        <property name="can-focus">False</property>
+        <property name="margin-start">5</property>
+        <property name="margin-end">5</property>
+        <property name="margin-top">5</property>
+        <property name="margin-bottom">5</property>
         <property name="orientation">vertical</property>
         <property name="spacing">3</property>
         <child>
           <object class="GtkLabel">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
+            <property name="can-focus">False</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
             <property name="label" translatable="yes">Items to hide:</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -117,9 +117,9 @@
           <object class="GtkCheckButton" id="CheckButtonFilterFavourites">
             <property name="label" translatable="yes">Favourites</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <signal name="toggled" handler="RunFilter" swapped="no"/>
           </object>
           <packing>
@@ -132,9 +132,9 @@
           <object class="GtkCheckButton" id="CheckButtonFilterNonFavourites">
             <property name="label" translatable="yes">Non-favourites</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <signal name="toggled" handler="RunFilter" swapped="no"/>
           </object>
           <packing>
@@ -147,9 +147,9 @@
           <object class="GtkCheckButton" id="CheckButtonFilterActive">
             <property name="label" translatable="yes">Active</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <signal name="toggled" handler="RunFilter" swapped="no"/>
           </object>
           <packing>
@@ -162,9 +162,9 @@
           <object class="GtkCheckButton" id="CheckButtonFilterEnded">
             <property name="label" translatable="yes">Ended</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <signal name="toggled" handler="RunFilter" swapped="no"/>
           </object>
           <packing>
@@ -177,9 +177,9 @@
           <object class="GtkCheckButton" id="CheckButtonFilterEndingToday">
             <property name="label" translatable="yes">Ending today</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <signal name="toggled" handler="RunFilter" swapped="no"/>
           </object>
           <packing>
@@ -192,9 +192,9 @@
           <object class="GtkCheckButton" id="CheckButtonFilterEndingAfterToday">
             <property name="label" translatable="yes">Ending after today</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <signal name="toggled" handler="RunFilter" swapped="no"/>
           </object>
           <packing>
@@ -207,9 +207,9 @@
           <object class="GtkCheckButton" id="CheckButtonFilterWithWinPrice">
             <property name="label" translatable="yes">With win price</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <signal name="toggled" handler="RunFilter" swapped="no"/>
           </object>
           <packing>
@@ -222,9 +222,9 @@
           <object class="GtkCheckButton" id="CheckButtonFilterWithNoWinPrice">
             <property name="label" translatable="yes">With no win price</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="draw-indicator">True</property>
             <signal name="toggled" handler="RunFilter" swapped="no"/>
           </object>
           <packing>
@@ -237,8 +237,8 @@
           <object class="GtkButton">
             <property name="label" translatable="yes">Show all</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -250,36 +250,36 @@
     </child>
   </object>
   <object class="GtkWindow" id="wndMain">
-    <property name="can_focus">False</property>
-    <property name="default_width">810</property>
-    <property name="default_height">500</property>
+    <property name="can-focus">False</property>
+    <property name="default-width">810</property>
+    <property name="default-height">500</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkPaned">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkToolbar">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="orientation">vertical</property>
-                    <property name="toolbar_style">icons</property>
+                    <property name="toolbar-style">icons</property>
                     <child>
                       <object class="GtkToolButton">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Add new</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Add new</property>
                         <property name="label" translatable="yes">Add new</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-add</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-add</property>
                         <signal name="clicked" handler="ButtonAddClicked" swapped="no"/>
                         <accelerator key="n" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -291,11 +291,11 @@
                     <child>
                       <object class="GtkToolButton" id="ButtonUpdateAll">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Update all</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Update all</property>
                         <property name="label" translatable="yes">Update all</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-refresh</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-refresh</property>
                         <signal name="clicked" handler="ButtonUpdateAllClicked" swapped="no"/>
                         <accelerator key="r" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -307,7 +307,7 @@
                     <child>
                       <object class="GtkSeparatorToolItem">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -317,11 +317,11 @@
                     <child>
                       <object class="GtkToolButton" id="ButtonClearEnded">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Clear ended</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Clear ended</property>
                         <property name="label" translatable="yes">Clear ended</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-clear</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-clear</property>
                         <signal name="clicked" handler="ButtonClearEndedClicked" swapped="no"/>
                       </object>
                       <packing>
@@ -332,11 +332,11 @@
                     <child>
                       <object class="GtkToolButton" id="ButtonClearAll">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Clear all</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Clear all</property>
                         <property name="label" translatable="yes">Clear all</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-delete</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-delete</property>
                         <signal name="clicked" handler="ButtonClearAllClicked" swapped="no"/>
                       </object>
                       <packing>
@@ -347,7 +347,7 @@
                     <child>
                       <object class="GtkSeparatorToolItem">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -357,11 +357,11 @@
                     <child>
                       <object class="GtkToolButton">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Open</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Open</property>
                         <property name="label" translatable="yes">Open</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-open</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-open</property>
                         <signal name="clicked" handler="ButtonOpenClicked" swapped="no"/>
                         <accelerator key="o" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -373,11 +373,11 @@
                     <child>
                       <object class="GtkToolButton">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Save</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Save</property>
                         <property name="label" translatable="yes">Save</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-save</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-save</property>
                         <signal name="clicked" handler="ButtonSaveClicked" swapped="no"/>
                         <accelerator key="s" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -389,11 +389,11 @@
                     <child>
                       <object class="GtkToolButton">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Save as...</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Save as...</property>
                         <property name="label" translatable="yes">Save as...</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-save-as</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-save-as</property>
                         <signal name="clicked" handler="ButtonSaveAsClicked" swapped="no"/>
                         <accelerator key="s" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </object>
@@ -405,11 +405,11 @@
                     <child>
                       <object class="GtkToolButton">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Export</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Export</property>
                         <property name="label" translatable="yes">Export</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-convert</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-convert</property>
                         <signal name="clicked" handler="ButtonExportClicked" swapped="no"/>
                         <accelerator key="e" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </object>
@@ -421,7 +421,7 @@
                     <child>
                       <object class="GtkSeparatorToolItem">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -431,11 +431,11 @@
                     <child>
                       <object class="GtkToolButton" id="HelpButton">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Help</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Help</property>
                         <property name="label" translatable="yes">Help</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-help</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-help</property>
                         <signal name="clicked" handler="ButtonHelpClicked" swapped="no"/>
                         <accelerator key="slash" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -447,11 +447,11 @@
                     <child>
                       <object class="GtkToolButton">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Settings</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Settings</property>
                         <property name="label" translatable="yes">Settings</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-preferences</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-preferences</property>
                         <signal name="clicked" handler="ButtonSettingsClicked" swapped="no"/>
                         <accelerator key="comma" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -463,11 +463,11 @@
                     <child>
                       <object class="GtkToolButton">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Quit</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Quit</property>
                         <property name="label" translatable="yes">Quit</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-quit</property>
+                        <property name="use-underline">True</property>
+                        <property name="stock-id">gtk-quit</property>
                         <signal name="clicked" handler="ButtonQuitClicked" swapped="no"/>
                         <accelerator key="q" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -486,25 +486,25 @@
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_start">3</property>
-                        <property name="margin_end">3</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
                         <property name="spacing">3</property>
                         <child>
                           <object class="GtkSearchEntry" id="FilterSearchEntry">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can-focus">True</property>
                             <property name="hexpand">True</property>
-                            <property name="primary_icon_name">edit-find-symbolic</property>
-                            <property name="primary_icon_activatable">False</property>
-                            <property name="primary_icon_sensitive">False</property>
-                            <property name="placeholder_text" translatable="yes">Search...</property>
+                            <property name="primary-icon-name">edit-find-symbolic</property>
+                            <property name="primary-icon-activatable">False</property>
+                            <property name="primary-icon-sensitive">False</property>
+                            <property name="placeholder-text" translatable="yes">Search...</property>
                             <signal name="activate" handler="RunFilter" swapped="no"/>
                             <signal name="changed" handler="RunFilter" swapped="no"/>
                           </object>
@@ -517,9 +517,9 @@
                         <child>
                           <object class="GtkMenuButton" id="MenuButtonFilter">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">True</property>
                             <property name="popover">popover1</property>
                             <child>
                               <placeholder/>
@@ -534,11 +534,11 @@
                         <child>
                           <object class="GtkMenuButton" id="MenuButtonSort">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="focus-on-click">False</property>
+                            <property name="receives-default">True</property>
                             <property name="popup">menu1</property>
-                            <property name="use_popover">False</property>
+                            <property name="use-popover">False</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -559,19 +559,19 @@
                     <child>
                       <object class="GtkScrolledWindow">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
-                        <property name="shadow_type">in</property>
-                        <property name="min_content_width">200</property>
+                        <property name="shadow-type">in</property>
+                        <property name="min-content-width">200</property>
                         <child>
                           <object class="GtkTreeView" id="TreeViewItems">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="rules_hint">True</property>
-                            <property name="enable_search">False</property>
-                            <property name="search_column">1</property>
-                            <property name="activate_on_single_click">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="rules-hint">True</property>
+                            <property name="enable-search">False</property>
+                            <property name="search-column">1</property>
+                            <property name="activate-on-single-click">True</property>
                             <child internal-child="selection">
                               <object class="GtkTreeSelection">
                                 <signal name="changed" handler="TreeViewItemsSelectionChanged" swapped="no"/>
@@ -589,7 +589,7 @@
                               <object class="GtkTreeViewColumn">
                                 <property name="resizable">True</property>
                                 <property name="sizing">fixed</property>
-                                <property name="fixed_width">100</property>
+                                <property name="fixed-width">100</property>
                                 <property name="title" translatable="yes">Name</property>
                                 <property name="expand">True</property>
                                 <child>
@@ -649,21 +649,21 @@
             </child>
             <child>
               <object class="GtkBox" id="SelectionViewBox">
-                <property name="width_request">200</property>
+                <property name="width-request">200</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_start">5</property>
-                <property name="margin_end">5</property>
+                <property name="can-focus">False</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkLabel" id="LabelSelectedName">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">precious peebus polytonal player (paca edition)</property>
                     <property name="justify">center</property>
                     <property name="wrap">True</property>
                     <property name="ellipsize">end</property>
-                    <property name="max_width_chars">40</property>
+                    <property name="max-width-chars">40</property>
                     <property name="lines">3</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -679,9 +679,9 @@
                 <child>
                   <object class="GtkSeparator">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_top">3</property>
-                    <property name="margin_bottom">3</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-top">3</property>
+                    <property name="margin-bottom">3</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -692,185 +692,207 @@
                 <child>
                   <object class="GtkBox" id="SelectionInfoBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
+                      <!-- n-columns=3 n-rows=7 -->
                       <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">start</property>
-                        <property name="row_spacing">5</property>
-                        <property name="column_spacing">10</property>
+                        <property name="row-spacing">5</property>
+                        <property name="column-spacing">10</property>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Original name</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Price (Yen)</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Price (AUD)</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Ending in</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Bid count</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">4</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Buy it now?</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">5</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">5</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Auto extension?</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">6</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">6</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="LabelSelectedYahooName">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="label" translatable="yes">something in japanese</property>
                             <property name="ellipsize">end</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="LabelSelectedPrice">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="label" translatable="yes">¥12345</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="LabelSelectedPriceAUD">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="label" translatable="yes">$123.45</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="LabelSelectedEnding">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
                             <property name="label" translatable="yes">1h 17m 23s</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="LabelSelectedBids">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="label" translatable="yes">5</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">4</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">4</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="LabelSelectedBuyItNow">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="label" translatable="yes">Yes</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">5</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">5</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="LabelSelectedAutoExtension">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="label" translatable="yes">N/A</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">6</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">6</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -881,16 +903,16 @@
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-bottom">5</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkButton" id="ButtonViewBuyee">
                             <property name="label" translatable="yes">View on Buyee</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">True</property>
                             <signal name="clicked" handler="ButtonViewBuyeeClicked" swapped="no"/>
                           </object>
                           <packing>
@@ -903,8 +925,8 @@
                           <object class="GtkButton" id="ButtonViewYahoo">
                             <property name="label" translatable="yes">View on Yahoo! Auctions</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">True</property>
                             <signal name="clicked" handler="ButtonViewYahooClicked" swapped="no"/>
                           </object>
                           <packing>
@@ -916,43 +938,43 @@
                         <child>
                           <object class="GtkButtonBox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="homogeneous">True</property>
-                            <property name="layout_style">expand</property>
+                            <property name="layout-style">expand</property>
                             <child>
                               <object class="GtkButton" id="ButtonSelectedRemove">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Remove</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Remove</property>
                                 <signal name="clicked" handler="ButtonSelectedRemoveClicked" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="image4">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">user-trash</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">user-trash</property>
                                   </object>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="pack_type">end</property>
+                                <property name="pack-type">end</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="ButtonSelectedRename">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Rename</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Rename</property>
                                 <signal name="clicked" handler="ButtonSelectedRenameClicked" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="image1">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="stock">gtk-edit</property>
                                   </object>
                                 </child>
@@ -966,15 +988,15 @@
                             <child>
                               <object class="GtkButton" id="ButtonSelectedUpdate">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Update</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Update</property>
                                 <signal name="clicked" handler="ButtonSelectedUpdateClicked" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="image2">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">view-refresh</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">view-refresh</property>
                                   </object>
                                 </child>
                               </object>
@@ -987,15 +1009,15 @@
                             <child>
                               <object class="GtkToggleButton" id="ButtonSelectedFavourite">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Favourite</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Favourite</property>
                                 <signal name="toggled" handler="ButtonSelectedFavouriteToggled" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="image3">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">emblem-favorite</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">emblem-favorite</property>
                                   </object>
                                 </child>
                               </object>
@@ -1016,14 +1038,14 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="pack_type">end</property>
+                        <property name="pack-type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="LabelSelectedLastUpdated">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Last updated: 12:34:56</property>
                         <property name="justify">center</property>
                         <property name="wrap">True</property>
@@ -1031,30 +1053,30 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="pack_type">end</property>
+                        <property name="pack-type">end</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkExpander">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
+                        <property name="can-focus">True</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
                         <child>
                           <object class="GtkBox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_start">3</property>
-                            <property name="margin_end">3</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-start">3</property>
+                            <property name="margin-end">3</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkTextView">
-                                <property name="height_request">100</property>
+                                <property name="height-request">100</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="wrap_mode">word</property>
+                                <property name="can-focus">True</property>
+                                <property name="wrap-mode">word</property>
                                 <property name="buffer">TextBufferSelectedNotes</property>
                                 <signal name="focus-out-event" handler="TextViewSelectedNotesFocusOut" swapped="no"/>
                               </object>
@@ -1067,13 +1089,13 @@
                             <child>
                               <object class="GtkBox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <child>
                                   <object class="GtkButton">
                                     <property name="label" translatable="yes">Clear</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
                                     <signal name="clicked" handler="ButtonSelectedNotesClearClicked" swapped="no"/>
                                   </object>
                                   <packing>
@@ -1086,13 +1108,13 @@
                                   <object class="GtkButton">
                                     <property name="label" translatable="yes">Save</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
-                                    <property name="pack_type">end</property>
+                                    <property name="pack-type">end</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -1108,7 +1130,7 @@
                         <child type="label">
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">Notes</property>
                           </object>
                         </child>
@@ -1141,8 +1163,5 @@
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/ui/settings.glade b/ui/settings.glade
index 2d631b4..cf0e03b 100644
--- a/ui/settings.glade
+++ b/ui/settings.glade
@@ -1,294 +1,302 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow" id="WindowSettings">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="modal">True</property>
-    <property name="default_width">440</property>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
+    <property name="default-width">440</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">5</property>
-        <property name="margin_right">5</property>
-        <property name="margin_top">5</property>
-        <property name="margin_bottom">5</property>
+        <property name="can-focus">False</property>
+        <property name="margin-left">5</property>
+        <property name="margin-right">5</property>
+        <property name="margin-top">5</property>
+        <property name="margin-bottom">5</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
           <object class="GtkNotebook">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="vexpand">True</property>
             <child>
+              <!-- n-columns=3 n-rows=3 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">5</property>
-                <property name="margin_right">5</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-                <property name="row_spacing">5</property>
+                <property name="can-focus">False</property>
+                <property name="margin-left">5</property>
+                <property name="margin-right">5</property>
+                <property name="margin-top">5</property>
+                <property name="margin-bottom">5</property>
+                <property name="row-spacing">5</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <property name="label" translatable="yes">Show seconds in list view</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSwitch" id="SwitchShowSecondsInListView">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="halign">end</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <property name="label" translatable="yes">Autosave</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSwitch" id="SwitchAutosave">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="halign">end</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <property name="label" translatable="yes">Show favourites at top of list</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSwitch" id="SwitchShowFavouritesAtTopOfList">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="halign">end</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
             <child type="tab">
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">General</property>
               </object>
               <packing>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
+              <!-- n-columns=3 n-rows=4 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">5</property>
-                <property name="margin_right">5</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">20</property>
-                <property name="column_spacing">3</property>
+                <property name="can-focus">False</property>
+                <property name="margin-left">5</property>
+                <property name="margin-right">5</property>
+                <property name="margin-top">5</property>
+                <property name="margin-bottom">20</property>
+                <property name="column-spacing">3</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <property name="label" translatable="yes">Default</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">start</property>
                     <property name="label" translatable="yes">Items ending soon</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">start</property>
                     <property name="label" translatable="yes">Favourite items</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">start</property>
                     <property name="label" translatable="yes">Favourite items ending soon</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">seconds</property>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">2</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">seconds</property>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">2</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">seconds</property>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">2</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">seconds</property>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">2</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkEntry" id="EntryUpdateInterval">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin_left">5</property>
-                    <property name="margin_right">5</property>
-                    <property name="margin_top">2</property>
-                    <property name="margin_bottom">2</property>
-                    <property name="max_length">3</property>
-                    <property name="width_chars">5</property>
-                    <property name="input_purpose">number</property>
+                    <property name="can-focus">True</property>
+                    <property name="margin-left">5</property>
+                    <property name="margin-right">5</property>
+                    <property name="margin-top">2</property>
+                    <property name="margin-bottom">2</property>
+                    <property name="max-length">3</property>
+                    <property name="width-chars">5</property>
+                    <property name="input-purpose">number</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkEntry" id="EntryUpdateIntervalCritical">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin_left">5</property>
-                    <property name="margin_right">5</property>
-                    <property name="margin_top">2</property>
-                    <property name="margin_bottom">2</property>
-                    <property name="max_length">3</property>
-                    <property name="width_chars">5</property>
-                    <property name="input_purpose">number</property>
+                    <property name="can-focus">True</property>
+                    <property name="margin-left">5</property>
+                    <property name="margin-right">5</property>
+                    <property name="margin-top">2</property>
+                    <property name="margin-bottom">2</property>
+                    <property name="max-length">3</property>
+                    <property name="width-chars">5</property>
+                    <property name="input-purpose">number</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkEntry" id="EntryFavouriteUpdateInterval">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin_left">5</property>
-                    <property name="margin_right">5</property>
-                    <property name="margin_top">2</property>
-                    <property name="margin_bottom">2</property>
-                    <property name="max_length">3</property>
-                    <property name="width_chars">5</property>
-                    <property name="input_purpose">number</property>
+                    <property name="can-focus">True</property>
+                    <property name="margin-left">5</property>
+                    <property name="margin-right">5</property>
+                    <property name="margin-top">2</property>
+                    <property name="margin-bottom">2</property>
+                    <property name="max-length">3</property>
+                    <property name="width-chars">5</property>
+                    <property name="input-purpose">number</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkEntry" id="EntryFavouriteUpdateIntervalCritical">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin_left">5</property>
-                    <property name="margin_right">5</property>
-                    <property name="margin_top">2</property>
-                    <property name="margin_bottom">2</property>
-                    <property name="max_length">3</property>
-                    <property name="width_chars">5</property>
-                    <property name="input_purpose">number</property>
+                    <property name="can-focus">True</property>
+                    <property name="margin-left">5</property>
+                    <property name="margin-right">5</property>
+                    <property name="margin-top">2</property>
+                    <property name="margin-bottom">2</property>
+                    <property name="max-length">3</property>
+                    <property name="width-chars">5</property>
+                    <property name="input-purpose">number</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
               </object>
@@ -299,12 +307,12 @@
             <child type="tab">
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">Update intervals</property>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
           </object>
@@ -317,14 +325,15 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkButton">
                 <property name="label" translatable="yes">About Buypeeb</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <signal name="clicked" handler="ButtonAboutClicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -336,14 +345,14 @@
               <object class="GtkButton">
                 <property name="label" translatable="yes">Save</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <signal name="clicked" handler="ButtonSaveClicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -351,14 +360,14 @@
               <object class="GtkButton">
                 <property name="label" translatable="yes">Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <signal name="clicked" handler="ButtonCancelClicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -367,7 +376,7 @@
             <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="padding">2</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">4</property>
           </packing>
         </child>