Merge branch 'main' into danirabbit/styles-accent

elementary · Aug 18, 2024 · 3be33e6 · 3be33e6
2 parents a42d5cc + edf3947
commit 3be33e6
Show file tree

Hide file tree

Showing 424 changed files with 15,779 additions and 11,536 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ built for elementary OS.
 ## Building, Testing, and Installation
 
 You'll need the following dependencies:
-* meson >= 0.49.0
+* meson >= 0.57.0
 * gobject-introspection
 * libgee-0.8-dev
 * libgirepository1.0-dev

diff --git a/data/granite.metainfo.xml.in b/data/granite.metainfo.xml.in
@@ -27,7 +27,19 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-    <release version="7.5.0" date="2023-05-06" urgency="medium">
+    <release version="7.5.1" date="2024-06-18" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>Improve screen reader support for SwitchModelButton</li>
+          <li>Wrap long labels for SwitchModelButton</li>
+          <li>ValidatedEntry: set AccessibleState for validity</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="7.5.0" date="2024-05-06" urgency="medium">
       <description>
         <p>New Features:</p>
         <ul>

diff --git a/demo/Views/FormView.vala b/demo/Views/FormView.vala
@@ -12,17 +12,16 @@ public class FormView : Gtk.Box {
             critical (e.message);
         }
 
-        var username_label = new Gtk.Label ("Username") {
-            halign = Gtk.Align.START,
-            xalign = 0
-        };
-        username_label.add_css_class (Granite.STYLE_CLASS_H4_LABEL);
-
         var username_entry = new Granite.ValidatedEntry () {
             min_length = 8,
             regex = username_regex
         };
 
+        var username_label = new Granite.HeaderLabel ("Username") {
+            mnemonic_widget = username_entry,
+            secondary_text = "Must be at least 8 characters long"
+        };
+
         var button = new Gtk.Button.with_label ("Submit");
 
         margin_start = margin_end = margin_top = margin_bottom = 12;

