Port to GTK4 (#319)

* CalendarView: Port to GTK4

* GridDay Port to GTK4

* Util: Port to GTK4

* Grid: Port to GTK4

* ComponentRow: Port to GTK4

* PanelLabel: Port to GTK4

* Indicator: Port to GTK4

* GridDay: Finish GTK4 port

* PanelLabel: Finish GTK4 port

* meson: Update deps for GTK4

* Reapply meson, CI and readme updates

* Use PopoverMenuItem

* Remove todos, connect to response

* Update main.yml

* Update main.yml

* Avoid conflicts

---------

Co-authored-by: Danielle Foré <danielle@elementary.io>

Author: leolost2605

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y gobject-introspection libecal2.0-dev libhandy-1-dev libedataserver1.2-dev libical-dev libgranite-dev libwingpanel-dev meson valac
+        apt install -y gobject-introspection libecal2.0-dev libadwaita-1-dev libedataserver1.2-dev libical-dev libgranite-7-dev libwingpanel-8-dev meson valac
     - name: Build
       env:
         DESTDIR: out

README.md

@@ -9,11 +9,12 @@
 You'll need the following dependencies:
 
 * gobject-introspection
+* libadwaita-1-dev
 * libecal1.2-dev
 * libedataserver1.2-dev
 * libical-dev
-* libgranite-dev >= 6.0.0
-* libwingpanel-dev
+* libgranite-7-dev >= 7.6.0
+* libwingpanel-8-dev
 * meson (>= 0.57.0)
 * valac >= 0.40.3
 

…y.desktop.wingpanel.datetime.gschema.xml data/datetime.gschema.xmldata/io.elementary.desktop.wingpanel.datetime.gschema.xml renamed to data/datetime.gschema.xml data/io.elementary.desktop.wingpanel.datetime.gschema.xml renamed to data/datetime.gschema.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2019-2022 elementary, Inc. <contact@elementary.io> -->
 <component type="addon">
-  <id>io.elementary.wingpanel.datetime</id>
+  <id>io.elementary.panel.datetime</id>
   <extends>io.elementary.wingpanel</extends>
-  <translation type="gettext">datetime-indicator</translation>
+  <translation type="gettext">io.elementary.panel.datetime</translation>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
 

data/datetime.metainfo.xml.in

@@ -1,13 +1,14 @@
 i18n.merge_file(
     input: 'datetime.metainfo.xml.in',
-    output: 'io.elementary.wingpanel.datetime.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.desktop.wingpanel.datetime.gschema.xml',
-    install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
+    'datetime.gschema.xml',
+    install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',
+    rename: gettext_name + '.gschema.xml'
 )

data/meson.build

@@ -8,22 +8,22 @@ project(
 i18n = import('i18n')
 gnome = import('gnome')
 
-gettext_name = meson.project_name() + '-indicator'
+gettext_name = 'io.elementary.panel.' + meson.project_name()
 
 prefix = get_option('prefix')
 libdir = prefix / get_option('libdir')
 
 add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(gettext_name), language:'c')
 add_project_arguments(['--vapidir', meson.current_source_dir() / 'vapi'], language: 'vala')
-add_project_arguments('-DG_LOG_DOMAIN="io.elementary.wingpanel.datetime"', language:'c')
+add_project_arguments('-DG_LOG_DOMAIN="io.elementary.panel.datetime"', language:'c')
 
 gresource = gnome.compile_resources(
     'gresource',
     'data' / 'datetime.gresource.xml',
     source_dir: 'data'
 )
 
-wingpanel_dep = dependency('wingpanel')
+wingpanel_dep = dependency('wingpanel-8')
 wingpanel_indicatorsdir = wingpanel_dep.get_variable('indicatorsdir', pkgconfig_define: ['libdir', libdir])
 
 libecal_dep = dependency('libecal-2.0', required: false)
@@ -64,11 +64,11 @@ shared_module(
     dependencies: [
         dependency('glib-2.0'),
         dependency('gobject-2.0'),
-        dependency('granite', version: '>=6.0.0'),
-        dependency('gtk+-3.0'),
+        dependency('granite-7', version: '>=7.6.0'),
+        dependency('gtk4'),
         libecal_dep,
         dependency('libedataserver-1.2'),
-        dependency('libhandy-1'),
+        dependency('libadwaita-1'),
         libical_dep,
         wingpanel_dep,
     ],

meson.build

@@ -71,10 +71,9 @@ public class DateTime.Indicator : Wingpanel.Indicator {
                 max_width_chars = 20,
                 justify = Gtk.Justification.CENTER
             };
-            placeholder_label.show_all ();
 
             var placeholder_style_context = placeholder_label.get_style_context ();
-            placeholder_style_context.add_class (Gtk.STYLE_CLASS_DIM_LABEL);
+            placeholder_style_context.add_class (Granite.STYLE_CLASS_DIM_LABEL);
             placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL);
 
             component_listbox = new Gtk.ListBox () {
@@ -84,14 +83,12 @@ public class DateTime.Indicator : Wingpanel.Indicator {
             component_listbox.set_placeholder (placeholder_label);
             component_listbox.set_sort_func (sort_function);
 
-            var scrolled_window = new Gtk.ScrolledWindow (null, null) {
+            var scrolled_window = new Gtk.ScrolledWindow () {
                 hscrollbar_policy = Gtk.PolicyType.NEVER,
                 child = component_listbox
             };
 
-            var settings_button = new Gtk.ModelButton () {
-                text = _("Date & Time Settings…")
-            };
+            var settings_button = new Wingpanel.PopoverMenuItem.with_text (_("Date & Time Settings…"));
 
             var sep = new Gtk.Separator (Gtk.Orientation.HORIZONTAL) {
                 margin_bottom = 3,
@@ -213,9 +210,7 @@ public class DateTime.Indicator : Wingpanel.Indicator {
     }
 
     private bool update_components () {
-        foreach (unowned Gtk.Widget widget in component_listbox.get_children ()) {
-            widget.destroy ();
-        }
+        component_listbox.remove_all ();
 
         if (calendar.selected_date == null) {
             update_components_idle_source = 0;
@@ -237,7 +232,7 @@ public class DateTime.Indicator : Wingpanel.Indicator {
                     if (!components_on_day.has_key (component_uid)) {
                         components_on_day[component_uid] = new DateTime.ComponentRow (date, ical, source);
 
-                        component_listbox.add (components_on_day[component_uid]);
+                        component_listbox.append (components_on_day[component_uid]);
                     }
                 }
             }
@@ -251,13 +246,12 @@ public class DateTime.Indicator : Wingpanel.Indicator {
                     if (!components_on_day.has_key (component_uid)) {
                         components_on_day[component_uid] = new DateTime.ComponentRow (date, ical, source);
 
-                        component_listbox.add (components_on_day[component_uid]);
+                        component_listbox.append (components_on_day[component_uid]);
                     }
                 }
             }
         });
 
-        component_listbox.show_all ();
         update_components_idle_source = 0;
         return GLib.Source.REMOVE;
     }

po/datetime-indicator.pot po/io.elementary.panel.datetime.potpo/datetime-indicator.pot renamed to po/io.elementary.panel.datetime.pot

@@ -87,7 +87,7 @@ public class DateTime.ComponentRow : Gtk.ListBoxRow {
             icon_name = "alarm-symbolic";
         }
 
-        component_image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.MENU) {
+        component_image = new Gtk.Image.from_icon_name (icon_name) {
             valign = Gtk.Align.START
         };
 
@@ -112,7 +112,7 @@ public class DateTime.ComponentRow : Gtk.ListBoxRow {
             use_markup = true,
             xalign = 0,
         };
-        time_label.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
+        time_label.get_style_context ().add_class (Granite.STYLE_CLASS_DIM_LABEL);
 
         grid = new Gtk.Grid () {
             column_spacing = 6,
@@ -131,7 +131,7 @@ public class DateTime.ComponentRow : Gtk.ListBoxRow {
         grid_context.add_class ("event");
         grid_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-        add (grid);
+        child = grid;
 
         set_color ();
         source_selectable.notify["color"].connect (set_color);

src/Indicator.vala

@@ -26,25 +26,23 @@ public class DateTime.Widgets.PanelLabel : Gtk.Box {
     public bool clock_show_seconds { get; set; }
     public bool clock_show_weekday { get; set; }
 
-    private Gtk.GestureMultiPress gesture_click;
-
     construct {
         date_label = new Gtk.Label (null) {
             margin_end = 12
         };
 
         var date_revealer = new Gtk.Revealer () {
-            transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT
+            transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT,
+            child = date_label
         };
-        date_revealer.add (date_label);
 
         time_label = new Gtk.Label (null) {
             use_markup = true
         };
 
         valign = Gtk.Align.CENTER;
-        add (date_revealer);
-        add (time_label);
+        append (date_revealer);
+        append (time_label);
 
         var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime");
         clock_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT);
@@ -60,10 +58,11 @@ public class DateTime.Widgets.PanelLabel : Gtk.Box {
         time_manager.minute_changed.connect (update_labels);
         time_manager.notify["is-12h"].connect (update_labels);
 
-        gesture_click = new Gtk.GestureMultiPress (this) {
+        var gesture_click = new Gtk.GestureClick () {
             button = Gdk.BUTTON_MIDDLE
         };
         gesture_click.pressed.connect (on_pressed);
+        add_controller (gesture_click);
     }
 
     private void update_labels () {