GTK4 port

.gitignore

@@ -8,3 +8,4 @@ SwayNotificationCenter
 ./src/swaync
 ./src/swaync*
 swaync-git*
+subprojects

data/icons/meson.build

@@ -0,0 +1,4 @@
+app_resources += gnome.compile_resources('icon-resources',
+  'swaync_icons.gresource.xml',
+  c_name: 'sway_notification_center_icons'
+)

data/icons/swaync_icons.gresource.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/erikreider/swaync/icons/scalable/actions">
+    <file preprocess="xml-stripblanks">notifications-placeholder-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">notifications-close-symbolic.svg</file>
+  </gresource>
+</gresources>

data/meson.build

@@ -2,6 +2,8 @@ install_data('org.erikreider.swaync.gschema.xml',
   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
 )
 
+subdir('icons')
+
 compile_schemas = find_program('glib-compile-schemas', required: false)
 if compile_schemas.found()
   test('Validate schema file', compile_schemas,

man/swaync.5.scd

@@ -304,24 +304,24 @@ config file to be able to detect config errors
 				widget-mpris-player ++
 				widget-mpris-title ++
 				widget-mpris-subtitle ++
+				widget-mpris-album-art ++
 			properties: ++
 				image-size: ++
 					type: integer ++
 					optional: true ++
 					default: 96 ++
 					description: The size of the album art. ++
-				image-radius: ++
-					type: integer ++
-					optional: true ++
-					default: 12 ++
-					description: The border radius of the album art. ++
 			description: A widget that displays multiple music players. ++
 		*menubar*++
 			type: object ++
 			css classes: ++
 				widget-menubar ++
-				.widget-menubar>box>.menu-button-bar ++
-				name of element given after menu or buttons with # ++
+				widget-menubar-container (with additional classes "start" and "end") ++
+				widget-menubar-child (direct child of the container) ++
+				widget-menubar-buttons (group of buttons, "buttons" widget) ++
+				widget-menubar-button (each individual button) ++
+				widget-menubar-menu (the animated menu for the "menu" widget) ++
+				Name of individual buttons, ex: "button#power" would be "power" ++
 			patternProperties: ++
 				menu#<name>: ++
 					type: object ++
@@ -391,7 +391,9 @@ config file to be able to detect config errors
 					description: A list of buttons to be displayed in the menu-button-bar ++
 		*buttons-grid*++
 			type: object ++
-			css class: widget-buttons (access buttons with >flowbox>flowboxchild>button) ++
+			css class: ++
+				widget-buttons ++
+				widget-buttons-grid-button ++
 			properties: ++
 				actions: ++
 					type: array ++
@@ -545,16 +547,16 @@ config file to be able to detect config errors
 					},
 					...
 				]
+			},
+			"buttons": {
+				"actions": [
+					{
+						"label": "wifi",
+						"command": "rofi-wifi-menu"
+					},
+					...
+				]
 			}
-		},
-		"buttons": {
-			"actions": [
-				{
-					"label": "wifi",
-					"command": "rofi-wifi-menu"
-				},
-				...
-			]
 		}
 	}
 }

meson.build

@@ -9,6 +9,9 @@ add_project_arguments(['--enable-gobject-tracing'], language: 'vala')
 add_project_arguments(['--enable-checking'], language: 'vala')
 
 i18n = import('i18n')
+gnome = import('gnome')
+
+app_resources = []
 
 subdir('data')
 subdir('src')

src/config.json.in

@@ -71,8 +71,7 @@
       "text": "Label Text"
     },
     "mpris": {
-      "image-size": 96,
-      "image-radius": 12
+      "image-size": 96
     }
   }
 }

src/configSchema.json

@@ -389,11 +389,6 @@
           "type": "integer",
           "description": "The size of the album art",
           "default": 96
-        },
-        "image-radius": {
-          "type": "integer",
-          "description": "The border radius of the album art",
-          "default": 12
         }
       }
     },