Merge branch 'main' into gamepads-demo

.github/workflows/CI.yaml

@@ -6,10 +6,11 @@ on:
 
 jobs:
   CI:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
         with:
+          fetch-depth: 0 # required for make test
           submodules: "recursive"
 
       - name: Install host dependencies
@@ -25,13 +26,6 @@ jobs:
           key: ${{ runner.os }}-flatpak-dependencies-${{ github.run_id }}
           restore-keys: |
             ${{ runner.os }}-flatpak-dependencies-
-      - name: Restore .flatpak-builder
-        uses: actions/cache/restore@v3
-        with:
-          path: Workbench/.flatpak-builder
-          key: ${{ runner.os }}-flatpak-builder-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-flatpak-builder-
 
       - run: mutter --wayland --no-x11 --headless --wayland-display=wayland-0 --virtual-monitor 1280x720 > /tmp/mutter.log 2>&1 &
       - run: make ci
@@ -44,9 +38,3 @@ jobs:
         with:
           path: ~/.local/share/flatpak
           key: ${{ runner.os }}-flatpak-dependencies-${{ github.run_id }}
-      - name: Save .flatpak-builder
-        uses: actions/cache/save@v3
-        if: always()
-        with:
-          path: Workbench/.flatpak-builder
-          key: ${{ runner.os }}-flatpak-builder-${{ github.run_id }}

.gitignore

@@ -30,3 +30,6 @@ src/*/Cargo.toml
 src/*/lib.rs
 src/*/workbench.rs
 src/*/target
+src/*/*.gresource
+src/*/*.gresource.xml
+src/*/jsconfig.json

CONTRIBUTING.md

@@ -124,3 +124,7 @@ Here is a compilation of resources to learn more about the GNOME platform.
 - [Valadoc.org](https://valadoc.org)
 - [Vala tutorial](https://wiki.gnome.org/Projects/Vala/Tutorial)
 - [Vala examples](https://wiki.gnome.org/Projects/Vala/Examples)
+
+### Python
+
+- [PyGObject Docs](https://pygobject.gnome.org)

Makefile

@@ -1,29 +1,29 @@
 SHELL:=/bin/bash -O globstar
-.PHONY: setup lint test ci
+.PHONY: setup test ci
 .DEFAULT_GOAL := ci
 
 setup:
 	flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+	flatpak install --or-update --user --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.node20//24.08 #org.freedesktop.Sdk.Extension.typescript//24.08
 # flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
-	flatpak install --or-update --user --noninteractive flathub re.sonny.Workbench org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08
-
-lint:
-# Rust
-	flatpak run --command="/usr/lib/sdk/rust-stable/bin/rustfmt" --filesystem=host re.sonny.Workbench --check --edition 2021 src/*/*.rs
-# Python
-# flatpak run --command="ruff" --filesystem=host re.sonny.Workbench check --config=../src/langs/python/ruff.toml src/*/*.py
+	flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
+	flatpak install --or-update --user --noninteractive gnome-nightly re.sonny.Workbench.Devel
 
 format:
 # npx prettier --write src/*/*.json
-	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format javascript src/*/*.js
-	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format css src/*/*.css
-# flatpak run --command="ruff" --filesystem=host re.sonny.Workbench format --config=../src/langs/python/ruff.toml src/**/*.py
-	flatpak run --command="/usr/lib/sdk/rust-stable/bin/rustfmt" --filesystem=host re.sonny.Workbench --edition 2021 src/*/*.rs
-	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format blueprint src/*/*.blp
-	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format vala src/*/*.vala
+	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format javascript src/*/*.js
+	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format css src/*/*.css
+	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format python src/*/*.py
+	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format rust src/*/*.rs
+	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format blueprint src/*/*.blp
+	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format vala src/*/*.vala
+
+test:
+# list folders that have changed and run workbench-cli ci on them
+	git diff --dirstat=files,0 origin/main src | sed 's/^[ 0-9.]\+% //g' | uniq | xargs -d '\n' flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel ci
 
-test: lint
-	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench ci src/*
+all:
+	flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel ci src/*
 
 ci: setup test
 
@@ -37,5 +37,8 @@ clean:
 	rm -f src/*/Cargo.lockfile
 	rm -f src/*/lib.rs
 	rm -f src/*/workbench.rs
