Port to GTK4 (#289)

Author: danirabbit

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y libhandy-1-dev gettext libdbus-glib-1-dev libgdk-pixbuf2.0-dev libglib2.0-dev libgranite-dev libwingpanel-dev meson valac
+        apt install -y libadwaita-1-dev gettext libdbus-glib-1-dev libgdk-pixbuf-2.0-dev libglib2.0-dev libgranite-7-dev libwingpanel-9-dev meson valac
     - name: Build
       env:
         DESTDIR: out

README.md

@@ -7,11 +7,12 @@
 
 You'll need the following dependencies:
 
-* libgdk-pixbuf2.0-dev
+* libadwaita-1-dev
+* libgdk-pixbuf-2.0-dev
 * libglib2.0-dev
-* libgranite-dev
-* libgtk-3-dev
-* libwingpanel-dev
+* libgranite-7-dev >= 7.7.0
+* libgtk-4-dev
+* libwingpanel-9-dev
 * meson >= 0.58.0
 * valac
 

data/NotificationEntry.css

@@ -1,4 +1,4 @@
-notification .card {
+notification grid.card {
     border-radius: 6px;
     padding: 6px;
     /* Box shadow is clipped to the margin area */
@@ -54,5 +54,5 @@ notification .close {
 
 notification .close image {
     color: #fff;
-    -gtk-icon-shadow: 0 1px 1px alpha (#000, 0.6);
+    -gtk-icon-shadow: 0 1px 1px alpha(#000, 0.6);
 }

data/gresource.xml

@@ -5,9 +5,6 @@
     <file compressed="true">indicator.css</file>
     <file compressed="true">NotificationEntry.css</file>
   </gresource>
-  <gresource prefix="/io/elementary/notifications">
-    <file alias="image-mask.svg" compressed="true" preprocess="xml-stripblanks">image-mask.svg</file>
-  </gresource>
   <gresource prefix="org/elementary/wingpanel/icons">
     <file alias="24x24/status/notification-disabled-10-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-10.svg</file>
     <file alias="24x24/status/notification-disabled-20-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/disabled-20.svg</file>

data/image-mask.svg

@@ -1,12 +1,13 @@
 i18n.merge_file(
     input: 'notifications.metainfo.xml.in',
-    output: 'io.elementary.wingpanel.notifications.metainfo.xml',
+    output: gettext_name + '.metainfo.xml',
     po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
     install_dir: get_option('datadir') / 'metainfo',
 )
 
-install_data('io.elementary.wingpanel.notifications.gschema.xml',
-  install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',
+install_data('notifications.gschema.xml',
+    install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',
+    rename: gettext_name + '.gschema.xml'
 )

data/meson.build

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-<schema path="/io/elementary/wingpanel/notifications/" id="io.elementary.wingpanel.notifications">
+<schema path="/io/elementary/panel/notifications/" id="io.elementary.panel.notifications">
   <key name="headers" type="a{sb}">
     <default>{}</default>
     <summary>The expanded state of the headers</summary>

…tary.wingpanel.notifications.gschema.xml data/notifications.gschema.xmldata/io.elementary.wingpanel.notifications.gschema.xml renamed to data/notifications.gschema.xml data/io.elementary.wingpanel.notifications.gschema.xml renamed to data/notifications.gschema.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2019–2023 elementary, Inc. <contact@elementary.io> -->
 <component type="addon">
-  <id>io.elementary.wingpanel.notifications</id>
-  <translation type="gettext">notifications-indicator</translation>
+  <id>io.elementary.panel.notifications</id>
+  <translation type="gettext">io.elementary.panel.notifications</translation>
   <extends>io.elementary.wingpanel</extends>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
@@ -14,13 +14,13 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/wingpanel-indicator-notifications/7.1.1/data/screenshot.png</image>
+      <image>https://raw.githubusercontent.com/elementary/panel-notifications/7.1.1/data/screenshot.png</image>
     </screenshot>
   </screenshots>
 
-  <url type="bugtracker">https://github.com/elementary/wingpanel-indicator-notifications/issues</url>
+  <url type="bugtracker">https://github.com/elementary/panel-notifications/issues</url>
   <url type="donation">https://elementary.io/get-involved#funding</url>
-  <url type="help">https://github.com/elementary/wingpanel-indicator-notifications/discussions/categories/q-a</url>
+  <url type="help">https://github.com/elementary/panel-notifications/discussions/categories/q-a</url>
   <url type="homepage">https://elementary.io/</url>
   <url type="translate">https://l10n.elementary.io/projects/wingpanel/wingpanel-indicator-notifications/</url>
 
@@ -50,7 +50,7 @@
         </ul>
       </description>
       <issues>
-        <issue url="https://github.com/elementary/wingpanel-indicator-notifications/issues/9">Replacing a bubble gives two notification entries</issue>
+        <issue url="https://github.com/elementary/panel-notifications/issues/9">Replacing a bubble gives two notification entries</issue>
       </issues>
     </release>
 
@@ -64,9 +64,9 @@
         </ul>
       </description>
       <issues>
-        <issue url="https://github.com/elementary/wingpanel-indicator-notifications/issues/58">The character ' is not rendered correctly</issue>
-        <issue url="https://github.com/elementary/wingpanel-indicator-notifications/issues/168">Indicator width changes when there are no notifications</issue>
-        <issue url="https://github.com/elementary/wingpanel-indicator-notifications/issues/251">Update indicator animation</issue>
+        <issue url="https://github.com/elementary/panel-notifications/issues/58">The character ' is not rendered correctly</issue>
+        <issue url="https://github.com/elementary/panel-notifications/issues/168">Indicator width changes when there are no notifications</issue>
+        <issue url="https://github.com/elementary/panel-notifications/issues/251">Update indicator animation</issue>
       </issues>
     </release>