Merge branch 'main' into ryonakano/granite-init-explicit-gtk-init

Author: danirabbit

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

@@ -1,25 +0,0 @@
-map-marker {
-    // This stacks with the other shadows,
-    // so reduce it's alpha by the sum of other shadows
-    $shadow-border-color: scale-color($border-color, $alpha: -50%);
-    @if $color-scheme == "dark" {
-        $shadow-border-color: transparent
-    }
-
-    background-color: bg-color(0);
-    border-radius: 50%;
-    box-shadow:
-        highlight(),
-        // Intentionally not in ems since it's used as a stroke
-        0 0 0 1px $shadow-border-color,
-        shadow(2);
-    padding: $button-spacing / 3;
-
-    image {
-        background: $BLUEBERRY_500;
-        color: white;
-        border-radius: 50%;
-        padding: $button-spacing / 2;
-        -gtk-icon-size: 1rem;
-    }
-}

lib/Styles/Shumate/MapMarker.scss

@@ -8,21 +8,23 @@ msgstr ""
 "Project-Id-Version: granite\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-07-09 01:07+0000\n"
-"PO-Revision-Date: 2015-12-04 01:36+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
-"Language-Team: Belarusian <[email protected]>\n"
+"PO-Revision-Date: 2025-07-19 10:55+0000\n"
+"Last-Translator: lenify <[email protected]>\n"
+"Language-Team: Belarusian <https://l10n.elementaryos.org/projects/desktop/"
+"granite/be/>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 5.11.4\n"
 "X-Launchpad-Export-Date: 2017-03-07 05:44+0000\n"
-"X-Generator: Launchpad (build 18330)\n"
 
 #. / TRANSLATORS: a GLib.DateTime format showing the hour (12h format) with seconds
 #: lib/DateTime.vala:28
-#, fuzzy
 msgid "%-l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+msgstr "%-l:%M:%S %p"
 
 #. / TRANSLATORS: a GLib.DateTime format showing the hour (12h format)
 #: lib/DateTime.vala:31

po/be.po

@@ -8,15 +8,17 @@ msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-07-09 01:07+0000\n"
-"PO-Revision-Date: 2019-12-10 12:56-0800\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2025-07-19 10:55+0000\n"
+"Last-Translator: lenify <[email protected]>\n"
+"Language-Team: Belarusian <https://l10n.elementaryos.org/projects/desktop/"
+"granite-extra/be/>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 5.11.4\n"
 
 #: data/granite.metainfo.xml.in:11
 msgid "Granite 7"
@@ -34,7 +36,7 @@ msgstr ""
 
 #: data/granite.metainfo.xml.in:24
 msgid "elementary, Inc."
-msgstr ""
+msgstr "elementary, Inc."
 
 #: data/granite.metainfo.xml.in:32
 msgid "New Icons:"
@@ -120,7 +122,7 @@ msgstr ""
 #: data/granite.metainfo.xml.in:139 data/granite.metainfo.xml.in:149
 #: data/granite.metainfo.xml.in:168 data/granite.metainfo.xml.in:204
 msgid "Updated translations"
-msgstr ""
+msgstr "Абноўлены пераклады"
 
 #: data/granite.metainfo.xml.in:55 data/granite.metainfo.xml.in:108
 msgid "Deprecations:"