Port to GTK 4

.github/workflows/gettext.yml

@@ -2,7 +2,7 @@ name: Gettext Updates
 
 on:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
   build:

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Install Dependencies
         run: |
           apt update
-          apt install -y libgranite-dev libgranite-7-dev libgtk-3-dev libgtk-4-dev libswitchboard-2.0-dev libgexiv2-dev meson valac
+          apt install -y libadwaita-1-dev libgranite-7-dev libgtk-4-dev libswitchboard-3-dev libgexiv2-dev meson valac
       - name: Build
         env:
           DESTDIR: out

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 
 on:
   pull_request:
-    branches: [master]
+    branches: [main]
     types: [closed]
 jobs:
   release:

README.md

@@ -1,4 +1,4 @@
-# Switchboard Desktop Plug
+# Desktop Settings
 [![Translation status](https://l10n.elementary.io/widgets/switchboard/-/switchboard-plug-pantheon-shell/svg-badge.svg)](https://l10n.elementary.io/engage/switchboard/?utm_source=widget)
 
 ![screenshot](data/screenshot-appearance.png?raw=true)
@@ -7,13 +7,10 @@
 
 You'll need the following dependencies:
 
-* gnome-settings-daemon-dev
-* libswitchboard-2.0-dev
+* libswitchboard-3-dev
 * libgee-0.8-dev
 * libgexiv2-dev
-* libgtk-3-dev (>= 3.22)
 * libgtk-4-dev
-* libgranite-dev
 * libgranite-7-dev
 * meson
 * valac
@@ -26,4 +23,4 @@ Run `meson` to configure the build environment and then `ninja` to build
 
 To install, use `ninja install`
 
-    sudo ninja install
+    ninja install

data/pantheon-shell.metainfo.xml.in → data/desktop.metainfo.xml.in

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
-  <id>io.elementary.switchboard.pantheon-shell</id>
-  <extends>io.elementary.switchboard</extends>
-  <translation type="gettext">pantheon-desktop-plug</translation>
+  <id>io.elementary.settings.desktop</id>
+  <extends>io.elementary.settings</extends>
+  <translation type="gettext">io.elementary.settings.desktop</translation>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
 

data/icons.gresource.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/io/elementary/switchboard/plug/pantheon-shell">
+  <gresource prefix="/io/elementary/settings/desktop">
     <file alias="appearance-default.svg" compressed="true" preprocess="xml-stripblanks">appearance-default.svg</file>
     <file alias="appearance-dark.svg" compressed="true" preprocess="xml-stripblanks">appearance-dark.svg</file>
     <file compressed="true">plug.css</file>
   </gresource>
-  <gresource prefix="io/elementary/switchboard/icons">
+  <gresource prefix="io/elementary/settings/icons">
     <file alias="32x32@2/apps/dock-icon-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/32.svg</file>
     <file alias="32x32/apps/dock-icon-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/32.svg</file>
     <file alias="48x48@2/apps/dock-icon-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/48.svg</file>

data/meson.build

@@ -1,6 +1,6 @@
 i18n.merge_file(
-    input: 'pantheon-shell.metainfo.xml.in',
-    output: 'io.elementary.switchboard.pantheon-shell.metainfo.xml',
+    input: 'desktop.metainfo.xml.in',
+    output: gettext_name + '.metainfo.xml',
     po_dir: meson.source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,

data/plug.css

@@ -78,13 +78,19 @@
         0 3px 3px alpha(#000, 0.22);
 }
 
-.wallpaper-container radio {
+.wallpaper-container check {
+    border-radius: 50%;
     min-height: 20px;
     min-width: 20px;
     -gtk-icon-transform: scale(0.6);
 }
 
-appearance-view radiobutton .card {
+.wallpaper-container picture {
+    min-width: 162px;
+    min-height: 100px;
+}
+
+appearance-view checkbutton .card {
     background-position: center;
     background-repeat: no-repeat;
     background-size: 86px 64px, cover;
@@ -93,21 +99,21 @@ appearance-view radiobutton .card {
     margin: 6px 6px 12px 12px;
 }
 
-appearance-view radiobutton .card.prefer-default {
+appearance-view checkbutton .card.prefer-default {
     background-color: white;
     background-image:
-        url("resource:///io/elementary/switchboard/plug/pantheon-shell/appearance-default.svg"),
+        url("resource:///io/elementary/settings/desktop/appearance-default.svg"),
         linear-gradient(
             to bottom,
             alpha(@accent_color_300, 0.1),
             alpha(@accent_color_500, 0.1)
         );
 }
 
-appearance-view radiobutton .card.prefer-dark {
+appearance-view checkbutton .card.prefer-dark {
     background-color: mix(@BLACK_300, @BLACK_500, 0.25);
     background-image:
-        url("resource:///io/elementary/switchboard/plug/pantheon-shell/appearance-dark.svg"),
+        url("resource:///io/elementary/settings/desktop/appearance-dark.svg"),
         linear-gradient(
             to bottom,
             alpha(@accent_color_300, 0.1),

meson.build

@@ -1,9 +1,9 @@
 project(
-    'pantheon-desktop',
+    'desktop',
     'vala', 'c',
     version: '6.5.0'
 )
-gettext_name = meson.project_name() + '-plug'
+gettext_name = 'io.elementary.settings.' + meson.project_name()
 gnome = import('gnome')
 i18n = import('i18n')
 
@@ -20,9 +20,9 @@ add_project_arguments(
 gio_dep = dependency('gio-2.0')
 glib_dep = dependency('glib-2.0')
 gobject_dep = dependency('gobject-2.0')
-granite_dep = dependency('granite', version: '>=6.0.0')
-gtk_dep = dependency('gtk+-3.0', version: '>= 3.22')
-hdy_dep = dependency ('libhandy-1')
+granite_dep = dependency('granite-7', version: '>=7.4.0')
+gtk_dep = dependency('gtk4')
+hdy_dep = dependency ('libadwaita-1')
 posix_dep = meson.get_compiler('vala').find_library('posix')
 
 plug_resources = gnome.compile_resources(

po/extra/POTFILES

@@ -1 +1 @@
-data/pantheon-shell.metainfo.xml.in
+data/desktop.metainfo.xml.in

set-wallpaper-contract/meson.build

@@ -28,11 +28,8 @@ executable(
         glib_dep,
         gio_dep,
         gobject_dep,
-#        granite_dep,
-#        gtk_dep,
-        # TODO: Re-use the variables above when the plug itself is ported to GTK 4
-        dependency('gtk4'),
-        dependency('granite-7'),
+        granite_dep,
+        gtk_dep,
         posix_dep,
         meson.get_compiler('c').find_library('m')
     ],

src/Plug.vala

@@ -37,15 +37,15 @@ public class PantheonShell.Plug : Switchboard.Plug {
         settings.set ("desktop/text", "text");
 
         var provider = new Gtk.CssProvider ();
-        provider.load_from_resource ("/io/elementary/switchboard/plug/pantheon-shell/plug.css");
-        Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        provider.load_from_resource ("/io/elementary/settings/desktop/plug.css");
+        Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         // DEPRECATED
         settings.set ("desktop/wallpaper", "wallpaper");
         settings.set ("desktop/hot-corners", "multitasking");
 
         Object (category: Category.PERSONAL,
-                code_name: "io.elementary.switchboard.pantheon-shell",
+                code_name: "io.elementary.settings.desktop",
                 display_name: _("Desktop"),
                 description: _("Configure the dock, hot corners, and change wallpaper"),
                 icon: "preferences-desktop",
@@ -54,8 +54,6 @@ public class PantheonShell.Plug : Switchboard.Plug {
 
     public override Gtk.Widget get_widget () {
         if (main_grid == null) {
-            main_grid = new Gtk.Grid ();
-
             wallpaper_view = new Wallpaper (this);
 
             var multitasking = new Multitasking ();
@@ -74,15 +72,25 @@ public class PantheonShell.Plug : Switchboard.Plug {
 
             stack.add_titled (multitasking, "multitasking", _("Multitasking"));
 
-            var stack_switcher = new Gtk.StackSwitcher ();
-            stack_switcher.stack = stack;
-            stack_switcher.halign = Gtk.Align.CENTER;
-            stack_switcher.homogeneous = true;
-            stack_switcher.margin = 24;
+            var stack_switcher = new Gtk.StackSwitcher () {
+                stack = stack,
+                halign = CENTER,
+                margin_top = 24,
+                margin_end = 24,
+                margin_bottom = 24,
+                margin_start = 24
+            };
+
+            var switcher_sizegroup = new Gtk.SizeGroup (HORIZONTAL);
+            unowned var switcher_child = stack_switcher.get_first_child ();
+            while (switcher_child != null) {
+                switcher_sizegroup.add_widget (switcher_child);
+                switcher_child = switcher_child.get_next_sibling ();
+            }
 
-            main_grid.attach (stack_switcher, 0, 0, 1, 1);
-            main_grid.attach (stack, 0, 1, 1, 1);
-            main_grid.show_all ();
+            main_grid = new Gtk.Grid ();
+            main_grid.attach (stack_switcher, 0, 0);
+            main_grid.attach (stack, 0, 1);
         }
 
         return main_grid;