Merge branch 'main' into release-7.7.0

Author: danirabbit

.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,7 +19,7 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Dependencies
         run: |
           apt update

.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"

data/granite.metainfo.xml.in

@@ -66,6 +66,7 @@
       <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>

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/MapsView.vala

@@ -4,9 +4,34 @@
  */
 
 public class MapsView : DemoPage {
+    private string styles = "
+        map-marker.self {
+            background-color: @base_color;
+            border-radius: 50%;
+            box-shadow:
+                0 0 0 1px @borders,
+                0 3px 4px alpha(black, 0.15),
+                0 3px 3px -3px alpha(black, 0.35);
+            padding: 0.25rem;
+        }
+
+        map-marker.self grid {
+            background: @accent_color;
+            color: white;
+            border-radius: 50%;
+            min-height: 1rem;
+            min-width: 1rem;
+        }
+    ";
+
     construct {
         title = "Shumate.SimpleMap";
 
+        var style_provider = new Gtk.CssProvider ();
+        style_provider.load_from_string (styles);
+
+        Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+
         var registry = new Shumate.MapSourceRegistry.with_defaults ();
 
         var simple_map = new Shumate.SimpleMap () {
@@ -21,20 +46,28 @@ public class MapsView : DemoPage {
         simple_map.add_css_class (Granite.CssClass.CARD);
 
         var point = new Shumate.Marker () {
-            child = new Gtk.Image.from_icon_name ("emblem-favorite-symbolic"),
+            child = new Gtk.Image.from_icon_name ("map-marker") { pixel_size = 48 },
             latitude = 38.580753,
             longitude = -121.487300
         };
 
+        var self_point = new Shumate.Marker () {
+            child = new Gtk.Grid (),
+            latitude = 38.575764,
+            longitude = -121.478851
+        };
+        self_point.add_css_class ("self");
+
         var marker_layer = new Shumate.MarkerLayer.full (simple_map.viewport, SINGLE);
         marker_layer.add_marker (point);
+        marker_layer.add_marker (self_point);
 
         var map_view = simple_map.viewport;
         map_view.zoom_level = 15;
 
         var map = simple_map.map;
         map.add_layer (marker_layer);
-        map.center_on (38.575764, -121.478851);
+        map.center_on (self_point.latitude, self_point.longitude);
 
         child = simple_map;
     }

demo/data/demo.gresource.xml

@@ -3,5 +3,7 @@
   <gresource prefix="/io/elementary/granite/demo/icons">
     <file alias="32x32/actions/git.svg" compressed="true" preprocess="xml-stripblanks">git.svg</file>
     <file alias="32x32/actions/valadoc.svg" compressed="true" preprocess="xml-stripblanks">valadoc.svg</file>
+
+    <file alias="48x48/places/map-marker.svg" compressed="true" preprocess="xml-stripblanks">map-marker.svg</file>
   </gresource>
 </gresources>

demo/data/map-marker.svg

@@ -20,6 +20,13 @@ namespace Granite {
 
         typeof (Granite.Settings).ensure ();
 
+        /*
+         * gdk_display_manager_get() requires gtk_init() is already called since
+         * Gtk 4.17, so initialize Gtk explicitly
+         * See also https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/223
+         */
+        Gtk.init ();
+
         unowned var display_manager = Gdk.DisplayManager.@get ();
         display_manager.display_opened.connect (StyleManager.init_for_display);