Merge branch 'main' into lenemter/remove-accounts-service

Author: zeebok

.github/workflows/gettext.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
     - name: Clone repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

.github/workflows/lint.yml

@@ -7,5 +7,5 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: elementary/actions/vala-lint@master
+      - uses: actions/checkout@v5
+      - uses: elementary/actions/vala-lint@main

.github/workflows/main.yml

@@ -19,17 +19,17 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Dependencies
         run: |
           apt update
-          apt install -y meson gobject-introspection libgee-0.8-dev libgirepository1.0-dev libgtk-4-dev libshumate-dev sassc valac
+          apt install -y meson gobject-introspection libgee-0.8-dev libgirepository1.0-dev libgtk-4-dev libshumate-dev sassc valac valadoc gtk-doc-tools
       - name: Build
         env:
           DESTDIR: out
           PKG_CONFIG_PATH: ${{ github.workspace }}/build/meson-uninstalled
         run: |
-          meson build
+          meson setup build -Ddocumentation=true
           ninja -C build
           ninja -C build install
 

.github/workflows/release.yml

@@ -9,8 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
     steps:
-      - uses: actions/checkout@v4
-      - uses: elementary/actions/release@master
+      - uses: actions/checkout@v5
+      - uses: elementary/actions/release@main
         env:
           GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
           GIT_USER_NAME: "elementaryBot"

README.md

@@ -22,9 +22,9 @@ You'll need the following dependencies:
 To build the Demo you'll additionally need:
 * libshumate-dev
 
-Run `meson build` to configure the build environment:
+Run `meson setup` to configure the build environment:
 
-    meson build --prefix=/usr
+    meson setup build --prefix=/usr
 
 This command creates a `build` directory. For all following commands, change to
 the build directory before running them.

data/granite.metainfo.xml.in

@@ -27,17 +27,48 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-    <release version="7.7.0" date="2025-02-10" urgency="medium">
+    <release version="7.7.0" date="2025-09-30" urgency="medium">
       <description>
+        <p>New Icons:</p>
+        <ul>
+          <li>View icons for columns, grids, lists, and reader mode. Plus horizontal and vertical ellipsis icons</li>
+          <li>Start and End show/hide sidebar icons</li>
+          <li>Emoji category icons used by GTK's emoji picker</li>
+          <li>Eye icons required by Gtk.PasswordEntry</li>
+        </ul>
         <p>New Features:</p>
         <ul>
-          <li>Granite.CssClass.NUMERIC</li>
+          <li>Box is an orientable widget that includes standardized spacing and linked styles</li>
+          <li>ListItem is a standard list widget that includes styles and spacing</li>
+          <li>ToolBox is a vertical layout widget for top and bottom toolbars</li>
+          <li>new style class constants for labels: CssClass.NUMERIC and CssClass.MONOSPACE</li>
+          <li>StyleManager handles automatically setting dark and light modes as well as system accent colors using Portals</li>
+          <li>BackButton is a standardized navigation button that activates "navigation.pop" and includes a shortcut tooltip</li>
         </ul>
         <p>Improvements:</p>
         <ul>
+          <li>accel_to_string now uses the word "Super" instead of the "⌘" symbol</li>
+          <li>HeaderLabel has a new property for H1-H4 sizes and H2 styles are now bolder</li>
+          <li>CssClass.CARD is now rounded by default</li>
           <li>Updated translations</li>
         </ul>
+        <p>Deprecations:</p>
+        <ul>
+          <li>Utils.set_color_primary. Modern apps have moved to more of a split paned design and this style is no longer very fashionable</li>
+          <li>Nearly all of the old `STYLE_CLASS` constants have been deprecated. Some of them have been replaced by `CssClass` constants, others by widgets.</li>
+        </ul>
+        <p>Demo Improvements:</p>
+        <ul>
+          <li>More demo pages with more widgets</li>
+          <li>Color scheme switcher in the sidebar</li>
+        </ul>
       </description>
+      <issues>
+        <issue url="https://github.com/elementary/granite/issues/742">adw-entry-apply-symbolic</issue>
+        <issue url="https://github.com/elementary/granite/issues/802">Provide native support for libshumate</issue>
+        <issue url="https://github.com/elementary/granite/issues/874">Default icon themes by non-Pantheon desktops may have missing icons or use incorrect icons</issue>
+        <issue url="https://github.com/elementary/granite/issues/883">PopoverAccelLabel styles broken in Demo</issue>
+      </issues>
     </release>
 
     <release version="7.6.0" date="2024-11-21" urgency="medium">

demo/GraniteDemo.vala

