Port to Gtk4

data/gresource.xml

@@ -4,6 +4,6 @@
     <file compressed="true">Application.css</file>
   </gresource>
   <gresource prefix="/io/elementary/tasks/icons">
-      <file alias="location-marker.svg" compressed="true" preprocess="xml-stripblanks">LocationMarker.svg</file>
+    <file alias="location-marker.svg" compressed="true" preprocess="xml-stripblanks">LocationMarker.svg</file>
   </gresource>
 </gresources>

data/gschema.xml

@@ -6,10 +6,15 @@
       <summary>Whether the window was maximized on last run</summary>
       <description>Whether the window was maximized on last run</description>
     </key>
-    <key name="window-size" type="(ii)">
-      <default>(1000, 800)</default>
-      <summary>Most recent window size</summary>
-      <description>Most recent window size (width, height)</description>
+    <key name="window-width" type="i">
+      <default>1024</default>
+      <summary>Most recent window width</summary>
+      <description>Most recent window width</description>
+    </key>
+    <key name="window-height" type="i">
+      <default>750</default>
+      <summary>Most recent window height</summary>
+      <description>Most recent window height</description>
     </key>
     <key name="pane-position" type="i">
       <default>256</default>

io.elementary.tasks.json

@@ -95,87 +95,6 @@
                 }
             ]
         },
-        {
-            "name": "clutter-gtk",
-            "cleanup": [
-                "/share/gtk-doc"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz",
-                    "sha256": "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06"
-                }
-            ],
-            "modules": [
-                {
-                    "name": "cogl",
-                    "config-opts": [
-                        "--disable-cogl-gst",
-                        "--disable-gtk-doc",
-                        "--enable-xlib-egl-platform",
-                        "--enable-wayland-egl-platform"
-                    ],
-                    "cleanup": [
-                        "/share/gtk-doc",
-                        "/share/cogl/examples-data"
-                    ],
-                    "sources": [
-                        {
-                            "type": "archive",
-                            "url": "https://download.gnome.org/sources/cogl/1.22/cogl-1.22.8.tar.xz",
-                            "sha256": "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759"
-                        }
-                    ]
-                },
-                {
-                    "name": "clutter",
-                    "config-opts": [
-                        "--disable-gtk-doc",
-                        "--enable-egl-backend",
-                        "--enable-wayland-backend",
-                        "--enable-deprecated=no"
-                    ],
-                    "cleanup": [
-                        "/share/gtk-doc"
-                    ],
-                    "sources": [
-                        {
-                            "type": "archive",
-                            "url": "https://download.gnome.org/sources/clutter/1.26/clutter-1.26.4.tar.xz",
-                            "sha256": "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6"
-                        }
-                    ]
-                },
-                {
-                    "name": "clutter-gst",
-                    "config-opts": [
-                        "--disable-gtk-doc"
-                    ],
-                    "cleanup": [
-                        "/share/gtk-doc"
-                    ],
-                    "sources": [
-                        {
-                            "type": "archive",
-                            "url": "https://download.gnome.org/sources/clutter-gst/3.0/clutter-gst-3.0.27.tar.xz",
-                            "sha256": "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d"
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "name": "champlain",
-            "buildsystem": "meson",
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libchamplain/0.12/libchamplain-0.12.21.tar.xz",
-                    "sha256": "a915cd172a0c52944c5579fcb4683f8a878c571bf5e928254b5dafefc727e5a7"
-                }
-            ]
-        },
         {
             "name": "geocode-glib-2.0",
             "buildsystem": "meson",
@@ -211,6 +130,27 @@
                 }
             ]
         },
