.gitignore

 # SPDX-FileCopyrightText: 2012-2017 Bruce Cowan <bruce@bcowan.me.uk>
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: CC0-1.0
 
 .flatpak*
 

.gitlab-ci.yml

-# SPDX-FileCopyrightText: 2018-2022 Bruce Cowan <bruce@bcowan.me.uk>
+# SPDX-FileCopyrightText: 2018-2024 Bruce Cowan <bruce@bcowan.me.uk>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 flatpak:
   image: alpine:latest
   stage: build
   variables:
-    MANIFEST_PATH: "build-aux/uk.me.bcowan.Rugby.yml"
+    MANIFEST_PATH: "uk.me.bcowan.Rugby.json"
     RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
     FLATPAK_MODULE: "rugby"
     BUNDLE: "rugby.flatpak"
     APP_ID: "uk.me.bcowan.Rugby"
 
   script:
-  - apk update && apk add flatpak-builder
+  - apk update && apk add flatpak-builder appstream-compose
   - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  - flatpak install -y flathub org.gnome.Platform 43
-  - flatpak install -y flathub org.gnome.Sdk 43
+  - flatpak install -y flathub org.gnome.Platform 47
+  - flatpak install -y flathub org.gnome.Sdk 47
   - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-  - flatpak build app meson --prefix=/app ${MESON_ARGS} _build
-  - flatpak build app ninja -C _build install
+  - flatpak build app meson setup --prefix=/app ${MESON_ARGS} _build
+  - flatpak build app meson install -C _build
   - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
   - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID}
   artifacts:
@@ -28,3 +28,5 @@ flatpak:
   cache:
     paths:
       - .flatpak-builder/cache
+  tags:
+    - flatpak

LICENSES/CC0-1.0.txt

+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

build-aux/uk.me.bcowan.Rugby.yml

-# SPDX-FileCopyrightText: 2018-2023 Bruce Cowan <bruce@bcowan.me.uk>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-app-id: uk.me.bcowan.Rugby
-runtime: org.gnome.Platform
-runtime-version: "43"
-sdk: org.gnome.Sdk
-command: rugby
-
-finish-args:
-  - "--share=ipc"
-  - "--device=dri"
-  - "--socket=fallback-x11"
-  - "--socket=wayland"
-
-modules:
-  - name: blueprint-compiler
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://gitlab.gnome.org/jwestman/blueprint-compiler
-        tag: v0.6.0
-  - name: rugby
-    buildsystem: meson
-    builddir: true
-    sources:
-      - type: dir
-        path: .
-    config_opts:
-      - "-Dprofile=development"

data/gtk/help-overlay.blp

@@ -27,11 +27,6 @@ ShortcutsWindow help_overlay {
         title: "Decrement score";
         accelerator: "<Ctrl>Down <Ctrl>Left";
       }
-
-      ShortcutsShortcut {
-        title: "Show try filter";
-        accelerator: "<Ctrl>f";
-      }
     }
   }
 }

data/gtk/prefs.blp

-// SPDX-FileCopyrightText: 2022 Bruce Cowan <bruce@bcowan.me.uk>
+// SPDX-FileCopyrightText: 2022-2024 Bruce Cowan <bruce@bcowan.me.uk>
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 using Gtk 4.0;
 using Adw 1;
 
