Port to GTK4

lib/PopoverMenuItem.vala

@@ -0,0 +1,51 @@
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+* SPDX-FileCopyrightText: 2017-2023 elementary, Inc. (https://elementary.io)
+*/
+
+/**
+ * PopoverMenuItem is a {@link Gtk.Button} subclass for use as a MenuItem in {@link Gtk.Popover}
+ *
+ * It will automatically call {@link Gtk.Popover.popdown} on its parent when clicked
+ *
+ * It contains a {@link Granite.AccelLabel} which will automatically show
+ * accelerators for the {@link GLib.Action} assigned to #this
+ *
+ * @since 8.0.0
+ */
+[Version (since = "8.0.0")]
+public class Wingpanel.PopoverMenuItem : Gtk.Button {
+    /**
+     * The label for the button
+     */
+    public string text {
+        set {
+            child = new Granite.AccelLabel (value) {
+                action_name = this.action_name
+            };
+
+            update_property (Gtk.AccessibleProperty.LABEL, value, -1);
+        }
+    }
+
+    class construct {
+        set_css_name ("modelbutton");
+    }
+
+    public PopoverMenuItem () {}
+
+    public PopoverMenuItem.with_text (string text) {
+        Object (text: text);
+    }
+
+    construct {
+        accessible_role = MENU_ITEM;
+
+        clicked.connect (() => {
+            var popover = (Gtk.Popover) get_ancestor (typeof (Gtk.Popover));
+            if (popover != null) {
+                popover.popdown ();
+            }
+        });
+    }
+}

lib/meson.build

@@ -1,4 +1,4 @@
-indicators_dir = join_paths(get_option('prefix'), get_option('libdir'), 'wingpanel')
+indicators_dir = join_paths(get_option('prefix'), get_option('libdir'), 'wingpanel-8')
 
 config_vapi = meson.get_compiler('vala').find_library('config', dirs: meson.current_source_dir())
 
@@ -17,36 +17,35 @@ libwingpanel_deps = [
     gmodule_dep,
     gee_dep,
     gtk_dep,
+    granite_dep
 ]
 
-libwingpanel_lib = library('wingpanel',
+libwingpanel_lib = library(
+    'wingpanel-8',
     'Indicator.vala',
     'IndicatorManager.vala',
-    'Widgets/Container.vala',
-    'Widgets/OverlayIcon.vala',
-    'Widgets/Separator.vala',
-    'Widgets/Switch.vala',
+    'PopoverMenuItem.vala',
     config_header,
     dependencies: [libwingpanel_deps, config_vapi],
-    vala_header: 'wingpanel.h',
+    vala_header: 'wingpanel-8.h',
     version: meson.project_version(),
     install: true,
-    install_dir: [true, join_paths(get_option('includedir'), 'wingpanel'), true]
+    install_dir: [true, join_paths(get_option('includedir'), 'wingpanel-8'), true]
 )
 
 pkg.generate(
     libwingpanel_lib,
-    filebase: 'wingpanel',
-    name: 'Wingpanel',
+    filebase: 'wingpanel-8',
+    name: 'Wingpanel-8',
     description: 'Wingpanel Indicators API',
     version: meson.project_version(),
-    subdirs: 'wingpanel',
-    variables: ['indicatorsdir=${libdir}/wingpanel'],
+    subdirs: 'wingpanel-8',
+    variables: ['indicatorsdir=${libdir}/wingpanel-8'],
     requires: libwingpanel_deps
 )
 
 install_data(
-    'wingpanel.deps',
+    'wingpanel-8.deps',
     install_dir: join_paths(get_option('datadir'), 'vala', 'vapi')
 )
 

lib/wingpanel.deps → lib/wingpanel-8.deps

@@ -1,4 +1,4 @@
 glib-2.0
 gee-0.8
 gmodule-2.0
-gtk+-3.0
+gtk4

meson.build

@@ -28,14 +28,14 @@ glib_dep = dependency('glib-2.0', version: '>=2.32')
 gio_dep = dependency('gio-2.0')
 gio_unix_dep = dependency('gio-unix-2.0')
 gmodule_dep = dependency('gmodule-2.0')
-gdk_wl_dep = dependency('gdk-wayland-3.0')
+gdk_wl_dep = dependency('gtk4-wayland')
 # GDK X11 dep is for detecting whether we're on Wayland or not ONLY, we don't actually have
 # a hard X11 dependency here
-gdk_x11_dep = dependency('gdk-x11-3.0')
+gdk_x11_dep = dependency('gtk4-x11')
 x11_dep = dependency('x11')
-gtk_dep = dependency('gtk+-3.0', version: '>=3.10')
+gtk_dep = dependency('gtk4')
 gee_dep = dependency('gee-0.8')
-granite_dep = dependency('granite', version: '>=5.4.0')
+granite_dep = dependency('granite-7')
 posix_dep = meson.get_compiler('vala').find_library('posix')
 wl_client_dep = dependency('wayland-client')
 

sample/SampleIndicator.vala

@@ -26,7 +26,7 @@ public class Sample.Indicator : Wingpanel.Indicator {
     private Gtk.Overlay display_widget;
 
     /* The main widget that is displayed in the popover */
-    private Gtk.Grid main_widget;
+    private Gtk.Box main_widget;
 
     public Indicator () {
         /* Some information about the indicator */
@@ -57,15 +57,15 @@ public class Sample.Indicator : Wingpanel.Indicator {
         };
 
         var hide_button = new Gtk.Button.with_label (_("Hide me!"));
-        hide_button.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
-        hide_button.get_style_context ().add_class (Gtk.STYLE_CLASS_MENUITEM);
+        hide_button.get_style_context ().add_class (Granite.STYLE_CLASS_FLAT);
+        hide_button.get_style_context ().add_class (Granite.STYLE_CLASS_MENUITEM);
 
         var compositing_switch = new Granite.SwitchModelButton (_("Composited Icon"));
 
-        main_widget = new Gtk.Grid ();
-        main_widget.attach (hide_button, 0, 0);
-        main_widget.attach (separator, 0, 1);
-        main_widget.attach (compositing_switch, 0, 2);
+        main_widget = new Gtk.Box (VERTICAL, 0);
+        main_widget.append (hide_button);
+        main_widget.append (separator);
+        main_widget.append (compositing_switch);
 
         /* Indicator should be visible at startup */
         this.visible = true;