Merge branch 'master' into danirabbit/gtk4prep-labelclasses

elementary · May 28, 2024 · c25ba0c · c25ba0c
2 parents 00e059e + e61a9e5
commit c25ba0c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 30 deletions.
diff --git a/po/en_GB.po b/po/en_GB.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-05-24 17:31+0000\n"
-"PO-Revision-Date: 2024-05-04 07:13+0000\n"
+"PO-Revision-Date: 2024-05-28 23:13+0000\n"
 "Last-Translator: David Hewitt <[email protected]>\n"
 "Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
 "installer/installer/en_GB/>\n"
@@ -336,21 +336,14 @@ msgid "Currently active language"
 msgstr "Currently active language"
 
 #: src/Views/PartitioningView.vala:52
-#, fuzzy
-#| msgid "Use Partition"
 msgid "Select Partitions"
-msgstr "Use Partition"
+msgstr "Select Partitions"
 
 #: src/Views/PartitioningView.vala:56
-#, fuzzy
-#| msgid ""
-#| "Select which partitions to use across all drives. <b>Selecting \"Format\" "
-#| "will erase ALL data on the selected partition.</b>"
 msgid ""
 "Selecting “Format” will erase <i>all</i> data on the selected partition."
 msgstr ""
-"Select which partitions to use across all drives. <b>Selecting \"Format\" "
-"will erase ALL data on the selected partition.</b>"
+"Selecting “Format” will erase <i>all</i> data on the selected partition."
 
 #. Device is in BIOS mode, so we just require a root partition
 #: src/Views/PartitioningView.vala:65

diff --git a/po/extra/en_GB.po b/po/extra/en_GB.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-05-24 17:31+0000\n"
-"PO-Revision-Date: 2023-08-03 16:08+0000\n"
+"PO-Revision-Date: 2024-05-28 23:13+0000\n"
 "Last-Translator: David Hewitt <[email protected]>\n"
 "Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
 "installer/extra/en_GB/>\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.5\n"
 
 #: data/installer.metainfo.xml.in:9
 msgid "Installer"
@@ -37,7 +37,7 @@ msgstr "Improvements:"
 
 #: data/installer.metainfo.xml.in:63
 msgid "Keyboard layout preview is now in a resizable window"
-msgstr ""
+msgstr "Keyboard layout preview is now in a resizeable window"
 
 #: data/installer.metainfo.xml.in:64 data/installer.metainfo.xml.in:78
 #: data/installer.metainfo.xml.in:91 data/installer.metainfo.xml.in:107

diff --git a/src/Views/EncryptView.vala b/src/Views/EncryptView.vala
@@ -285,26 +285,35 @@ public class EncryptView : AbstractInstallerView {
         }
     }
 
-    private class ErrorRevealer : Gtk.Revealer {
-        public Gtk.Label label_widget;
+    private class ErrorRevealer : Gtk.Box {
+        public bool reveal_child { get; set; }
+        public Gtk.Label label_widget { get; private set; }
+        public string label { get; construct set; }
 
-        public string label {
-            set {
-                label_widget.label = "<span font_size=\"small\">%s</span>".printf (value);
-            }
+        public ErrorRevealer (string label) {
+            Object (label: label);
         }
 
-        public ErrorRevealer (string label) {
-            label_widget = new Gtk.Label ("<span font_size=\"small\">%s</span>".printf (label));
-            label_widget.halign = Gtk.Align.END;
-            label_widget.justify = Gtk.Justification.RIGHT;
-            label_widget.max_width_chars = 55;
-            label_widget.use_markup = true;
-            label_widget.wrap = true;
-            label_widget.xalign = 1;
-
-            transition_type = Gtk.RevealerTransitionType.CROSSFADE;
-            add (label_widget);
+        construct {
+            label_widget = new Gtk.Label (label) {
+                halign = END,
+                justify = RIGHT,
+                max_width_chars = 55,
+                use_markup = true,
+                wrap = true,
+                xalign = 1
+            };
+            label_widget.get_style_context ().add_class (Granite.STYLE_CLASS_SMALL_LABEL);
+
+            var revealer = new Gtk.Revealer () {
+                child = label_widget,
+                transition_type = CROSSFADE
+            };
+
+            add (revealer);
+
+            bind_property ("reveal-child", revealer, "reveal-child");
+            bind_property ("label", label_widget, "label");
         }
     }
 }