-template RugbyPrefWindow : Adw.PreferencesWindow {
-  default-height: 300;
-  default-width: 400;
+template $RugbyPrefDialog : Adw.PreferencesDialog {
   title: "Preferences";
-  modal: true;
+  search-enabled: false;
 
   Adw.PreferencesPage {
     Adw.PreferencesGroup {
       title: "Scoring";
 
-      Adw.ActionRow {
-        title: "Points for a converted tries";
-
-        SpinButton try_spin {
-          adjustment: Adjustment {
-            lower: 1;
-            upper: 7;
-            step-increment: 1;
-          };
-          max-width-chars: 3;
-          valign: center;
-        }
+      Adw.SpinRow try_spin {
+        title: "Points for a converted try";
+        adjustment: Adjustment {
+          lower: 1;
+          upper: 7;
+          step-increment: 1;
+        };
       }
 
-      Adw.ActionRow {
+      Adw.SpinRow utry_spin {
         title: "Points for an unconverted try";
-
-        SpinButton utry_spin {
-          adjustment: Adjustment {
-            lower: 1;
-            upper: 5;
-            step-increment: 1;
-          };
-          max-width-chars: 3;
-          valign: center;
-        }
+        adjustment: Adjustment {
+          lower: 1;
+          upper: 5;
+          step-increment: 1;
+        };
       }
 
-      Adw.ActionRow {
+      Adw.SpinRow kick_spin {
         title: "Points for a kick";
-
-        SpinButton kick_spin {
-          adjustment: Adjustment {
-            lower: 1;
-            upper: 3;
-            step-increment: 1;
-          };
-          max-width-chars: 3;
-          valign: center;
-        }
+        adjustment: Adjustment {
+          lower: 1;
+          upper: 3;
+          step-increment: 1;
+        };
       }
     }
   }

data/gtk/score-item.ui

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  SPDX-FileCopyrightText: 2021 Bruce Cowan <bruce@bcowan.me.uk>
-
-  SPDX-License-Identifier: GPL-3.0-or-later
--->
-<interface>
-  <requires lib="gtk" version="4.0"/>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="RugbyPossibilityWidget">
-        <binding name="possibility">
-          <lookup name="item">GtkListItem</lookup>
-        </binding>
-        <binding name="tooltip-text">
-          <closure type="gchararray" function="item_tooltip_cb">
-            <lookup name="item">GtkListItem</lookup>
-          </closure>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>

data/gtk/window.blp

-// SPDX-FileCopyrightText: 2022-2023 Bruce Cowan <bruce@bcowan.me.uk>
+// SPDX-FileCopyrightText: 2022-2024 Bruce Cowan <bruce@bcowan.me.uk>
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 using Gtk 4.0;
 using Adw 1;
 
-template RugbyAppWindow : Adw.ApplicationWindow {
+template $RugbyAppWindow : Adw.ApplicationWindow {
   title: "Rugby";
+  width-request: 360;
+  height-request: 294;
 
-  Box {
-    orientation: vertical;
-
+  Adw.ToolbarView {
+    [top]
     Adw.HeaderBar {
       SpinButton scorespin {
         adjustment: Adjustment {
@@ -21,84 +22,69 @@ template RugbyAppWindow : Adw.ApplicationWindow {
         tooltip-text: "Score";
       }
 
-      ToggleButton filter_toggle {
-        action-name: "win.show-try-filter";
-        icon-name: "funnel";
-        tooltip-text: "Show Try Filter";
-      }
-
       [end]
       MenuButton {
         direction: none;
         primary: true;
         menu-model: app_menu;
-        tooltip-text: "Main Menu";
+        tooltip-text: "Main Menu (F10)";
       }
     }
 
-    Adw.Clamp {
-      maximum-size: 600;
-
-      Box {
-        orientation: vertical;
-
-        Revealer {
-          halign: center;
-          margin-top: 6;
-          reveal-child: bind filter_toggle.active;
-          transition-type: swing_down;
+    content: Box {
+      orientation: vertical;
 
-          SpinButton tryspin {
-            adjustment: Adjustment {
-              step-increment: 1;
-              lower: 0;
-              upper: 40;
-            };
-            focusable: true;
-            tooltip-text: "Tries";
+      Stack stack {
 
-            value-changed => try_spin_value_changed_cb();
-          }
+        StackPage {
+          name: "empty_page";
+          child: Adw.StatusPage {
+            icon-name: "list";
+            title: "No possibilities";
+          };
         }
 
-        Stack stack {
-          StackPage {
-            name: "empty_page";
+        StackPage {
+          name: "list_page";
+          child: ScrolledWindow {
+            vexpand: true;
 
-            child: Adw.StatusPage {
-              icon-name: "list";
-              title: "No possibilities";
-            };
-          }
-
-          StackPage {
-            name: "list_page";
-
-            child: ScrolledWindow {
-              vexpand: true;
+            Adw.Clamp {
+              maximum-size: 600;
+              tightening-threshold: 400;
 
               ListView listview {
-                styles ["rich-list"]
-
                 factory: BuilderListItemFactory {
-                  resource: "/uk/me/bcowan/Rugby/gtk/score-item.ui";
+                  template ListItem {
+                    child: $RugbyPossibilityWidget {
+                      possibility: bind template.item;
+                      tooltip-text: bind $item_tooltip_cb(template.item) as <string>;
+                    };
+                  }
                 };
-                model: NoSelection {
-                  model: FilterListModel {
-                    filter: CustomFilter try_filter {};
-                    model: .RugbyListStore list_store {
-                      score: bind scorespin.value;
+                header-factory: BuilderListItemFactory {
+                  template ListHeader {
+                    child: Label {
+                      label: bind $header_label_cb(template.item) as <string>;
+                      halign: start;
                     };
+                  }
+                };
+                model: NoSelection {
+                  model: $RugbyListStore list_store {
+                    score: bind scorespin.value;
 
-                    items-changed => list_store_items_changed_cb();
+                    items-changed => $list_store_items_changed_cb();
                   };
                 };
+
+                styles ["rich-list"]
               }
-            };
-          }
+            }
+          };
         }
       }
-    }
+    };
   }
 
   ShortcutController {
@@ -114,10 +100,6 @@ template RugbyAppWindow : Adw.ApplicationWindow {
       arguments: "'down'";
       trigger: "<Ctrl>Down|<Ctrl>Left";
     }
-    Shortcut {
-      action: "action(win.show-try-filter)";
-      trigger: "<Ctrl>F";
-    }
   }
 }
 
@@ -128,4 +110,3 @@ menu app_menu {
     item ("_About Rugby", "app.about")
   }
 }
-

data/icons/football-american-symbolic.svg.license

+SPDX-FileCopyrightText: 2022 The GNOME Project
+
+SPDX-License-Identifier: CC0-1.0

data/icons/funnel-symbolic.svg.license

+SPDX-FileCopyrightText: 2022 The GNOME Project
+
+SPDX-License-Identifier: CC0-1.0

data/icons/list-symbolic.svg.license

+SPDX-FileCopyrightText: 2022 The GNOME Project
+
+SPDX-License-Identifier: CC0-1.0

data/meson.build

-# SPDX-FileCopyrightText: 2016-2023 Bruce Cowan <bruce@bcowan.me.uk>
+# SPDX-FileCopyrightText: 2016-2024 Bruce Cowan <bruce@bcowan.me.uk>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -17,10 +17,6 @@ resources = gnome.compile_resources('gen-resources',
                                     source_dir: 'data',
                                     dependencies: blueprints)
 
-install_data('uk.me.bcowan.Rugby.desktop',
-  install_dir: join_paths(get_option('datadir'), 'applications')
-)
-
 install_data(
   'uk.me.bcowan.Rugby.gschema.xml',
   install_dir: datadir / 'glib-2.0' / 'schemas',
@@ -31,13 +27,13 @@ install_data(
   install_dir: datadir / 'metainfo',
 )
 
-desktop_file_validate = find_program('desktop-file-validate', required: false)
-if desktop_file_validate.found()
-	test(
-		'validate-desktop',
-		desktop_file_validate,
-		args: [
-			'uk.me.bcowan.Rugby.desktop'
-		]
-	)
-endif
+# Create desktop-entry file from metainfo
+metainfo_file = 'uk.me.bcowan.Rugby.metainfo.xml'
+ascli_exe = find_program('appstreamcli')
+custom_target('gen-desktop-entry',
+    input : [metainfo_file],
+    output : ['uk.me.bcowan.Rugby.desktop'],
+    command : [ascli_exe, 'make-desktop-file', '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'applications')
+)

data/style.css

+/*
+ * SPDX-FileCopyrightText: 2024 Bruce Cowan <bruce@bcowan.me.uk>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+listview {
+  background-color: var(--window-bg-color);
+}

data/uk.me.bcowan.Rugby.desktop

-# SPDX-FileCopyrightText: 2020-2021 Bruce Cowan <bruce@bcowan.me.uk>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[Desktop Entry]
-Name=Rugby
-Exec=rugby
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Sports;Calculator;Utility
-StartupNotify=true

data/uk.me.bcowan.Rugby.gresource.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  SPDX-FileCopyrightText: 2012-2022 Bruce Cowan <bruce@bcowan.me.uk>
+  SPDX-FileCopyrightText: 2012-2023 Bruce Cowan <bruce@bcowan.me.uk>
 
-  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-License-Identifier: CC0-1.0
 -->
 <gresources>
   <gresource prefix="/uk/me/bcowan/Rugby">
     <file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">gtk/prefs.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">gtk/score-item.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">gtk/window.ui</file>
+    <file compressed="true">style.css</file>
+    <file compressed="true" preprocess="xml-stripblanks">uk.me.bcowan.Rugby.metainfo.xml</file>
   </gresource>
   <gresource prefix="/uk/me/bcowan/Rugby/icons/scalable/actions/">
     <file compressed="true" preprocess="xml-stripblanks" alias="football-american-symbolic.svg">icons/football-american-symbolic.svg</file>

data/uk.me.bcowan.Rugby.metainfo.xml

 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+SPDX-FileCopyrightText: 2023-2024 Bruce Cowan
+
+SPDX-License-Identifier: CC0-1.0
+-->
+
 <component type="desktop-application">
   <id>uk.me.bcowan.Rugby</id>
 
   <name>Rugby</name>
+  <developer_name>Bruce Cowan</developer_name>
   <summary>Find possibilities for rugby scores</summary>
 
-  <metadata_license>CC-BY-SA-4.0</metadata_license>
+  <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
 
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>touch</control>
+  </supports>
+
   <description>
     <p>
       A program to determine possible combinations of scoring for rugby matches.
@@ -15,4 +29,15 @@
   </description>
 
   <launchable type="desktop-id">uk.me.bcowan.Rugby.desktop</launchable>
+
+  <icon type="stock">rugby</icon>
+
+  <categories>
+    <category>Utility</category>
+    <category>GNOME</category>
+  </categories>
+
+  <provides>
+    <binary>rugby</binary>
+  </provides>
 </component>

meson.build

-# SPDX-FileCopyrightText: 2016-2023 Bruce Cowan <bruce@bcowan.me.uk>
+# SPDX-FileCopyrightText: 2016-2024 Bruce Cowan <bruce@bcowan.me.uk>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 project('rugby', 'c',
   version: '0.4.alpha',
   license:'GPLv3+',
-  meson_version: '>= 0.59.0',
+  meson_version: '>= 1.1.0',
   default_options: [
     'buildtype=debugoptimized',
     'c_std=gnu11',
@@ -18,9 +18,9 @@ desktopdir = datadir / 'applications'
 
 gnome = import('gnome')
 
-gio_dep = dependency('gio-2.0', version: '>= 2.66')
-gtk_dep = dependency('gtk4', version: '>= 4.8')
-libadwaita_dep = dependency('libadwaita-1')
+gio_dep = dependency('gio-2.0', version: '>= 2.76')
+gtk_dep = dependency('gtk4', version: '>= 4.12')
+libadwaita_dep = dependency('libadwaita-1', version: '>=1.5.beta')
 
 conf = configuration_data()
 
@@ -33,10 +33,10 @@ else
   conf.set_quoted('VERSION', meson.project_version())
 endif
 
-cflags = ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66',
-          '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66',
-          '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_8',
-          '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_8',
+cflags = ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_70',
+          '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_70',
+          '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_12',
+          '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_12',
           '-Wno-overlength-strings',
 ]
 
@@ -52,4 +52,3 @@ gnome.post_install(
   glib_compile_schemas: true,
   update_desktop_database: true,
 )
-

src/main.c

 /*
- * SPDX-FileCopyrightText: 2012-2022 Bruce Cowan <bruce@bcowan.me.uk>
+ * SPDX-FileCopyrightText: 2012-2024 Bruce Cowan <bruce@bcowan.me.uk>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
 
 #include "rugby-app-window.h"
-#include "rugby-pref-window.h"
+#include "rugby-pref-dialog.h"
 
 static void
 on_activate (              GApplication *app,
@@ -32,14 +32,12 @@ about_activated (G_GNUC_UNUSED GSimpleAction *simple,
     GtkApplication *app = GTK_APPLICATION (user_data);
     GtkWindow *window = gtk_application_get_active_window (app);
 
-    adw_show_about_window (window,
-                           "application-icon", "football-american",
-                           "application-name", "Rugby",
-                           "copyright", "Copyright 2012–2022 Bruce Cowan",
-                           "license-type", GTK_LICENSE_GPL_3_0,
-                           "developer-name", "Bruce Cowan",
-                           "version", VERSION,
-                           NULL);
+    adw_show_about_dialog_from_appdata (GTK_WIDGET (window),
+                                        "uk/me/bcowan/Rugby/uk.me.bcowan.Rugby.metainfo.xml",
+                                        NULL,
+                                        "application-icon", "football-american",
+                                        "version", VERSION,
+                                        NULL);
 }
 
 static void
@@ -50,8 +48,8 @@ preferences_activated (G_GNUC_UNUSED GSimpleAction *simple,
     GtkApplication *app = GTK_APPLICATION (user_data);
     GtkWindow *window = gtk_application_get_active_window (app);
 
-    RugbyPrefWindow *pref_window = rugby_pref_window_new (RUGBY_APP_WINDOW (window));
-    gtk_window_present (GTK_WINDOW (pref_window));
+    RugbyPrefDialog *pref_window = rugby_pref_dialog_new ();
+    adw_dialog_present (ADW_DIALOG (pref_window), GTK_WIDGET (window));
 }
 
 static void
@@ -78,7 +76,7 @@ main (int    argc,
       char **argv)
 {
     g_autoptr (AdwApplication) app = adw_application_new ("uk.me.bcowan.Rugby",
-                                                          G_APPLICATION_FLAGS_NONE);
+                                                          G_APPLICATION_NON_UNIQUE);
 
     g_signal_connect (app, "startup",
                       G_CALLBACK (on_startup), NULL);

src/meson.build

-# SPDX-FileCopyrightText: 2016-2023 Bruce Cowan <bruce@bcowan.me.uk>
+# SPDX-FileCopyrightText: 2016-2024 Bruce Cowan <bruce@bcowan.me.uk>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 sources = [
@@ -7,7 +7,7 @@ sources = [
     'rugby-list-store.c',
     'rugby-possibility.c',
     'rugby-possibility-widget.c',
-    'rugby-pref-window.c',
+    'rugby-pref-dialog.c',
 ]
 
 config_h = vcs_tag(