diff --git a/demo/Views/ModeButtonView.vala b/demo/Views/ModeButtonView.vala
@@ -30,7 +30,7 @@ public class ModeButtonView : Gtk.Box {
 
         var switchmodelbutton = new Granite.SwitchModelButton ("Default");
 
-        var description_switchmodelbutton = new Granite.SwitchModelButton ("With Description") {
+        var description_switchmodelbutton = new Granite.SwitchModelButton ("A SwitchModelButton With A Description") {
             active = true,
             description = "A description of additional affects related to the activation state of this switch"
         };

diff --git a/lib/Widgets/AbstractSimpleSettingsPage.vala b/lib/Widgets/AbstractSimpleSettingsPage.vala
@@ -8,7 +8,7 @@
  * a content area, and an action area.
  */
 
-[Version (deprecated = true, deprecated_since = "7.5.0", replacement = "Switchboard.SimpleSettingsPage")]
+[Version (deprecated = true, deprecated_since = "7.5.0", replacement = "Switchboard.SettingsPage")]
 public abstract class Granite.SimpleSettingsPage : Granite.SettingsPage {
     private Gtk.Label description_label;
     private string _description;

diff --git a/lib/Widgets/HeaderLabel.vala b/lib/Widgets/HeaderLabel.vala
@@ -46,10 +46,10 @@ public class Granite.HeaderLabel : Gtk.Widget {
                 secondary_label.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
                 secondary_label.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
 
-                bind_property ("mnemonic-widget", secondary_label, "mnemonic-widget", SYNC_CREATE);
-
                 secondary_label.set_parent (this);
             }
+
+            update_accessible_description (value);
         }
     }
 
@@ -80,6 +80,16 @@ public class Granite.HeaderLabel : Gtk.Widget {
 
         bind_property ("label", label_widget, "label");
         bind_property ("mnemonic-widget", label_widget, "mnemonic-widget");
+
+        notify["mnemonic-widget"].connect (() => {
+            update_accessible_description (secondary_text);
+        });
+    }
+
+    private void update_accessible_description (string? description) {
+        if (mnemonic_widget != null) {
+            mnemonic_widget.update_property (Gtk.AccessibleProperty.DESCRIPTION, description, -1);
+        }
     }
 
     ~HeaderLabel () {

diff --git a/lib/Widgets/SwitchModelButton.vala b/lib/Widgets/SwitchModelButton.vala
@@ -37,11 +37,13 @@ public class Granite.SwitchModelButton : Gtk.ToggleButton {
 
     construct {
         var label = new Gtk.Label (text) {
-            ellipsize = Pango.EllipsizeMode.MIDDLE,
-            halign = Gtk.Align.START,
+            halign = START,
             hexpand = true,
-            vexpand = true,
             max_width_chars = 25,
+            vexpand = true,
+            wrap = true,
+            xalign = 0,
+            mnemonic_widget = this
         };
 
         var description_label = new Gtk.Label (null) {
@@ -68,9 +70,11 @@ public class Granite.SwitchModelButton : Gtk.ToggleButton {
         };
         button_switch.set_parent (this);
 
+        accessible_role = SWITCH;
+
         bind_property ("text", label, "label");
         bind_property ("description", description_label, "label");
-        bind_property ("active", button_switch, "active", GLib.BindingFlags.BIDIRECTIONAL);
+        bind_property ("active", button_switch, "active", BIDIRECTIONAL | SYNC_CREATE);
 
         var controller = new Gtk.GestureClick ();
         add_controller (controller);
@@ -80,7 +84,13 @@ public class Granite.SwitchModelButton : Gtk.ToggleButton {
             button_switch.activate ();
         });
 
+        notify["active"].connect (() => {
+            update_state (Gtk.AccessibleState.CHECKED, active, -1);
+        });
+
         notify["description"].connect (() => {
+            update_property (Gtk.AccessibleProperty.DESCRIPTION, description, -1);
+
             if (description == null || description == "") {
                 box.remove (description_revealer);
             } else {

diff --git a/lib/Widgets/ValidatedEntry.vala b/lib/Widgets/ValidatedEntry.vala
@@ -72,6 +72,8 @@ public class Granite.ValidatedEntry : Gtk.Entry {
                 secondary_icon_name = "process-error-symbolic";
                 add_css_class (Granite.STYLE_CLASS_ERROR);
             }
+
+            update_state (Gtk.AccessibleState.INVALID, !is_valid, -1);
         });
     }
 }
diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
     'granite-7',
     'vala', 'c',
-    meson_version: '>= 0.56.0',
+    meson_version: '>= 0.57.0',
     version: '7.5.0'
 )
 
@@ -52,13 +52,6 @@ libgranite_deps = [
     dependency('gtk4', version: '>=4.12'),
 ]
 
-icons_dir = join_paths(
-    get_option('prefix'),
-    get_option('datadir'),
-    'icons',
-    'hicolor'
-)
-
 pkgconfig = import('pkgconfig')
 gnome = import('gnome')
 i18n = import('i18n')
@@ -75,8 +68,6 @@ if get_option('demo')
     subdir('demo')
 endif
 
-# set up post-install script to refresh the GTK icon cache
-meson.add_install_script(
-    join_paths(meson.current_source_dir(), 'meson', 'post_install.py'),
-    '--iconsdir', icons_dir,
+gnome.post_install(
+    gtk_update_icon_cache: true
 )
diff --git a/meson/post_install.py b/meson/post_install.py
diff --git a/po/LINGUAS b/po/LINGUAS
@@ -200,3 +200,6 @@ gn
 an
 id_ID
 frp
+ca@valencia
+en_ZA
+pap
diff --git a/po/aa.po b/po/aa.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/ab.po b/po/ab.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/ace.po b/po/ace.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"

diff --git a/po/ae.po b/po/ae.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/af.po b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "PO-Revision-Date: 2015-12-04 01:36+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Afrikaans <[email protected]>\n"

diff --git a/po/ak.po b/po/ak.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "PO-Revision-Date: 2016-10-08 17:19+0000\n"
 "Last-Translator: aberba <[email protected]>\n"
 "Language-Team: Akan <[email protected]>\n"

diff --git a/po/am.po b/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "PO-Revision-Date: 2021-10-01 14:36+0000\n"
 "Last-Translator: carnage-mode <[email protected]>\n"
 "Language-Team: Amharic <https://l10n.elementary.io/projects/desktop/granite/"

diff --git a/po/an.po b/po/an.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/ar.po b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "PO-Revision-Date: 2021-08-30 15:00+0000\n"
 "Last-Translator: Muhammad Al-Jayyousi <[email protected]>\n"
 "Language-Team: Arabic <https://l10n.elementary.io/projects/desktop/granite/"

diff --git a/po/as.po b/po/as.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/ast.po b/po/ast.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/av.po b/po/av.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/ay.po b/po/ay.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/az.po b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "PO-Revision-Date: 2018-02-19 16:04+0000\n"
 "Last-Translator: Вагиф Кязым <[email protected]>\n"
 "Language-Team: Azerbaijani <https://weblate.elementary.io/projects/desktop/"

diff --git a/po/ba.po b/po/ba.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/be.po b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+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"

diff --git a/po/bg.po b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "PO-Revision-Date: 2016-10-27 12:56+0000\n"
 "Last-Translator: Адмирал АнимЕ <Unknown>\n"
 "Language-Team: Bulgarian <[email protected]>\n"

diff --git a/po/bh.po b/po/bh.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/bi.po b/po/bi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 

diff --git a/po/bm.po b/po/bm.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-06 18:11+0000\n"
+"POT-Creation-Date: 2024-07-31 17:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-Original file line number
+Diff line change
@@ Expand Up / @@ -200,3 +200,6 @@ gn @@
     an
     id_ID
     frp
+    ca@valencia
+    en_ZA
+    pap