+	rm -f src/*/jsconfig.json
+	rm -f src/*/*.gresource
+	rm -f src/*/*.gresource.xml
 	rm -rf src/*/target
 	rm -rf src/*/__pycache__

README.md

@@ -23,22 +23,6 @@ flatpak override --user --filesystem=$PWD re.sonny.Workbench
 
 For more details see [CONTRIBUTING.md](./CONTRIBUTING.md).
 
-## Testing
-
-Please make sure to test your changes manually.
-
-You can run automated tests for a specific demo locally with
-
-```sh
-flatpak run --command="workbench-cli" --filesystem=$PWD/src re.sonny.Workbench ci src/Welcome
-```
-
-Or run all the tests locally with
-
-```sh
-make ci
-```
-
 ## Code of conduct
 
 Workbench follows the [GNOME Code of Conduct](https://conduct.gnome.org/).

STYLEGUIDE.md

@@ -11,6 +11,7 @@
 - Prefer properties like `Gtk.Box:spacing` to `Gtk.Widget:margin-top` for layout
 - Avoid hard-coded height and width, except for e.g. images with fixed geometry
 - Prefer HIG terms (Radio Groups, Checkboxes) over technical ones (Checkbuttons)
+- If you need icons, it is possible to use custom icons but prefer included [Adwaita icons set](ttps://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/tree/master/Adwaita/symbolic/actions?ref_type=heads).
 
 ## CSS
 
@@ -130,4 +131,4 @@ button.add_css_class ("pill");
 ### Logging
 
 - Use `message ()`, `warning ()` and `critical ()` for debug messages (depending on the severity)
-- Use `print ()`/`stdout.printf ()` for messages that are intended to be seen by the user
+- Use `print ()`/`stdout.printf ()` for messages that are intended to be seen by the user

src/About Dialog/code.rs

@@ -28,7 +28,7 @@ fn on_button_clicked() {
 
     dialog.add_link(
         "Documentation",
-        "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.5/class.AboutDialog.html",
+        "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.6/class.AboutDialog.html",
     );
 
     dialog.add_legal_section(

src/About Dialog/main.blp

@@ -21,7 +21,7 @@ Adw.StatusPage {
 
     LinkButton {
       label: _("API Reference");
-      uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.5/class.AboutDialog.html";
+      uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.6/class.AboutDialog.html";
     }
   }
 }

src/About Dialog/main.js

@@ -1,6 +1,6 @@
 import { gettext as _ } from "gettext";
 import Adw from "gi://Adw";
-import Gtk from "gi://Gtk";
+import Gtk from "gi://Gtk?version=4.0";
 
 const button = workbench.builder.get_object("button");
 
@@ -25,7 +25,7 @@ function openAboutDialog() {
 
   dialog.add_link(
     _("Documentation"),
-    "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.5/class.AboutDialog.html",
+    "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.6/class.AboutDialog.html",
   );
 
   dialog.add_legal_section(

src/About Dialog/main.py

@@ -28,7 +28,7 @@ def open_about_window(_widget):
 
     dialog.add_link(
         _("Documentation"),
-        "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.5/class.AboutDialog.html",
+        "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.6/class.AboutDialog.html",
     )
 
     dialog.add_legal_section(

src/About Dialog/main.vala

@@ -25,7 +25,7 @@ public void on_button_clicked () {
     };
     dialog.add_link (
                      "Documentation",
-                     "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.5/class.AboutDialog.html"
+                     "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.6/class.AboutDialog.html"
     );
     dialog.add_legal_section (
                               "Fonts",

src/Accessibility/main.js

@@ -1,6 +1,6 @@
 import GObject from "gi://GObject";
-import Gdk from "gi://Gdk";
-import Gtk from "gi://Gtk";
+import Gdk from "gi://Gdk?version=4.0";
+import Gtk from "gi://Gtk?version=4.0";
 
 const button = workbench.builder.get_object("custom_button");
 
@@ -22,6 +22,9 @@ key_controller.connect("key-released", (_controller, keyval) => {
 });
 button.add_controller(key_controller);
 
+/**
+ * @param {Gtk.Button} button
+ */
 function toggleButton(button) {
   let checked = (button.get_state_flags() & Gtk.StateFlags.CHECKED) !== 0;
   let pressed;

src/Account/main.js

@@ -1,6 +1,6 @@
-import Gdk from "gi://Gdk";
+import Gdk from "gi://Gdk?version=4.0";
 import Gio from "gi://Gio";
-import Xdp from "gi://Xdp";
+import Xdp from "gi://Xdp?version=1.0";
 import XdpGtk from "gi://XdpGtk4";
 
 Gio._promisify(

src/Action Bar/main.blp

@@ -64,7 +64,7 @@ Box {
 
     [end]
     Button end_widget {
-      icon-name: "padlock2-symbolic";
+      icon-name: "input-keyboard-symbolic";
     }
   }
 }

src/Actions/main.vala

@@ -0,0 +1,44 @@
+#! /usr/bin/env -S vala workbench.vala --pkg libadwaita-1
+
+public void main () {
+    var demo = (Adw.StatusPage) workbench.builder.get_object ("demo");
+
+    var demo_group = new SimpleActionGroup ();
+    demo.insert_action_group ("demo", demo_group);
+
+    // Action with no state or parameters
+    var simple_action = new SimpleAction ("simple", null);
+    simple_action.activate.connect (() => {
+        message (@"$(simple_action.name) action activated");
+    });
+    demo_group.add_action (simple_action);
+
+    // Action with parameter
+    var bookmarks_action = new SimpleAction ("open-bookmarks", new GLib.VariantType ("s"));
+    bookmarks_action.activate.connect ((action, parameter) => {
+        message (@"$(action.name) activated with $(parameter.get_string())");
+    });
+    demo_group.add_action (bookmarks_action);
+
+    // Action with state
+    var toggle_action = new SimpleAction.stateful ("toggle", null, new Variant.boolean (false));
+    toggle_action.notify.connect ((action, state) => {
+        bool b = toggle_action.state.get_boolean ();
+        message (@"$(toggle_action.name) action set to " + (b ? "true" : "false"));
+    });
+
+    demo_group.add_action (toggle_action);
+
+    // Action with state and parameter
+    var scale_action = new SimpleAction.stateful ("scale", new VariantType ("s"), new Variant.string ("100%"));
+
+    scale_action.notify.connect ((action) => {
+        message (@"$(scale_action.name) action set to $(scale_action.state.get_string())");
+    });
+
+    demo_group.add_action (scale_action);
+
+    var text = (Gtk.Label) workbench.builder.get_object ("text");
+    var alignment_action = new PropertyAction ("text-align", text, "halign");
+    demo_group.add_action (alignment_action);
+}

src/Advanced Buttons/main.blp

@@ -41,7 +41,7 @@ Adw.StatusPage {
 
           Adw.SplitButton {
             halign: center;
-            icon-name: "execute-from-symbolic";
+            icon-name: "media-playback-start-symbolic";
             menu-model: button_run_menu;
           }
 
@@ -71,7 +71,7 @@ Adw.StatusPage {
     LinkButton {
       margin-bottom: 36;
       label: _("API Reference");
-      uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.5/class.SplitButton.html";
+      uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.6/class.SplitButton.html";
     }
 
     Box {
@@ -126,7 +126,7 @@ Adw.StatusPage {
 
             Adw.ButtonContent {
               label: _("New");
-              icon-name: "plus-symbolic";
+              icon-name: "list-add-symbolic";
             }
           }
 
@@ -143,8 +143,8 @@ Adw.StatusPage {
 
           ToggleButton {
             Adw.ButtonContent {
-              label: _("Alerts");
-              icon-name: "bell-outline-symbolic";
+              label: _("Bluetooth");
+              icon-name: "bluetooth-active-symbolic";
             }
           }
 
@@ -157,7 +157,7 @@ Adw.StatusPage {
 
     LinkButton {
       label: _("API Reference");
-      uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.5/class.ButtonContent.html";
+      uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.6/class.ButtonContent.html";
     }
   }
 }
@@ -172,7 +172,7 @@ Popover button_popover {
 
     Adw.StatusPage {
       title: _("No Recent Documents");
-      icon-name: "clock-symbolic";
+      icon-name: "document-open-recent-symbolic";
       width-request: 300;
       height-request: 300;
 

src/Animation/main.blp

@@ -64,7 +64,7 @@ Adw.Clamp {
             hexpand: true;
             halign: end;
             valign: center;
-            icon-name: "play-large-symbolic";
+            icon-name: "media-playback-start-symbolic";
 
             styles [
               "circular"
@@ -115,7 +115,7 @@ Adw.Clamp {
             hexpand: true;
             halign: end;
             valign: center;
-            icon-name: "play-large-symbolic";
+            icon-name: "media-playback-start-symbolic";
 
             styles [
               "circular"
@@ -163,12 +163,12 @@ Adw.Clamp {
 
       LinkButton {
         label: _("Timed Animation");
-        uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.5/class.TimedAnimation.html";
+        uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.6/class.TimedAnimation.html";
       }
 
       LinkButton {
         label: _("Spring Animation");
-        uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.5/class.SpringAnimation.html";
+        uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.6/class.SpringAnimation.html";
       }
     }
   }

src/Animation/main.js

@@ -41,11 +41,10 @@ const animation_spring = new Adw.SpringAnimation({
   value_to: 1,
   spring_params: params,
   target: target_spring,
+  initial_velocity: 1.0, // If amplitude of oscillation < epsilon, animation stops
+  epsilon: 0.001,
+  clamp: false,
 });
-animation_spring.initial_velocity = 1.0;
-// If amplitude of oscillation < epsilon, animation stops
-animation_spring.epsilon = 0.001;
-animation_spring.clamp = false;
 
 button_spring.connect("clicked", () => {
   animation_spring.play();