@@ -29,7 +29,6 @@ public class Granite.Demo : Gtk.Application {
         var overlaybar_view = new OverlayBarView ();
         var toast_view = new ToastView ();
         var settings_uris_view = new SettingsUrisView ();
-        var style_manager_view = new StyleManagerView ();
         var utils_view = new UtilsView ();
         var video_view = new VideoView ();
         var placeholder = new WelcomeView ();
@@ -42,7 +41,6 @@ public class Granite.Demo : Gtk.Application {
         main_stack.add_titled (placeholder, "placeholder", "Placeholder");
         main_stack.add_titled (box_view, "box", "Box");
         main_stack.add_titled (lists_view, "lists", "Lists & Grids");
-        main_stack.add_titled (style_manager_view, "style_manager", "StyleManager");
         main_stack.add_titled (accel_label_view, "accel_label", "AccelLabel");
         main_stack.add_titled (css_view, "css", "Style Classes");
         main_stack.add_titled (date_time_picker_view, "pickers", "Date & Time");
@@ -70,10 +68,45 @@ public class Granite.Demo : Gtk.Application {
             vexpand = true
         };
 
+        var dont_button = new Gtk.ToggleButton () {
+            action_name = "app.color-scheme",
+            action_target = new Variant.uint32 (Granite.Settings.ColorScheme.NO_PREFERENCE),
+            icon_name = "preferences-system-symbolic",
+            tooltip_text = "Follow system setting"
+        };
+
+        var force_light = new Gtk.ToggleButton () {
+            action_name = "app.color-scheme",
+            action_target = new Variant.uint32 (Granite.Settings.ColorScheme.LIGHT),
+            group = dont_button,
+            icon_name = "display-brightness-symbolic",
+            tooltip_text = "Light"
+        };
+
+        var force_dark = new Gtk.ToggleButton () {
+            action_name = "app.color-scheme",
+            action_target = new Variant.uint32 (Granite.Settings.ColorScheme.DARK),
+            group = force_light,
+            icon_name = "weather-clear-night-symbolic",
+            tooltip_text = "Dark"
+        };
+
+        var style_box = new Granite.Box (HORIZONTAL, LINKED) {
+            homogeneous = true,
+            margin_start = 6,
+            margin_bottom = 6,
+            margin_end = 6,
+            margin_top = 6
+        };
+        style_box.append (force_light);
+        style_box.append (dont_button);
+        style_box.append (force_dark);
+
         var start_box = new Granite.ToolBox () {
             content = stack_sidebar
         };
         start_box.add_top_bar (start_header);
+        start_box.add_bottom_bar (style_box);
         start_box.add_css_class (Granite.STYLE_CLASS_SIDEBAR);
 
         var paned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL) {
@@ -92,6 +125,19 @@ public class Granite.Demo : Gtk.Application {
 
         add_window (window);
         window.show ();
+
+        var style_manager = Granite.StyleManager.get_default ();
+
+        var style_action = new SimpleAction.stateful ("color-scheme", VariantType.UINT32, new Variant.uint32 (style_manager.color_scheme));
+        style_action.activate.connect ((parameter) => {
+            style_manager.color_scheme = (Granite.Settings.ColorScheme) parameter.get_uint32 ();
+        });
+
+        style_manager.notify ["color-scheme"].connect (() => {
+            style_action.set_state (new Variant.uint32 (style_manager.color_scheme));
+        });
+
+        add_action (style_action);
     }
 
     public static int main (string[] args) {

demo/Views/AccelLabelView.vala

@@ -13,15 +13,13 @@ public class AccelLabelView : DemoPage {
         var popover_label = new Gtk.Label ("In a Popover:");
         popover_label.halign = Gtk.Align.END;
 
-        var lock_button = new Gtk.Button () {
+        var lock_button = new PopoverMenuItem () {
             child = new Granite.AccelLabel ("Lock", "<Super>L")
         };
-        lock_button.add_css_class ("model");
 
-        var logout_button = new Gtk.Button () {
+        var logout_button = new PopoverMenuItem () {
             child = new Granite.AccelLabel ("Log Out…", "<Ctrl><Alt>Delete")
         };
-        logout_button.add_css_class ("model");
 
         var lock_item = new GLib.MenuItem (null, null);
         lock_item.set_attribute_value ("custom", "lock");
@@ -55,4 +53,10 @@ public class AccelLabelView : DemoPage {
 
         child = grid;
     }
+
+    private class PopoverMenuItem : Gtk.Button {
+        class construct {
+            set_css_name ("modelbutton");
+        }
+    }
 }

demo/Views/BoxView.vala

@@ -12,8 +12,8 @@ public class BoxView : DemoPage {
         };
 
         var single_box = new Granite.Box (HORIZONTAL);
-        single_box.append (new Gtk.Image.from_icon_name ("application-default-icon") { icon_size = LARGE });
-        single_box.append (new Gtk.Image.from_icon_name ("application-default-icon") { icon_size = LARGE });
+        single_box.append (new Gtk.Image.from_icon_name ("package-x-generic") { icon_size = LARGE });
+        single_box.append (new Gtk.Image.from_icon_name ("package-x-generic") { icon_size = LARGE });
 
         var single_container = new Granite.Box (VERTICAL);
         single_container.append (single_header);
@@ -24,8 +24,8 @@ public class BoxView : DemoPage {
         };
 
         var double_box = new Granite.Box (HORIZONTAL, DOUBLE);
-        double_box.append (new Gtk.Image.from_icon_name ("application-default-icon") { icon_size = LARGE });
-        double_box.append (new Gtk.Image.from_icon_name ("application-default-icon") { icon_size = LARGE });
+        double_box.append (new Gtk.Image.from_icon_name ("package-x-generic") { icon_size = LARGE });
+        double_box.append (new Gtk.Image.from_icon_name ("package-x-generic") { icon_size = LARGE });
 
         var double_container = new Granite.Box (VERTICAL);
         double_container.append (double_header);

demo/Views/HyperTextViewGrid.vala

@@ -27,9 +27,9 @@ public class HyperTextViewGrid : DemoPage {
         var hypertext_scrolled_window = new Gtk.ScrolledWindow () {
             height_request = 300,
             width_request = 600,
-            child = hypertext_textview
+            child = hypertext_textview,
+            has_frame = true
         };
-        hypertext_scrolled_window.add_css_class (Granite.STYLE_CLASS_FRAME);
 
         var box = new Granite.Box (VERTICAL, NONE) {
             halign = CENTER,