+        {
+            "name": "libshumate",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Ddemos=false",
+                "-Dgtk_doc=false",
+                "-Dvapi=false"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/libshumate/1.2/libshumate-1.2.1.tar.xz",
+                    "sha256": "1105ee077e2147f2a039cddfa616fa5cb9438883dd940427e11699dcd6549c11",
+                    "x-checker-data": {
+                        "type": "gnome",
+                        "stable-only": false,
+                        "name": "libshumate"
+                    }
+                }
+            ]
+        },
         {
             "name": "tasks",
             "buildsystem": "meson",

meson.build

@@ -28,21 +28,17 @@ config_file = configure_file(
 libecal_dep = dependency('libecal-2.0')
 
 tasks_deps = [
-    dependency('champlain-0.12'),
-    dependency('champlain-gtk-0.12'),
-    dependency('clutter-1.0'),
-    dependency('clutter-gtk-1.0'),
     dependency('glib-2.0'),
     dependency('gobject-2.0'),
-    dependency('granite', version: '>=6.2.0'),
-    dependency('gtk+-3.0'),
+    dependency('granite-7', version: '>=7.0.0'),
+    dependency('gtk4', version: '>=4.12'),
     libecal_dep,
     dependency('libedataserver-1.2'),
     dependency('libgeoclue-2.0'),
-    dependency('libhandy-1', version: '>=0.90.0'),
+    dependency('shumate-1.0'),
     dependency('libical-glib'),
     dependency('libportal'),
-    dependency('libportal-gtk3')
+    dependency('libportal-gtk4')
 ]
 
 if libecal_dep.version().version_compare('>=3.46.0')
@@ -66,19 +62,20 @@ executable(
     'src/Application.vala',
     'src/Location.vala',
     'src/MainWindow.vala',
+    'src/TaskModel.vala',
     'src/TodayTaskMonitor.vala',
     'src/Util.vala',
-    'src/Widgets/EditableLabel.vala',
     'src/Widgets/EntryPopover/DateTime.vala',
     'src/Widgets/EntryPopover/Generic.vala',
     'src/Widgets/EntryPopover/Location.vala',
+    'src/Widgets/EditableLabel.vala',
+    'src/Widgets/ListSettingsPopover.vala',
+    'src/Widgets/PopoverButton.vala',
     'src/Widgets/ScheduledRow.vala',
-    'src/Widgets/SourceRow.vala',
     'src/Widgets/ScheduledTaskListBox.vala',
+    'src/Widgets/SourceRow.vala',
     'src/Widgets/TaskListGrid.vala',
     'src/Widgets/TaskRow.vala',
-    'src/Widgets/ListSettingsPopover.vala',
-    'src/TaskModel.vala',
     dependencies: tasks_deps,
     install : true
 )

src/Application.vala

@@ -28,12 +28,7 @@ public class Tasks.Application : Gtk.Application {
     public static Tasks.TaskModel model;
     public static bool run_in_background = false;
 
-    public const Gtk.TargetEntry[] DRAG_AND_DROP_TASK_DATA = {
-        { "text/uri-list", Gtk.TargetFlags.SAME_APP | Gtk.TargetFlags.OTHER_WIDGET, 0 } // TODO: TEXT_URI
-    };
-
     private bool first_activation = true;
-
     public Application () {
         Object (
             application_id: "io.elementary.tasks",
@@ -58,7 +53,7 @@ public class Tasks.Application : Gtk.Application {
     protected override void startup () {
         base.startup ();
 
-        Hdy.init ();
+        Granite.init ();
 
         unowned var granite_settings = Granite.Settings.get_default ();
         unowned var gtk_settings = Gtk.Settings.get_default ();
@@ -69,11 +64,6 @@ public class Tasks.Application : Gtk.Application {
             gtk_settings.gtk_application_prefer_dark_theme = ((Granite.Settings) obj).prefers_color_scheme == DARK;
         });
 
-        var css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("io/elementary/tasks/Application.css");
-
-        Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
         var quit_action = new SimpleAction ("quit", null);
         quit_action.activate.connect (() => {
             if (active_window != null) {
@@ -105,15 +95,19 @@ public class Tasks.Application : Gtk.Application {
             var main_window = new MainWindow (this);
             add_window (main_window);
 
-            var rect = Gtk.Allocation ();
-            settings.get ("window-size", "(ii)", out rect.width, out rect.height);
-            main_window.set_allocation (rect);
+            /*
+            * This is very finicky. Bind size after present else set_titlebar gives us bad sizes
+            * Set maximize after height/width else window is min size on unmaximize
+            * Bind maximize as SET else get get bad sizes
+            */
+            settings.bind ("window-height", main_window, "default-height", DEFAULT);
+            settings.bind ("window-width", main_window, "default-width", DEFAULT);
 
             if (settings.get_boolean ("window-maximized")) {
                 main_window.maximize ();
             }
 
-            main_window.show_all ();
+            settings.bind ("window-maximized", main_window, "maximized", SET);
         }
 
         active_window.present ();
@@ -153,7 +147,7 @@ public class Tasks.Application : Gtk.Application {
         if (providers == null) {
             providers = new Gee.HashMap<string, Gtk.CssProvider> ();
         }
-        var task_list = (E.SourceTaskList?) source.get_extension (E.SOURCE_EXTENSION_TASK_LIST);
+        unowned var task_list = (E.SourceTaskList?) source.get_extension (E.SOURCE_EXTENSION_TASK_LIST);
         // Ensure we get a valid CSS color, not including FF
         var color = task_list.dup_color ().slice (0, 7);
         if (!providers.has_key (color)) {
@@ -162,21 +156,16 @@ public class Tasks.Application : Gtk.Application {
                 @define-color accent_color %s;
             """.printf (color, color);
 
-            try {
-                var style_provider = new Gtk.CssProvider ();
-                style_provider.load_from_data (style, style.length);
+            var style_provider = new Gtk.CssProvider ();
+            style_provider.load_from_string (style);
 
-                providers[color] = style_provider;
-            } catch (Error e) {
-                critical ("Unable to set color: %s", e.message);
-            }
+            providers[color] = style_provider;
         }
 
         widget.get_style_context ().add_provider (providers[color], Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
 
     public static int main (string[] args) {
-        GtkClutter.init (ref args);
         var app = new Application ();
         int res = app.run (args);
         ICal.Object.free_global_objects ();